From e7a5aa275f9091a4b8967ba12dc80cce0166deef Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Thu, 28 Oct 2021 14:30:43 +0330
Subject: [PATCH 01/32] Update bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md   | 32 ---------
 .github/ISSUE_TEMPLATE/bug_report.yaml | 90 ++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 32 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 150c58a4..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Environment (please complete the following information):**
- - .net: [e.g. 4.6.2]
- - IDE [e.g. vs2017]
- - Version [e.g. 1.0.0]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000..ea3be13c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,90 @@
+name: Bug report
+description: File a bug report
+title: "Bug title"
+labels: []
+body: 
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: Please enter a short, clear description of the bug.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce the bug
+      description: Please provide any required setup and steps to reproduce the behavior.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Please provide a description of what you expected to happen
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots here to help explain your problem
+  - type: dropdown
+    attributes:
+      label: NuGet package version
+      options:
+        - "HandyControl 3.2.0"
+        - "HandyControl 3.1.0"
+        - "HandyControl 3.0.0"
+        - "HandyControls (Custom version) 3.3.8.1"
+        - "HandyControls (Custom version) 3.3.8"
+        - "HandyControls (Custom version) 3.3.7"
+  - type: dropdown
+    attributes:
+      label: IDE
+      description: Which Visual Studio versions did you see the issue on?
+      multiple: true
+      options:
+        - "Visual Studio 2022-preview"
+        - "Visual Studio 2022"
+        - "Visual Studio 2019"
+        - "Visual Studio 2017"
+  - type: dropdown
+    attributes:
+      label: Framework type
+      description: please specify for which framework type you have encountered the issue.
+      multiple: true
+      options:
+        - ".Net 6.0"
+        - ".Net 5.0"
+        - ".Net Core 3.1"
+        - ".Net Core 3.0"
+        - ".Net Framework 4.8"
+        - ".Net Framework 4.7.2"
+        - ".Net Framework 4.7.1"
+        - ".Net Framework 4.7.0"
+        - ".Net Framework 4.6.2"
+        - ".Net Framework 4.6.1"
+        - ".Net Framework 4.6.0"
+        - ".Net Framework 4.5.2"
+        - ".Net Framework 4.5.1"
+        - ".Net Framework 4.5.0"
+        - ".Net Framework 4.0.0"
+  - type: dropdown
+    attributes:
+      label: Windows version
+      description: Which Windows versions did you see the issue on?
+      multiple: true
+      options:
+        - "Insider Build (xxxxx)"
+        - "Windows 11 (22000)"
+        - "May 2021 Update (19043)"
+        - "October 2020 Update (19042)"
+        - "May 2020 Update (19041)"
+        - "November 2019 Update (18363)"
+        - "May 2019 Update (18362)"
+        - "October 2018 Update (17763)"
+        - "April 2018 Update (17134)"
+        - "Fall Creators Update (16299)"
+        - "Creators Update (15063)"
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Enter any other applicable info here

From 483370f218abe7c0d464217c0e1467fc1bd91e67 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 5 Jan 2022 21:56:30 +0800
Subject: [PATCH 02/32] enhance: add Layout prop for ButtonGroup

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |  37 ++++-
 .../Controls/Button/ButtonGroup.cs            |  17 ++-
 .../Data/Enum/LinearLayout.cs                 |   9 ++
 .../HandyControl_Shared.projitems             |   1 +
 .../Styles/Base/ButtonGroupBaseStyle.xaml     |  41 +++++-
 .../HandyControl_Shared/Themes/Theme.xaml     |  37 ++++-
 .../ButtonGroupItemStyleSelector.cs           | 136 ++++++++++--------
 7 files changed, 192 insertions(+), 86 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 43d0dd10..d134dfb4 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -561,12 +561,18 @@
 			</Border>
 		</Grid>
 	</ControlTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalItemsPanelTemplate">
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
 		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
 	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupVerticalItemsPanelTemplate">
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
 		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
 	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
 	<tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
 	<LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
 		<GradientStop Color="#00FFFFFF" Offset="0" />
@@ -2442,16 +2448,35 @@
 	<Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
 		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
 		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
 		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
 		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
 		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalItemsPanelTemplate}" />
-			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
+			</MultiTrigger>
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
index 14ab530d..6b938fc7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
@@ -1,12 +1,14 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using HandyControl.Data;
 
 namespace HandyControl.Controls
 {
     public class ButtonGroup : ItemsControl
     {
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is Button || item is RadioButton || item is ToggleButton;
+        protected override bool IsItemItsOwnContainerOverride(object item) => item is Button or RadioButton or ToggleButton;
 
         public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
             "Orientation", typeof(Orientation), typeof(ButtonGroup), new PropertyMetadata(default(Orientation)));
@@ -17,10 +19,17 @@ namespace HandyControl.Controls
             set => SetValue(OrientationProperty, value);
         }
 
-        protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
-        {
-            base.OnVisualChildrenChanged(visualAdded, visualRemoved);
+        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+            "Layout", typeof(LinearLayout), typeof(ButtonGroup), new PropertyMetadata(LinearLayout.Uniform));
 
+        public LinearLayout Layout
+        {
+            get => (LinearLayout) GetValue(LayoutProperty);
+            set => SetValue(LayoutProperty, value);
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
             var count = Items.Count;
             for (var i = 0; i < count; i++)
             {
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
new file mode 100644
index 00000000..5aa6c542
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
@@ -0,0 +1,9 @@
+namespace HandyControl.Data
+{
+    public enum LinearLayout
+    {
+        Stack,
+
+        Uniform
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 9f73d850..094f4063 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -85,6 +85,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Tag\TagContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\HighlightTextBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\SimpleText.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\LinearLayout.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\FullScreenHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\EnumItem.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonGroupBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonGroupBaseStyle.xaml
index a049b0a9..d3575c2c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonGroupBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonGroupBaseStyle.xaml
@@ -3,30 +3,57 @@
                     xmlns:hc="clr-namespace:HandyControl.Controls"
                     xmlns:tools="clr-namespace:HandyControl.Tools">
 
-    <ItemsPanelTemplate x:Key="ButtonGroupHorizontalItemsPanelTemplate">
+    <ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
         <UniformGrid FocusVisualStyle="{x:Null}" Rows="1"/>
     </ItemsPanelTemplate>
 
-    <ItemsPanelTemplate x:Key="ButtonGroupVerticalItemsPanelTemplate">
+    <ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
         <UniformGrid FocusVisualStyle="{x:Null}" Columns="1"/>
     </ItemsPanelTemplate>
 
+    <ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}"/>
+    </ItemsPanelTemplate>
+
     <tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector"/>
 
     <Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
         <Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Layout" Value="Uniform"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Focusable" Value="False"/>
-        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}"/>
         <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}"/>
         <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}"/>
         <Style.Triggers>
-            <Trigger Property="Orientation" Value="Vertical">
-                <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalItemsPanelTemplate}"/>
-            </Trigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Uniform"/>
+                    <Condition Property="Orientation" Value="Vertical"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Stack"/>
+                    <Condition Property="Orientation" Value="Horizontal"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Stack"/>
+                    <Condition Property="Orientation" Value="Vertical"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}"/>
+            </MultiTrigger>
         </Style.Triggers>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 5949ea9c..5e78b866 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -561,12 +561,18 @@
 			</Border>
 		</Grid>
 	</ControlTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalItemsPanelTemplate">
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
 		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
 	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupVerticalItemsPanelTemplate">
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
 		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
 	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
 	<tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
 	<LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
 		<GradientStop Color="#00FFFFFF" Offset="0" />
@@ -2442,16 +2448,35 @@
 	<Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
 		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
 		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
 		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
 		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
 		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalItemsPanelTemplate}" />
-			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
+			</MultiTrigger>
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
index 7877494b..82a4a879 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -37,76 +38,85 @@ namespace HandyControl.Tools
         {
             if (container is ButtonGroup buttonGroup && item is ButtonBase buttonBase)
             {
-                var count = buttonGroup.Items.Count;
+                var count = GetVisibleButtonsCount(buttonGroup);
 
                 switch (buttonBase)
                 {
-                    case RadioButton:
-                        {
-                            if (count == 1)
-                            {
-                                return StyleDict[ResourceToken.RadioGroupItemSingle];
-                            }
-
-                            var index = buttonGroup.Items.IndexOf(buttonBase);
-                            return buttonGroup.Orientation == Orientation.Horizontal
-                                ? index == 0
-                                    ? StyleDict[ResourceToken.RadioGroupItemHorizontalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.RadioGroupItemHorizontalLast
-                                        : ResourceToken.RadioGroupItemDefault]
-                                : index == 0
-                                    ? StyleDict[ResourceToken.RadioGroupItemVerticalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.RadioGroupItemVerticalLast
-                                        : ResourceToken.RadioGroupItemDefault];
-                        }
-
-                    case Button:
-                        {
-                            if (count == 1)
-                            {
-                                return StyleDict[ResourceToken.ButtonGroupItemSingle];
-                            }
-
-                            var index = buttonGroup.Items.IndexOf(buttonBase);
-                            return buttonGroup.Orientation == Orientation.Horizontal
-                                ? index == 0
-                                    ? StyleDict[ResourceToken.ButtonGroupItemHorizontalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.ButtonGroupItemHorizontalLast
-                                        : ResourceToken.ButtonGroupItemDefault]
-                                : index == 0
-                                    ? StyleDict[ResourceToken.ButtonGroupItemVerticalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.ButtonGroupItemVerticalLast
-                                        : ResourceToken.ButtonGroupItemDefault];
-                        }
-
-                    case ToggleButton:
-                        {
-                            if (count == 1)
-                            {
-                                return StyleDict[ResourceToken.ToggleButtonGroupItemSingle];
-                            }
-
-                            var index = buttonGroup.Items.IndexOf(buttonBase);
-                            return buttonGroup.Orientation == Orientation.Horizontal
-                                ? index == 0
-                                    ? StyleDict[ResourceToken.ToggleButtonGroupItemHorizontalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.ToggleButtonGroupItemHorizontalLast
-                                        : ResourceToken.ToggleButtonGroupItemDefault]
-                                : index == 0
-                                    ? StyleDict[ResourceToken.ToggleButtonGroupItemVerticalFirst]
-                                    : StyleDict[index == count - 1
-                                        ? ResourceToken.ToggleButtonGroupItemVerticalLast
-                                        : ResourceToken.ToggleButtonGroupItemDefault];
-                        }
+                    case RadioButton: return GetRadioButtonStyle(count, buttonGroup, buttonBase);
+                    case Button: return GetButtonStyle(count, buttonGroup, buttonBase);
+                    case ToggleButton: return GetToggleButtonStyle(count, buttonGroup, buttonBase);
                 }
             }
 
             return null;
         }
+
+        private static int GetVisibleButtonsCount(ButtonGroup buttonGroup)
+        {
+            return buttonGroup.Items.OfType<ButtonBase>().Count(button => button.IsVisible);
+        }
+
+        private static Style GetToggleButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+        {
+            if (count == 1)
+            {
+                return StyleDict[ResourceToken.ToggleButtonGroupItemSingle];
+            }
+
+            var index = buttonGroup.Items.IndexOf(button);
+            return buttonGroup.Orientation == Orientation.Horizontal
+                ? index == 0
+                    ? StyleDict[ResourceToken.ToggleButtonGroupItemHorizontalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.ToggleButtonGroupItemHorizontalLast
+                        : ResourceToken.ToggleButtonGroupItemDefault]
+                : index == 0
+                    ? StyleDict[ResourceToken.ToggleButtonGroupItemVerticalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.ToggleButtonGroupItemVerticalLast
+                        : ResourceToken.ToggleButtonGroupItemDefault];
+        }
+
+        private static Style GetButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+        {
+            if (count == 1)
+            {
+                return StyleDict[ResourceToken.ButtonGroupItemSingle];
+            }
+
+            var index = buttonGroup.Items.IndexOf(button);
+            return buttonGroup.Orientation == Orientation.Horizontal
+                ? index == 0
+                    ? StyleDict[ResourceToken.ButtonGroupItemHorizontalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.ButtonGroupItemHorizontalLast
+                        : ResourceToken.ButtonGroupItemDefault]
+                : index == 0
+                    ? StyleDict[ResourceToken.ButtonGroupItemVerticalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.ButtonGroupItemVerticalLast
+                        : ResourceToken.ButtonGroupItemDefault];
+        }
+
+        private static Style GetRadioButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+        {
+            if (count == 1)
+            {
+                return StyleDict[ResourceToken.RadioGroupItemSingle];
+            }
+
+            var index = buttonGroup.Items.IndexOf(button);
+            return buttonGroup.Orientation == Orientation.Horizontal
+                ? index == 0
+                    ? StyleDict[ResourceToken.RadioGroupItemHorizontalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.RadioGroupItemHorizontalLast
+                        : ResourceToken.RadioGroupItemDefault]
+                : index == 0
+                    ? StyleDict[ResourceToken.RadioGroupItemVerticalFirst]
+                    : StyleDict[index == count - 1
+                        ? ResourceToken.RadioGroupItemVerticalLast
+                        : ResourceToken.RadioGroupItemDefault];
+        }
     }
 }

From fda076b5e6ebe2a3a08e858643d556b12ef8d3c8 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 19 Jan 2022 22:56:50 +0800
Subject: [PATCH 03/32] enhance: optimized ElementGroup

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 100 ++++++++++++------
 .../Controls/ElementGroupDemoCtl.xaml         |  35 ++++--
 .../Controls/Panel/ElementGroup.cs            |  79 ++++++++++----
 .../HandyControl_Shared.projitems             |   9 ++
 .../Styles/Base/ElementGroupBaseStyle.xaml    |  39 +++++++
 .../Styles/Base/ItemsPanelTemplate.xaml       |  32 ++++++
 .../Themes/Styles/Base/StepBarBaseStyle.xaml  |  16 +--
 .../Themes/Styles/Carousel.xaml               |  86 ---------------
 .../Themes/Styles/ElementGroup.xaml           |  13 +++
 .../Themes/Styles/ListBox.xaml                |  24 +----
 .../Themes/Styles/PropertyGrid.xaml           |   6 +-
 .../HandyControl_Shared/Themes/Theme.xaml     | 100 ++++++++++++------
 .../HandyControl_Shared/Themes/Theme_40.txt   |   3 +
 .../HandyControl_Shared/Themes/Theme_GE45.txt |   3 +
 14 files changed, 330 insertions(+), 215 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/ElementGroupBaseStyle.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/Base/ItemsPanelTemplate.xaml
 create mode 100644 src/Shared/HandyControl_Shared/Themes/Styles/ElementGroup.xaml

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index d134dfb4..5eee86f4 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -587,6 +587,27 @@
 			<TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
 		</hc:SimplePanel>
 	</ControlTemplate>
+	<ItemsPanelTemplate x:Key="UniformHorizontalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="UniformVerticalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackHorizontalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackVerticalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapHorizontalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapVerticalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="DockItemsPanelTemplate">
+		<DockPanel FocusVisualStyle="{x:Null}" LastChildFill="True" />
+	</ItemsPanelTemplate>
 	<LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
 		<GradientStop Color="#FFFFFF" Offset="0.3" />
 		<GradientStop Color="#BBC5D7" Offset="0.75" />
@@ -722,12 +743,6 @@
 			</DrawingGroup>
 		</DrawingBrush.Drawing>
 	</DrawingBrush>
-	<ItemsPanelTemplate x:Key="StepBarHorizontalItemsPanelTemplate">
-		<UniformGrid Rows="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StepBarVerticalItemsPanelTemplate">
-		<UniformGrid Columns="1" />
-	</ItemsPanelTemplate>
 	<ContextMenu x:Key="TabItemMenu" x:Shared="False">
 		<MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
 		<MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
@@ -813,21 +828,6 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<ItemsPanelTemplate x:Key="WrapPanelHorizontalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="WrapPanelVerticalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackPanelHorizontalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackPanelVerticalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Stretch" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ComboBoxCapsuleItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
-	</ItemsPanelTemplate>
 	<tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
 	<hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
 	<hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
@@ -2479,6 +2479,39 @@
 			</MultiTrigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ElementGroupBaseStyle" TargetType="hc:ElementGroup">
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
 		<Setter Property="hc:VisualElement.Text">
 			<Setter.Value>
@@ -10626,23 +10659,23 @@
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
 		<Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
-		<Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="Dock" Value="Left">
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
 				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
 			</Trigger>
 			<Trigger Property="Dock" Value="Bottom">
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
 				<Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 			</Trigger>
 			<Trigger Property="Dock" Value="Right">
 				<Setter Property="FlowDirection" Value="RightToLeft" />
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
 				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
 			</Trigger>
 		</Style.Triggers>
 	</Style>
@@ -12137,7 +12170,6 @@
 					</ControlTemplate.Triggers>
 					<hc:SimplePanel ClipToBounds="True">
 						<StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
-						<!--<ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>-->
 						<hc:SimplePanel x:Name="GridTop" Opacity="0">
 							<Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
 								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
@@ -12472,6 +12504,12 @@
 	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
 	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
 	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
+	<Style BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup" />
+	<Style x:Key="ElementGroupSolid" BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup">
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
 	<Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
 	<Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
 	<Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
@@ -12616,16 +12654,16 @@
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 	</Style>
 	<Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapPanelHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapPanelVerticalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackPanelHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackPanelVerticalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="ListViewBaseStyle" TargetType="ListView">
 		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -13052,7 +13090,7 @@
 		<Setter Property="VerticalAlignment" Value="Top" />
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource ComboBoxCapsuleItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ComboBox">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
index bea3e62a..afe53368 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
@@ -6,8 +6,20 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" VerticalAlignment="Center">
-            <hc:ElementGroup Orientation="Horizontal">
+        <hc:UniformSpacingPanel Margin="32" VerticalAlignment="Center" Orientation="Vertical" Spacing="16">
+            <hc:ElementGroup Orientation="Horizontal" Layout="Stack">
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+            </hc:ElementGroup>
+            <hc:ElementGroup Orientation="Horizontal" Width="500">
+                <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+            </hc:ElementGroup>
+            <hc:ElementGroup Orientation="Horizontal" Layout="Stack">
                 <Border Style="{StaticResource BorderRegion}" Padding="6,0">
                     <Path Data="{StaticResource ClockGeometry}" Width="16" Height="16" Stretch="Uniform" Fill="{DynamicResource BorderBrush}"/>
                 </Border>
@@ -15,11 +27,20 @@
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
                 <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
             </hc:ElementGroup>
-            <hc:ElementGroup Margin="0,16,0,0">
-                <TextBox/>
-                <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+            <hc:ElementGroup>
+                <hc:ElementGroup.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </ItemsPanelTemplate>
+                </hc:ElementGroup.ItemsPanel>
+                <TextBox HorizontalAlignment="Stretch" DockPanel.Dock="Left"/>
+                <Button Grid.Column="1" Width="100" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}" DockPanel.Dock="Right" HorizontalAlignment="Right" Style="{StaticResource ButtonPrimary}"/>
             </hc:ElementGroup>
-        </StackPanel>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
index 58125c25..9dd90545 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
@@ -1,14 +1,38 @@
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
+using HandyControl.Data;
 using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
-    public class ElementGroup : SimpleStackPanel
+    public class ElementGroup : ItemsControl
     {
         private static readonly Dictionary<Orientation, Dictionary<ChildLocation, CornerRadius>> CornerRadiusDict;
 
+        public static readonly DependencyProperty OrientationProperty =
+            StackPanel.OrientationProperty.AddOwner(typeof(ElementGroup),
+                new FrameworkPropertyMetadata(ValueBoxes.HorizontalBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+        public Orientation Orientation
+        {
+            get => (Orientation) GetValue(OrientationProperty);
+            set => SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
+        }
+
+        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+            "Layout", typeof(LinearLayout), typeof(ElementGroup),
+            new FrameworkPropertyMetadata(LinearLayout.Uniform, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+        public LinearLayout Layout
+        {
+            get => (LinearLayout) GetValue(LayoutProperty);
+            set => SetValue(LayoutProperty, value);
+        }
+
         static ElementGroup()
         {
             var defaultCornerRadius = ResourceHelper.GetResourceInternal<CornerRadius>("DefaultCornerRadius");
@@ -40,47 +64,62 @@ namespace HandyControl.Controls
             {
                 elementAdded.GotFocus += ElementAdded_GotFocus;
                 elementAdded.LostFocus += ElementAdded_LostFocus;
+                elementAdded.IsVisibleChanged += ElementAdded_IsVisibleChanged;
             }
 
             if (visualRemoved is UIElement elementRemoved)
             {
                 elementRemoved.GotFocus -= ElementAdded_GotFocus;
                 elementRemoved.LostFocus -= ElementAdded_LostFocus;
+                elementRemoved.IsVisibleChanged -= ElementAdded_IsVisibleChanged;
             }
+        }
 
-            var childrenCount = InternalChildren.Count;
-            if (childrenCount == 0)
+        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) => UpdateChildrenCornerRadius();
+
+        protected override void OnRender(DrawingContext drawingContext) => UpdateChildrenCornerRadius();
+
+        private void UpdateChildrenCornerRadius()
+        {
+            var visibleChildren = GetVisibleChildrenCount();
+            var count = visibleChildren.Count;
+            if (count == 0)
             {
                 return;
             }
 
             var orientation = Orientation;
 
-            if (childrenCount == 1)
+            if (count == 1)
             {
-                UpdateChildCornerRadius(InternalChildren[0], CornerRadiusDict[orientation][ChildLocation.Single]);
+                UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.Single]);
             }
             else
             {
-                UpdateChildCornerRadius(InternalChildren[0], CornerRadiusDict[orientation][ChildLocation.First]);
+                UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.First]);
 
                 var childMargin = orientation == Orientation.Horizontal
                     ? new Thickness(-1, 0, 0, 0)
                     : new Thickness(0, -1, 0, 0);
 
-                for (var childIndex = 1; childIndex < childrenCount; childIndex++)
+                for (var childIndex = 1; childIndex < count; childIndex++)
                 {
-                    var child = InternalChildren[childIndex];
+                    var child = visibleChildren[childIndex];
                     child.SetCurrentValue(MarginProperty, childMargin);
                     UpdateChildCornerRadius(child, CornerRadiusDict[orientation][ChildLocation.Middle]);
                 }
 
-                var lastChild = InternalChildren[childrenCount - 1];
+                var lastChild = visibleChildren[count - 1];
                 lastChild.SetCurrentValue(MarginProperty, childMargin);
                 UpdateChildCornerRadius(lastChild, CornerRadiusDict[orientation][ChildLocation.Last]);
             }
         }
 
+        private List<UIElement> GetVisibleChildrenCount()
+        {
+            return Items.OfType<UIElement>().Where(element => element.Visibility == Visibility.Visible).ToList();
+        }
+
         private static void UpdateChildCornerRadius(DependencyObject child, CornerRadius cornerRadius)
         {
             if (child is Border border)
@@ -93,21 +132,15 @@ namespace HandyControl.Controls
             }
         }
 
-        private void ElementAdded_LostFocus(object sender, RoutedEventArgs e)
-        {
-            if (sender is UIElement element)
-            {
-                SetZIndex(element, 0);
-            }
-        }
+        private void ElementAdded_LostFocus(object sender, RoutedEventArgs e) => ResetElementZIndex(e.OriginalSource);
 
-        private void ElementAdded_GotFocus(object sender, RoutedEventArgs e)
-        {
-            if (sender is UIElement element)
-            {
-                SetZIndex(element, int.MaxValue);
-            }
-        }
+        private void ElementAdded_GotFocus(object sender, RoutedEventArgs e) => MaximizeElementZIndex(e.OriginalSource);
+
+        private static void ResetElementZIndex(object element) => Panel.SetZIndex((UIElement) element, 0);
+
+        private static void MaximizeElementZIndex(object element) => Panel.SetZIndex((UIElement) element, int.MaxValue);
+
+        private void ElementAdded_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => UpdateChildrenCornerRadius();
 
         private enum ChildLocation
         {
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 094f4063..cc810bd4 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -429,12 +429,21 @@
     <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\AutoCompleteTextBoxBaseStyle.xaml">
       <SubType>Designer</SubType>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ItemsPanelTemplate.xaml">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ElementGroupBaseStyle.xaml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\ListViewBaseStyle.xaml">
       <SubType>Designer</SubType>
     </None>
     <None Include="$(MSBuildThisFileDirectory)Themes\Styles\Base\DataGridBaseStyle.xaml">
       <SubType>Designer</SubType>
     </None>
+    <None Include="$(MSBuildThisFileDirectory)Themes\Styles\ElementGroup.xaml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="$(MSBuildThisFileDirectory)Themes\XamlCombine.exe" />
     <Page Include="$(MSBuildThisFileDirectory)Themes\Basic\Colors\Colors.xaml">
       <SubType>Designer</SubType>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ElementGroupBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ElementGroupBaseStyle.xaml
new file mode 100644
index 00000000..f37c92cb
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ElementGroupBaseStyle.xaml
@@ -0,0 +1,39 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:hc="clr-namespace:HandyControl.Controls">
+
+    <Style x:Key="ElementGroupBaseStyle" TargetType="hc:ElementGroup">
+        <Setter Property="VerticalAlignment" Value="Top"/>
+        <Setter Property="Layout" Value="Uniform"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Focusable" Value="False"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/>
+        <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}"/>
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Uniform"/>
+                    <Condition Property="Orientation" Value="Vertical"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Stack"/>
+                    <Condition Property="Orientation" Value="Horizontal"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}"/>
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Layout" Value="Stack"/>
+                    <Condition Property="Orientation" Value="Vertical"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}"/>
+            </MultiTrigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ItemsPanelTemplate.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ItemsPanelTemplate.xaml
new file mode 100644
index 00000000..bada6f89
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ItemsPanelTemplate.xaml
@@ -0,0 +1,32 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ItemsPanelTemplate x:Key="UniformHorizontalItemsPanelTemplate">
+        <UniformGrid FocusVisualStyle="{x:Null}" Rows="1"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="UniformVerticalItemsPanelTemplate">
+        <UniformGrid FocusVisualStyle="{x:Null}" Columns="1"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="StackHorizontalItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="StackVerticalItemsPanelTemplate">
+        <StackPanel FocusVisualStyle="{x:Null}"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="WrapHorizontalItemsPanelTemplate">
+        <WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="WrapVerticalItemsPanelTemplate">
+        <WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </ItemsPanelTemplate>
+
+    <ItemsPanelTemplate x:Key="DockItemsPanelTemplate">
+        <DockPanel FocusVisualStyle="{x:Null}" LastChildFill="True"/>
+    </ItemsPanelTemplate>
+
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
index ff623ef1..cf59fb07 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/StepBarBaseStyle.xaml
@@ -66,14 +66,6 @@
         </Setter>
     </Style>
 
-    <ItemsPanelTemplate x:Key="StepBarHorizontalItemsPanelTemplate">
-        <UniformGrid Rows="1"/>
-    </ItemsPanelTemplate>
-
-    <ItemsPanelTemplate x:Key="StepBarVerticalItemsPanelTemplate">
-        <UniformGrid Columns="1"/>
-    </ItemsPanelTemplate>
-
     <ControlTemplate x:Key="StepBarHorizontalTopControlTemplate" TargetType="hc:StepBar">
         <hc:SimplePanel>
             <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Top" Margin="0,10,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}"/>
@@ -105,23 +97,23 @@
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}"/>
         <Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}"/>
-        <Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/>
         <Style.Triggers>
             <Trigger Property="Dock" Value="Left">
                 <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}"/>
                 <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}"/>
-                <Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}"/>
+                <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/>
             </Trigger>
             <Trigger Property="Dock" Value="Bottom">
                 <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}"/>
                 <Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}"/>
-                <Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}"/>
+                <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/>
             </Trigger>
             <Trigger Property="Dock" Value="Right">
                 <Setter Property="FlowDirection" Value="RightToLeft"/>
                 <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}"/>
                 <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}"/>
-                <Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}"/>
+                <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}"/>
             </Trigger>
         </Style.Triggers>
     </Style>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
index 9f5856cb..a8d595f4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Carousel.xaml
@@ -68,7 +68,6 @@
                     </ControlTemplate.Triggers>
                     <hc:SimplePanel ClipToBounds="True">
                         <StackPanel x:Name="PART_Panel" Orientation="Horizontal"/>
-                        <!--<ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>-->
                         <hc:SimplePanel x:Name="GridTop" Opacity="0">
                             <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
                                 <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
@@ -88,89 +87,4 @@
         </Setter>
     </Style>
 
-    <!--<Style x:Key="CarouselListBoxItemStyle" BasedOn="{StaticResource ListBoxItemCustom}" TargetType="ListBoxItem">
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource AncestorType=ItemsControl}}"/>
-    </Style>
-
-    <ItemsPanelTemplate x:Key="CarouselListBoxItemPanelTemplate">
-        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" HorizontalAlignment="Left"/>
-    </ItemsPanelTemplate>
-
-    <Style x:Key="CarouselListBox" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource CarouselListBoxItemPanelTemplate}"/>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselListBoxItemStyle}"/>
-    </Style>
-
-    <Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-        <Setter Property="Margin" Value="5,0"/>
-        <Setter Property="Width" Value="10"/>
-        <Setter Property="Height" Value="10"/>
-        <Setter Property="Background" Value="White"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
-        <Setter Property="Padding" Value="0"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}"/>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Opacity" Value=".9"/>
-                        </Trigger>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Opacity" Value=".6"/>
-                        </Trigger>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="hc:Carousel" BasedOn="{StaticResource CarouselListBox}">
-        <Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="hc:Carousel">
-                    <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1"/>
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
-                        <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1"/>
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
-                    </ControlTemplate.Triggers>
-                    <hc:SimplePanel ClipToBounds="True">
-                        <ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>
-                        <hc:SimplePanel x:Name="GridTop" Opacity="0">
-                            <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
-                                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-                                    <Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}"/>
-                                </Border>
-                            </Button>
-                            <Button Command="interactivity:ControlCommands.Next" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource ButtonCustom}">
-                                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-                                    <Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}"/>
-                                </Border>
-                            </Button>
-                        </hc:SimplePanel>
-                        <StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20"/>
-                    </hc:SimplePanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>-->
-
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ElementGroup.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ElementGroup.xaml
new file mode 100644
index 00000000..feb31095
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ElementGroup.xaml
@@ -0,0 +1,13 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:hc="clr-namespace:HandyControl.Controls">
+
+    <Style BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup"/>
+
+    <Style x:Key="ElementGroupSolid" BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup">
+        <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}"/>
+        <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}"/>
+        <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}"/>
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
index 69620440..d8940a9a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ListBox.xaml
@@ -36,36 +36,20 @@
         <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="WrapPanelHorizontalItemsPanelTemplate">
-        <WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-    </ItemsPanelTemplate>
-
     <Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource WrapPanelHorizontalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="WrapPanelVerticalItemsPanelTemplate">
-        <WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-    </ItemsPanelTemplate>
-
     <Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource WrapPanelVerticalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="StackPanelHorizontalItemsPanelTemplate">
-        <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal"/>
-    </ItemsPanelTemplate>
-
     <Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource StackPanelHorizontalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="StackPanelVerticalItemsPanelTemplate">
-        <StackPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Stretch"/>
-    </ItemsPanelTemplate>
-
     <Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-        <Setter Property="ItemsPanel" Value="{StaticResource StackPanelVerticalItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/PropertyGrid.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/PropertyGrid.xaml
index 7906c69d..91dcc0b3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/PropertyGrid.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/PropertyGrid.xaml
@@ -67,10 +67,6 @@
         <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4"/>
     </Style>
 
-    <ItemsPanelTemplate x:Key="ComboBoxCapsuleItemsPanelTemplate">
-        <UniformGrid FocusVisualStyle="{x:Null}" Rows="1"/>
-    </ItemsPanelTemplate>
-
     <tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector"/>
 
     <Style x:Key="ComboBoxCapsule" BasedOn="{x:Null}" TargetType="ComboBox">
@@ -78,7 +74,7 @@
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="Focusable" Value="False"/>
-        <Setter Property="ItemsPanel" Value="{StaticResource ComboBoxCapsuleItemsPanelTemplate}"/>
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBox">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 5e78b866..c72999a7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -587,6 +587,27 @@
 			<TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
 		</hc:SimplePanel>
 	</ControlTemplate>
+	<ItemsPanelTemplate x:Key="UniformHorizontalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="UniformVerticalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackHorizontalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackVerticalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapHorizontalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapVerticalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="DockItemsPanelTemplate">
+		<DockPanel FocusVisualStyle="{x:Null}" LastChildFill="True" />
+	</ItemsPanelTemplate>
 	<LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
 		<GradientStop Color="#FFFFFF" Offset="0.3" />
 		<GradientStop Color="#BBC5D7" Offset="0.75" />
@@ -722,12 +743,6 @@
 			</DrawingGroup>
 		</DrawingBrush.Drawing>
 	</DrawingBrush>
-	<ItemsPanelTemplate x:Key="StepBarHorizontalItemsPanelTemplate">
-		<UniformGrid Rows="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StepBarVerticalItemsPanelTemplate">
-		<UniformGrid Columns="1" />
-	</ItemsPanelTemplate>
 	<ContextMenu x:Key="TabItemMenu" x:Shared="False">
 		<MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
 		<MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
@@ -813,21 +828,6 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<ItemsPanelTemplate x:Key="WrapPanelHorizontalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="WrapPanelVerticalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackPanelHorizontalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackPanelVerticalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Stretch" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ComboBoxCapsuleItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
-	</ItemsPanelTemplate>
 	<tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
 	<hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
 	<hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
@@ -2479,6 +2479,39 @@
 			</MultiTrigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ElementGroupBaseStyle" TargetType="hc:ElementGroup">
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
 		<Setter Property="hc:VisualElement.Text">
 			<Setter.Value>
@@ -10744,23 +10777,23 @@
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
 		<Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
-		<Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="Dock" Value="Left">
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
 				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
 			</Trigger>
 			<Trigger Property="Dock" Value="Bottom">
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
 				<Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarHorizontalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 			</Trigger>
 			<Trigger Property="Dock" Value="Right">
 				<Setter Property="FlowDirection" Value="RightToLeft" />
 				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
 				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource StepBarVerticalItemsPanelTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
 			</Trigger>
 		</Style.Triggers>
 	</Style>
@@ -12270,7 +12303,6 @@
 					</ControlTemplate.Triggers>
 					<hc:SimplePanel ClipToBounds="True">
 						<StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
-						<!--<ItemsPresenter x:Name="PART_ItemsControl" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" HorizontalAlignment="Left"/>-->
 						<hc:SimplePanel x:Name="GridTop" Opacity="0">
 							<Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
 								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
@@ -12614,6 +12646,12 @@
 	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
 	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
 	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
+	<Style BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup" />
+	<Style x:Key="ElementGroupSolid" BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup">
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
 	<Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
 	<Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
 	<Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
@@ -12758,16 +12796,16 @@
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 	</Style>
 	<Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapPanelHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapPanelVerticalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackPanelHorizontalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackPanelVerticalItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
 	</Style>
 	<Style x:Key="ListViewBaseStyle" TargetType="ListView">
 		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -13203,7 +13241,7 @@
 		<Setter Property="VerticalAlignment" Value="Top" />
 		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource ComboBoxCapsuleItemsPanelTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ComboBox">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
index d1158b1a..80e81bb0 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_40.txt
@@ -37,9 +37,11 @@ Styles\Base\RepeatButtonBaseStyle.xaml
 Styles\Base\ToggleBlockBaseStyle.xaml
 Styles\Base\GroupBoxBaseStyle.xaml
 Styles\Base\ButtonGroupBaseStyle.xaml
+Styles\Base\ElementGroupBaseStyle.xaml
 Styles\Base\ProgressBarBaseStyle.xaml
 Styles\Base\CheckBoxBaseStyle.xaml
 Styles\Base\RadioButtonBaseStyle.xaml
+Styles\Base\ItemsPanelTemplate.xaml
 # --------------------------------------
 Styles\Button.xaml
 Styles\TextBlock.xaml
@@ -138,6 +140,7 @@ Styles\DateTimePicker.xaml
 Styles\Dialog.xaml
 Styles\Divider.xaml
 Styles\Drawer.xaml
+Styles\ElementGroup.xaml
 Styles\Empty.xaml
 Styles\Expander.xaml
 Styles\FlipClock.xaml
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
index e42ae089..0020c54a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
+++ b/src/Shared/HandyControl_Shared/Themes/Theme_GE45.txt
@@ -37,9 +37,11 @@ Styles\Base\RepeatButtonBaseStyle.xaml
 Styles\Base\ToggleBlockBaseStyle.xaml
 Styles\Base\GroupBoxBaseStyle.xaml
 Styles\Base\ButtonGroupBaseStyle.xaml
+Styles\Base\ElementGroupBaseStyle.xaml
 Styles\Base\ProgressBarBaseStyle.xaml
 Styles\Base\CheckBoxBaseStyle.xaml
 Styles\Base\RadioButtonBaseStyle.xaml
+Styles\Base\ItemsPanelTemplate.xaml
 # --------------------------------------
 Styles\Button.xaml
 Styles\TextBlock.xaml
@@ -138,6 +140,7 @@ Styles\DateTimePicker.xaml
 Styles\Dialog.xaml
 Styles\Divider.xaml
 Styles\Drawer.xaml
+Styles\ElementGroup.xaml
 Styles\Empty.xaml
 Styles\Expander.xaml
 Styles\FlipClock.xaml

From 85e8909b11533e79f45890d433321070bb50227f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 22 Jan 2022 13:50:43 +0800
Subject: [PATCH 04/32] fix: fixed #1072

---
 .../Controls/Other/TransitioningContentControl.cs            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
index 979178cd..8d33d18a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
@@ -55,7 +55,6 @@ namespace HandyControl.Controls
 
         private void TransitioningContentControl_Loaded(object sender, RoutedEventArgs e)
         {
-            StartTransition();
             IsVisibleChanged += TransitioningContentControl_IsVisibleChanged;
         }
 
@@ -66,7 +65,7 @@ namespace HandyControl.Controls
 
         private void StartTransition()
         {
-            if (!IsArrangeValid || _contentPresenter == null) return;
+            if (_contentPresenter == null || !IsVisible) return;
 
             if (TransitionStoryboard != null)
             {
@@ -102,6 +101,8 @@ namespace HandyControl.Controls
                     }
                 };
             }
+
+            StartTransition();
         }
     }
 }

From f05ce9e7d22bec64a3ed01ab0bcccb0a9c4a85ac Mon Sep 17 00:00:00 2001
From: Seymour Zhang <zsh2401@163.com>
Date: Sat, 29 Jan 2022 18:24:42 +0800
Subject: [PATCH 05/32] Due to the unstability of China internet, changed the
 url of the example project AutumnBox

---
 README-cn.md | 2 +-
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README-cn.md b/README-cn.md
index c3371000..0e901601 100644
--- a/README-cn.md
+++ b/README-cn.md
@@ -143,7 +143,7 @@ HandyControl 项目已加入 [dotNET China](https://gitee.com/dotnetchina)  组
 
 <a href="https://getquicker.net" target="_blank"><img width="70px" alt="quicker" src="https://files.getquicker.net/_sitefiles/quicker_round_128.png"></a>
 <a href="https://www.phpenv.cn" target="_blank"><img width="70px" alt="phpenv" src="https://www.phpenv.cn/usr/themes/phpenv/img/logo.png"></a>
-<a href="https://atmb.top" target="_blank"><img width="70px" alt="AutumnBox" src="https://atmb.top/images/icon.png"></a>
+<a href="https://github.com/zsh2401/AutumnBox" target="_blank"><img width="70px" alt="AutumnBox" src="https://raw.githubusercontent.com/zsh2401/AutumnBox/master/src/AutumnBox.GUI/Resources/Icons/icon.ico"></a>
 
 如果你的项目没有被列出，请告知我们! 😀
 
diff --git a/README.md b/README.md
index 7f102047..4226d573 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@
 
 <a href="https://getquicker.net" target="_blank"><img width="70px" alt="quicker" src="https://i0.hdslb.com/bfs/face/3765a3d0ce5da37e1aaa830d2eec6d3e0806a2d8.jpg@96w_96h_1c.webp"></a>
 <a href="https://www.phpenv.cn" target="_blank"><img width="70px" alt="phpenv" src="https://www.phpenv.cn/usr/themes/phpenv/img/logo.png"></a>
-<a href="https://atmb.top" target="_blank"><img width="70px" alt="AutumnBox" src="https://atmb.top/images/icon.png"></a>
+<a href="https://github.com/zsh2401/AutumnBox" target="_blank"><img width="70px" alt="AutumnBox" src="https://raw.githubusercontent.com/zsh2401/AutumnBox/master/src/AutumnBox.GUI/Resources/Icons/icon.ico"></a>
 
 if your project is not listed here, let us know! 😀
 

From 7030f3d203071d66fa5f06f63ae549f6ad3c27a8 Mon Sep 17 00:00:00 2001
From: cuiliang <cuiliang.bj@gmail.com>
Date: Sat, 19 Feb 2022 09:57:00 +0800
Subject: [PATCH 06/32] Fix build

---
 .../Tools/Interop/InteropMethods.cs              |  2 +-
 .../Tools/Interop/InteropValues.cs               | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index 7fc72dd9..f34b9b72 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -306,7 +306,7 @@ namespace HandyControl.Tools.Interop
 
         internal static InteropValues.WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
         {
-            InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = new InteropValues.WINDOWPLACEMENT();
+            InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = InteropValues.WINDOWPLACEMENT.Default;
             if (GetWindowPlacement(hwnd, wINDOWPLACEMENT))
             {
                 return wINDOWPLACEMENT;
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index 78ef2903..51cb5463 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -364,12 +364,26 @@ namespace HandyControl.Tools.Interop
         [StructLayout(LayoutKind.Sequential)]
         internal struct WINDOWPLACEMENT
         {
-            public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
+
+            public int length;
             public int flags;
             public SW showCmd;
             public POINT ptMinPosition;
             public POINT ptMaxPosition;
             public RECT rcNormalPosition;
+
+            /// <summary>
+            /// Gets the default (empty) value.
+            /// </summary>
+            public static WINDOWPLACEMENT Default
+            {
+                get
+                {
+                    WINDOWPLACEMENT result = new WINDOWPLACEMENT();
+                    result.length = Marshal.SizeOf(result);
+                    return result;
+                }
+            }
         }
 
         [StructLayout(LayoutKind.Sequential, Pack = 4)]

From ca112f9757e9ae3cf015ff1ee05135eab70d2b9d Mon Sep 17 00:00:00 2001
From: cuiliang <cuiliang.bj@gmail.com>
Date: Sat, 19 Feb 2022 09:58:33 +0800
Subject: [PATCH 07/32] Save fix build

---
 .../HandyControl_Shared/Themes/Theme.xaml     | 27970 ++++++++--------
 1 file changed, 13952 insertions(+), 14018 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index c72999a7..d6b25685 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1,14020 +1,13954 @@
-<!--
-    This code was generated by a tool.
-
-    Changes to this file may cause incorrect behavior and will be lost if
-    the code is regenerated.
--->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
-	<langs:LangProvider x:Key="Langs" />
-	<converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
-	<converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
-	<converter:BooleanArr2VisibilityConverter x:Key="BooleanArr2VisibilityConverter" />
-	<converter:BooleanArr2BooleanConverter x:Key="BooleanArr2BooleanConverter" />
-	<converter:Long2FileSizeConverter x:Key="Long2FileSizeConverter" />
-	<converter:String2VisibilityConverter x:Key="String2VisibilityConverter" />
-	<converter:String2VisibilityReConverter x:Key="String2VisibilityReConverter" />
-	<BooleanToVisibilityConverter x:Key="Boolean2VisibilityConverter" />
-	<converter:TreeViewItemMarginConverter x:Key="TreeViewItemMarginConverter" />
-	<converter:Color2HexStringConverter x:Key="Color2HexStringConverter" />
-	<converter:Object2BooleanConverter x:Key="Object2BooleanConverter" />
-	<converter:Boolean2StringConverter x:Key="Boolean2StringConverter" />
-	<converter:Int2StringConverter x:Key="Int2StringConverter" />
-	<converter:BorderClipConverter x:Key="BorderClipConverter" />
-	<converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
-	<converter:BorderCircularConverter x:Key="BorderCircularConverter" />
-	<converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter" />
-	<converter:Object2VisibilityReConverter x:Key="Object2VisibilityReConverter" />
-	<converter:Number2PercentageConverter x:Key="Number2PercentageConverter" />
-	<converter:RectangleCircularConverter x:Key="RectangleCircularConverter" />
-	<converter:ThicknessSplitConverter x:Key="ThicknessSplitConverter" />
-	<converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
-	<MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
-	<converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
-	<converter:DoubleMinConverter x:Key="DoubleMinConverter" />
-	<converter:Object2StringConverter x:Key="Object2StringConverter" />
-	<converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
-	<Color x:Key="EffectShadowColor">#88000000</Color>
-	<system:Double x:Key="LargeFontSize">24</system:Double>
-	<system:Double x:Key="HeadFontSize">20</system:Double>
-	<system:Double x:Key="SubHeadFontSize">16</system:Double>
-	<system:Double x:Key="TextFontSize">12</system:Double>
-	<Geometry o:Freeze="True" x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
-	<Geometry o:Freeze="True" x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
-	<Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
-	<Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
-	<Geometry o:Freeze="True" x:Key="RotateRightGeometry">M13.1117823382705,0.00108644926083379C18.7165758868546,0.0742913923738762 23.9197352191299,3.84162509632329 25.6893389483779,9.62980814885544 26.1165926715226,11.0273168346189 26.3185999652236,12.461670228202 26.296833302626,13.8899238456496L28.4974711200089,11.6892569876356C28.8483088275283,11.3384168617557 29.4089472552627,11.330238049977 29.7496950885147,11.6709881771838 30.0904429217666,12.0117402117628 30.0822642108291,12.572387459387 29.7314265033096,12.923229492639L25.9199488421768,16.7347560556155C25.5691111346572,17.0855980888674 25.0084688922257,17.0937769006462 24.6677210589736,16.7530248660672 24.5891077777236,16.674408708165 24.5290644427627,16.5840870073788 24.4875185748428,16.4873374624474L20.9957621356339,12.9955379708416C20.6550143023818,12.6547878436347 20.6631930133193,12.0941405960106 21.0140307208389,11.7432985627585 21.3648684283584,11.3924565295065 21.9255068560928,11.3842777177278 22.2662546893447,11.7250297523068L24.4968645831436,13.9556652415401C24.5284846087783,12.6830303030582 24.3545000811904,11.4030042974954 23.9728319903702,10.1546044295501 22.0890505572647,3.99295504901009 15.7152140399307,0.483677352708723 9.73950221742095,2.3106585349176 3.76379420960845,4.13763876344051 0.441986348280352,10.6112083411418 2.32576778138575,16.7728577216819 4.20954921449125,22.9345051948497 10.5833819171279,26.4437838448372 16.5590937396377,24.6168036163144 18.3326227923721,24.0745720467974 19.9086878558486,23.1123447593618 21.1902544757217,21.8133823630949 21.5398485919327,21.4590441166922 22.1090319415421,21.4627806587338 22.4615595599502,21.8217271162507 22.8140871783584,22.1806735737676 22.8164675494522,22.7589048852417 22.4668734332412,23.1132431316444 20.9798891803115,24.6204085496776 19.1496775409072,25.7378005615073 17.0939638873428,26.3663063881084 10.1663286944717,28.484321088751 2.78723170960845,24.4215726325395 0.609260823377952,17.2976520950044 -1.56871387754975,10.1737353722136 2.27700069154205,2.6791733248245 9.20463588441315,0.561156716809679 10.5035670062393,0.164028483596132 11.8183710833877,-0.0158071458708005 13.1117823382705,0.00108644926083379z</Geometry>
-	<Geometry o:Freeze="True" x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
-	<Geometry o:Freeze="True" x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
-	<Geometry o:Freeze="True" x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
-	<Geometry o:Freeze="True" x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
-	<Geometry o:Freeze="True" x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
-	<Geometry o:Freeze="True" x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
-	<Geometry o:Freeze="True" x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
-	<Geometry o:Freeze="True" x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignLeftGeometry">M0,8 L4,8 4,10 0,10 z M0,4 L8,4 8,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignRightGeometry">M8,8 L12,8 12,10 8,10 z M4,4 L12,4 12,6 4,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignHCenterGeometry">M4,8 L8,8 8,10 4,10 z M2,4 L10,4 10,6 2,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignHStretchGeometry">M0,8 L12,8 12,10 0,10 z M0,4 L12,4 12,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignTopGeometry">M8,0 L10,0 10,4 8,4 z M4,0 L6,0 6,8 4,8 z M0,0 L2,0 2,12 0,12 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignBottomGeometry">M8,8 L10,8 10,12 8,12 z M4,4 L6,4 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignVCenterGeometry">M8,4 L10,4 10,8 8,8 z M4,2 L6,2 6,10 4,10 z M0,0 L2,0 2,12 0,12 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AlignVStretchGeometry">M8,0 L10,0 10,12 8,12 z M4,0 L6,0 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="PageModeGeometry">M1.0000002,12 L1.0000002,13 11,13 11,12 z M1.0000002,10 L1.0000002,11 11,11 11,10 z M1.0000002,8 L1.0000002,9 11,9 11,8 z M1.0000002,6 L1.0000002,7 11,7 11,6 z M1.0000002,4 L1.0000002,5 11,5 11,4 z M1.0000002,2 L1.0000002,3 11,3 11,2 z M0,0 L12,0 12,14 0,14 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="TwoPageModeGeometry">M8.99999988079071,12L8.99999988079071,13 13,13 13,12z M1,12L1,13 5,13 5,12z M9.00000011920929,10L9.00000011920929,11 13,11 13,10z M1,10L1,11 5,11 5,10z M9.00000011920929,8L9.00000011920929,9 13,9 13,8z M1,8L1,9 5,9 5,8z M9.00000011920929,6L9.00000011920929,7 13,7 13,6z M1,6L1,7 5,7 5,6z M9.00000011920929,4L9.00000011920929,5 13,5 13,4z M1,4L1,5 5,5 5,4z M8.99999988079071,2L8.99999988079071,3 13,3 13,2z M1,2L1,3 5,3 5,2z M7.99999994039536,0L14,0 14,14 7.99999994039536,14z M0,0L6,0 6,14 0,14z</Geometry>
-	<Geometry o:Freeze="True" x:Key="ScrollModeGeometry">M1,12L1,13 8,13 8,12z M1,10L1,11 8,11 8,10z M1,8L1,9 8,9 8,8z M1,6L1,7 8,7 8,6z M11.0000002384186,5L11.0000002384186,9 13,9 13,5z M1,4L1,5 8,5 8,4z M1,2L1,3 8,3 8,2z M10.0000000298023,0L14,0 14,14 10.0000000298023,14z M0,0L9.00000011920929,0 9.00000011920929,14 0,14z</Geometry>
-	<Geometry o:Freeze="True" x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
-	<Geometry o:Freeze="True" x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
-	<Geometry o:Freeze="True" x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
-	<Geometry o:Freeze="True" x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AddGeometry">M8,0 C8.5522847,0 9,0.44771525 9,1 L9,7 15,7 C15.552285,7 16,7.4477153 16,8 16,8.5522852 15.552285,9 15,9 L9,9 9,15 C9,15.552285 8.5522847,16 8,16 7.4477153,16 7,15.552285 7,15 L7,9 1,9 C0.44771528,9 0,8.5522852 0,8 0,7.4477153 0.44771528,7 1,7 L7,7 7,1 C7,0.44771525 7.4477153,0 8,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="RemoveGeometry">M10.899495,0 C11.155417,0 11.411339,0.097630501 11.606602,0.29289246 11.997126,0.68341732 11.997126,1.3165817 11.606602,1.7071066 L7.3639612,5.9497471 11.606602,10.192388 C11.997126,10.582912 11.997126,11.216077 11.606602,11.606601 11.216077,11.997126 10.582912,11.997126 10.192388,11.606601 L5.9497476,7.3639607 1.7071068,11.606601 C1.3165827,11.997126 0.68341756,11.997126 0.29289341,11.606601 -0.097630978,11.216077 -0.097630978,10.582912 0.29289341,10.192388 L4.5355338,5.9497471 0.29289341,1.7071066 C-0.097630978,1.3165817 -0.097630978,0.68341732 0.29289341,0.29289246 0.48815536,0.097630501 0.74407768,0 1,0 1.2559223,0 1.5118446,0.097630501 1.7071068,0.29289246 L5.9497476,4.5355334 10.192388,0.29289246 C10.38765,0.097630501 10.643572,0 10.899495,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
-	<Geometry o:Freeze="True" x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
-	<Geometry o:Freeze="True" x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
-	<Geometry o:Freeze="True" x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
-	<Geometry o:Freeze="True" x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
-	<Geometry o:Freeze="True" x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
-	<Geometry o:Freeze="True" x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DragVerticalGeometry">M2,12 C3.1045694,12 4,12.895431 4,14 4,15.104569 3.1045694,16 2,16 0.89543051,16 0,15.104569 0,14 0,12.895431 0.89543051,12 2,12 z M2,6 C3.1045694,6 4,6.8954306 4,8 4,9.1045694 3.1045694,10 2,10 0.89543051,10 0,9.1045694 0,8 0,6.8954306 0.89543051,6 2,6 z M2,0 C3.1045694,0 4,0.89543056 4,2 4,3.1045694 3.1045694,4 2,4 0.89543051,4 0,3.1045694 0,2 0,0.89543056 0.89543051,0 2,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DragHorizontalGeometry">M14,0 C15.104569,0 16,0.89543051 16,2 16,3.1045694 15.104569,4 14,4 12.895431,4 12,3.1045694 12,2 12,0.89543051 12.895431,0 14,0 z M8,0 C9.1045694,0 10,0.89543051 10,2 10,3.1045694 9.1045694,4 8,4 6.8954306,4 6,3.1045694 6,2 6,0.89543051 6.8954306,0 8,0 z M2,0 C3.1045694,0 4,0.89543051 4,2 4,3.1045694 3.1045694,4 2,4 0.89543056,4 0,3.1045694 0,2 0,0.89543051 0.89543056,0 2,0 z</Geometry>
-	<Geometry o:Freeze="True" x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
-	<Style x:Key="PathBaseStyle" TargetType="Path">
-		<Setter Property="Stretch" Value="Uniform" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="FlowDirection" Value="LeftToRight" />
-	</Style>
-	<system:Double x:Key="DefaultControlHeight">30</system:Double>
-	<Thickness x:Key="DefaultControlPadding">10,6</Thickness>
-	<Thickness x:Key="DefaultInputPadding">8,6</Thickness>
-	<CornerRadius x:Key="DefaultCornerRadius">4</CornerRadius>
-	<system:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">30</system:Double>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorXY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-		<interactivity:FluidMoveBehavior.EaseX>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseX>
-		<interactivity:FluidMoveBehavior.EaseY>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseY>
-	</interactivity:FluidMoveBehavior>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorX200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-		<interactivity:FluidMoveBehavior.EaseX>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseX>
-	</interactivity:FluidMoveBehavior>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-		<interactivity:FluidMoveBehavior.EaseY>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseY>
-	</interactivity:FluidMoveBehavior>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorXY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-		<interactivity:FluidMoveBehavior.EaseX>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseX>
-		<interactivity:FluidMoveBehavior.EaseY>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseY>
-	</interactivity:FluidMoveBehavior>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorX400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-		<interactivity:FluidMoveBehavior.EaseX>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseX>
-	</interactivity:FluidMoveBehavior>
-	<interactivity:FluidMoveBehavior x:Key="BehaviorY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-		<interactivity:FluidMoveBehavior.EaseY>
-			<PowerEase />
-		</interactivity:FluidMoveBehavior.EaseY>
-	</interactivity:FluidMoveBehavior>
-	<Style TargetType="hc:BlendEffectBox">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:BlendEffectBox">
-					<ContentPresenter ContentSource="ActualContent" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="BorderCircular" TargetType="Border">
-		<Setter Property="hc:BorderElement.Circular" Value="True" />
-	</Style>
-	<Style TargetType="hc:Col">
-		<Setter Property="Focusable" Value="False" />
-	</Style>
-	<Style TargetType="ContentControl">
-		<Setter Property="Focusable" Value="False" />
-	</Style>
-	<Style TargetType="hc:FlipClock">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:FlipClock">
-					<StackPanel Orientation="Horizontal">
-						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[0],RelativeSource={RelativeSource TemplatedParent}}" />
-						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[1],RelativeSource={RelativeSource TemplatedParent}}" />
-						<hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[2],RelativeSource={RelativeSource TemplatedParent}}" />
-						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[3],RelativeSource={RelativeSource TemplatedParent}}" />
-						<hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[4],RelativeSource={RelativeSource TemplatedParent}}" />
-						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[5],RelativeSource={RelativeSource TemplatedParent}}" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:FloatingBlock">
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:FloatingBlock">
-					<ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="GridSplitter">
-		<Setter Property="Focusable" Value="False" />
-	</Style>
-	<Style TargetType="hc:Notification">
-		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="ShowActivated" Value="False" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="Topmost" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Notification">
-					<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RectangleCircular" TargetType="Rectangle">
-		<Setter Property="hc:RectangleAttach.Circular" Value="True" />
-	</Style>
-	<Style x:Key="SnapRect4ScreenshotStyle" TargetType="Rectangle">
-		<Setter Property="Height" Value="5" />
-		<Setter Property="Width" Value="5" />
-		<Setter Property="Fill" Value="DodgerBlue" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Visibility" Value="Collapsed" />
-		<Style.Triggers>
-			<Trigger Property="hc:TipElement.Placement" Value="LeftTop">
-				<Setter Property="Margin" Value="-3, -3, 0, 0" />
-				<Setter Property="HorizontalAlignment" Value="Left" />
-				<Setter Property="VerticalAlignment" Value="Top" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="Top">
-				<Setter Property="Margin" Value="0, -3, 0, 0" />
-				<Setter Property="HorizontalAlignment" Value="Center" />
-				<Setter Property="VerticalAlignment" Value="Top" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="RightTop">
-				<Setter Property="Margin" Value="0, -3, -3, 0" />
-				<Setter Property="HorizontalAlignment" Value="Right" />
-				<Setter Property="VerticalAlignment" Value="Top" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="Right">
-				<Setter Property="Margin" Value="0, 0, -3, 0" />
-				<Setter Property="HorizontalAlignment" Value="Right" />
-				<Setter Property="VerticalAlignment" Value="Center" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="RightBottom">
-				<Setter Property="Margin" Value="0, 0, -3, -3" />
-				<Setter Property="HorizontalAlignment" Value="Right" />
-				<Setter Property="VerticalAlignment" Value="Bottom" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="Bottom">
-				<Setter Property="Margin" Value="0, 0, 0, -3" />
-				<Setter Property="HorizontalAlignment" Value="Center" />
-				<Setter Property="VerticalAlignment" Value="Bottom" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="LeftBottom">
-				<Setter Property="Margin" Value="-3, 0, 0, -3" />
-				<Setter Property="HorizontalAlignment" Value="Left" />
-				<Setter Property="VerticalAlignment" Value="Bottom" />
-			</Trigger>
-			<Trigger Property="hc:TipElement.Placement" Value="Left">
-				<Setter Property="Margin" Value="-3, 0, 0, 0" />
-				<Setter Property="HorizontalAlignment" Value="Left" />
-				<Setter Property="VerticalAlignment" Value="Center" />
-			</Trigger>
-			<DataTrigger Binding="{Binding IsSelecting}" Value="True">
-				<Setter Property="Visibility" Value="Visible" />
-			</DataTrigger>
-			<DataTrigger Binding="{Binding IsDrawing}" Value="True">
-				<Setter Property="Visibility" Value="Visible" />
-			</DataTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TargetArea4ScreenshotStyle" TargetType="Border">
-		<Setter Property="IsHitTestVisible" Value="False" />
-		<Setter Property="BorderThickness" Value="5" />
-		<Setter Property="BorderBrush" Value="DodgerBlue" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Style.Triggers>
-			<DataTrigger Binding="{Binding IsSelecting}" Value="True">
-				<Setter Property="BorderThickness" Value="1" />
-			</DataTrigger>
-			<DataTrigger Binding="{Binding IsDrawing}" Value="True">
-				<Setter Property="IsHitTestVisible" Value="True" />
-				<Setter Property="BorderThickness" Value="1" />
-			</DataTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style TargetType="hc:SimpleItemsControl">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SimpleItemsControl">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<StackPanel x:Name="PART_Panel" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:Sprite">
-		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="ShowActivated" Value="False" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="Topmost" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Sprite">
-					<ContentPresenter Margin="{TemplateBinding Padding}" hc:WindowAttach.IsDragElement="True" HorizontalAlignment="Center" VerticalAlignment="Center" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Storyboard x:Key="Right2LeftTransition" x:Shared="False">
-		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Left2RightTransition" x:Shared="False">
-		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Bottom2TopTransition" x:Shared="False">
-		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Top2BottomTransition" x:Shared="False">
-		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Right2LeftWithFadeTransition" x:Shared="False">
-		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Left2RightWithFadeTransition" x:Shared="False">
-		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Bottom2TopWithFadeTransition" x:Shared="False">
-		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="Top2BottomWithFadeTransition" x:Shared="False">
-		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-			<DoubleAnimation.EasingFunction>
-				<CubicEase EasingMode="EaseOut" />
-			</DoubleAnimation.EasingFunction>
-		</DoubleAnimation>
-	</Storyboard>
-	<Storyboard x:Key="FadeTransition" x:Shared="False">
-		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-	</Storyboard>
-	<Style TargetType="hc:TransitioningContentControl">
-		<Setter Property="Focusable" Value="False" />
-	</Style>
-	<Style x:Key="SliderRepeatButtonHorizontalStyle" 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">
-					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-						<Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Height="2" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SliderRepeatButtonVerticalStyle" 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">
-					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-						<Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Width="2" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CompareSliderRepeatButtonTransparent" 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">
-					<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PreviewSliderRepeatButtonHorizontalStyle" 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">
-					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-						<Rectangle Fill="{TemplateBinding Background}" Height="2" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PreviewSliderRepeatButtonVerticalStyle" 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">
-					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-						<Rectangle Fill="{TemplateBinding Background}" Width="2" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ScrollBarBaseRepeatButton" 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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ToggleBlock">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<hc:SimplePanel Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-							<ContentPresenter Name="ContentPresenterChecked" ContentSource="CheckedContent" Visibility="Collapsed" />
-							<ContentPresenter Name="ContentPresenterUnChecked" ContentSource="UnCheckedContent" />
-							<ContentPresenter Name="ContentPresenterIndeterminate" ContentSource="IndeterminateContent" Visibility="Collapsed" />
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Visible" />
-							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="False">
-							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Visible" />
-							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="{x:Null}">
-							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="GroupBoxBaseTopTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" MinHeight="30" />
-				<RowDefinition />
-			</Grid.RowDefinitions>
-			<Border MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,0,6">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<ControlTemplate x:Key="GroupBoxBaseLeftTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<Border MinWidth="30" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="False" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,6,0">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" RenderTransformOrigin="0.5,0.5">
-					<ContentPresenter.LayoutTransform>
-						<TransformGroup>
-							<RotateTransform Angle="-90" />
-						</TransformGroup>
-					</ContentPresenter.LayoutTransform>
-				</ContentPresenter>
-			</Border>
-			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<ControlTemplate x:Key="GroupBoxTabTopTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" MinHeight="30" />
-				<RowDefinition />
-			</Grid.RowDefinitions>
-			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,0,1,1'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-			<Border Grid.Row="0" MinHeight="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,1,0'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,1,0,0'}">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<ControlTemplate x:Key="GroupBoxTabLeftTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-			<Border Grid.Column="0" MinWidth="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,0,1'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-					<ContentPresenter.LayoutTransform>
-						<TransformGroup>
-							<RotateTransform Angle="-90" />
-						</TransformGroup>
-					</ContentPresenter.LayoutTransform>
-				</ContentPresenter>
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" />
-	</ItemsPanelTemplate>
-	<tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
-	<LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
-		<GradientStop Color="#00FFFFFF" Offset="0" />
-		<GradientStop Color="#60FFFFFF" Offset="0.4" />
-		<GradientStop Color="#60FFFFFF" Offset="0.6" />
-		<GradientStop Color="#00FFFFFF" Offset="1" />
-	</LinearGradientBrush>
-	<ControlTemplate x:Key="CircleProgressBarTemplate" TargetType="hc:CircleProgressBar">
-		<hc:SimplePanel x:Name="TemplateRoot">
-			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
-			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="PART_Indicator" Fill="{TemplateBinding Foreground}" />
-			<TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<ItemsPanelTemplate x:Key="UniformHorizontalItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="UniformVerticalItemsPanelTemplate">
-		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackHorizontalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="StackVerticalItemsPanelTemplate">
-		<StackPanel FocusVisualStyle="{x:Null}" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="WrapHorizontalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="WrapVerticalItemsPanelTemplate">
-		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
-	</ItemsPanelTemplate>
-	<ItemsPanelTemplate x:Key="DockItemsPanelTemplate">
-		<DockPanel FocusVisualStyle="{x:Null}" LastChildFill="True" />
-	</ItemsPanelTemplate>
-	<LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
-		<GradientStop Color="#FFFFFF" Offset="0.3" />
-		<GradientStop Color="#BBC5D7" Offset="0.75" />
-		<GradientStop Color="#6D83A9" Offset="1" />
-	</LinearGradientBrush>
-	<SineEase x:Key="SineEaseOut" EasingMode="EaseOut" />
-	<ControlTemplate x:Key="BadgeDotTemplate" TargetType="hc:Badge">
-		<hc:SimplePanel>
-			<ContentPresenter />
-			<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<Style x:Key="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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ColorPickerSliderThumbTemplate" TargetType="Thumb">
-		<Border Width="13" Height="13" Background="White" CornerRadius="6.5" />
-	</ControlTemplate>
-	<LinearGradientBrush x:Key="ColorPickerRainbowBrush">
-		<GradientStop Color="#ff0000" />
-		<GradientStop Color="#ff00ff" Offset="0.167" />
-		<GradientStop Color="#0000ff" Offset="0.334" />
-		<GradientStop Color="#00ffff" Offset="0.501" />
-		<GradientStop Color="#00ff00" Offset="0.668" />
-		<GradientStop Color="#ffff00" Offset="0.835" />
-		<GradientStop Color="#ff0000" Offset="1" />
-	</LinearGradientBrush>
-	<DrawingBrush x:Key="ColorPickerOpacityBrush" Viewport="0,0,12,11" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-		<DrawingBrush.Drawing>
-			<DrawingGroup>
-				<GeometryDrawing Brush="#d0cec7">
-					<GeometryDrawing.Geometry>
-						<GeometryGroup>
-							<RectangleGeometry Rect="0,0,6,5" />
-							<RectangleGeometry Rect="6,6,6,5" />
-						</GeometryGroup>
-					</GeometryDrawing.Geometry>
-				</GeometryDrawing>
-				<GeometryDrawing Brush="#e7e7e2">
-					<GeometryDrawing.Geometry>
-						<RectangleGeometry Rect="0,5,12,1" />
-					</GeometryDrawing.Geometry>
-				</GeometryDrawing>
-			</DrawingGroup>
-		</DrawingBrush.Drawing>
-	</DrawingBrush>
-	<Style x:Key="CoverFlowBaseStyle" TargetType="hc:CoverFlow">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CoverFlow">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Viewport3D x:Name="PART_Viewport3D">
-							<Viewport3D.Camera>
-								<PerspectiveCamera x:Name="PART_Camera" Position="0,0,3" UpDirection="0,1,0" LookDirection="0,0,-1" FieldOfView="90" />
-							</Viewport3D.Camera>
-							<Viewport3D.Children>
-								<ModelVisual3D>
-									<ModelVisual3D.Content>
-										<DirectionalLight Color="White" Direction="1,0,-4" />
-									</ModelVisual3D.Content>
-								</ModelVisual3D>
-								<ModelVisual3D>
-									<ModelVisual3D.Content>
-										<DirectionalLight Color="White" Direction="-1,0,-4" />
-									</ModelVisual3D.Content>
-								</ModelVisual3D>
-								<ModelVisual3D x:Name="PART_VisualParent" />
-							</Viewport3D.Children>
-						</Viewport3D>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CoverViewItemBaseStyle" TargetType="hc:CoverViewItem">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CoverViewItem">
-					<Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{TemplateBinding Padding}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
-		<Setter Property="Canvas.Right" Value="-9" />
-		<Setter Property="Width" Value="18" />
-		<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<Border Background="Transparent" Padding="{TemplateBinding Padding}">
-						<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">
-		<DrawingBrush.Drawing>
-			<DrawingGroup o:Freeze="True">
-				<GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0.9999,-0.000199999999999534L0.9999,15.9998 10.9999,15.9998 10.9999,13.4148 11.9999,14.4138 15.9999,10.4138 15.9999,5.5858 14.0009,7.5858 14.0009,3.0008 10.9999,3.0008 10.9999,-0.000199999999999534z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M10,12.4141L10,15.0001 2,15.0001 2,1.0001 10,1.0001 10,3.0001 10,7.5861 8.414,6.0001 9,6.0001 9,3.0001 3,3.0001 3,6.0001 8,6.0001 8,7.0001 3,7.0001 3,10.0001 8,10.0001 8,10.4141 8.586,11.0001 3,11.0001 3,14.0001 9,14.0001 9,11.4141z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M8.5859,11L2.9999,11 2.9999,14 8.9999,14 8.9999,11.414z M7.9999,7L2.9999,7 2.9999,10 7.9999,10z M7.9999,6L2.9999,6 2.9999,3 8.9999,3 8.9999,6 8.4139,6 7.9999,5.586z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M13,10L13,4 11,4 11,10 9,8 9,10 12,13 15,10 15,8z" />
-			</DrawingGroup>
-		</DrawingBrush.Drawing>
-	</DrawingBrush>
-	<DrawingBrush x:Key="SortByNameDrawingBrush" o:Freeze="True">
-		<DrawingBrush.Drawing>
-			<DrawingGroup o:Freeze="True">
-				<GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
-				<GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
-			</DrawingGroup>
-		</DrawingBrush.Drawing>
-	</DrawingBrush>
-	<ContextMenu x:Key="TabItemMenu" x:Shared="False">
-		<MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
-		<MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
-		<MenuItem Command="interactivity:ControlCommands.CloseOther" Header="{x:Static langs:Lang.CloseOther}" />
-	</ContextMenu>
-	<Style x:Key="ToolBarTrayBaseStyle" TargetType="ToolBarTray">
-		<Setter Property="Background" Value="Transparent" />
-	</Style>
-	<PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z" />
-	<Style x:Key="RowHeaderGripperStyle" TargetType="Thumb">
-		<Setter Property="Height" Value="8" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Cursor" Value="SizeNS" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
-		<Setter Property="Width" Value="8" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Cursor" Value="SizeWE" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
-		<Setter Property="Focusable" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ComboBox">
-					<TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
-		<Setter Property="TextTrimming" Value="CharacterEllipsis" />
-	</Style>
-	<Style x:Key="CarouselItemBaseStyle" TargetType="hc:CarouselItem">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CarouselItem">
-					<Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:Carousel}}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:GrowlWindow">
-		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-		<Setter Property="Width" Value="340" />
-		<Setter Property="MaxWidth" Value="340" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="ShowActivated" Value="False" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="Topmost" Value="True" />
-	</Style>
-	<Style x:Key="ListBoxItemCustom" TargetType="ListBoxItem">
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListBoxItem">
-					<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
-	<hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
-	<hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
-	<SolidColorBrush o:Freeze="True" x:Key="LightPrimaryBrush" Color="{DynamicResource LightPrimaryColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource PrimaryColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource DarkPrimaryColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="BorderBrush" Color="{DynamicResource BorderColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="RegionBrush" Color="{DynamicResource RegionColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource TitleColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource SecondaryTitleColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="LightDangerBrush" Color="{DynamicResource LightDangerColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource DangerColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource DarkDangerColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="LightWarningBrush" Color="{DynamicResource LightWarningColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource WarningColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource DarkWarningColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="LightInfoBrush" Color="{DynamicResource LightInfoColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource InfoColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource DarkInfoColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="LightSuccessBrush" Color="{DynamicResource LightSuccessColor}" />
-	<LinearGradientBrush o:Freeze="True" x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
-		<GradientStop o:Freeze="True" Color="{DynamicResource SuccessColor}" Offset="0" />
-		<GradientStop o:Freeze="True" Color="{DynamicResource DarkSuccessColor}" Offset="1" />
-	</LinearGradientBrush>
-	<SolidColorBrush o:Freeze="True" x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="AccentBrush" Color="{DynamicResource AccentColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}" />
-	<SolidColorBrush o:Freeze="True" x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}" />
-	<DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-	<DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-	<DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-	<DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-	<DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-	<Style x:Key="SearchPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource SearchGeometry}" />
-	</Style>
-	<Style x:Key="FullScreenReturnPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource FullScreenReturnGeometry}" />
-	</Style>
-	<Style x:Key="FullScreenPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource FullScreenGeometry}" />
-	</Style>
-	<Style x:Key="WindowsPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource WindowsGeometry}" />
-	</Style>
-	<Style x:Key="SavePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource SaveGeometry}" />
-	</Style>
-	<Style x:Key="DownloadPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource DownloadGeometry}" />
-	</Style>
-	<Style x:Key="EnlargePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource EnlargeGeometry}" />
-	</Style>
-	<Style x:Key="ReducePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource ReduceGeometry}" />
-	</Style>
-	<Style x:Key="RotatePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource RotateLeftGeometry}" />
-	</Style>
-	<Style x:Key="CalendarPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource CalendarGeometry}" />
-	</Style>
-	<Style x:Key="DeletePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource DeleteGeometry}" />
-	</Style>
-	<Style x:Key="ClosePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource CloseGeometry}" />
-	</Style>
-	<Style x:Key="DownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource DownGeometry}" />
-	</Style>
-	<Style x:Key="ClockPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource ClockGeometry}" />
-	</Style>
-	<Style x:Key="LeftPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource LeftGeometry}" />
-	</Style>
-	<Style x:Key="RightPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="RenderTransformOrigin" Value="0.5, 0.5" />
-		<Setter Property="RenderTransform">
-			<Setter.Value>
-				<TransformGroup>
-					<ScaleTransform ScaleY="1" ScaleX="-1" />
-					<SkewTransform AngleY="0" AngleX="0" />
-					<RotateTransform Angle="0" />
-					<TranslateTransform />
-				</TransformGroup>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Data" Value="{StaticResource LeftGeometry}" />
-	</Style>
-	<Style x:Key="UpDownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-		<Setter Property="Data" Value="{StaticResource UpDownGeometry}" />
-	</Style>
-	<Style x:Key="BorderRegion" TargetType="Border">
-		<Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-	</Style>
-	<Style x:Key="BorderTipBaseStyle" TargetType="Border">
-		<Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="BorderThickness" Value="5,0,0,0" />
-	</Style>
-	<Style x:Key="BorderTipPrimary" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-		<Setter Property="Background" Value="{DynamicResource LightPrimaryBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="BorderTipDanger" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-		<Setter Property="Background" Value="{DynamicResource LightDangerBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="BorderTipWarning" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-		<Setter Property="Background" Value="{DynamicResource LightWarningBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="BorderTipInfo" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-		<Setter Property="Background" Value="{DynamicResource LightInfoBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="BorderTipSuccess" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-		<Setter Property="Background" Value="{DynamicResource LightSuccessBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="BorderVerticallySplitter" TargetType="Border">
-		<Setter Property="Width" Value="1" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
-	</Style>
-	<Style x:Key="BorderHorizontallySplitter" TargetType="Border">
-		<Setter Property="Height" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
-	</Style>
-	<Style x:Key="BorderClip" TargetType="Border">
-		<Setter Property="Clip">
-			<Setter.Value>
-				<MultiBinding Converter="{StaticResource BorderClipConverter}">
-					<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-					<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-					<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-				</MultiBinding>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="BorderCircularClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
-		<Setter Property="Clip">
-			<Setter.Value>
-				<MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
-					<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-					<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-					<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-				</MultiBinding>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:FlipNumber">
-		<Setter Property="FontSize" Value="70" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="Width" Value="120" />
-		<Setter Property="Height" Value="180" />
-		<Setter Property="Camera">
-			<Setter.Value>
-				<PerspectiveCamera Position="0 0 120" LookDirection="0 0 -1" />
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RectangleFocusVisual" TargetType="Rectangle">
-		<Setter Property="Margin" Value="-2" />
-		<Setter Property="Opacity" Value=".6" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Stroke" Value="{DynamicResource SecondaryBorderBrush}" />
-		<Setter Property="StrokeThickness" Value="2" />
-		<Setter Property="StrokeDashArray" Value="1 1" />
-	</Style>
-	<Style x:Key="RectangleFocusVisualCircular" BasedOn="{StaticResource RectangleFocusVisual}" TargetType="Rectangle">
-		<Setter Property="hc:RectangleAttach.Circular" Value="True" />
-	</Style>
-	<Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="2,7" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TextBoxBase">
-					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="border" Value="0.4" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
-		<Setter Property="MinWidth" Value="10" />
-	</Style>
-	<Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox" />
-	<Style x:Key="MaskRect4ScreenshotStyle" TargetType="Rectangle">
-		<Setter Property="IsHitTestVisible" Value="False" />
-		<Setter Property="Fill" Value="{DynamicResource DarkOpacityBrush}" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-	</Style>
-	<Style x:Key="Window4ScreenshotStyle" TargetType="hc:ScreenshotWindow">
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="WindowStyle" Value="None" />
-		<Setter Property="WindowState" Value="Maximized" />
-		<Setter Property="Topmost" Value="True" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ScreenshotWindow">
-					<AdornerDecorator>
-						<hc:SimplePanel>
-							<InkCanvas EditingMode="None" Name="PART_Canvas" Background="Transparent" />
-							<Rectangle Name="PART_MaskAreaLeft" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-							<Rectangle Name="PART_MaskAreaTop" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-							<Rectangle Name="PART_MaskAreaRight" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-							<Rectangle Name="PART_MaskAreaBottom" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-							<Border Name="PART_TargetArea" Style="{StaticResource TargetArea4ScreenshotStyle}">
-								<hc:SimplePanel>
-									<Rectangle hc:TipElement.Placement="LeftTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="Top" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="RightTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="Right" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="RightBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="Bottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="LeftBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<Rectangle hc:TipElement.Placement="Left" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-									<TextBlock Text="{TemplateBinding SizeStr}" Background="#CC212121" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="8,2" />
-								</hc:SimplePanel>
-							</Border>
-							<Border x:Name="PART_Magnifier" IsHitTestVisible="False" Visibility="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Top" Width="122" Height="122" BorderThickness="1" BorderBrush="#FF333333" CornerRadius="1">
-								<Border.Effect>
-									<DropShadowEffect BlurRadius="2" Opacity=".2" Direction="-45" RenderingBias="Performance" ShadowDepth="3" />
-								</Border.Effect>
-								<hc:SimplePanel>
-									<Border Margin="0,0,0,32" Background="{TemplateBinding PreviewBrush}" BorderThickness="2" BorderBrush="White">
-										<hc:SimplePanel>
-											<Path Data="M56,0 L60,0 60,40 116,40 116,44 60,44 60,84 56,84 56,44 0,44 0,40 56,40 z" Fill="#CC4CC6FF" />
-										</hc:SimplePanel>
-									</Border>
-									<Border Height="32" VerticalAlignment="Bottom" Background="#CC000000">
-										<StackPanel VerticalAlignment="Center" Margin="5,0,0,0">
-											<TextBlock Foreground="White" Text="{TemplateBinding SizeStr}" />
-										</StackPanel>
-									</Border>
-								</hc:SimplePanel>
-							</Border>
-						</hc:SimplePanel>
-					</AdornerDecorator>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FocusVisual">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle Style="{StaticResource RectangleFocusVisual}" RadiusX="4" RadiusY="4" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FocusVisualRadius0">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle Style="{StaticResource RectangleFocusVisual}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FocusVisualMargin0">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FocusVisualRadius0Margin0">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="BaseStyle" TargetType="Control">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
-	</Style>
-	<Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ButtonBase">
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-	</Style>
-	<Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</StackPanel>
-						</Border>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</hc:DashedBorder>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-				<Setter Property="Margin" Value="0,-1,0,0" />
-			</DataTrigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TextBlockBaseStyle" TargetType="TextBlock">
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-	</Style>
-	<Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontWeight" Value="Bold" />
-	</Style>
-	<Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
-		<Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style x:Key="LabelBaseStyle" TargetType="Label">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Label">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="SliderThumb" TargetType="Thumb">
-		<hc:AxleCanvas>
-			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CompareSliderThumbHorizontal" TargetType="Thumb">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
-					<EasingDoubleKeyFrame KeyTime="0" Value="-2" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
-					<EasingDoubleKeyFrame KeyTime="0" Value="2" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
-					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
-					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<hc:SimplePanel>
-			<Border Width="1" HorizontalAlignment="Center">
-				<Border.Background>
-					<DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-						<DrawingBrush.Drawing>
-							<DrawingGroup>
-								<GeometryDrawing Brush="{DynamicResource BorderBrush}">
-									<GeometryDrawing.Geometry>
-										<GeometryGroup>
-											<RectangleGeometry Rect="0,0,1,4" />
-										</GeometryGroup>
-									</GeometryDrawing.Geometry>
-								</GeometryDrawing>
-							</DrawingGroup>
-						</DrawingBrush.Drawing>
-					</DrawingBrush>
-				</Border.Background>
-			</Border>
-			<Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-				<hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
-					<Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-						<Path.RenderTransform>
-							<TransformGroup>
-								<TranslateTransform />
-							</TransformGroup>
-						</Path.RenderTransform>
-					</Path>
-					<Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-						<Path.RenderTransform>
-							<TransformGroup>
-								<TranslateTransform />
-							</TransformGroup>
-						</Path.RenderTransform>
-					</Path>
-				</hc:SimplePanel>
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Stroke" TargetName="PathLeft" Value="White" />
-				<Setter Property="Stroke" TargetName="PathRight" Value="White" />
-			</Trigger>
-			<Trigger Property="IsDragging" Value="true">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
-		<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-			<hc:CompareTrack x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-						<ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
-					</RepeatButton>
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-						<ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
-					</RepeatButton>
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
-				</Track.Thumb>
-			</hc:CompareTrack>
-		</Border>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CompareSliderThumbVertical" TargetType="Thumb">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="Storyboard1">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
-					<EasingDoubleKeyFrame KeyTime="0" Value="-2" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
-					<EasingDoubleKeyFrame KeyTime="0" Value="2" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="Storyboard2">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
-					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
-					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<hc:SimplePanel>
-			<Border Height="1" VerticalAlignment="Center">
-				<Border.Background>
-					<DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-						<DrawingBrush.Drawing>
-							<DrawingGroup>
-								<GeometryDrawing Brush="{DynamicResource BorderBrush}">
-									<GeometryDrawing.Geometry>
-										<GeometryGroup>
-											<RectangleGeometry Rect="0,0,4,1" />
-										</GeometryGroup>
-									</GeometryDrawing.Geometry>
-								</GeometryDrawing>
-							</DrawingGroup>
-						</DrawingBrush.Drawing>
-					</DrawingBrush>
-				</Border.Background>
-			</Border>
-			<Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-				<hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
-					<Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-						<Path.RenderTransform>
-							<TransformGroup>
-								<TranslateTransform />
-							</TransformGroup>
-						</Path.RenderTransform>
-					</Path>
-					<Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-						<Path.RenderTransform>
-							<TransformGroup>
-								<TranslateTransform />
-							</TransformGroup>
-						</Path.RenderTransform>
-					</Path>
-				</hc:SimplePanel>
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="grip">
-				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Stroke" TargetName="PathUp" Value="White" />
-				<Setter Property="Stroke" TargetName="PathDown" Value="White" />
-			</Trigger>
-			<Trigger Property="IsDragging" Value="true">
-				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Stroke" TargetName="PathUp" Value="White" />
-				<Setter Property="Stroke" TargetName="PathDown" Value="White" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
-		<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-			<hc:CompareTrack x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-						<ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
-					</RepeatButton>
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-						<ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
-					</RepeatButton>
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
-				</Track.Thumb>
-			</hc:CompareTrack>
-		</Border>
-	</ControlTemplate>
-	<Style x:Key="CompareSliderBaseStyle" TargetType="hc:CompareSlider">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="MinWidth" Value="30" />
-		<Setter Property="MinHeight" Value="30" />
-		<Setter Property="Template" Value="{StaticResource CompareSliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource CompareSliderVertical}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="PreviewSliderThumb" TargetType="Thumb">
-		<Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="PreviewSliderHorizontal" TargetType="hc:PreviewSlider">
-		<hc:SimplePanel>
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Height="2" VerticalAlignment="center" Margin="9,0" />
-			<Track VerticalAlignment="center" Margin="9,0" x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb Margin="-9,0" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" VerticalAlignment="Center" Width="18" />
-				</Track.Thumb>
-			</Track>
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="PreviewSliderVertical" TargetType="hc:PreviewSlider">
-		<hc:SimplePanel>
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Width="2" HorizontalAlignment="center" Margin="0,9" />
-			<Track HorizontalAlignment="center" Margin="0,9" x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb Margin="0,-9" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" HorizontalAlignment="Center" Width="18" />
-				</Track.Thumb>
-			</Track>
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<Style x:Key="PreviewSliderBaseStyle" TargetType="hc:PreviewSlider">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="IsMoveToPointEnabled" Value="True" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template" Value="{StaticResource PreviewSliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource PreviewSliderVertical}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="RangeSliderThumb" TargetType="hc:RangeThumb">
-		<Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</StackPanel>
-						</Border>
-						<Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="true">
-							<Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="6,0,0,0" />
-		<Setter Property="Width" Value="36" />
-		<Setter Property="Height" Value="22" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardChecked">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="14">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardUnChecked">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Viewbox>
-						<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11" />
-							<Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-							<Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
-								<Border.RenderTransform>
-									<TransformGroup>
-										<ScaleTransform />
-									</TransformGroup>
-								</Border.RenderTransform>
-							</Border>
-							<hc:SimplePanel Grid.Column="0" Margin="1">
-								<Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
-									<Border.RenderTransform>
-										<TransformGroup>
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-							</hc:SimplePanel>
-							<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Grid>
-					</Viewbox>
-					<ControlTemplate.Triggers>
-						<Trigger Property="HasContent" Value="true">
-							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
-		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-							</ContentControl>
-						</Border>
-						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-			</Trigger>
-			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-				<Setter Property="Margin" Value="0,-1,0,0" />
-			</DataTrigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ScrollBarBaseThumbVertical" TargetType="Thumb">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardMouseEnter">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardMouseLeave">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border Width="{TemplateBinding Width}" Background="Transparent">
-						<Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" HorizontalAlignment="Right" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="2" Fill="{TemplateBinding Background}">
-							<Rectangle.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform X="-2" />
-								</TransformGroup>
-							</Rectangle.RenderTransform>
-						</Rectangle>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
-						</Trigger>
-						<Trigger Property="IsDragging" Value="true">
-							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
-						</Trigger>
-						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ScrollBarBaseThumbHorizontal" TargetType="Thumb">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardMouseEnter">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardMouseLeave">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border Height="{TemplateBinding Height}" Background="Transparent">
-						<Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" VerticalAlignment="Bottom" Height="2" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" Fill="{TemplateBinding Background}">
-							<Rectangle.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform Y="-2" />
-								</TransformGroup>
-							</Rectangle.RenderTransform>
-						</Rectangle>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
-						</Trigger>
-						<Trigger Property="IsDragging" Value="true">
-							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
-						</Trigger>
-						<EventTrigger RoutedEvent="MouseEnter">
-							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="MouseLeave">
-							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ScrollBarBaseStyle" TargetType="ScrollBar">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Width" Value="8" />
-		<Setter Property="MinWidth" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ScrollBar">
-					<hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
-						<Border Background="{TemplateBinding Background}" />
-						<Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
-							<Track.DecreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-							</Track.DecreaseRepeatButton>
-							<Track.IncreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-							</Track.IncreaseRepeatButton>
-							<Track.Thumb>
-								<Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbVertical}" />
-							</Track.Thumb>
-						</Track>
-					</hc:SimplePanel>
-				</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="8" />
-				<Setter Property="MinHeight" Value="8" />
-				<Setter Property="BorderThickness" Value="0,1" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="ScrollBar">
-							<hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
-								<Border Background="{TemplateBinding Background}" />
-								<Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
-									<Track.DecreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-									</Track.DecreaseRepeatButton>
-									<Track.IncreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-									</Track.IncreaseRepeatButton>
-									<Track.Thumb>
-										<Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbHorizontal}" />
-									</Track.Thumb>
-								</Track>
-							</hc:SimplePanel>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardMouseOver">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="StoryboardCommon">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardMouseOver">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="StoryboardCommon">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
-				<Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardMouseOver">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="StoryboardCommon">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardMouseOver">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-			<Storyboard x:Key="StoryboardCommon">
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-				</DoubleAnimationUsingKeyFrames>
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
-				<Setter Property="Template" Value="{StaticResource ScrollViewerBaseControlTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</StackPanel>
-						</Border>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RepeatButtonDashedBaseStyle" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</hc:DashedBorder>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="GroupBoxBaseStyle" TargetType="GroupBox">
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="hc:TitleElement.TitlePlacement" Value="Top" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="4" />
-		<Setter Property="Template" Value="{StaticResource GroupBoxBaseTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource GroupBoxBaseLeftTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="GroupBoxOriginalTopTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition />
-			</Grid.RowDefinitions>
-			<StackPanel Orientation="Horizontal" Margin="8,6">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				<ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-			</StackPanel>
-			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<ControlTemplate x:Key="GroupBoxOriginalLeftTemplate" TargetType="GroupBox">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<StackPanel Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8">
-				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				<ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-			</StackPanel>
-			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<Style x:Key="GroupBoxOriginalBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Template" Value="{StaticResource GroupBoxOriginalTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource GroupBoxOriginalLeftTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="GroupBoxTabBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
-		<Setter Property="Template" Value="{StaticResource GroupBoxTabTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource GroupBoxTabLeftTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
-		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Layout" Value="Uniform" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
-		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Uniform" />
-					<Condition Property="Orientation" Value="Vertical" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Stack" />
-					<Condition Property="Orientation" Value="Horizontal" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Stack" />
-					<Condition Property="Orientation" Value="Vertical" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ElementGroupBaseStyle" TargetType="hc:ElementGroup">
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Layout" Value="Uniform" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Uniform" />
-					<Condition Property="Orientation" Value="Vertical" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Stack" />
-					<Condition Property="Orientation" Value="Horizontal" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="Layout" Value="Stack" />
-					<Condition Property="Orientation" Value="Vertical" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
-		<Setter Property="hc:VisualElement.Text">
-			<Setter.Value>
-				<MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0:F0} %">
-					<Binding Path="Value" RelativeSource="{RelativeSource Self}" />
-					<Binding Path="Maximum" RelativeSource="{RelativeSource Self}" />
-				</MultiBinding>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Height" Value="20" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ProgressBar">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
-								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
-								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
-							</DoubleAnimationUsingKeyFrames>
-							<PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
-								<EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
-								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
-								<EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
-							</PointAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<hc:SimplePanel>
-							<Rectangle x:Name="PART_Track" />
-							<TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
-							<Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
-								<hc:SimplePanel>
-									<Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
-										<Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
-											<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
-										</Border>
-									</Border>
-									<Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
-									<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
-										<Rectangle.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-											</TransformGroup>
-										</Rectangle.RenderTransform>
-									</Rectangle>
-								</hc:SimplePanel>
-							</Border>
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Orientation" Value="Vertical">
-							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
-								<Setter.Value>
-									<RotateTransform Angle="-90" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<Trigger Property="IsIndeterminate" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-							</Trigger.EnterActions>
-							<Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
-							<Setter Property="Visibility" TargetName="PART_GlowRect" Value="Collapsed" />
-							<Setter Property="Visibility" TargetName="Animation" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ProgressBar">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OnLoaded">
-							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
-								<LinearDoubleKeyFrame KeyTime="0" Value="0" />
-								<LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
-						<Rectangle x:Name="PART_Track" />
-						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-							<Border x:Name="Indicator" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}" />
-						</Decorator>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Orientation" Value="Vertical">
-							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
-								<Setter.Value>
-									<RotateTransform Angle="-90" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
-							<BeginStoryboard Storyboard="{StaticResource OnLoaded}" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="CircleProgressBarIndeterminateTemplate" TargetType="hc:CircleProgressBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-				<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="TemplateRoot">
-					<LinearDoubleKeyFrame KeyTime="0:0:1.568" Value="360" />
-				</DoubleAnimationUsingKeyFrames>
-				<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="arc">
-					<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.TargetProperty="(shapes:Arc.StartAngle)" Storyboard.TargetName="arc">
-					<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.TargetProperty="(shapes:Arc.EndAngle)" Storyboard.TargetName="arc">
-					<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>
-		<hc:SimplePanel x:Name="TemplateRoot" RenderTransformOrigin="0.5,0.5">
-			<hc:SimplePanel.RenderTransform>
-				<TransformGroup>
-					<RotateTransform />
-				</TransformGroup>
-			</hc:SimplePanel.RenderTransform>
-			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
-			<shapes:Arc RenderTransformOrigin="0.5,0.5" StartAngle="-5" EndAngle="5" ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="arc" Fill="{TemplateBinding Foreground}">
-				<shapes:Arc.RenderTransform>
-					<TransformGroup>
-						<RotateTransform />
-					</TransformGroup>
-				</shapes:Arc.RenderTransform>
-			</shapes:Arc>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsIndeterminate" Value="true">
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-				</Trigger.EnterActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ProgressBarCircleBaseStyle" TargetType="hc:CircleProgressBar">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Height" Value="100" />
-		<Setter Property="Width" Value="100" />
-		<Setter Property="ArcThickness" Value="4" />
-		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
-		<Setter Property="Template" Value="{StaticResource CircleProgressBarTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="IsIndeterminate" Value="True">
-				<Setter Property="Template" Value="{StaticResource CircleProgressBarIndeterminateTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ProgressBarWaveBaseStyle" TargetType="hc:WaveProgressBar">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Width" Value="100" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:WaveProgressBar">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardOnLoaded" RepeatBehavior="Forever">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PART_Wave">
-								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="-400" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<StackPanel>
-						<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-							<Viewbox>
-								<Border x:Name="PART_Clip" Style="{StaticResource BorderCircularClip}" CornerRadius="100" Width="200" Height="200">
-									<Path x:Name="PART_Wave" Stroke="{TemplateBinding WaveStroke}" StrokeThickness="{TemplateBinding WaveThickness}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="250" Fill="{TemplateBinding WaveFill}" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Margin="0,0,-400,-20">
-										<Path.Data>
-											<PathGeometry>
-												<PathFigure StartPoint="0,1">
-													<PolyBezierSegment Points="0.5,1 0.5,0 1,0" />
-													<PolyBezierSegment Points="1.5,0 1.5,1 2,1" />
-													<PolyBezierSegment Points="2.5,1 2.5,0 3,0" />
-													<PolyLineSegment Points="3,0 3,10, 0,10 0,1" />
-												</PathFigure>
-											</PathGeometry>
-										</Path.Data>
-									</Path>
-								</Border>
-							</Viewbox>
-						</Border>
-						<TextBlock Margin="0,10,0,0" Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
-					</StackPanel>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="PART_Wave">
-							<BeginStoryboard Name="BeginStoryboardWave" Storyboard="{StaticResource StoryboardOnLoaded}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="FrameworkElement.Unloaded" SourceName="PART_Wave">
-							<StopStoryboard BeginStoryboardName="BeginStoryboardWave" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Background" Value="White" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="6,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CheckBox">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardCheckedTrue">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardCheckedFalse">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="8" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Border Height="16" Width="16" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-						<hc:SimplePanel Grid.Column="0" Height="16" Width="16" x:Name="markGrid">
-							<Path FlowDirection="LeftToRight" UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-							<Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0" />
-						</hc:SimplePanel>
-						<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="HasContent" Value="true">
-							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="true" />
-								<Condition Property="IsPressed" Value="true" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Opacity" Value=".8" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="false" />
-								<Condition Property="IsPressed" Value="true" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
-							</Trigger.ExitActions>
-							<Setter Property="Opacity" TargetName="indeterminateMark" Value="0" />
-							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="false">
-							<Setter Property="Stroke" Value="{DynamicResource BorderBrush}" TargetName="path" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="{x:Null}">
-							<Setter Property="Opacity" TargetName="indeterminateMark" Value="1" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RadioButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="6,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RadioButton">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardCheckedTrue">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardCheckedFalse">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Border Height="18" Width="18" x:Name="radioButtonBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="100" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<Ellipse x:Name="optionMark" Fill="White" MinWidth="6" MinHeight="6" RenderTransformOrigin="0.5,0.5">
-								<Ellipse.RenderTransform>
-									<TransformGroup>
-										<ScaleTransform />
-									</TransformGroup>
-								</Ellipse.RenderTransform>
-							</Ellipse>
-						</Border>
-						<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="HasContent" Value="true">
-							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="true" />
-								<Condition Property="IsPressed" Value="true" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Opacity" Value=".8" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="false" />
-								<Condition Property="IsPressed" Value="true" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
-							</Trigger.ExitActions>
-							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RadioButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</StackPanel>
-						</Border>
-						<Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="true">
-							<Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:IconElement.Width" Value="16" />
-		<Setter Property="hc:IconElement.Height" Value="16" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RadioButton">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<Border Name="BorderHighlight" BorderThickness="3,0,0,0" BorderBrush="Transparent">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-								<Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</StackPanel>
-						</Border>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderHighlight" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RadioGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="hc:IconElement.Width" Value="16" />
-		<Setter Property="hc:IconElement.Height" Value="16" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RadioButton">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{Binding Path=(TextElement.Foreground),ElementName=contentPresenter}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-			</Trigger>
-			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-				<Setter Property="Margin" Value="0,-1,0,0" />
-			</DataTrigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
-	<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-						</ContentControl>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Padding" Value="6" />
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-						</ContentControl>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ButtonIconCircular.Small" BasedOn="{StaticResource ButtonIconCircular}" TargetType="Button">
-		<Setter Property="Width" Value="20" />
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="1" />
-	</Style>
-	<Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
-		<Setter Property="Background" Value="{x:Null}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ButtonGroupItemDefault" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button" />
-	<Style x:Key="ButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ButtonGroupItemHorizontalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-	</Style>
-	<Style x:Key="ButtonGroupItemSingle" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-	</Style>
-	<Style x:Key="ButtonGroupItemVerticalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ButtonGroupItemVerticalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-	</Style>
-	<Style x:Key="TextBlockDefault" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock" />
-	<Style x:Key="TextBlockDefaultAccent" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource AccentBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultPrimary" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultDanger" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultWarning" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultInfo" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultSuccess" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultSecLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultThiLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-	</Style>
-	<Style x:Key="TextBlockLarge" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockSubTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockLargeBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockSubTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
-	</Style>
-	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
-	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
-	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-	</Style>
-	<Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
-	<Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
-	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
-	<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-						</ContentControl>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
-	<Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Height" Value="30" />
-		<Setter Property="Width" Value="30" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardChecked">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="StoryboardUnChecked">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
-									<EasingDoubleKeyFrame.EasingFunction>
-										<PowerEase EasingMode="EaseOut" />
-									</EasingDoubleKeyFrame.EasingFunction>
-								</EasingDoubleKeyFrame>
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Viewbox>
-						<hc:SimplePanel Height="28" Width="28">
-							<Border Name="UnCheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-								<Border.RenderTransform>
-									<TransformGroup>
-										<ScaleTransform ScaleX="1" />
-									</TransformGroup>
-								</Border.RenderTransform>
-								<ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</Border>
-							<Border Name="CheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-								<Border.RenderTransform>
-									<TransformGroup>
-										<ScaleTransform ScaleX="0" />
-									</TransformGroup>
-								</Border.RenderTransform>
-								<ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-							</Border>
-						</hc:SimplePanel>
-					</Viewbox>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<hc:SimplePanel>
-							<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-								<Condition Property="IsChecked" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-						</MultiTrigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemDefault" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton" />
-	<Style x:Key="ToggleButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemHorizontalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemSingle" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemVerticalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ToggleButtonGroupItemVerticalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-	</Style>
-	<Style x:Key="ToggleButtonLoadingPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-							<hc:SimplePanel>
-								<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-							</hc:SimplePanel>
-							<Viewbox Margin="0,4">
-								<hc:LoadingCircle x:Name="Loading" Width="22" Height="22" Foreground="{TemplateBinding Foreground}" DotDiameter="3" IsRunning="{TemplateBinding IsChecked}" Visibility="Collapsed" />
-							</Viewbox>
-						</StackPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Visibility" Value="Visible" TargetName="Loading" />
-							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-								<Condition Property="IsChecked" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-						</MultiTrigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToggleButtonLoading" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToggleButtonLoadingSuccess" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonLoadingInfo" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonLoadingWarning" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ToggleButtonLoadingDanger" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
-	<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-						</ContentControl>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-						</ContentControl>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RepeatButtonIconCircular.Small" BasedOn="{StaticResource RepeatButtonIconCircular}" TargetType="RepeatButton">
-		<Setter Property="Width" Value="20" />
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
-		<Setter Property="Background" Value="{x:Null}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer" />
-	<Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="hc:ScrollViewer" />
-	<Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="Height" Value="10" />
-		<Setter Property="Padding" Value="0,2" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="ClickMode" Value="Hover" />
-	</Style>
-	<ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
-		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}">
-				<RepeatButton.Visibility>
-					<MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-					</MultiBinding>
-				</RepeatButton.Visibility>
-			</RepeatButton>
-			<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1" />
-			<RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}">
-				<RepeatButton.Visibility>
-					<MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-					</MultiBinding>
-				</RepeatButton.Visibility>
-			</RepeatButton>
-		</Grid>
-	</ControlTemplate>
-	<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
-	</Style>
-	<Style x:Key="CalendarButtonStyle" TargetType="CalendarButton">
-		<Setter Property="MinWidth" Value="10" />
-		<Setter Property="MinHeight" Value="10" />
-		<Setter Property="FontSize" Value="12" />
-		<Setter Property="Width" Value="40" />
-		<Setter Property="Height" Value="32" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CalendarButton">
-					<hc:SimplePanel>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
-										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="ActiveStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Active" />
-								<VisualState x:Name="Inactive">
-									<Storyboard>
-										<ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Rectangle x:Name="SelectedBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
-						<Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="16" RadiusX="16" />
-						<ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<TextElement.Foreground>
-								<SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
-							</TextElement.Foreground>
-						</ContentPresenter>
-						<Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsFocused" Value="True">
-							<Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CalendarDayButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CalendarDayButton">
-		<Setter Property="MinWidth" Value="10" />
-		<Setter Property="MinHeight" Value="10" />
-		<Setter Property="Width" Value="32" />
-		<Setter Property="Height" Value="32" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CalendarDayButton">
-					<hc:SimplePanel>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0:0:0.1" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
-										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="ActiveStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="Active" />
-								<VisualState x:Name="Inactive">
-									<Storyboard>
-										<ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="DayStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState x:Name="RegularDay" />
-								<VisualState x:Name="Today">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground" />
-										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Rectangle RadiusX="16" RadiusY="16" x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" />
-						<Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
-						<ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<TextElement.Foreground>
-								<SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
-							</TextElement.Foreground>
-						</ContentPresenter>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="CalendarItem">
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CalendarItem">
-					<ControlTemplate.Resources>
-						<DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
-							<TextBlock Foreground="{DynamicResource PrimaryTextBrush}" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center" />
-						</DataTemplate>
-					</ControlTemplate.Resources>
-					<hc:SimplePanel x:Name="PART_Root">
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
-							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" />
-							<Button x:Name="PART_PreviousButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource LeftGeometry}" />
-							<Button x:Name="PART_HeaderButton" Focusable="False" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}" />
-							<Button x:Name="PART_NextButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RightGeometry}" />
-							<Grid Width="240" Height="240" x:Name="PART_MonthView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Visible">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-							</Grid>
-							<Grid Width="240" Height="240" x:Name="PART_YearView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Hidden">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition />
-									<RowDefinition />
-									<RowDefinition />
-								</Grid.RowDefinitions>
-							</Grid>
-						</Grid>
-						<Rectangle x:Name="PART_DisabledVisual" Visibility="Collapsed" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
-							<Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
-							<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
-						</DataTrigger>
-						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Decade">
-							<Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
-							<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
-						</DataTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CalendarBaseStyle" TargetType="Calendar">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Language" Value="{Binding Lang,Source={x:Static tools:ConfigHelper.Instance}}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Margin" Value="8 0" />
-		<Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}" />
-		<Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Calendar">
-					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-						<CalendarItem x:Name="PART_CalendarItem" Margin="{TemplateBinding BorderThickness}" />
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="Calendar" BasedOn="{StaticResource CalendarBaseStyle}" />
-	<Style BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock" />
-	<Style x:Key="ToggleBlockIcon" BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ToggleBlock">
-					<ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-						<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-					</ContentControl>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox" />
-	<Style x:Key="GroupBoxOriginal" BasedOn="{StaticResource GroupBoxOriginalBaseStyle}" TargetType="GroupBox" />
-	<Style x:Key="GroupBoxTab" BasedOn="{StaticResource GroupBoxTabBaseStyle}" TargetType="GroupBox" />
-	<Style BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup" />
-	<Style x:Key="ButtonGroupSolid" BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup">
-		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarSuccess" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarInfo" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarWarning" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarDanger" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-					<DrawingBrush.Transform>
-						<TransformGroup>
-							<RotateTransform Angle="20" />
-							<TranslateTransform x:Name="MyTransform" X="0" />
-						</TransformGroup>
-					</DrawingBrush.Transform>
-					<DrawingBrush.Drawing>
-						<GeometryDrawing>
-							<GeometryDrawing.Brush>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0" />
-									<GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-								</LinearGradientBrush>
-							</GeometryDrawing.Brush>
-							<GeometryDrawing.Geometry>
-								<RectangleGeometry Rect="0,0,20,32" />
-							</GeometryDrawing.Geometry>
-						</GeometryDrawing>
-					</DrawingBrush.Drawing>
-				</DrawingBrush>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-					<DrawingBrush.Transform>
-						<TransformGroup>
-							<RotateTransform Angle="20" />
-							<TranslateTransform x:Name="MyTransform" X="0" />
-						</TransformGroup>
-					</DrawingBrush.Transform>
-					<DrawingBrush.Drawing>
-						<GeometryDrawing>
-							<GeometryDrawing.Brush>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0" />
-									<GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-								</LinearGradientBrush>
-							</GeometryDrawing.Brush>
-							<GeometryDrawing.Geometry>
-								<RectangleGeometry Rect="0,0,20,32" />
-							</GeometryDrawing.Geometry>
-						</GeometryDrawing>
-					</DrawingBrush.Drawing>
-				</DrawingBrush>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-					<DrawingBrush.Transform>
-						<TransformGroup>
-							<RotateTransform Angle="20" />
-							<TranslateTransform x:Name="MyTransform" X="0" />
-						</TransformGroup>
-					</DrawingBrush.Transform>
-					<DrawingBrush.Drawing>
-						<GeometryDrawing>
-							<GeometryDrawing.Brush>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0" />
-									<GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-								</LinearGradientBrush>
-							</GeometryDrawing.Brush>
-							<GeometryDrawing.Geometry>
-								<RectangleGeometry Rect="0,0,20,32" />
-							</GeometryDrawing.Geometry>
-						</GeometryDrawing>
-					</DrawingBrush.Drawing>
-				</DrawingBrush>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-					<DrawingBrush.Transform>
-						<TransformGroup>
-							<RotateTransform Angle="20" />
-							<TranslateTransform x:Name="MyTransform" X="0" />
-						</TransformGroup>
-					</DrawingBrush.Transform>
-					<DrawingBrush.Drawing>
-						<GeometryDrawing>
-							<GeometryDrawing.Brush>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0" />
-									<GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-								</LinearGradientBrush>
-							</GeometryDrawing.Brush>
-							<GeometryDrawing.Geometry>
-								<RectangleGeometry Rect="0,0,20,32" />
-							</GeometryDrawing.Geometry>
-						</GeometryDrawing>
-					</DrawingBrush.Drawing>
-				</DrawingBrush>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-					<DrawingBrush.Transform>
-						<TransformGroup>
-							<RotateTransform Angle="20" />
-							<TranslateTransform x:Name="MyTransform" X="0" />
-						</TransformGroup>
-					</DrawingBrush.Transform>
-					<DrawingBrush.Drawing>
-						<GeometryDrawing>
-							<GeometryDrawing.Brush>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0" />
-									<GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-								</LinearGradientBrush>
-							</GeometryDrawing.Brush>
-							<GeometryDrawing.Geometry>
-								<RectangleGeometry Rect="0,0,20,32" />
-							</GeometryDrawing.Geometry>
-						</GeometryDrawing>
-					</DrawingBrush.Drawing>
-				</DrawingBrush>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarSuccessCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarInfoCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarWarningCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarDangerCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-		<Setter Property="WaveFill" Value="{DynamicResource DarkPrimaryBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarSuccessWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-		<Setter Property="WaveFill" Value="{DynamicResource DarkSuccessBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarInfoWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-		<Setter Property="WaveFill" Value="{DynamicResource DarkInfoBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarWarningWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-		<Setter Property="WaveFill" Value="{DynamicResource DarkWarningBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarDangerWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-		<Setter Property="WaveFill" Value="{DynamicResource DarkDangerBrush}" />
-	</Style>
-	<Style x:Key="ProgressBarFlat" TargetType="ProgressBar">
-		<Setter Property="Height" Value="4" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ProgressBar">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
-								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
-								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
-							</DoubleAnimationUsingKeyFrames>
-							<PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
-								<EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
-								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
-								<EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
-							</PointAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true" ClipToBounds="True">
-						<Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}" />
-						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-							<Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" />
-						</Decorator>
-						<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
-							<Rectangle.RenderTransform>
-								<TransformGroup>
-									<ScaleTransform />
-								</TransformGroup>
-							</Rectangle.RenderTransform>
-						</Rectangle>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsIndeterminate" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-							</Trigger.EnterActions>
-							<Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
-							<Setter Property="Visibility" TargetName="Animation" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Orientation" Value="Vertical">
-							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
-								<Setter.Value>
-									<RotateTransform Angle="-90" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
-	<Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
-	<Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
-	<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
-	<Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="RadioGroupItemHorizontalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-	</Style>
-	<Style x:Key="RadioGroupItemSingle" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-	</Style>
-	<Style x:Key="RadioGroupItemVerticalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="RadioGroupItemVerticalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-	</Style>
-	<Style TargetType="ResizeGrip">
-		<Setter Property="MinWidth" Value="11" />
-		<Setter Property="MinHeight" Value="11" />
-		<Setter Property="Width" Value="11" />
-		<Setter Property="Height" Value="11" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ResizeGrip">
-					<hc:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-						<Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-							<Path.Fill>
-								<DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
-									<DrawingBrush.Drawing>
-										<DrawingGroup>
-											<GeometryDrawing Brush="{StaticResource ResizeGripperForeground}">
-												<GeometryDrawing.Geometry>
-													<RectangleGeometry Rect="0,0,2,2" />
-												</GeometryDrawing.Geometry>
-											</GeometryDrawing>
-										</DrawingGroup>
-									</DrawingBrush.Drawing>
-								</DrawingBrush>
-							</Path.Fill>
-						</Path>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="Window">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-	</Style>
-	<Style x:Key="WindowWin10" TargetType="hc:Window">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="#262e2f" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="CloseButtonBackground" Value="Transparent" />
-		<Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="CloseButtonHoverBackground" Value="#e81123" />
-		<Setter Property="CloseButtonHoverForeground" Value="White" />
-		<Setter Property="OtherButtonBackground" Value="Transparent" />
-		<Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkMaskBrush}" />
-		<Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Window">
-					<Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<Grid Margin="{TemplateBinding Padding}">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<StackPanel Name="ButtonPanel" WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" hc:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-									<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-								</StackPanel>
-								<Grid Grid.Column="0">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition />
-									</Grid.ColumnDefinitions>
-									<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
-										<interactivity:Interaction.Triggers>
-											<interactivity:EventTrigger EventName="MouseDoubleClick">
-												<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-											</interactivity:EventTrigger>
-										</interactivity:Interaction.Triggers>
-										<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
-									</Button>
-									<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
-										<TextBlock.Visibility>
-											<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-												<MultiBinding.Bindings>
-													<Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
-													<Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
-												</MultiBinding.Bindings>
-											</MultiBinding>
-										</TextBlock.Visibility>
-									</TextBlock>
-									<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
-								</Grid>
-							</Grid>
-							<AdornerDecorator Grid.Row="1">
-								<ContentPresenter ClipToBounds="True" />
-							</AdornerDecorator>
-							<ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsActive" Value="False">
-							<Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
-							<Setter Property="Opacity" Value=".8" TargetName="ButtonPanel" />
-						</Trigger>
-						<Trigger Property="WindowState" Value="Maximized">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-							<Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore" />
-						</Trigger>
-						<Trigger Property="WindowState" Value="Normal">
-							<Setter Property="Visibility" Value="Visible" TargetName="ButtonMax" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-						</Trigger>
-						<Trigger Property="ResizeMode" Value="NoResize">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-						</Trigger>
-						<Trigger Property="ResizeMode" Value="CanMinimize">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-							<Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
-							<Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
-							<Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
-							<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-						<Trigger Property="WindowStyle" Value="None">
-							<Setter Property="ShowNonClientArea" Value="False" />
-						</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="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="hc:BlurWindow">
-		<Setter Property="Background" Value="Transparent" />
-	</Style>
-	<Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="hc:GlowWindow">
-		<Setter Property="ActiveGlowColor" Value="#262e2f" />
-		<Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}" />
-		<Setter Property="BorderThickness" Value="0" />
-	</Style>
-	<Style TargetType="hc:ImageBrowser">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="MinWidth" Value="400" />
-		<Setter Property="MinHeight" Value="250" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="Black" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ImageBrowser">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-								<EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<hc:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000" />
-						<hc:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
-							<StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
-								<TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0" />
-								<TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0" />
-							</StackPanel>
-							<Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40" />
-						</hc:SimplePanel>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsFullScreen" Value="True">
-				<Setter Property="WindowState" Value="Maximized" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TagBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Tag">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Tag">
-					<Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Border Visibility="{Binding HasHeader,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Width="{Binding ActualHeight,RelativeSource={RelativeSource Self}}" Style="{StaticResource BorderCircularClip}" BorderBrush="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}">
-								<ContentPresenter TextElement.Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" VerticalAlignment="Center" HorizontalAlignment="Center" />
-							</Border>
-							<ContentPresenter Margin="{TemplateBinding Padding}" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-							<Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="0,0,6,0" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,11" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-							<Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
-							<Setter Property="Padding" Value="0,6" TargetName="ButtonClose" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource DarkMaskBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TagContainerBaseStyle" TargetType="hc:TagContainer" BasedOn="{StaticResource BaseStyle}">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TagBaseStyle}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<WrapPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TagContainer">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<hc:ScrollViewer Focusable="false">
-							<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</hc:ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Focusable" Value="false" />
-		<Setter Property="ClickMode" Value="Press" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-						<Border Margin="0,0,6,0" BorderThickness="1" BorderBrush="Transparent" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-							<Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-						</Border>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value=".4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Focusable" Value="false" />
-		<Setter Property="ClickMode" Value="Press" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="30" />
-						</Grid.ColumnDefinitions>
-						<Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
-						<Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
-						<Border Margin="1" Grid.Column="0" Visibility="{Binding Text,RelativeSource={RelativeSource AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}">
-							<ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value=".4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ComboBoxTemplate" TargetType="ComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{Binding Background,RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
-			<Border Grid.Column="0" Margin="1,0">
-				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxTopTemplate" TargetType="ComboBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" Margin="1,0">
-				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxLeftTemplate" TargetType="ComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" Margin="1,0">
-				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ComboBoxEditableTextBox" TargetType="TextBox">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="MinWidth" Value="0" />
-		<Setter Property="MinHeight" Value="0" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TextBox">
-					<ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="ComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
-			<Border Grid.Column="0" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxEditableTopTemplate" TargetType="ComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxEditableLeftTemplate" TargetType="ComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ComboBoxItemBaseStyle" TargetType="ComboBoxItem">
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ComboBoxItem">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="Foreground" Value="White" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ComboBoxBaseStyle" TargetType="ComboBox">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemBaseStyle}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-		<Setter Property="Template" Value="{StaticResource ComboBoxTemplate}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Style.Triggers>
-			<Trigger Property="IsEditable" Value="true">
-				<Setter Property="IsTabStop" Value="false" />
-				<Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ComboBoxExtendBaseStyle" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Template" Value="{StaticResource ComboBoxTopTemplate}" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="False" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxLeftTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxEditableTopTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxEditableLeftTemplate}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="ComboBoxPlusTopTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" Margin="1,0">
-				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxPlusLeftTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" Margin="1,0">
-				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxPlusEditableTopTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-				<Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="hc:ComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer Margin="0,4">
-									<StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			</Border>
-			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-				<Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}" />
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="False" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxPlusLeftTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-					<Condition Property="AutoComplete" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsEditable" Value="True" />
-					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-					<Condition Property="AutoComplete" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="MenuItem">
-					<Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="26" />
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
-								<ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
-								<ColumnDefinition Width="20" />
-							</Grid.ColumnDefinitions>
-							<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-								<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-							</Border>
-							<ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" Margin="0,3" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							<TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Icon" Value="{x:Null}">
-							<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Role" Value="TopLevelHeader">
-				<Setter Property="Margin" Value="0" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="MenuItem">
-							<Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-								<Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-									<Border Margin="0,0,10,0" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-									</Border>
-									<ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									<Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom">
-										<hc:SimplePanel Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8">
-											<Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-												<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-													<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
-												</ScrollViewer>
-											</Border>
-											<Border hc:MenuTopLineAttach.Popup="{Binding ElementName=PART_Popup}" Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" />
-										</hc:SimplePanel>
-									</Popup>
-								</Grid>
-							</Border>
-							<ControlTemplate.Triggers>
-								<Trigger Property="Icon" Value="{x:Null}">
-									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-								</Trigger>
-								<Trigger Property="IsChecked" Value="True">
-									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-								</Trigger>
-								<Trigger Property="IsHighlighted" Value="True">
-									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
-									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-								</Trigger>
-								<Trigger Property="IsSubmenuOpen" Value="True">
-									<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}" />
-									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}" />
-									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-								</Trigger>
-							</ControlTemplate.Triggers>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-			<Trigger Property="Role" Value="TopLevelItem">
-				<Setter Property="Margin" Value="0" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="MenuItem">
-							<Border x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-								<Grid Margin="{TemplateBinding Padding}">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition />
-									</Grid.ColumnDefinitions>
-									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" HorizontalAlignment="Left" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-									<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-									</Border>
-									<ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-								</Grid>
-							</Border>
-							<ControlTemplate.Triggers>
-								<Trigger Property="Icon" Value="{x:Null}">
-									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-								</Trigger>
-								<Trigger Property="IsChecked" Value="True">
-									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-								</Trigger>
-								<Trigger Property="IsHighlighted" Value="True">
-									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
-									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-								</Trigger>
-								<Trigger Property="IsSubmenuOpen" Value="True">
-									<Setter Property="Background" TargetName="templateRoot" Value="White" />
-									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-								</Trigger>
-								<MultiTrigger>
-									<MultiTrigger.Conditions>
-										<Condition Property="IsHighlighted" Value="True" />
-										<Condition Property="IsEnabled" Value="False" />
-									</MultiTrigger.Conditions>
-									<Setter Property="Background" TargetName="templateRoot" Value="#0A000000" />
-									<Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000" />
-								</MultiTrigger>
-							</ControlTemplate.Triggers>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-			<Trigger Property="Role" Value="SubmenuHeader">
-				<Setter Property="DockPanel.Dock" Value="Top" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="MenuItem">
-							<Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-								<Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="26" />
-										<ColumnDefinition Width="*" />
-										<ColumnDefinition Width="30" />
-										<ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
-										<ColumnDefinition Width="20" />
-									</Grid.ColumnDefinitions>
-									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-									<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-									</Border>
-									<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,3" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									<Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" />
-									<Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" VerticalOffset="-13" HorizontalOffset="10">
-										<Border Effect="{StaticResource EffectShadow2}" Margin="8" CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-											<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-												<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
-											</ScrollViewer>
-										</Border>
-									</Popup>
-								</Grid>
-							</Border>
-							<ControlTemplate.Triggers>
-								<Trigger Property="IsChecked" Value="True">
-									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-								</Trigger>
-							</ControlTemplate.Triggers>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-			<Trigger Property="IsHighlighted" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="MenuBaseStyle" TargetType="Menu">
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="FontSize" Value="12" />
-		<Setter Property="FontStyle" Value="Normal" />
-		<Setter Property="FontWeight" Value="Normal" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Menu">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WatermarkTextBoxBaseStyle" TargetType="hc:WatermarkTextBox">
-		<Setter Property="Background" Value="{x:Null}" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="CaretBrush" Value="{Binding Foreground,RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:WatermarkTextBox">
-					<hc:SimplePanel x:Name="WatermarkContent">
-						<TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TextBox">
-					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="border" Value="0.4" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="TextBoxExtendTopTemplate" TargetType="TextBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="border" Value="0.4" />
-				<Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
-				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TextBoxExtendLeftTemplate" TargetType="TextBox">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="border" Value="0.4" />
-				<Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
-				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="TextBoxExtendBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Template" Value="{StaticResource TextBoxExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource TextBoxExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource TextBoxPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="SearchBarBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="hc:SearchBar">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SearchBar">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition Width="30" />
-							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-							<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="SearchBarExtendTopTemplate" TargetType="hc:SearchBar">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="SearchBarExtendLeftTemplate" TargetType="hc:SearchBar">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="SearchBarExtendBaseStyle" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="SearchBarPlusBaseStyle" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar">
-		<Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
-	<Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
-	<Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
-	<Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
-	<Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
-	<Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
-	<Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style x:Key="ComboBoxExtend" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="ComboBox" />
-	<Style x:Key="ComboBoxExtend.Small" BasedOn="{StaticResource ComboBoxExtend}" TargetType="ComboBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox" />
-	<Style x:Key="ComboBoxPlus.Small" BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource WatermarkTextBoxBaseStyle}" TargetType="hc:WatermarkTextBox" />
-	<Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
-	<Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
-	<Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
-	<Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
-	<Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
-	<ControlTemplate x:Key="BadgeTextTemplate" TargetType="hc:Badge">
-		<hc:SimplePanel>
-			<ContentPresenter />
-			<Border x:Name="Border" Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-				<Border.RenderTransform>
-					<ScaleTransform />
-				</Border.RenderTransform>
-				<ContentPresenter ContentSource="Text" Margin="{TemplateBinding Padding}" />
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<EventTrigger RoutedEvent="hc:Badge.ValueChanged">
-				<BeginStoryboard>
-					<Storyboard AutoReverse="True">
-						<DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
-						<DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
-					</Storyboard>
-				</BeginStoryboard>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="hc:Badge">
-		<hc:SimplePanel>
-			<ContentPresenter />
-			<Ellipse Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-				<Ellipse.OpacityMask>
-					<RadialGradientBrush>
-						<GradientStop Offset="0" Color="Transparent" />
-						<GradientStop Offset="1" Color="Black" />
-					</RadialGradientBrush>
-				</Ellipse.OpacityMask>
-				<Ellipse.RenderTransform>
-					<ScaleTransform />
-				</Ellipse.RenderTransform>
-				<Ellipse.Triggers>
-					<EventTrigger RoutedEvent="Loaded">
-						<BeginStoryboard>
-							<Storyboard RepeatBehavior="Forever" DesiredFrameRate="20">
-								<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
-								<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
-								<DoubleAnimation Storyboard.TargetProperty="Opacity" BeginTime="0" Duration="0:0:1" From="1" To="0" EasingFunction="{StaticResource SineEaseOut}" />
-							</Storyboard>
-						</BeginStoryboard>
-					</EventTrigger>
-				</Ellipse.Triggers>
-			</Ellipse>
-			<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<Style x:Key="BadgeBaseStyle" TargetType="hc:Badge">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Padding" Value="6,2" />
-		<Setter Property="Template" Value="{StaticResource BadgeTextTemplate}" />
-		<Setter Property="HorizontalContentAlignment" Value="Right" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="BadgeMargin" Value="0,-10,-10,0" />
-		<Style.Triggers>
-			<Trigger Property="Status" Value="Dot">
-				<Setter Property="Template" Value="{StaticResource BadgeDotTemplate}" />
-				<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-				<Setter Property="BadgeMargin" Value="0,-5,-5,0" />
-			</Trigger>
-			<Trigger Property="Status" Value="Processing">
-				<Setter Property="Template" Value="{StaticResource BadgeProcessingTemplate}" />
-				<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-				<Setter Property="BadgeMargin" Value="0,-5,-5,0" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="CardBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Card">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Card">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
-								<ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" />
-							</Border>
-							<ContentPresenter Grid.Row="1" />
-							<Border Grid.Row="2" BorderThickness="0,1,0,0" Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
-								<ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}" />
-							</Border>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="hc:ChatBubble">
-		<hc:SimplePanel>
-			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-				<TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Role" Value="Receiver">
-				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-				<Setter TargetName="Tail" Property="RenderTransform">
-					<Setter.Value>
-						<TransformGroup>
-							<ScaleTransform ScaleY="1" ScaleX="-1" />
-						</TransformGroup>
-					</Setter.Value>
-				</Setter>
-				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="hc:ChatBubble">
-		<hc:SimplePanel>
-			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-				<hc:SimplePanel>
-					<Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}" />
-					<Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15" />
-				</hc:SimplePanel>
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Role" Value="Receiver">
-				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-				<Setter TargetName="Tail" Property="RenderTransform">
-					<Setter.Value>
-						<TransformGroup>
-							<ScaleTransform ScaleY="1" ScaleX="-1" />
-						</TransformGroup>
-					</Setter.Value>
-				</Setter>
-				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ChatBubbleAudioBaseTemplate" TargetType="hc:ChatBubble">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="12" Name="Definition1" />
-				<ColumnDefinition Name="Definition2" />
-			</Grid.ColumnDefinitions>
-			<Ellipse Name="Dot" VerticalAlignment="Top" Fill="{DynamicResource DangerBrush}" Width="6" Height="6" Visibility="{TemplateBinding IsRead,Converter={StaticResource Boolean2VisibilityReConverter}}" Margin="0,0,6,0" />
-			<Path Name="Tail" Grid.Column="1" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-			<Border Name="Body" Grid.Column="1" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-				<Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<ContentPresenter Name="Presenter" VerticalAlignment="Center" />
-					<Path Name="Audio" Grid.Column="1" Data="{StaticResource AudioGeometry}" Fill="{TemplateBinding Foreground}" Width="16" Height="16" Margin="6,0,0,0" RenderTransformOrigin="0.5,0.5">
-						<Path.RenderTransform>
-							<TransformGroup>
-								<ScaleTransform ScaleY="1" ScaleX="-1" />
-							</TransformGroup>
-						</Path.RenderTransform>
-					</Path>
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Role" Value="Receiver">
-				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-				<Setter TargetName="Tail" Property="RenderTransform">
-					<Setter.Value>
-						<TransformGroup>
-							<ScaleTransform ScaleY="1" ScaleX="-1" />
-						</TransformGroup>
-					</Setter.Value>
-				</Setter>
-				<Setter TargetName="Tail" Property="Grid.Column" Value="0" />
-				<Setter TargetName="Dot" Property="Grid.Column" Value="1" />
-				<Setter TargetName="Dot" Property="Margin" Value="6,0,0,0" />
-				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-				<Setter TargetName="Body" Property="Grid.Column" Value="0" />
-				<Setter TargetName="Definition1" Property="Width" Value="Auto" />
-				<Setter TargetName="Definition2" Property="Width" Value="12" />
-				<Setter TargetName="Audio" Property="Grid.Column" Value="0" />
-				<Setter TargetName="Audio" Property="Margin" Value="0,0,6,0" />
-				<Setter TargetName="Audio" Property="RenderTransform">
-					<Setter.Value>
-						<TransformGroup>
-							<ScaleTransform ScaleY="1" ScaleX="1" />
-						</TransformGroup>
-					</Setter.Value>
-				</Setter>
-				<Setter TargetName="Presenter" Property="Grid.Column" Value="1" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="hc:ChatBubble">
-		<hc:SimplePanel>
-			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-				<ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
-			</Border>
-		</hc:SimplePanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Role" Value="Receiver">
-				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-				<Setter TargetName="Tail" Property="RenderTransform">
-					<Setter.Value>
-						<TransformGroup>
-							<ScaleTransform ScaleY="1" ScaleX="-1" />
-						</TransformGroup>
-					</Setter.Value>
-				</Setter>
-				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ChatBubbleBaseStyle" TargetType="hc:ChatBubble">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="HorizontalAlignment" Value="Right" />
-		<Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="Margin" Value="10" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template" Value="{StaticResource ChatBubbleStringBaseTemplate}" />
-		<Setter Property="IsRead" Value="{Binding IsSelected,RelativeSource={RelativeSource Self}}" />
-		<Setter Property="MaxWidth" Value="280" />
-		<Style.Triggers>
-			<Trigger Property="Role" Value="Receiver">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-				<Setter Property="HorizontalAlignment" Value="Left" />
-			</Trigger>
-			<Trigger Property="Type" Value="Image">
-				<Setter Property="Template" Value="{StaticResource ChatBubbleImageBaseTemplate}" />
-				<Setter Property="MaxHeight" Value="280" />
-			</Trigger>
-			<Trigger Property="Type" Value="Audio">
-				<Setter Property="Template" Value="{StaticResource ChatBubbleAudioBaseTemplate}" />
-			</Trigger>
-			<Trigger Property="Type" Value="Custom">
-				<Setter Property="Template" Value="{StaticResource ChatBubbleCustomBaseTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="Tag4CheckComboBoxStyle" BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag">
-		<Setter Property="Padding" Value="6,3,4,3" />
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Tag">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-							<Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Height="16" Padding="0,4" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" Foreground="{TemplateBinding Foreground}" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-							<Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
-							<Setter Property="Padding" Value="0" TargetName="ButtonClose" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
-		<Setter Property="ClickMode" Value="Release" />
-	</Style>
-	<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
-		<Setter Property="ClickMode" Value="Release" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="30" />
-						</Grid.ColumnDefinitions>
-						<Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
-						<Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
-						<Border Margin="1" Grid.Column="0" Visibility="{Binding SelectedItem,RelativeSource={RelativeSource AncestorType=hc:CheckComboBox},Converter={StaticResource Object2VisibilityReConverter}}">
-							<ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value=".4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CheckComboBoxItemBaseStyle" TargetType="hc:CheckComboBoxItem">
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CheckComboBoxItem">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
-						<CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
-							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</CheckBox>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="CheckComboBoxTemplate" TargetType="hc:CheckComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<Grid Margin="0,4" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
-			<Border Grid.Column="0" Margin="-1,1">
-				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="CheckComboBoxBaseStyle" TargetType="hc:CheckComboBox">
-		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle}" />
-		<Setter Property="SelectionMode" Value="Multiple" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource CheckComboBoxItemBaseStyle}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Padding" Value="6,3" />
-		<Setter Property="Template" Value="{StaticResource CheckComboBoxTemplate}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-	</Style>
-	<ControlTemplate x:Key="CheckComboBoxExtendTopTemplate" TargetType="hc:CheckComboBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup x:Name="PART_Popup" Grid.Row="1" Grid.Column="0" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<Grid Margin="0,4" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
-				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CheckComboBoxExtendLeftTemplate" TargetType="hc:CheckComboBox">
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<Grid Margin="0,4" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" Margin="-1,1">
-				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="CheckComboBoxExtendBaseStyle" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Template" Value="{StaticResource CheckComboBoxExtendTopTemplate}" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource CheckComboBoxExtendLeftTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="CheckComboBoxPlusTopTemplate" TargetType="hc:CheckComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<Grid Margin="0,4" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-			<Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
-				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-			</Border>
-			<Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="CheckComboBoxPlusLeftTemplate" TargetType="hc:CheckComboBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" MinWidth="30" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-				<Decorator Margin="8 0">
-					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<Grid Margin="0,4" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</Decorator>
-			</Popup>
-			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-			<Border Grid.Column="1" Margin="-1,1">
-				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-			</Border>
-			<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="HasItems" Value="false">
-				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-			</Trigger>
-			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="CheckComboBoxPlusBaseStyle" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource CheckComboBoxPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource CheckComboBoxPlusLeftTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="ColorPickerSliderHorizontal" TargetType="Slider">
-		<hc:SimplePanel>
-			<Border Margin="7,0" Background="{TemplateBinding Background}" MaxHeight="11" CornerRadius="2" />
-			<Border Margin="7,0" Background="{TemplateBinding Foreground}" MaxHeight="11" CornerRadius="2">
-				<Border.OpacityMask>
-					<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-						<GradientStop Color="Transparent" Offset="1" />
-						<GradientStop Color="White" Offset="0" />
-					</LinearGradientBrush>
-				</Border.OpacityMask>
-			</Border>
-			<Track x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb x:Name="Thumb" Focusable="False" Height="13" Width="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Center">
-						<Thumb.Effect>
-							<DropShadowEffect ShadowDepth="0" Opacity=".6" />
-						</Thumb.Effect>
-					</Thumb>
-				</Track.Thumb>
-			</Track>
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ColorPickerSliderVertical" TargetType="Slider">
-		<hc:SimplePanel>
-			<Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Background}" />
-			<Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Foreground}">
-				<Border.OpacityMask>
-					<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-						<GradientStop Color="Transparent" Offset="1" />
-						<GradientStop Color="White" Offset="0" />
-					</LinearGradientBrush>
-				</Border.OpacityMask>
-			</Border>
-			<Track x:Name="PART_Track">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb x:Name="Thumb" Focusable="False" Height="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Top" Width="13">
-						<Thumb.Effect>
-							<DropShadowEffect ShadowDepth="0" Opacity=".6" />
-						</Thumb.Effect>
-					</Thumb>
-				</Track.Thumb>
-			</Track>
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<Style x:Key="ColorPickerSlider" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Foreground" Value="Transparent" />
-		<Setter Property="Template" Value="{StaticResource ColorPickerSliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource ColorPickerSliderVertical}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ColorPickerBaseStyle" TargetType="hc:ColorPicker">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Width" Value="230" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ColorPicker">
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="122" />
-							<RowDefinition Height="110" />
-							<RowDefinition Height="62" />
-							<RowDefinition Height="62" />
-						</Grid.RowDefinitions>
-						<Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}" />
-						<hc:SimplePanel Margin="1" Grid.Row="0">
-							<Border Background="{TemplateBinding BackColor}" />
-							<Border>
-								<Border.Background>
-									<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-										<GradientStop Color="White" Offset="1" />
-										<GradientStop Color="#80ffffff" Offset=".5" />
-										<GradientStop Color="#00ffffff" />
-									</LinearGradientBrush>
-								</Border.Background>
-							</Border>
-							<Border>
-								<Border.Background>
-									<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-										<GradientStop Color="Black" Offset="1" />
-										<GradientStop Color="#80000000" Offset=".5" />
-										<GradientStop Color="#00000000" />
-									</LinearGradientBrush>
-								</Border.Background>
-							</Border>
-						</hc:SimplePanel>
-						<Border Name="PART_BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
-							<Canvas Margin="-6">
-								<Border Name="PART_BorderPicker" Background="Transparent" Height="12" CornerRadius="6" Width="12" BorderThickness="1" BorderBrush="White">
-									<Border.Effect>
-										<DropShadowEffect ShadowDepth="0" Opacity=".4" />
-									</Border.Effect>
-								</Border>
-							</Canvas>
-						</Border>
-						<Border Grid.Row="0" Background="Transparent" Name="PART_BorderDrag" />
-						<Grid Margin="16,16,10,0" Grid.Row="1">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition />
-								<ColumnDefinition Width="28" />
-							</Grid.ColumnDefinitions>
-							<ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
-								<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
-								<hc:StatusSwitchElement.CheckedElement>
-									<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
-								</hc:StatusSwitchElement.CheckedElement>
-							</ToggleButton>
-							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
-							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{TemplateBinding SelectedBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
-							<Slider Name="PART_SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" Value="6" Maximum="6" Background="{StaticResource ColorPickerRainbowBrush}" Margin="2,1,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
-							<Slider Name="PART_SliderOpacity" Grid.ColumnSpan="2" IsSnapToTickEnabled="True" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Maximum="255" SmallChange="1" Foreground="{TemplateBinding SelectedBrushWithoutOpacity}" Background="{StaticResource ColorPickerOpacityBrush}" Margin="2,0,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Bottom" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
-							<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,14,0,0" VerticalAlignment="Top" Visibility="{Binding ShowList[0],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}">
-								<TextBox Padding="0" HorizontalContentAlignment="Center" Width="176" Text="{Binding SelectedBrush,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,Converter={StaticResource Color2HexStringConverter},UpdateSourceTrigger=LostFocus}" FontSize="10" MaxLength="10" Height="24" />
-								<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="HEX" HorizontalAlignment="Center" />
-							</StackPanel>
-							<UniformGrid Name="PART_PanelRgb" Visibility="{Binding ShowList[1],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Rows="1" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="-2,14,-2,0" VerticalAlignment="Top">
-								<StackPanel Margin="2,0">
-									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="2,0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="R" HorizontalAlignment="Center" />
-								</StackPanel>
-								<StackPanel Margin="2,0">
-									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="G" Value="{Binding ChannelG,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="G" HorizontalAlignment="Center" />
-								</StackPanel>
-								<StackPanel Margin="2,0">
-									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="B" Value="{Binding ChannelB,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="B" HorizontalAlignment="Center" />
-								</StackPanel>
-								<StackPanel Margin="2,0">
-									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="A" HorizontalAlignment="Center" />
-								</StackPanel>
-							</UniformGrid>
-							<Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="3" Grid.Row="1">
-								<Button.Content>
-									<Path Fill="#323534" Style="{StaticResource UpDownPathStyle}" />
-								</Button.Content>
-							</Button>
-						</Grid>
-						<Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
-							<WrapPanel Name="PART_PanelColor" Margin="6" HorizontalAlignment="Center" />
-						</Border>
-						<Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
-							<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-								<Button Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Width="80" Margin="0,0,16,0" />
-								<Button Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Width="80" Style="{StaticResource ButtonPrimary}" />
-							</StackPanel>
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ContextMenu">
-					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-						<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-							<ItemsPresenter />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CoverViewContentBaseStyle" TargetType="hc:CoverViewContent">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Margin" Value="0,0,0,8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CoverViewContent">
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="16" />
-							<RowDefinition />
-						</Grid.RowDefinitions>
-						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
-							<Border.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform X="5" Y="5" />
-									<RotateTransform Angle="45" />
-								</TransformGroup>
-							</Border.RenderTransform>
-						</Border>
-						<Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-							<ContentPresenter Margin="{TemplateBinding Padding}" />
-						</Border>
-						<Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">
-							<Rectangle.RenderTransform>
-								<TransformGroup>
-									<TranslateTransform X="1" />
-								</TransformGroup>
-							</Rectangle.RenderTransform>
-						</Rectangle>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="CoverViewBaseStyle" TargetType="hc:CoverView">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource CoverViewItemBaseStyle}" />
-		<Setter Property="CoverViewContentStyle" Value="{StaticResource CoverViewContentBaseStyle}" />
-		<Setter Property="ItemMargin" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CoverView">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<ScrollViewer>
-							<WrapPanel x:Name="PART_Panel" />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DatePickerTextBoxStyle" TargetType="DatePickerTextBox">
-		<Setter Property="Foreground" Value="{Binding Foreground,RelativeSource={RelativeSource AncestorType=DatePicker}}" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DatePickerTextBox">
-					<hc:SimplePanel>
-						<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DatePickerBaseStyle" TargetType="DatePicker">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="CalendarStyle" Value="{StaticResource CalendarBaseStyle}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="IsTodayHighlighted" Value="True" />
-		<Setter Property="SelectedDateFormat" Value="Short" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DatePicker">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
-							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-							<DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="DatePickerExtendTopTemplate" TargetType="DatePicker">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="DatePickerExtendLeftTemplate" TargetType="DatePicker">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="DatePickerExtendBaseStyle" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template" Value="{StaticResource DatePickerExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource DatePickerExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="DatePickerPlusTopTemplate" TargetType="hc:DatePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="DatePickerPlusLeftTemplate" TargetType="hc:DatePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
-					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="DatePickerPlusBaseStyle" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="hc:DatePicker">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Template" Value="{StaticResource DatePickerPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource DatePickerPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DateTimePickerBaseStyle" TargetType="hc:DateTimePicker">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:DateTimePicker">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
-							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="DateTimePickerExtendTopTemplate" TargetType="hc:DateTimePicker">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="DateTimePickerExtendLeftTemplate" TargetType="hc:DateTimePicker">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="DateTimePickerExtendBaseStyle" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template" Value="{StaticResource DateTimePickerExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource DateTimePickerExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="DateTimePickerPlusTopTemplate" TargetType="hc:DateTimePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="DateTimePickerPlusLeftTemplate" TargetType="hc:DateTimePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource DateTimePickerPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DialogBaseStyle" TargetType="hc:Dialog">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Dialog">
-					<Border Background="{DynamicResource DarkOpacityBrush}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DividerBaseStyle" TargetType="hc:Divider">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Margin" Value="0,24" />
-		<Setter Property="Padding" Value="24,0" />
-		<Setter Property="LineStroke" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Divider">
-					<hc:Row>
-						<hc:Col Layout="12" x:Name="ColStart">
-							<Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-						</hc:Col>
-						<hc:Col Layout="0">
-							<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-						</hc:Col>
-						<hc:Col Layout="12" x:Name="ColEnd">
-							<Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-						</hc:Col>
-					</hc:Row>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Padding" Value="0" />
-						</Trigger>
-						<Trigger Property="HorizontalContentAlignment" Value="Left">
-							<Setter TargetName="ColStart" Property="Layout" Value="0" />
-							<Setter TargetName="ColStart" Property="IsFixed" Value="True" />
-							<Setter TargetName="ColStart" Property="Width" Value="20" />
-							<Setter TargetName="ColEnd" Property="Layout" Value="24" />
-						</Trigger>
-						<Trigger Property="HorizontalContentAlignment" Value="Right">
-							<Setter TargetName="ColEnd" Property="Layout" Value="0" />
-							<Setter TargetName="ColEnd" Property="IsFixed" Value="True" />
-							<Setter TargetName="ColEnd" Property="Width" Value="20" />
-							<Setter TargetName="ColStart" Property="Layout" Value="24" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Content" Value="{x:Null}">
-				<Setter Property="Padding" Value="0" />
-			</Trigger>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Margin" Value="6,0" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="hc:Divider">
-							<Line HorizontalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" Y2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DrawerBaseStyle" TargetType="hc:Drawer">
-		<Setter Property="Dock" Value="Right" />
-		<Setter Property="MaskBrush" Value="{DynamicResource DarkOpacityBrush}" />
-	</Style>
-	<DrawingBrush x:Key="EmptySimpleLogo" o:Freeze="True">
-		<DrawingBrush.Drawing>
-			<DrawingGroup o:Freeze="True">
-				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M0,844.8C0,942.250667 361.096533,1021.269333 806.536533,1021.269333 1251.976533,1021.269333 1613.038933,942.250666 1613.038933,844.8 1613.038933,747.383467 1251.9424,668.398933 806.536533,668.398933 361.096533,668.398933 0,747.383467 0,844.8z" />
-				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1398.784,580.164267L214.254933,580.164267 214.254933,330.6496 473.873067,35.771733C486.4,13.1072,509.1328,0.477867,531.797333,0.477867L1081.2416,0.477867C1103.940267,0.477867,1126.638933,13.1072,1141.725867,38.2976L1398.818133,330.6496 1398.818133,580.164267z M239.479467,555.008L1373.627733,555.008 1373.627733,338.261333 1121.553067,50.858667C1108.992,33.245867,1096.362667,23.210667,1081.2416,23.210667L531.797333,23.210667C516.676266,23.210667,504.081066,33.28,493.9776,48.401067L239.445333,340.753067 239.445333,554.973867z" />
-				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M1048.4736,413.832533C1048.4736,373.521066,1073.664,340.753066,1103.940267,340.753067L1386.222933,340.753067 1386.222933,796.945067C1386.222933,849.851734,1353.454933,895.249067,1310.583467,895.249067L302.455467,895.249067C262.109867,895.249067,226.850134,852.3776,226.850133,796.945067L226.850133,340.753067 509.1328,340.753067C539.374933,340.753067 564.565333,373.521067 564.565333,413.832533 564.565333,454.143999 589.755733,486.912 619.997867,486.912L993.041067,486.912C1023.2832,489.437867,1048.4736,454.144,1048.4736,413.832533z" />
-				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1310.583467,907.844267L302.455467,907.844267C254.5664,907.844267,214.2208,857.429334,214.2208,796.910933L214.2208,328.192 509.1328,328.192C546.9184,328.192 577.160533,365.9776 577.160533,413.866667 577.160533,446.634667 597.2992,474.350934 619.997867,474.350933L993.041067,474.350933C1015.7056,474.350933 1035.8784,446.634666 1035.8784,413.866667 1035.8784,365.9776 1066.120533,328.192 1103.940267,328.192L1398.818133,328.192 1398.818133,796.9792C1398.818133,857.463467,1360.9984,907.8784,1310.583467,907.8784z M239.445333,353.348267L239.445333,796.945067C239.445333,844.834134,267.1616,882.619734,302.455467,882.619733L1310.583467,882.619733C1345.877334,882.619733,1373.5936,844.834133,1373.5936,796.945067L1373.5936,353.348267 1103.940267,353.348267C1081.2416,353.348267 1061.0688,381.064534 1061.0688,413.832533 1061.0688,461.7216 1030.826667,499.5072 993.041067,499.5072L619.997867,499.5072C582.212267,499.5072 551.970134,461.7216 551.970133,413.832533 551.970133,381.064533 531.831466,350.8224 509.1328,350.8224L239.445333,350.8224 239.445333,353.348267z" />
-			</DrawingGroup>
-		</DrawingBrush.Drawing>
-	</DrawingBrush>
-	<Rectangle x:Key="LogoRectangle4Empty" x:Shared="False" HorizontalAlignment="Center" Width="64" Height="41" Fill="{StaticResource EmptySimpleLogo}" />
-	<TextBlock x:Key="DescriptionTextBlock4Empty" x:Shared="False" Margin="0,10,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource ThirdlyTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.NoData}}" />
-	<Style x:Key="EmptyBaseStyle" TargetType="hc:Empty">
-		<Setter Property="Logo" Value="{StaticResource LogoRectangle4Empty}" />
-		<Setter Property="Description" Value="{StaticResource DescriptionTextBlock4Empty}" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Visibility" Value="{Binding Path=(hc:Empty.ShowEmpty),RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Empty">
-					<hc:SimpleStackPanel>
-						<ContentPresenter ContentSource="Logo" />
-						<ContentPresenter ContentSource="Description" />
-						<ContentPresenter HorizontalAlignment="Center" />
-					</hc:SimpleStackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="32" />
-						</Grid.ColumnDefinitions>
-						<Grid.LayoutTransform>
-							<TransformGroup>
-								<RotateTransform Angle="-90" />
-							</TransformGroup>
-						</Grid.LayoutTransform>
-						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-					</Grid>
-				</ToggleButton>
-			</Border>
-			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="0" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsExpanded" Value="true">
-				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}" />
-				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="32" />
-						</Grid.ColumnDefinitions>
-						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-					</Grid>
-				</ToggleButton>
-			</Border>
-			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="0" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsExpanded" Value="true">
-				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}" />
-				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ExpanderRightTemplate" TargetType="Expander">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="32" />
-						</Grid.ColumnDefinitions>
-						<Grid.LayoutTransform>
-							<TransformGroup>
-								<RotateTransform Angle="-90" />
-							</TransformGroup>
-						</Grid.LayoutTransform>
-						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-					</Grid>
-				</ToggleButton>
-			</Border>
-			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="1" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsExpanded" Value="true">
-				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}" />
-				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ExpanderDownTemplate" TargetType="Expander">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition />
-			</Grid.RowDefinitions>
-			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition />
-							<ColumnDefinition Width="32" />
-						</Grid.ColumnDefinitions>
-						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-					</Grid>
-				</ToggleButton>
-			</Border>
-			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsExpanded" Value="true">
-				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" />
-				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ExpanderBaseStyle" TargetType="Expander">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="MinWidth" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template" Value="{StaticResource ExpanderDownTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="ExpandDirection" Value="Left">
-				<Setter Property="Template" Value="{StaticResource ExpanderLeftTemplate}" />
-			</Trigger>
-			<Trigger Property="ExpandDirection" Value="Up">
-				<Setter Property="Template" Value="{StaticResource ExpanderUpTemplate}" />
-			</Trigger>
-			<Trigger Property="ExpandDirection" Value="Right">
-				<Setter Property="Template" Value="{StaticResource ExpanderRightTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="FlowDocumentScrollViewerBaseStyle" TargetType="FlowDocumentScrollViewer">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="FlowDocumentScrollViewer">
-					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-						<Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-							<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-							</Grid>
-						</Grid>
-						<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Border>
-					</DockPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FlowDocumentPageViewerBaseStyle" TargetType="FlowDocumentPageViewer">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="FlowDocumentPageViewer">
-					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-						<Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-							<StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
-								<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
-									<Run Text=" " />
-									<InlineUIContainer>
-										<TextBlock Text="{Binding MasterPageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
-									</InlineUIContainer>
-									<Run Text=" " />
-									<Run Text="/" />
-									<Run Text=" " />
-									<InlineUIContainer>
-										<TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
-									</InlineUIContainer>
-									<Run Text=" " />
-								</TextBlock>
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
-							</StackPanel>
-							<Grid Grid.Column="2" VerticalAlignment="Center" Margin="32,0,0,0">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-							</Grid>
-						</Grid>
-						<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<AdornerDecorator>
-								<DocumentPageView HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" DocumentPaginator="{x:Null}" KeyboardNavigation.IsTabStop="False" DocumentViewerBase.IsMasterPage="True" PageNumber="0" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" />
-							</AdornerDecorator>
-						</Border>
-					</DockPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="FlowDocumentReaderBaseStyle" TargetType="FlowDocumentReader">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="FlowDocumentReader">
-					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-						<Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<StackPanel Orientation="Horizontal">
-								<ToggleButton Width="24" Height="24" Padding="5" x:Name="FindButton" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Command="ApplicationCommands.Find" Margin="0,0,10,0" ToolTip="{x:Static langs:Lang.Find}" />
-								<Border x:Name="PART_FindToolBarHost" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-							</StackPanel>
-							<StackPanel x:Name="PageCountAndButtons" Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
-								<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
-									<Run Text=" " />
-									<InlineUIContainer>
-										<TextBlock Text="{Binding PageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
-									</InlineUIContainer>
-									<Run Text=" " />
-									<Run Text="/" />
-									<Run Text=" " />
-									<InlineUIContainer>
-										<TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
-									</InlineUIContainer>
-									<Run Text=" " />
-								</TextBlock>
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
-							</StackPanel>
-							<Grid Grid.Column="2" Margin="32,0,0,0" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<hc:ButtonGroup Width="90">
-									<RadioButton x:Name="PageViewButton" Padding="0" hc:IconElement.Geometry="{StaticResource PageModeGeometry}" CommandParameter="Page" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsPageViewEnabled}" ToolTip="{x:Static langs:Lang.PageMode}" />
-									<RadioButton x:Name="TwoPageViewButton" hc:IconElement.Geometry="{StaticResource TwoPageModeGeometry}" Padding="0" CommandParameter="TwoPage" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsTwoPageViewEnabled}" ToolTip="{x:Static langs:Lang.TwoPageMode}" />
-									<RadioButton x:Name="ScrollViewButton" hc:IconElement.Geometry="{StaticResource ScrollModeGeometry}" Padding="0" CommandParameter="Scroll" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsScrollViewEnabled}" ToolTip="{x:Static langs:Lang.ScrollMode}" />
-								</hc:ButtonGroup>
-								<RepeatButton Margin="32,0,0,0" Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="1" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="2" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="3" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-							</Grid>
-						</Grid>
-						<Border Panel.ZIndex="0" x:Name="PART_ContentHost" KeyboardNavigation.IsTabStop="False" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-					</DockPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="ViewingMode" Value="Page">
-							<Setter Property="IsChecked" TargetName="PageViewButton" Value="True" />
-						</Trigger>
-						<Trigger Property="ViewingMode" Value="TwoPage">
-							<Setter Property="IsChecked" TargetName="TwoPageViewButton" Value="True" />
-							<Setter Property="BorderThickness" Value="0" />
-						</Trigger>
-						<Trigger Property="ViewingMode" Value="Scroll">
-							<Setter Property="IsChecked" TargetName="ScrollViewButton" Value="True" />
-							<Setter Property="Visibility" TargetName="PageCountAndButtons" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="Document" Value="{x:Null}">
-							<Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
-						</Trigger>
-						<Trigger Property="IsFindEnabled" Value="False">
-							<Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="MenuItem4FrameStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
-		<Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
-		<Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
-		<Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
-		<Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-	</Style>
-	<ControlTemplate x:Key="FrameWithNavigationUIStyle" TargetType="Frame">
-		<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-			<DockPanel LastChildFill="True">
-				<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
-					<hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
-						<Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
-							<Button.ContextMenu>
-								<ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
-							</Button.ContextMenu>
-						</Button>
-						<Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
-							<Button.ContextMenu>
-								<ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
-							</Button.ContextMenu>
-						</Button>
-						<Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
-					</hc:ButtonGroup>
-				</Border>
-				<ContentPresenter SnapsToDevicePixels="True" x:Name="PART_NavWinCP" ClipToBounds="true" />
-			</DockPanel>
-		</Border>
-	</ControlTemplate>
-	<Style x:Key="FrameBaseStyle" TargetType="Frame">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Frame">
-					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<ContentPresenter SnapsToDevicePixels="True" x:Name="PART_FrameCP" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="NavigationUIVisibility" Value="Visible">
-				<Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="JournalOwnership" Value="OwnsJournal" />
-					<Condition Property="NavigationUIVisibility" Value="Automatic" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="GotoTopBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="hc:GotoTop">
-		<Setter Property="Width" Value="50" />
-		<Setter Property="Height" Value="50" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="25" />
-		<Setter Property="hc:IconElement.Geometry" Value="{StaticResource UpGeometry}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="16" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="GravatarBaseStyle" TargetType="hc:Gravatar">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Width" Value="72" />
-		<Setter Property="Height" Value="72" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="6" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Gravatar">
-					<Border ClipToBounds="True" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ImageSelectorBaseStyle" TargetType="hc:ImageSelector">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Stretch" Value="UniformToFill" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="StrokeThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="StrokeDashArray" Value="2,2" />
-		<Setter Property="hc:IconSwitchElement.Geometry" Value="{StaticResource AddGeometry}" />
-		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{StaticResource RemoveGeometry}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ImageSelector">
-					<Button Command="interactivity:ControlCommands.Switch" Style="{StaticResource ButtonCustom}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<hc:DashedBorder BorderDashArray="{TemplateBinding StrokeDashArray}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" BorderDashThickness="{TemplateBinding StrokeThickness}" Background="{TemplateBinding PreviewBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-								<Border Width="30" Height="30" Background="{TemplateBinding Background}" Style="{StaticResource BorderCircular}">
-									<hc:ToggleBlock IsChecked="{TemplateBinding HasValue}">
-										<hc:ToggleBlock.CheckedContent>
-											<Path Data="{TemplateBinding hc:IconSwitchElement.GeometrySelected}" Width="12" Height="12" Fill="{DynamicResource PrimaryBrush}" />
-										</hc:ToggleBlock.CheckedContent>
-										<hc:ToggleBlock.UnCheckedContent>
-											<Path Data="{TemplateBinding hc:IconSwitchElement.Geometry}" Width="16" Height="16" Fill="{DynamicResource PrimaryBrush}" />
-										</hc:ToggleBlock.UnCheckedContent>
-									</hc:ToggleBlock>
-								</Border>
-							</hc:DashedBorder>
-						</Border>
-					</Button>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ListBoxItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ListBoxItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListBoxItem">
-					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="true">
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="true" />
-					<Condition Property="Selector.IsSelectionActive" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-			<Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="ListBoxItem">
-							<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-								<StackPanel Orientation="Horizontal">
-									<ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
-									<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-								</StackPanel>
-							</Border>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ListBoxBaseStyle" TargetType="ListBox">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-		<Setter Property="hc:ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="hc:ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListBox">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer Focusable="false">
-									<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</hc:ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="GridViewColumnHeader">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="12,6,12,12" />
-		<Setter Property="MinHeight" Value="44" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="GridViewColumnHeader">
-					<hc:SimplePanel SnapsToDevicePixels="true">
-						<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
-							<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Border>
-						<Canvas>
-							<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
-						</Canvas>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="SnapsToDevicePixels" Value="true" />
-		<Setter Property="Margin" Value="0,0,0,4" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="MinHeight" Value="44" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListViewItem">
-					<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="true" />
-					<Condition Property="Selector.IsSelectionActive" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="LoadingBaseStyle" TargetType="hc:LoadingBase">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="DotDiameter" Value="10" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="LoadingCircleBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingCircle">
-		<Setter Property="Width" Value="40" />
-		<Setter Property="Height" Value="40" />
-		<Setter Property="DotDiameter" Value="5" />
-		<Setter Property="DotInterval" Value="30" />
-		<Setter Property="DotOffSet" Value="60" />
-		<Setter Property="DotDelayTime" Value="90" />
-		<Setter Property="DotSpeed" Value="4" />
-	</Style>
-	<Style x:Key="LoadingLineBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingLine">
-		<Setter Property="DotDiameter" Value="5" />
-	</Style>
-	<Style x:Key="MagnifierBaseStyle" TargetType="hc:Magnifier">
-		<Setter Property="IsHitTestVisible" Value="False" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Width" Value="180" />
-		<Setter Property="Height" Value="180" />
-		<Setter Property="BorderThickness" Value="8" />
-		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Magnifier">
-					<Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Ellipse>
-							<Ellipse.Fill>
-								<VisualBrush Visual="{Binding Target,RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute" x:Name="PART_VisualBrush" />
-							</Ellipse.Fill>
-						</Ellipse>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="MenuItem4NavigationWindowStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
-		<Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
-		<Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
-		<Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
-		<Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-	</Style>
-	<Style x:Key="NavigationWindowBaseStyle" TargetType="NavigationWindow">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="NavigationWindow">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<DockPanel LastChildFill="True">
-							<Border DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
-								<hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
-									<Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
-										<Button.ContextMenu>
-											<ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
-										</Button.ContextMenu>
-									</Button>
-									<Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
-										<Button.ContextMenu>
-											<ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
-										</Button.ContextMenu>
-									</Button>
-									<Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
-								</hc:ButtonGroup>
-							</Border>
-							<hc:SimplePanel>
-								<AdornerDecorator>
-									<ContentPresenter x:Name="PART_NavWinCP" ClipToBounds="true" />
-								</AdornerDecorator>
-								<ResizeGrip x:Name="WindowResizeGrip" HorizontalAlignment="Right" IsTabStop="false" Visibility="Collapsed" VerticalAlignment="Bottom" />
-							</hc:SimplePanel>
-						</DockPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="ShowsNavigationUI" Value="False">
-							<Setter Property="Visibility" TargetName="NavChrome" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="CanGoBack" Value="False">
-							<Setter Property="IsEnabled" TargetName="BackNavMenu" Value="false" />
-						</Trigger>
-						<Trigger Property="CanGoForward" Value="False">
-							<Setter Property="IsEnabled" TargetName="ForwardNavMenu" Value="false" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
-								<Condition Property="WindowState" Value="Normal" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Visibility" TargetName="WindowResizeGrip" Value="Visible" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:NumericUpDown">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-							<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-							<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="ShowUpDownButton" Value="False">
-							<Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
-						</Trigger>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-							<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="NumericUpDownExtendTopTemplate" TargetType="hc:NumericUpDown">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="NumericUpDownExtendLeftTemplate" TargetType="hc:NumericUpDown">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="NumericUpDownExtendBaseStyle" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Template" Value="{StaticResource NumericUpDownExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource NumericUpDownExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
-					<Condition Property="IsReadOnly" Value="False" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
-					<Condition Property="IsReadOnly" Value="False" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource NumericUpDownPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="PasswordBoxBaseStyle" TargetType="PasswordBox">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-		<Setter Property="PasswordChar" Value="●" />
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="PasswordBox">
-					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="border" Value="0.4" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="PasswordBoxExtendTopTemplate" TargetType="PasswordBox">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="placeholder" Padding="1" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-				<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-				<Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="PasswordBoxExtendLeftTemplate" TargetType="PasswordBox">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" Grid.Column="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-				<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value="0.4" TargetName="border" />
-				<Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
-				<Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="PasswordBoxExtendBaseStyle" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
-		<Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource PasswordBoxExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="PasswordBoxPlusInternalStyle" TargetType="PasswordBox">
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="PasswordBox">
-					<hc:SimplePanel>
-						<TextBlock Margin="2,-1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-						<ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-							<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="PasswordBoxPlusTopTemplate" TargetType="hc:PasswordBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<DockPanel Grid.ColumnSpan="3" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Grid.Column="0" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-			<Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="0" Grid.Row="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
-			<hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			<Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Grid.Column="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-			<ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="1" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="ShowEyeButton" Value="true">
-				<Setter Property="Margin" Value="0" TargetName="ButtonClear" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="PasswordBoxPlusLeftTemplate" TargetType="hc:PasswordBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
-			<hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="1" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-			<Button Height="{x:Static system:Double.NaN}" Grid.Column="2" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-			<ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="3" Foreground="{TemplateBinding BorderBrush}" Focusable="False" />
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-			<Trigger Property="ShowEyeButton" Value="true">
-				<Setter Property="Margin" Value="0" TargetName="ButtonClear" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="PasswordBoxPlusBaseStyle" TargetType="hc:PasswordBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-		<Setter Property="PasswordChar" Value="●" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template" Value="{StaticResource PasswordBoxPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource PasswordBoxPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="PinBoxBaseStyle" TargetType="hc:PinBox">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemMargin" Value="4,0" />
-		<Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:PinBox">
-					<UniformGrid Name="PART_Panel" Columns="{TemplateBinding Length}" Rows="1" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PoptipBaseStyle" TargetType="hc:Poptip">
-		<Setter Property="IsHitTestVisible" Value="False" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Offset" Value="6" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Poptip">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ProgressBar">
-					<Border x:Name="PART_Track">
-						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-							<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Indicator" Background="{TemplateBinding Foreground}" />
-						</Decorator>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ProgressButtonBaseStyle" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="ProgressStyle" Value="{StaticResource ProgressBarFlat4ProgressButton}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ProgressButton">
-					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<hc:SimplePanel>
-							<ProgressBar x:Name="ProgressBar" Height="Auto" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}" />
-							<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Visibility" Value="Visible" TargetName="ProgressBar" />
-							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-								<Condition Property="IsChecked" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-						</MultiTrigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PropertyItemToolTipBaseStyle" BasedOn="{StaticResource {x:Type ToolTip}}" TargetType="ToolTip">
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<ContentPresenter x:Name="Presenter" Margin="0,0,0,10" />
-							<StackPanel Grid.Row="1" Orientation="Horizontal">
-								<TextBlock FontWeight="Bold" Text="{Binding PropertyTypeName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" />
-								<TextBlock Text="{Binding PropertyName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" Margin="6,0,0,0" />
-							</StackPanel>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="Content" Value="">
-							<Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PropertyItemBaseStyle" TargetType="hc:PropertyItem">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Margin" Value="0,0,0,6" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:PropertyItem">
-					<GroupBox Style="{StaticResource GroupBoxOriginal}" hc:TitleElement.TitlePlacement="Left">
-						<GroupBox.Header>
-							<TextBlock Padding="0,0,10,0" Width="{Binding Path=(hc:TitleElement.TitleWidth).Value,RelativeSource={RelativeSource TemplatedParent}}" Text="{TemplateBinding DisplayName}" TextTrimming="CharacterEllipsis">
-								<TextBlock.ToolTip>
-									<ToolTip Style="{StaticResource PropertyItemToolTipBaseStyle}" Content="{TemplateBinding Description}" />
-								</TextBlock.ToolTip>
-							</TextBlock>
-						</GroupBox.Header>
-						<ContentPresenter ContentSource="EditorElement" />
-					</GroupBox>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PropertyItemsControlBaseStyle" TargetType="hc:PropertyItemsControl">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource PropertyItemBaseStyle}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:PropertyItemsControl">
-					<hc:ScrollViewer Focusable="false" HorizontalScrollBarVisibility="Disabled">
-						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</hc:ScrollViewer>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsGrouping" Value="False">
-				<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="PropertyGroupItemBaseStyle" TargetType="GroupItem">
-		<Setter Property="Margin" Value="0,0,0,6" />
-		<Setter Property="Padding" Value="10,6,6,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="GroupItem">
-					<Expander Header="{Binding Name}" IsExpanded="True">
-						<Border BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4">
-							<ItemsPresenter Margin="{TemplateBinding Padding}" />
-						</Border>
-					</Expander>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="PropertyGridBaseStyle" TargetType="hc:PropertyGrid">
-		<Setter Property="MaxTitleWidth" Value="200" />
-		<Setter Property="MinTitleWidth" Value="120" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:PropertyGrid">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid Margin="{TemplateBinding Padding}">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<DockPanel LastChildFill="True" Margin="0,0,0,6">
-								<hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
-									<RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
-										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
-									</RadioButton>
-									<RadioButton Command="interactivity:ControlCommands.SortByName">
-										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
-									</RadioButton>
-								</hc:ButtonGroup>
-								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
-							</DockPanel>
-							<hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
-								<hc:PropertyItemsControl.GroupStyle>
-									<GroupStyle ContainerStyle="{StaticResource PropertyGroupItemBaseStyle}" />
-								</hc:PropertyItemsControl.GroupStyle>
-							</hc:PropertyItemsControl>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:RateItem">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OnMouseEnter">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
-								<EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
-								<EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="OnMouseLeave">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
-								<EasingDoubleKeyFrame KeyTime="0" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
-								<EasingDoubleKeyFrame KeyTime="0" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Canvas x:Name="CanvasRoot" RenderTransformOrigin="0.5,0.5">
-						<Canvas.RenderTransform>
-							<TransformGroup>
-								<ScaleTransform />
-							</TransformGroup>
-						</Canvas.RenderTransform>
-						<Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Background}" Stretch="Uniform" />
-						<Border x:Name="PART_Icon" Visibility="Collapsed">
-							<Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" HorizontalAlignment="Left" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" />
-						</Border>
-					</Canvas>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="UIElement.MouseEnter" SourceName="CanvasRoot">
-							<BeginStoryboard Storyboard="{StaticResource OnMouseEnter}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="UIElement.MouseLeave" SourceName="CanvasRoot">
-							<BeginStoryboard Storyboard="{StaticResource OnMouseLeave}" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RateBaseStyle" TargetType="hc:Rate">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemMargin" Value="5,0" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="Icon" Value="{StaticResource StarGeometry}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource RateRateItemBaseStyle}" />
-		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:0.0}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Rate">
-					<StackPanel Background="Transparent" Orientation="Horizontal">
-						<UniformGrid Rows="1" Margin="-5,0" x:Name="PART_Panel" />
-						<TextBlock Visibility="{TemplateBinding ShowText,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding Text}" Margin="10,0,0,0" VerticalAlignment="Center" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="RunningBlockBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RunningBlock">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="0,10" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:RunningBlock">
-					<hc:RunningBorder CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<hc:SimplePanel ClipToBounds="True">
-							<hc:SimplePanel HorizontalAlignment="Left" x:Name="PART_Panel">
-								<ContentPresenter x:Name="PART_ContentElement" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left">
-									<ContentPresenter.RenderTransform>
-										<TransformGroup>
-											<TranslateTransform />
-										</TransformGroup>
-									</ContentPresenter.RenderTransform>
-								</ContentPresenter>
-							</hc:SimplePanel>
-						</hc:SimplePanel>
-					</hc:RunningBorder>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Padding" Value="10,0" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="SeparatorBaseStyle" TargetType="Separator">
-		<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-	</Style>
-	<Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Shield">
-		<Setter Property="Height" Value="20" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="3" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Color" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Shield">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
-							<TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
-						</Border>
-						<Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-		<Setter Property="Role" Value="Item" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="MinHeight" Value="40" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenuItem">
-					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
-						<hc:SimplePanel>
-							<Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
-							<ContentControl Margin="4,0,0,0">
-								<DockPanel Margin="{TemplateBinding Padding}">
-									<ContentControl Width="40" Name="PresenterIcon">
-										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-									</ContentControl>
-									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-								</DockPanel>
-							</ContentControl>
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Icon" Value="{x:Null}">
-							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-						</DataTrigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SideMenuItemAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemBaseStyle}" TargetType="hc:SideMenuItem">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenuItem">
-					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
-						<hc:SimplePanel>
-							<Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
-							<ContentControl Margin="4,0,0,0">
-								<DockPanel Margin="{TemplateBinding Padding}">
-									<ContentControl Width="40" Name="PresenterIcon">
-										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-									</ContentControl>
-									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-								</DockPanel>
-							</ContentControl>
-						</hc:SimplePanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Icon" Value="{x:Null}">
-							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
-							<Setter Property="BorderBrush" Value="Transparent" />
-						</DataTrigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenuItem">
-					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition MinHeight="48" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Border Name="BorderBack" Background="{TemplateBinding Background}" />
-							<ContentControl Grid.Row="0" Margin="4,0,0,0">
-								<DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
-									<ContentControl Width="40" Name="PresenterIcon">
-										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-									</ContentControl>
-									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-								</DockPanel>
-							</ContentControl>
-							<StackPanel Grid.Row="1" x:Name="PART_Panel" Visibility="Collapsed" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Icon" Value="{x:Null}">
-							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
-							<Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-						</Trigger>
-						<Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
-							<Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SideMenuItemHeaderAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemHeaderBaseStyle}" TargetType="hc:SideMenuItem">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemAccordionBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenuItem">
-					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition MinHeight="48" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Border Name="BorderBack" Background="{TemplateBinding Background}" />
-							<ContentControl Grid.Row="0" Margin="4,0,0,0">
-								<DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
-									<ContentControl Width="40" Name="PresenterIcon">
-										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-									</ContentControl>
-									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-								</DockPanel>
-							</ContentControl>
-							<ScrollViewer Visibility="{Binding Visibility,ElementName=PART_Panel}" Grid.Row="1" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}">
-								<StackPanel x:Name="PART_Panel" Visibility="Collapsed" />
-							</ScrollViewer>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Icon" Value="{x:Null}">
-							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
-							<Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-						</Trigger>
-						<Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
-							<Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SideMenuBaseStyle" TargetType="hc:SideMenu">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenu">
-					<Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<ScrollViewer>
-							<StackPanel x:Name="PART_Panel" />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="SplitButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SplitButton">
-					<hc:SimplePanel x:Name="templateRoot">
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-									<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-									<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								</StackPanel>
-								<ToggleButton x:Name="PART_Arrow" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="22" Height="Auto" Padding="0,10,8,10" HorizontalContentAlignment="Left" Grid.Column="1" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" hc:IconElement.Geometry="{StaticResource DownGeometry}" />
-							</Grid>
-						</Border>
-						<Popup AllowsTransparency="true" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="Fade" Placement="Bottom">
-							<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
-								<ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-									<hc:SimplePanel RenderOptions.ClearTypeHint="Enabled">
-										<Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-											<Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}" />
-										</Canvas>
-										<ContentPresenter ContentSource="DropDownContent" />
-									</hc:SimplePanel>
-								</ScrollViewer>
-							</Border>
-						</Popup>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="HitMode" Value="Click" />
-								<Condition Property="IsChecked" Value="True" SourceName="PART_Arrow" />
-							</MultiTrigger.Conditions>
-							<Setter Property="IsDropDownOpen" Value="True" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
-	<Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
-		<Setter Property="BorderThickness" Value="0,1,0,0" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-	</Style>
-	<Style x:Key="StatusBarItemBaseStyle" TargetType="StatusBarItem">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="StepBarItemBaseStyle" TargetType="hc:StepBarItem">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-		<Style.Triggers>
-			<Trigger Property="Status" Value="Complete">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-			</Trigger>
-			<Trigger Property="Status" Value="UnderWay">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="Status" Value="Waiting">
-				<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="StepBarItemHorizontalTop" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-		<Setter Property="Margin" Value="10,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:StepBarItem">
-					<StackPanel>
-						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Border>
-						<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="StepBarItemHorizontalBottom" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-		<Setter Property="Margin" Value="10,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:StepBarItem">
-					<StackPanel>
-						<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4" />
-						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Border>
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-		<Setter Property="Margin" Value="0, 10" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:StepBarItem">
-					<StackPanel Orientation="Horizontal">
-						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Border>
-						<ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="StepBarHorizontalTopControlTemplate" TargetType="hc:StepBar">
-		<hc:SimplePanel>
-			<ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Top" Margin="0,10,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
-			<ItemsPresenter />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="StepBarHorizontalBottomControlTemplate" TargetType="hc:StepBar">
-		<hc:SimplePanel>
-			<ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Bottom" Margin="0,0,0,10" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
-			<ItemsPresenter VerticalAlignment="Bottom" />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar">
-		<hc:SimplePanel>
-			<ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
-				<ProgressBar.RenderTransform>
-					<TransformGroup>
-						<RotateTransform Angle="180" />
-					</TransformGroup>
-				</ProgressBar.RenderTransform>
-			</ProgressBar>
-			<ItemsPresenter />
-		</hc:SimplePanel>
-	</ControlTemplate>
-	<Style x:Key="StepBarBaseStyle" TargetType="hc:StepBar">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
-		<Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
-		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="Dock" Value="Left">
-				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
-				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
-			</Trigger>
-			<Trigger Property="Dock" Value="Bottom">
-				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
-				<Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-			</Trigger>
-			<Trigger Property="Dock" Value="Right">
-				<Setter Property="FlowDirection" Value="RightToLeft" />
-				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
-				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TabItemStyle" TargetType="TabItem">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TabItem">
-					<hc:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
-						<Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0" />
-						<ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="False">
-							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-						</Trigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top" />
-							</MultiDataTrigger.Conditions>
-							<Setter Property="Panel.ZIndex" Value="1" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,3" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left" />
-							</MultiDataTrigger.Conditions>
-							<Setter Property="Panel.ZIndex" Value="1" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,3,0" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Bottom" />
-							</MultiDataTrigger.Conditions>
-							<Setter Property="Panel.ZIndex" Value="1" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,3,0,0" />
-						</MultiDataTrigger>
-						<MultiDataTrigger>
-							<MultiDataTrigger.Conditions>
-								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right" />
-							</MultiDataTrigger.Conditions>
-							<Setter Property="Panel.ZIndex" Value="1" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-							<Setter Property="BorderThickness" TargetName="mainBorder" Value="3,0,0,0" />
-						</MultiDataTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TabControlBaseStyle" TargetType="TabControl">
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Foreground" Value="White" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TabControl">
-					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition x:Name="ColumnDefinition0" />
-							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
-							<RowDefinition x:Name="RowDefinition1" Height="*" />
-						</Grid.RowDefinitions>
-						<TabPanel x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-						<Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="TabStripPlacement" Value="Bottom">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Left">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Right">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TabItemCapsuleBaseStyle" TargetType="TabItem">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TabItem">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentPresenter x:Name="contentPresenter" ContentSource="Header" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" TargetName="BorderRoot" />
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="true">
-							<Setter Property="BorderBrush" Value="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="Background" Value="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-						</Trigger>
-						<DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left">
-							<Setter Property="Margin" Value="0,-1,0,0" />
-						</DataTrigger>
-						<DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right">
-							<Setter Property="Margin" Value="0,-1,0,0" />
-						</DataTrigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TabItemPlusBaseStyle" TargetType="hc:TabItem">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderThickness" Value="1,0,1,1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="Padding" Value="10,0,0,0" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="Menu" Value="{StaticResource TabItemMenu}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TabItem">
-					<Grid x:Name="templateRoot" SnapsToDevicePixels="true" ContextMenu="{TemplateBinding Menu}">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-							<Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Visibility="Collapsed" />
-						</Border>
-						<Path x:Name="PathMain" Margin="10,0,0,0" Grid.Column="0" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-						<ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-						<Border Name="BorderMask" Grid.Column="1" HorizontalAlignment="Right" Width="20" Background="{TemplateBinding Background}" Margin="0,0,1,1">
-							<Border.OpacityMask>
-								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-									<GradientStop Color="White" Offset="1" />
-									<GradientStop Offset="0" />
-								</LinearGradientBrush>
-							</Border.OpacityMask>
-						</Border>
-						<Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
-							<Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}" />
-						</Button>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="true">
-							<Setter Property="Panel.ZIndex" Value="1" />
-							<Setter Property="Visibility" TargetName="innerBorder" Value="Visible" />
-							<Setter Property="Background" TargetName="BorderMask" Value="{DynamicResource RegionBrush}" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-						</Trigger>
-						<Trigger Property="ShowCloseButton" Value="True">
-							<Setter Property="Margin" Value="0,0,0,1" TargetName="BorderMask" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="TabControlPlusTemplate" TargetType="hc:TabControl">
-		<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-			<Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition x:Name="ColumnDefinition0" />
-					<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
-					<hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
-						<interactivity:Interaction.Behaviors>
-							<interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
-								<interactivity:FluidMoveBehavior.EaseX>
-									<CubicEase EasingMode="EaseOut" />
-								</interactivity:FluidMoveBehavior.EaseX>
-							</interactivity:FluidMoveBehavior>
-						</interactivity:Interaction.Behaviors>
-					</hc:TabPanel>
-				</Border>
-				<Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-					<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				</Border>
-				<Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
-					<hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-				</Border>
-			</Grid>
-		</Border>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TabControlPlusScrollableTemplate" TargetType="hc:TabControl">
-		<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-			<Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition />
-					<ColumnDefinition Width="Auto" />
-				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<Border Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="0,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left" Panel.ZIndex="2">
-					<Border.CacheMode>
-						<BitmapCache SnapsToDevicePixels="True" />
-					</Border.CacheMode>
-					<RepeatButton Focusable="False" Style="{StaticResource RepeatButtonIcon}" Padding="8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft" />
-				</Border>
-				<hc:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" hc:ScrollViewerAttach.Orientation="Horizontal" IsInertiaEnabled="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
-					<Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
-						<hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
-							<interactivity:Interaction.Behaviors>
-								<interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
-									<interactivity:FluidMoveBehavior.EaseX>
-										<CubicEase EasingMode="EaseOut" />
-									</interactivity:FluidMoveBehavior.EaseX>
-								</interactivity:FluidMoveBehavior>
-							</interactivity:Interaction.Behaviors>
-						</hc:TabPanel>
-					</Border>
-				</hc:ScrollViewer>
-				<Border Margin="0,-1,0,0" Grid.Row="0" Grid.Column="2" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
-					<Border.CacheMode>
-						<BitmapCache SnapsToDevicePixels="True" />
-					</Border.CacheMode>
-					<StackPanel Orientation="Horizontal">
-						<RepeatButton Focusable="False" Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource RepeatButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" hc:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight" />
-						<Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Width="1" Background="{DynamicResource BorderBrush}" />
-						<hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-					</StackPanel>
-				</Border>
-				<Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-					<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				</Border>
-			</Grid>
-		</Border>
-	</ControlTemplate>
-	<Style x:Key="TabControlPlusBaseStyle" TargetType="hc:TabControl">
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemPlusBaseStyle}" />
-		<Setter Property="Template" Value="{StaticResource TabControlPlusTemplate}" />
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsScrollable" Value="True" />
-					<Condition Property="IsTabFillEnabled" Value="False" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TimePickerBaseStyle" TargetType="hc:TimePicker">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TimePicker">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
-							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="TimePickerExtendTopTemplate" TargetType="hc:TimePicker">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TimePickerExtendLeftTemplate" TargetType="hc:TimePicker">
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="TimePickerExtendBaseStyle" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="hc:InfoElement.Symbol" Value="●" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template" Value="{StaticResource TimePickerExtendTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource TimePickerExtendLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="TimePickerPlusTopTemplate" TargetType="hc:TimePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-			</Grid.RowDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TimePickerPlusLeftTemplate" TargetType="hc:TimePicker">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
-		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-				<ColumnDefinition />
-			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-				</Grid>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-				</MultiTrigger.Conditions>
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-			</MultiTrigger>
-			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="TimePickerPlusBaseStyle" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-		<Setter Property="Template" Value="{StaticResource TimePickerPlusTopTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-				<Setter Property="Template" Value="{StaticResource TimePickerPlusLeftTemplate}" />
-				<Setter Property="Width" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
-		<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Width" Value="1" />
-	</Style>
-	<Style x:Key="{x:Static ToolBar.ButtonStyleKey}" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}" BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
-	<Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
-	<Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
-	<Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
-	<Style x:Key="{x:Static ToolBar.MenuStyleKey}" BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
-	<Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToolBarThumbHorizontalStyle" TargetType="Thumb">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
-						<Path Stretch="Uniform" Width="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragVerticalGeometry}" SnapsToDevicePixels="True" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Cursor" Value="SizeAll" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToolBarThumbVerticalStyle" TargetType="Thumb">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Thumb">
-					<Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
-						<Path Stretch="Uniform" Height="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragHorizontalGeometry}" SnapsToDevicePixels="True" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Cursor" Value="SizeAll" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToolBarVerticalOverflowButtonStyle" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="MinHeight" Value="0" />
-		<Setter Property="MinWidth" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
-						<Path x:Name="PathMore" Data="{StaticResource RightGeometry}" Height="8" Margin="4,4,8,4" HorizontalAlignment="Right" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsKeyboardFocused" Value="true">
-							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Visibility" Value="Collapsed" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ToolBarHorizontalOverflowButtonStyle" TargetType="ToggleButton">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="MinHeight" Value="0" />
-		<Setter Property="MinWidth" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
-						<Path x:Name="PathMore" Data="{StaticResource DownGeometry}" Width="8" Margin="4,4,4,8" VerticalAlignment="Bottom" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsKeyboardFocused" Value="true">
-							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Visibility" Value="Collapsed" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="ToolBarVerticalTemplate" TargetType="ToolBar">
-		<Grid x:Name="Grid" SnapsToDevicePixels="true">
-			<Grid.RowDefinitions>
-				<RowDefinition />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<hc:SimplePanel x:Name="OverflowGrid" Grid.Row="1">
-				<ToggleButton Margin="0,4,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarVerticalOverflowButtonStyle}" />
-				<Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Right" StaysOpen="false">
-					<Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
-						<ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
-					</Border>
-				</Popup>
-			</hc:SimplePanel>
-			<Border x:Name="MainPanelBorder" Grid.Row="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
-				<DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
-					<Thumb x:Name="ToolBarThumb" DockPanel.Dock="Top" Style="{StaticResource ToolBarThumbVerticalStyle}" Height="10" />
-					<ContentPresenter x:Name="ToolBarHeader" DockPanel.Dock="Top" ContentSource="Header" HorizontalAlignment="Center" Margin="0,4,0,4" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-					<ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				</DockPanel>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsOverflowOpen" Value="true">
-				<Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
-			</Trigger>
-			<Trigger Property="Header" Value="{x:Null}">
-				<Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="ToolBarTray.IsLocked" Value="true">
-				<Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="ToolBarHorizontalTemplate" TargetType="ToolBar">
-		<Grid x:Name="Grid" SnapsToDevicePixels="true">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<hc:SimplePanel x:Name="OverflowGrid" Grid.Column="1">
-				<ToggleButton Margin="4,0,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}" />
-				<Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
-					<Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
-						<ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
-					</Border>
-				</Popup>
-			</hc:SimplePanel>
-			<Border x:Name="MainPanelBorder" Grid.Column="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
-				<DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
-					<Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbHorizontalStyle}" Width="10" />
-					<ContentPresenter x:Name="ToolBarHeader" ContentSource="Header" HorizontalAlignment="Center" Margin="4,0,4,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-					<ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				</DockPanel>
-			</Border>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsOverflowOpen" Value="true">
-				<Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
-			</Trigger>
-			<Trigger Property="Header" Value="{x:Null}">
-				<Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="ToolBarTray.IsLocked" Value="true">
-				<Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="ToolBarBaseStyle" TargetType="ToolBar">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Margin" Value="0,0,4,4" />
-		<Setter Property="Template" Value="{StaticResource ToolBarHorizontalTemplate}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource ToolBarVerticalTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
-		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="Background" Value="White" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="FontSize" Value="12" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="2" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToolTip">
-					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-						<ContentPresenter Margin="10,0" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="CanDeselect" Value="True" />
-		<Setter Property="SelfManage" Value="True" />
-		<Setter Property="Padding" Value="10, 0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Margin" Value="5,0,5,5" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TransferItem">
-					<Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-						<ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="BorderRoot" Property="Background" Value="{DynamicResource PrimaryBrush}" />
-							<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsOrigin" Value="True" />
-					<Condition Property="IsTransferred" Value="False" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsOrigin" Value="True" />
-					<Condition Property="IsTransferred" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Collapsed" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsOrigin" Value="False" />
-					<Condition Property="IsTransferred" Value="True" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsOrigin" Value="False" />
-					<Condition Property="IsTransferred" Value="False" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Collapsed" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TransferGroup">
-					<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ScrollViewer Margin="0,5">
-							<StackPanel x:Name="PART_Panel" />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TransferBaseStyle" TargetType="hc:Transfer">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Transfer">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition MinWidth="200" />
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition MinWidth="200" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition />
-							<RowDefinition />
-							<RowDefinition />
-							<RowDefinition />
-						</Grid.RowDefinitions>
-						<hc:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
-						<StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
-							<Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
-							<Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
-						</StackPanel>
-						<hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Width" Value="16" />
-		<Setter Property="Height" Value="16" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border Background="Transparent" Height="16" Padding="4" Width="16">
-						<Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeViewItem}}">
-							<Path.RenderTransform>
-								<RotateTransform Angle="-90" />
-							</Path.RenderTransform>
-						</Path>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="RenderTransform" TargetName="ExpandPath">
-								<Setter.Value>
-									<RotateTransform Angle="0" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TreeViewItem">
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition MinHeight="{TemplateBinding MinHeight}" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-							<DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-								<ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}" />
-								<ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							</DockPanel>
-						</Border>
-						<ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true" SourceName="Bd">
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-						</Trigger>
-						<Trigger Property="IsExpanded" Value="false">
-							<Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="HasItems" Value="false">
-							<Setter Property="Visibility" TargetName="Expander" Value="Hidden" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="true">
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="true" />
-								<Condition Property="IsSelectionActive" Value="false" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="hc:ScrollViewer.IsInertiaEnabled" Value="False" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TreeView">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-									<ItemsPresenter />
-								</hc:ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}" />
-						</Trigger>
-						<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-							<Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-				<Setter Property="ItemsPanel">
-					<Setter.Value>
-						<ItemsPanelTemplate>
-							<VirtualizingStackPanel />
-						</ItemsPanelTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WatermarkBaseStyle" TargetType="hc:Watermark">
-		<Setter Property="MarkBrush" Value="{DynamicResource DarkMaskBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
-		<Setter Property="Angle" Value="20" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Watermark">
-					<Border Name="PART_Root">
-						<ContentPresenter />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="AutoCompleteTextBoxInternal" BasedOn="{StaticResource ComboBoxEditableTextBox}" TargetType="TextBox" />
-	<Style x:Key="AutoCompleteTextBoxItemBaseStyle" TargetType="ComboBoxItem">
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ComboBoxItem">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-							<Setter Property="Foreground" Value="White" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="AutoCompleteTextBoxBaseStyle" TargetType="hc:AutoCompleteTextBox">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteTextBoxItemBaseStyle}" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="hc:Empty.ShowEmpty" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:AutoCompleteTextBox">
-					<hc:SimplePanel>
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-							<TextBox x:Name="PART_SearchTextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Style="{StaticResource AutoCompleteTextBoxInternal}" />
-						</Border>
-						<Popup x:Name="PART_Popup" AllowsTransparency="true" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-							<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-								<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-									<hc:ToggleBlock.CheckedContent>
-										<ScrollViewer Margin="0,4">
-											<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-										</ScrollViewer>
-									</hc:ToggleBlock.CheckedContent>
-									<hc:ToggleBlock.UnCheckedContent>
-										<hc:Empty />
-									</hc:ToggleBlock.UnCheckedContent>
-								</hc:ToggleBlock>
-							</Border>
-						</Popup>
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="HasItems" Value="false">
-							<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-						</Trigger>
-						<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-							<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
-							<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
-						</Trigger>
-						<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-							<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-							<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=PART_SearchTextBox}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="true" SourceName="PART_SearchTextBox">
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="true" />
-								<Condition Property="IsFocused" Value="false" SourceName="PART_SearchTextBox" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsFocused" Value="True" SourceName="PART_SearchTextBox">
-							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.4" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-		<Setter Property="FocusVisualStyle">
-			<Setter.Value>
-				<Style>
-					<Setter Property="Control.Template">
-						<Setter.Value>
-							<ControlTemplate>
-								<Rectangle Margin="2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DataGridCell">
-					<Border Background="Transparent">
-						<Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<MultiDataTrigger>
-				<MultiDataTrigger.Conditions>
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="Cell" />
-				</MultiDataTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-			</MultiDataTrigger>
-			<MultiDataTrigger>
-				<MultiDataTrigger.Conditions>
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
-					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
-				</MultiDataTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-			</MultiDataTrigger>
-			<MultiDataTrigger>
-				<MultiDataTrigger.Conditions>
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
-					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
-				</MultiDataTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</MultiDataTrigger>
-			<MultiDataTrigger>
-				<MultiDataTrigger.Conditions>
-					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="FullRow" />
-				</MultiDataTrigger.Conditions>
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</MultiDataTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="true" />
-					<Condition Property="Selector.IsSelectionActive" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="SnapsToDevicePixels" Value="true" />
-		<Setter Property="Margin" Value="0,0,0,4" />
-		<Setter Property="Padding" Value="0,6" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="ValidationErrorTemplate">
-			<Setter.Value>
-				<ControlTemplate>
-					<TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DataGridRow">
-					<SelectiveScrollingGrid>
-						<SelectiveScrollingGrid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</SelectiveScrollingGrid.ColumnDefinitions>
-						<SelectiveScrollingGrid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</SelectiveScrollingGrid.RowDefinitions>
-						<Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-						<DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}" />
-						<DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-					</SelectiveScrollingGrid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsSelected" Value="true" />
-					<Condition Property="Selector.IsSelectionActive" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Padding" Value="12,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DataGridColumnHeader">
-					<hc:SimplePanel>
-						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
-							<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<ContentPresenter RecognizesAccessKey="True" VerticalAlignment="Center" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-								<ToggleButton Grid.Column="1" VerticalAlignment="Center" Height="{x:Static system:Double.NaN}" Padding="4,0" Width="20" IsEnabled="False" Opacity="1" Foreground="{DynamicResource PrimaryBrush}" x:Name="ToggleButtonSortDirection" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-							</Grid>
-						</Border>
-						<Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
-						<Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="SortDirection" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection" />
-						</Trigger>
-						<Trigger Property="SortDirection" Value="Ascending">
-							<Setter Property="IsChecked" Value="True" TargetName="ToggleButtonSortDirection" />
-						</Trigger>
-						<Trigger Property="SortDirection" Value="Descending">
-							<Setter Property="IsChecked" Value="False" TargetName="ToggleButtonSortDirection" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="SortDirection" Value="Ascending">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="SortDirection" Value="Descending">
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DataGridRowHeader">
-					<hc:SimplePanel HorizontalAlignment="Center">
-						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
-							<StackPanel Orientation="Horizontal">
-								<ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-							</StackPanel>
-						</Border>
-						<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
-						<Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-	</Style>
-	<Style x:Key="BadgePrimary" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="BadgeSuccess" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="BadgeInfo" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="BadgeWarning" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="BadgeDanger" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style x:Key="CalendarWithClockBaseStyle" TargetType="hc:CalendarWithClock">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Margin" Value="8 0" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:CalendarWithClock">
-					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" Height="42" VerticalAlignment="Top" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" />
-							<ContentPresenter Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_CalendarPresenter" Margin="-8,-4,-8,-8" />
-							<ContentPresenter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_ClockPresenter" Margin="-8,-4,-8,-8" />
-							<Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" HorizontalAlignment="Center" Margin="0,0,0,19" Width="180" VerticalAlignment="Bottom" Style="{StaticResource ButtonPrimary}" />
-						</Grid>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:CalendarWithClock" BasedOn="{StaticResource CalendarWithClockBaseStyle}" />
-	<Style BasedOn="{StaticResource CardBaseStyle}" TargetType="hc:Card" />
-	<Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="Margin" Value="5,0" />
-		<Setter Property="Width" Value="10" />
-		<Setter Property="Height" Value="10" />
-		<Setter Property="Background" Value="White" />
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".9" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Opacity" Value=".6" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:Carousel">
-		<Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource CarouselItemBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Carousel">
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1" />
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-						<EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1" />
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-					<hc:SimplePanel ClipToBounds="True">
-						<StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
-						<hc:SimplePanel x:Name="GridTop" Opacity="0">
-							<Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
-								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-									<Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}" />
-								</Border>
-							</Button>
-							<Button Command="interactivity:ControlCommands.Next" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource ButtonCustom}">
-								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-									<Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}" />
-								</Border>
-							</Button>
-						</hc:SimplePanel>
-						<StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" />
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="hc:ChatBubble" />
-	<Style BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox" />
-	<Style x:Key="Tag4CheckComboBoxStyle.Small" BasedOn="{StaticResource Tag4CheckComboBoxStyle}" TargetType="hc:Tag">
-		<Setter Property="Padding" Value="6,0,4,0" />
-	</Style>
-	<Style x:Key="CheckComboBox.Small" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
-		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="CheckComboBoxExtend" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox" />
-	<Style x:Key="CheckComboBoxExtend.Small" BasedOn="{StaticResource CheckComboBoxExtend}" TargetType="hc:CheckComboBox">
-		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="CheckComboBoxPlus" BasedOn="{StaticResource CheckComboBoxPlusBaseStyle}" TargetType="hc:CheckComboBox" />
-	<Style x:Key="CheckComboBoxPlus.Small" BasedOn="{StaticResource CheckComboBoxPlus}" TargetType="hc:CheckComboBox">
-		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,1" />
-	</Style>
-	<Style x:Key="ClockRadioButtonStyle" TargetType="hc:ClockRadioButton">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Width" Value="28" />
-		<Setter Property="Height" Value="28" />
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ClockRadioButton">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<hc:SimplePanel x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-						<Ellipse x:Name="optionMark" Fill="{TemplateBinding Background}" MinWidth="6" MinHeight="6" Opacity="0" />
-						<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="true">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ClockBaseStyle" TargetType="hc:Clock">
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Margin" Value="8 0" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="ClockRadioButtonStyle" Value="{StaticResource ClockRadioButtonStyle}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Clock">
-					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="50" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Name="PART_BorderTitle">
-								<TextBlock x:Name="PART_TimeStr" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Foreground="{DynamicResource TextIconBrush}" />
-							</Border>
-							<Canvas Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="16,16,16,62" VerticalAlignment="Top" Name="PART_Canvas" Width="178" Height="178">
-								<Border Background="{DynamicResource SecondaryRegionBrush}" Width="178" Height="178" CornerRadius="89" />
-								<hc:CirclePanel Diameter="130" x:Name="PART_PanelNum" KeepVertical="True" Margin="24,24,0,0" OffsetAngle="-60" />
-								<Border Focusable="False" Name="PART_BorderClock" Background="{DynamicResource PrimaryBrush}" RenderTransformOrigin="0.5,1" Height="63" Width="2" Canvas.Left="88" Canvas.Top="26" />
-								<Ellipse Fill="White" Width="8" Height="8" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Canvas.Top="85" Canvas.Left="85" />
-							</Canvas>
-							<hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Am}}" Style="{StaticResource ClockRadioButtonStyle}" />
-							<hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Pm}}" Style="{StaticResource ClockRadioButtonStyle}" />
-							<Button Grid.Row="1" Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}" />
-						</Grid>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:Clock" BasedOn="{StaticResource ClockBaseStyle}" />
-	<Style x:Key="ClockListBoxItemStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="true">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="true">
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-			<Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="ListBoxItem">
-							<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-								<StackPanel Orientation="Horizontal">
-									<ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
-									<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-								</StackPanel>
-							</Border>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ClockListBoxStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
-		<Setter Property="MaxHeight" Value="180" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ClockListBoxItemStyle}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-	</Style>
-	<Style x:Key="ListClockBaseStyle" TargetType="hc:ListClock">
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Margin" Value="8 0" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ListClock">
-					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-						<Grid Margin="0,4" Width="210">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<ListBox hc:BorderElement.CornerRadius="0" x:Name="PART_HourList" Style="{StaticResource ClockListBoxStyle}" />
-							<ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="1" x:Name="PART_MinuteList" Style="{StaticResource ClockListBoxStyle}" BorderThickness="1,0" />
-							<ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="2" x:Name="PART_SecondList" Style="{StaticResource ClockListBoxStyle}" />
-							<Border VerticalAlignment="Bottom" Visibility="{Binding Visibility,ElementName=PART_ButtonConfirm}" Height="1" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Background="{DynamicResource BorderBrush}" />
-							<Button Margin="0,10" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Background="Transparent" Style="{StaticResource ButtonCustom}" />
-						</Grid>
-					</hc:SimplePanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}" />
-	<Style BasedOn="{StaticResource ColorPickerBaseStyle}" TargetType="hc:ColorPicker" />
-	<Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu" />
-	<Style BasedOn="{StaticResource CoverFlowBaseStyle}" TargetType="hc:CoverFlow" />
-	<Style BasedOn="{StaticResource CoverViewBaseStyle}" TargetType="hc:CoverView" />
-	<Style x:Key="DataGridBaseStyle" TargetType="DataGrid">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="GridLinesVisibility" Value="None" />
-		<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="EnableRowVirtualization" Value="True" />
-		<Setter Property="CanUserAddRows" Value="False" />
-		<Setter Property="CanUserDeleteRows" Value="False" />
-		<Setter Property="CanUserReorderColumns" Value="False" />
-		<Setter Property="CanUserResizeRows" Value="False" />
-		<Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle}" />
-		<Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}" />
-		<Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle}" />
-		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
-		<Setter Property="Padding" Value="6" />
-		<Setter Property="RowHeight" Value="44" />
-		<Setter Property="ColumnHeaderHeight" Value="44" />
-		<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
-		<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
-		<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
-		<Setter Property="hc:DataGridAttach.EditingComboBoxColumnStyle" Value="{StaticResource ComboBoxBaseStyle}" />
-		<Setter Property="hc:DataGridAttach.CheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
-		<Setter Property="hc:DataGridAttach.EditingCheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
-		<Setter Property="hc:DataGridAttach.ApplyDefaultStyle" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DataGrid">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard1">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-						<Storyboard x:Key="Storyboard2">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
-							<ScrollViewer.Template>
-								<ControlTemplate TargetType="ScrollViewer">
-									<Grid>
-										<Grid.ColumnDefinitions>
-											<ColumnDefinition Width="Auto" />
-											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
-										</Grid.ColumnDefinitions>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="*" />
-										</Grid.RowDefinitions>
-										<Button Command="{x:Static DataGrid.SelectAllCommand}" MaxHeight="30" Height="auto" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
-											<Button.Visibility>
-												<MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
-													<Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
-													<Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
-												</MultiBinding>
-											</Button.Visibility>
-										</Button>
-										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-										<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-											<hc:ToggleBlock.CheckedContent>
-												<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
-											</hc:ToggleBlock.CheckedContent>
-											<hc:ToggleBlock.UnCheckedContent>
-												<hc:Empty />
-											</hc:ToggleBlock.UnCheckedContent>
-										</hc:ToggleBlock>
-										<ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-										<ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" VerticalAlignment="Bottom" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-									</Grid>
-									<ControlTemplate.Triggers>
-										<EventTrigger RoutedEvent="MouseEnter">
-											<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-										</EventTrigger>
-										<EventTrigger RoutedEvent="MouseLeave">
-											<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-										</EventTrigger>
-									</ControlTemplate.Triggers>
-								</ControlTemplate>
-							</ScrollViewer.Template>
-							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid" />
-	<Style x:Key="DataGridCellStyle.Small" BasedOn="{StaticResource DataGridCellStyle}" TargetType="DataGridCell">
-		<Setter Property="Padding" Value="6,2" />
-	</Style>
-	<Style x:Key="DataGridRowStyle.Small" BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
-		<Setter Property="Margin" Value="0,0,0,2" />
-	</Style>
-	<Style x:Key="DataGridColumnHeaderStyle.Small" BasedOn="{StaticResource DataGridColumnHeaderStyle}" TargetType="DataGridColumnHeader">
-		<Setter Property="Padding" Value="8,0" />
-	</Style>
-	<Style x:Key="DataGrid.Small" BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid">
-		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle.Small}" />
-		<Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle.Small}" />
-		<Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle.Small}" />
-		<Setter Property="RowHeight" Value="24" />
-		<Setter Property="ColumnHeaderHeight" Value="20" />
-	</Style>
-	<Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
-	<Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
-	<Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
-	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
-	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
-	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
-	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
-	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
-	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
-	<Style BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup" />
-	<Style x:Key="ElementGroupSolid" BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup">
-		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
-	<Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
-	<Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
-	<Style BasedOn="{StaticResource FlowDocumentPageViewerBaseStyle}" TargetType="FlowDocumentPageViewer" />
-	<Style BasedOn="{StaticResource FlowDocumentReaderBaseStyle}" TargetType="FlowDocumentReader" />
-	<Style BasedOn="{StaticResource FrameBaseStyle}" TargetType="Frame" />
-	<Style BasedOn="{StaticResource GotoTopBaseStyle}" TargetType="hc:GotoTop" />
-	<Style BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar" />
-	<Style x:Key="GravatarCircle" BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar">
-		<Setter Property="Padding" Value="16" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Gravatar">
-					<Border Style="{StaticResource BorderCircularClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ContentPresenter Margin="{TemplateBinding Padding}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="GravatarCircleImg" BasedOn="{StaticResource GravatarCircle}" TargetType="hc:Gravatar">
-		<Setter Property="Padding" Value="0" />
-	</Style>
-	<Style TargetType="hc:Growl">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="MinHeight" Value="60" />
-		<Setter Property="Width" Value="320" />
-		<Setter Property="Margin" Value="10,10,10,0" />
-		<Setter Property="MaxWidth" Value="320" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="8" />
-		<Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Growl">
-					<Grid Name="PART_GridMain" RenderTransformOrigin="0.5,0.5">
-						<Grid.RenderTransform>
-							<TransformGroup>
-								<TranslateTransform X="{TemplateBinding MaxWidth}" />
-							</TransformGroup>
-						</Grid.RenderTransform>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="50" />
-							<ColumnDefinition />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Path FlowDirection="LeftToRight" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}" />
-						<StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
-							<TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap" />
-							<TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=hc:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0" />
-						</StackPanel>
-						<Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
-							<Path FlowDirection="LeftToRight" Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}" />
-						</Button>
-						<UniformGrid Columns="2" Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
-							<Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
-								<TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}" />
-							</Button>
-							<Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
-								<TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}" />
-							</Button>
-						</UniformGrid>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ImageSelectorBaseStyle}" TargetType="hc:ImageSelector" />
-	<Style TargetType="hc:ImageViewer">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="MinWidth" Value="400" />
-		<Setter Property="MinHeight" Value="250" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:ImageViewer">
-					<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<hc:SimplePanel x:Name="PART_PanelMain" ClipToBounds="True" Grid.RowSpan="2">
-								<Border HorizontalAlignment="Left" VerticalAlignment="Top" Height="{TemplateBinding ImageHeight}" Width="{TemplateBinding ImageWidth}" Margin="{TemplateBinding ImageMargin}">
-									<Image Name="PART_ImageMain" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}" />
-								</Border>
-							</hc:SimplePanel>
-							<Border Grid.Row="0" Grid.RowSpan="2" Width="252" Height="162" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="{DynamicResource DarkOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
-								<Border.Visibility>
-									<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-										<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowSmallImgInternal" />
-										<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowImgMap" />
-									</MultiBinding>
-								</Border.Visibility>
-								<Canvas ClipToBounds="True" Name="PART_CanvasSmallImg" MaxWidth="250" MaxHeight="160">
-									<Border UseLayoutRounding="True" Name="PART_BorderMove" Background="Transparent" Width="50" Height="70" BorderThickness="1" BorderBrush="Black">
-										<Border BorderThickness="1" BorderBrush="White" />
-									</Border>
-								</Canvas>
-							</Border>
-							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
-								<StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
-									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
-									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
-									<TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
-									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
-										<Border BorderThickness="1" BorderBrush="White" Padding="2">
-											<TextBlock Text="1:1" />
-										</Border>
-									</Button>
-									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
-									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
-								</StackPanel>
-							</Border>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
-	<Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
-		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="24" />
-	</Style>
-	<Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
-	</Style>
-	<Style x:Key="ListBoxCustom" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-	</Style>
-	<Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
-	</Style>
-	<Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
-	</Style>
-	<Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
-	</Style>
-	<Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-		<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
-	</Style>
-	<Style x:Key="ListViewBaseStyle" TargetType="ListView">
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="6" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListView">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-							<hc:ToggleBlock.CheckedContent>
-								<ScrollViewer>
-									<Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="*" />
-										</Grid.RowDefinitions>
-										<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-										<ItemsPresenter Grid.Row="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</Grid>
-								</ScrollViewer>
-							</hc:ToggleBlock.CheckedContent>
-							<hc:ToggleBlock.UnCheckedContent>
-								<hc:Empty />
-							</hc:ToggleBlock.UnCheckedContent>
-						</hc:ToggleBlock>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="IsGrouping" Value="true" />
-					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-				</MultiTrigger.Conditions>
-				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-			</MultiTrigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView" />
-	<Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
-	<Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style x:Key="LoadingLineLarge" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
-		<Setter Property="DotDiameter" Value="10" />
-	</Style>
-	<Style x:Key="LoadingLineLargeLight" BasedOn="{StaticResource LoadingLineLarge}" TargetType="hc:LoadingLine">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle" />
-	<Style x:Key="LoadingCircleLight" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style x:Key="LoadingCircleLarge" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
-		<Setter Property="Width" Value="100" />
-		<Setter Property="Height" Value="100" />
-		<Setter Property="DotDiameter" Value="10" />
-		<Setter Property="DotInterval" Value="20" />
-		<Setter Property="DotOffSet" Value="40" />
-		<Setter Property="DotDelayTime" Value="120" />
-	</Style>
-	<Style x:Key="LoadingCircleLargeLight" BasedOn="{StaticResource LoadingCircleLarge}" TargetType="hc:LoadingCircle">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource MagnifierBaseStyle}" TargetType="hc:Magnifier" />
-	<Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
-		<Setter Property="MinWidth" Value="88" />
-		<Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-		<Setter Property="Margin" Value="5,0" />
-	</Style>
-	<Style x:Key="MessageBoxPrimaryButtonStyle" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
-		<Setter Property="MinWidth" Value="88" />
-		<Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-		<Setter Property="Margin" Value="5,0" />
-	</Style>
-	<Style TargetType="hc:MessageBox" BasedOn="{StaticResource WindowWin10}">
-		<Setter Property="MinHeight" Value="172" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="MinWidth" Value="335" />
-		<Setter Property="MaxWidth" Value="476" />
-		<Setter Property="MaxHeight" Value="680" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:MessageBox">
-					<Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-						<Grid Margin="{TemplateBinding Padding}">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-									<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" IsTabStop="False" Name="PART_ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-								</StackPanel>
-								<Grid Grid.Column="0">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition />
-									</Grid.ColumnDefinitions>
-									<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
-										<interactivity:Interaction.Triggers>
-											<interactivity:EventTrigger EventName="MouseDoubleClick">
-												<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-											</interactivity:EventTrigger>
-										</interactivity:Interaction.Triggers>
-										<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
-									</Button>
-									<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
-										<TextBlock.Visibility>
-											<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-												<MultiBinding.Bindings>
-													<Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
-													<Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
-												</MultiBinding.Bindings>
-											</MultiBinding>
-										</TextBlock.Visibility>
-									</TextBlock>
-									<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
-								</Grid>
-							</Grid>
-							<AdornerDecorator Grid.Row="1">
-								<Grid>
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition />
-									</Grid.ColumnDefinitions>
-									<Grid.RowDefinitions>
-										<RowDefinition />
-										<RowDefinition Height="Auto" />
-									</Grid.RowDefinitions>
-									<Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform" />
-									<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
-										<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
-											<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
-										</Border>
-									</ScrollViewer>
-									<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
-								</Grid>
-							</AdornerDecorator>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsActive" Value="False">
-							<Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True" SourceName="PART_ButtonClose">
-							<Setter Property="Background" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter Property="Foreground" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
-	<Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
-	<Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
-	<Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
-	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="GroupName" Value="1" />
-		<Setter Property="MinWidth" Value="30" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RadioButton">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</StackPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="true">
-							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="Content" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-						</Trigger>
-						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style TargetType="hc:Pagination">
-		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:Pagination">
-					<StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-						<Button x:Name="PART_ButtonLeft" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}" Command="interactivity:ControlCommands.Prev" />
-						<StackPanel ZIndex="999" HorizontalAlignment="Center" Orientation="Horizontal">
-							<interactivity:Interaction.Triggers>
-								<interactivity:RoutedEventTrigger RoutedEvent="RadioButton.Checked">
-									<interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
-								</interactivity:RoutedEventTrigger>
-							</interactivity:Interaction.Triggers>
-							<RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{StaticResource PaginationButtonStyle}" />
-							<Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
-								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
-							</Border>
-							<StackPanel Name="PART_PanelMain" Orientation="Horizontal" />
-							<Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
-								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
-							</Border>
-							<RadioButton Name="PART_ButtonLast" Content="10" Style="{StaticResource PaginationButtonStyle}" />
-						</StackPanel>
-						<Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
-						<hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />
-						<Button IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Content="{ex:Lang {x:Static langs:LangKeys.Jump}}" Margin="6,0,0,0" Command="interactivity:ControlCommands.Jump" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox" />
-	<Style x:Key="PasswordBox.Small" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
-		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style x:Key="PasswordBoxExtend" BasedOn="{StaticResource PasswordBoxExtendBaseStyle}" TargetType="PasswordBox" />
-	<Style x:Key="PasswordBoxExtend.Small" BasedOn="{StaticResource PasswordBoxExtend}" TargetType="PasswordBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox" />
-	<Style x:Key="PasswordBoxPlus.Small" BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox">
-		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
-	</Style>
-	<Style BasedOn="{StaticResource PinBoxBaseStyle}" TargetType="hc:PinBox" />
-	<Style BasedOn="{StaticResource PoptipBaseStyle}" TargetType="hc:Poptip" />
-	<Style TargetType="hc:PopupWindow">
-		<Setter Property="WindowStyle" Value="None" />
-		<Setter Property="MinHeight" Value="220" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="BorderThickness" Value="20" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="MinWidth" Value="300" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="Effect">
-			<Setter.Value>
-				<DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:PopupWindow">
-					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="{StaticResource DefaultControlPadding}" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis" />
-								<Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
-									<Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}" />
-								</Button>
-							</Grid>
-							<Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-								<StackPanel>
-									<TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}" />
-									<StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-										<Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" />
-										<Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Style="{StaticResource ButtonPrimary}" />
-									</StackPanel>
-								</StackPanel>
-							</Border>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="ShowBorder" Value="True">
-							<Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder" />
-						</Trigger>
-						<Trigger Property="ShowTitle" Value="False">
-							<Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid" />
-							<Setter Property="Background" Value="Transparent" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ProgressButtonPrimary" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="ProgressButtonSuccess" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="ProgressButtonInfo" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="ProgressButtonWarning" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="ProgressButtonDanger" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource PropertyGridBaseStyle}" TargetType="hc:PropertyGrid" />
-	<Style x:Key="ComboBoxItemCapsuleBaseStyle" BasedOn="{x:Null}" TargetType="ComboBoxItem">
-		<Setter Property="MinWidth" Value="40" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="10,0" />
-		<Setter Property="Margin" Value="-1,0,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ComboBoxItem">
-					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<ContentPresenter x:Name="contentPresenter" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-				<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="true">
-				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ComboBoxItemCapsuleDefault" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem" />
-	<Style x:Key="ComboBoxItemCapsuleHorizontalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ComboBoxItemCapsuleHorizontalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-	</Style>
-	<Style x:Key="ComboBoxItemCapsuleSingle" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-	</Style>
-	<Style x:Key="ComboBoxItemCapsuleVerticalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="ComboBoxItemCapsuleVerticalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-	</Style>
-	<Style x:Key="ComboBoxCapsule" BasedOn="{x:Null}" TargetType="ComboBox">
-		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ComboBoxItemCapsuleStyleSelector}" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ComboBox">
-					<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource RateBaseStyle}" TargetType="hc:Rate" />
-	<Style BasedOn="{StaticResource RunningBlockBaseStyle}" TargetType="hc:RunningBlock" />
-	<Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
-	<Style BasedOn="{StaticResource ShieldBaseStyle}" TargetType="hc:Shield" />
-	<Style BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu" />
-	<Style x:Key="SideMenuAccordion" BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu">
-		<Setter Property="ExpandMode" Value="Accordion" />
-		<Setter Property="PanelAreaLength" Value="200" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderAccordionBaseStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:SideMenu">
-					<Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<StackPanel x:Name="PART_Panel" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="SplitButtonPrimary" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-	</Style>
-	<Style x:Key="SplitButtonSuccess" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-	</Style>
-	<Style x:Key="SplitButtonInfo" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-	</Style>
-	<Style x:Key="SplitButtonWarning" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-	</Style>
-	<Style x:Key="SplitButtonDanger" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-	</Style>
-	<Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar" />
-	<Style BasedOn="{StaticResource StatusBarItemBaseStyle}" TargetType="StatusBarItem" />
-	<Style BasedOn="{StaticResource StepBarBaseStyle}" TargetType="hc:StepBar" />
-	<Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl" />
-	<Style BasedOn="{StaticResource TabControlPlusBaseStyle}" TargetType="hc:TabControl" />
-	<Style x:Key="TabItemInLine" BasedOn="{StaticResource TabItemStyle}" TargetType="TabItem">
-		<Setter Property="MinWidth" Value="0" />
-	</Style>
-	<Style x:Key="TabControlInLine" BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemInLine}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TabControl">
-					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition x:Name="ColumnDefinition0" />
-							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
-							<RowDefinition x:Name="RowDefinition1" Height="*" />
-						</Grid.RowDefinitions>
-						<UniformGrid Rows="1" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-						<Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="TabStripPlacement" Value="Bottom">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Left">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
-							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Right">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
-							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TabItemCapsuleDefault" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem" />
-	<Style x:Key="TabItemCapsuleHorizontalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="TabItemCapsuleHorizontalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-	</Style>
-	<Style x:Key="TabItemCapsuleSingle" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-	</Style>
-	<Style x:Key="TabItemCapsuleVerticalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-		<Setter Property="Margin" Value="0" />
-	</Style>
-	<Style x:Key="TabItemCapsuleVerticalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-	</Style>
-	<Style x:Key="TabControlCapsule" TargetType="TabControl">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="ItemContainerStyleSelector">
-			<Setter.Value>
-				<tools:TabItemCapsuleStyleSelector />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="TabControl">
-					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition x:Name="ColumnDefinition0" />
-							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
-							<RowDefinition x:Name="RowDefinition1" Height="*" />
-						</Grid.RowDefinitions>
-						<UniformGrid Rows="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-						<Border x:Name="contentPanel" Margin="0,6,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</Border>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="TabStripPlacement" Value="Bottom">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-							<Setter TargetName="contentPanel" Property="Margin" Value="0,0,0,6" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Left">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
-							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="Margin" Value="6,0,0,0" />
-						</Trigger>
-						<Trigger Property="TabStripPlacement" Value="Right">
-							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
-							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
-							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="contentPanel" Property="Margin" Value="0,0,6,0" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="TabControlCapsuleSolid" BasedOn="{StaticResource TabControlCapsule}" TargetType="TabControl">
-		<Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-	</Style>
-	<Style TargetType="hc:TimeBar">
-		<Setter Property="HotspotsBrush" Value="{DynamicResource AccentBrush}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="BorderThickness" Value="0,1,0,0" />
-		<Setter Property="Foreground" Value="White" />
-		<Setter Property="Background" Value="{DynamicResource TitleBrush}" />
-		<Setter Property="Height" Value="60" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="hc:TimeBar">
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
-							<BeginStoryboard>
-								<Storyboard>
-									<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
-										<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-									</ObjectAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-						<EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
-							<BeginStoryboard>
-								<Storyboard>
-									<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
-										<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
-									</ObjectAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-						<hc:SimplePanel ClipToBounds="True">
-							<Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
-								<TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center" />
-							</Border>
-							<TextBlock Visibility="{TemplateBinding ShowSpeStr,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding SpeStr}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,14,10,0" />
-							<TextBlock Visibility="Collapsed" Name="PART_TextBlockMove" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,2,0,0" />
-							<Canvas Name="PART_CanvasSpe" VerticalAlignment="Bottom" Height="28" />
-							<hc:SimplePanel x:Name="PART_Hotspots" Margin="0,48,0,0" VerticalAlignment="Top" Visibility="{Binding Hotspots,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Object2VisibilityConverter}}" />
-							<Border Width="1" Background="{DynamicResource DangerBrush}" />
-							<Border Name="PART_BorderTop" Background="Transparent" Cursor="Hand" />
-						</hc:SimplePanel>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
-	<Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
-	<Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
-	<Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
-	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
-	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
-	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
-	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
-	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
-	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
-		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="MinHeight" Value="24" />
-	</Style>
-	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
-	</Style>
-	<Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
-	<Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
-	<ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
-		<hc:AxleCanvas>
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
-		<hc:AxleCanvas>
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
-		<hc:AxleCanvas Orientation="Vertical">
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
-		<hc:AxleCanvas Orientation="Vertical">
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="SliderHorizontal" TargetType="Slider">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
-			<TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
-				<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
-					<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
-				</Canvas>
-			</Border>
-			<Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
-				</Track.Thumb>
-			</Track>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Top" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalTop}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Bottom" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalBottom}" />
-			</MultiTrigger>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="IsSelectionRangeEnabled" Value="true">
-				<Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="SliderVertical" TargetType="Slider">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
-			<TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
-				<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
-					<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
-				</Canvas>
-			</Border>
-			<Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
-				<Track.DecreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-				</Track.DecreaseRepeatButton>
-				<Track.IncreaseRepeatButton>
-					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-				</Track.IncreaseRepeatButton>
-				<Track.Thumb>
-					<Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
-				</Track.Thumb>
-			</Track>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Left" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalLeft}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Right" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}" />
-			</MultiTrigger>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="IsSelectionRangeEnabled" Value="true">
-				<Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="SliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
-		<Setter Property="Template" Value="{StaticResource SliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource SliderVertical}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="TipRangeSliderThumbHorizontalTop" TargetType="hc:RangeThumb">
-		<hc:AxleCanvas>
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipRangeSliderThumbHorizontalBottom" TargetType="hc:RangeThumb">
-		<hc:AxleCanvas>
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipRangeSliderThumbVerticalLeft" TargetType="hc:RangeThumb">
-		<hc:AxleCanvas Orientation="Vertical">
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="TipRangeSliderThumbVerticalRight" TargetType="hc:RangeThumb">
-		<hc:AxleCanvas Orientation="Vertical">
-			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-		</hc:AxleCanvas>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-			</Trigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-				<EventTrigger.Actions>
-					<BeginStoryboard>
-						<Storyboard>
-							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-						</Storyboard>
-					</BeginStoryboard>
-				</EventTrigger.Actions>
-			</EventTrigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="RangeSliderHorizontal" TargetType="hc:RangeSlider">
-		<Grid>
-			<Grid.RowDefinitions>
-				<RowDefinition Height="Auto" />
-				<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-			<TickBar x:Name="TopTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
-			<TickBar x:Name="BottomTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="9,0" Grid.Row="1" Height="2" VerticalAlignment="center" />
-			<hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="9,0" x:Name="PART_Track" Grid.Row="1">
-				<hc:RangeTrack.DecreaseRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-				</hc:RangeTrack.DecreaseRepeatButton>
-				<hc:RangeTrack.CenterRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-				</hc:RangeTrack.CenterRepeatButton>
-				<hc:RangeTrack.IncreaseRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-				</hc:RangeTrack.IncreaseRepeatButton>
-				<hc:RangeTrack.ThumbStart>
-					<hc:RangeThumb Content="{TemplateBinding ValueStart}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbStart" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
-				</hc:RangeTrack.ThumbStart>
-				<hc:RangeTrack.ThumbEnd>
-					<hc:RangeThumb Content="{TemplateBinding ValueEnd}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbEnd" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
-				</hc:RangeTrack.ThumbEnd>
-			</hc:RangeTrack>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Top" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
-				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Bottom" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
-				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
-			</MultiTrigger>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="RangeSliderVertical" TargetType="hc:RangeSlider">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
-			<TickBar x:Name="TopTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
-			<TickBar x:Name="BottomTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
-			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="0,9" Grid.Column="1" HorizontalAlignment="center" Width="2" />
-			<hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="0,9" x:Name="PART_Track" Grid.Column="1">
-				<hc:RangeTrack.DecreaseRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-				</hc:RangeTrack.DecreaseRepeatButton>
-				<hc:RangeTrack.CenterRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-				</hc:RangeTrack.CenterRepeatButton>
-				<hc:RangeTrack.IncreaseRepeatButton>
-					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-				</hc:RangeTrack.IncreaseRepeatButton>
-				<hc:RangeTrack.ThumbStart>
-					<hc:RangeThumb Content="{TemplateBinding ValueStart}" Margin="0,-9" x:Name="ThumbStart" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
-				</hc:RangeTrack.ThumbStart>
-				<hc:RangeTrack.ThumbEnd>
-					<hc:RangeThumb Content="{TemplateBinding ValueEnd}" Margin="0,-9" x:Name="ThumbEnd" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
-				</hc:RangeTrack.ThumbEnd>
-			</hc:RangeTrack>
-		</Grid>
-		<ControlTemplate.Triggers>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Left" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
-				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
-			</MultiTrigger>
-			<MultiTrigger>
-				<MultiTrigger.Conditions>
-					<Condition Property="hc:TipElement.Placement" Value="Right" />
-					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
-				</MultiTrigger.Conditions>
-				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
-				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
-			</MultiTrigger>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="RangeSliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RangeSlider">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
-		<Setter Property="Template" Value="{StaticResource RangeSliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource RangeSliderVertical}" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value=".4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
-	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
+  <langs:LangProvider x:Key="Langs" />
+  <converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
+  <converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
+  <converter:BooleanArr2VisibilityConverter x:Key="BooleanArr2VisibilityConverter" />
+  <converter:BooleanArr2BooleanConverter x:Key="BooleanArr2BooleanConverter" />
+  <converter:Long2FileSizeConverter x:Key="Long2FileSizeConverter" />
+  <converter:String2VisibilityConverter x:Key="String2VisibilityConverter" />
+  <converter:String2VisibilityReConverter x:Key="String2VisibilityReConverter" />
+  <BooleanToVisibilityConverter x:Key="Boolean2VisibilityConverter" />
+  <converter:TreeViewItemMarginConverter x:Key="TreeViewItemMarginConverter" />
+  <converter:Color2HexStringConverter x:Key="Color2HexStringConverter" />
+  <converter:Object2BooleanConverter x:Key="Object2BooleanConverter" />
+  <converter:Boolean2StringConverter x:Key="Boolean2StringConverter" />
+  <converter:Int2StringConverter x:Key="Int2StringConverter" />
+  <converter:BorderClipConverter x:Key="BorderClipConverter" />
+  <converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
+  <converter:BorderCircularConverter x:Key="BorderCircularConverter" />
+  <converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter" />
+  <converter:Object2VisibilityReConverter x:Key="Object2VisibilityReConverter" />
+  <converter:Number2PercentageConverter x:Key="Number2PercentageConverter" />
+  <converter:RectangleCircularConverter x:Key="RectangleCircularConverter" />
+  <converter:ThicknessSplitConverter x:Key="ThicknessSplitConverter" />
+  <converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
+  <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
+  <converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
+  <converter:DoubleMinConverter x:Key="DoubleMinConverter" />
+  <converter:Object2StringConverter x:Key="Object2StringConverter" />
+  <converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
+  <Color x:Key="EffectShadowColor">#88000000</Color>
+  <system:Double x:Key="LargeFontSize">24</system:Double>
+  <system:Double x:Key="HeadFontSize">20</system:Double>
+  <system:Double x:Key="SubHeadFontSize">16</system:Double>
+  <system:Double x:Key="TextFontSize">12</system:Double>
+  <Geometry o:Freeze="True" x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
+  <Geometry o:Freeze="True" x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
+  <Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
+  <Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
+  <Geometry o:Freeze="True" x:Key="RotateRightGeometry">M13.1117823382705,0.00108644926083379C18.7165758868546,0.0742913923738762 23.9197352191299,3.84162509632329 25.6893389483779,9.62980814885544 26.1165926715226,11.0273168346189 26.3185999652236,12.461670228202 26.296833302626,13.8899238456496L28.4974711200089,11.6892569876356C28.8483088275283,11.3384168617557 29.4089472552627,11.330238049977 29.7496950885147,11.6709881771838 30.0904429217666,12.0117402117628 30.0822642108291,12.572387459387 29.7314265033096,12.923229492639L25.9199488421768,16.7347560556155C25.5691111346572,17.0855980888674 25.0084688922257,17.0937769006462 24.6677210589736,16.7530248660672 24.5891077777236,16.674408708165 24.5290644427627,16.5840870073788 24.4875185748428,16.4873374624474L20.9957621356339,12.9955379708416C20.6550143023818,12.6547878436347 20.6631930133193,12.0941405960106 21.0140307208389,11.7432985627585 21.3648684283584,11.3924565295065 21.9255068560928,11.3842777177278 22.2662546893447,11.7250297523068L24.4968645831436,13.9556652415401C24.5284846087783,12.6830303030582 24.3545000811904,11.4030042974954 23.9728319903702,10.1546044295501 22.0890505572647,3.99295504901009 15.7152140399307,0.483677352708723 9.73950221742095,2.3106585349176 3.76379420960845,4.13763876344051 0.441986348280352,10.6112083411418 2.32576778138575,16.7728577216819 4.20954921449125,22.9345051948497 10.5833819171279,26.4437838448372 16.5590937396377,24.6168036163144 18.3326227923721,24.0745720467974 19.9086878558486,23.1123447593618 21.1902544757217,21.8133823630949 21.5398485919327,21.4590441166922 22.1090319415421,21.4627806587338 22.4615595599502,21.8217271162507 22.8140871783584,22.1806735737676 22.8164675494522,22.7589048852417 22.4668734332412,23.1132431316444 20.9798891803115,24.6204085496776 19.1496775409072,25.7378005615073 17.0939638873428,26.3663063881084 10.1663286944717,28.484321088751 2.78723170960845,24.4215726325395 0.609260823377952,17.2976520950044 -1.56871387754975,10.1737353722136 2.27700069154205,2.6791733248245 9.20463588441315,0.561156716809679 10.5035670062393,0.164028483596132 11.8183710833877,-0.0158071458708005 13.1117823382705,0.00108644926083379z</Geometry>
+  <Geometry o:Freeze="True" x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
+  <Geometry o:Freeze="True" x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
+  <Geometry o:Freeze="True" x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
+  <Geometry o:Freeze="True" x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
+  <Geometry o:Freeze="True" x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
+  <Geometry o:Freeze="True" x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
+  <Geometry o:Freeze="True" x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
+  <Geometry o:Freeze="True" x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignLeftGeometry">M0,8 L4,8 4,10 0,10 z M0,4 L8,4 8,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignRightGeometry">M8,8 L12,8 12,10 8,10 z M4,4 L12,4 12,6 4,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignHCenterGeometry">M4,8 L8,8 8,10 4,10 z M2,4 L10,4 10,6 2,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignHStretchGeometry">M0,8 L12,8 12,10 0,10 z M0,4 L12,4 12,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignTopGeometry">M8,0 L10,0 10,4 8,4 z M4,0 L6,0 6,8 4,8 z M0,0 L2,0 2,12 0,12 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignBottomGeometry">M8,8 L10,8 10,12 8,12 z M4,4 L6,4 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignVCenterGeometry">M8,4 L10,4 10,8 8,8 z M4,2 L6,2 6,10 4,10 z M0,0 L2,0 2,12 0,12 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AlignVStretchGeometry">M8,0 L10,0 10,12 8,12 z M4,0 L6,0 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="PageModeGeometry">M1.0000002,12 L1.0000002,13 11,13 11,12 z M1.0000002,10 L1.0000002,11 11,11 11,10 z M1.0000002,8 L1.0000002,9 11,9 11,8 z M1.0000002,6 L1.0000002,7 11,7 11,6 z M1.0000002,4 L1.0000002,5 11,5 11,4 z M1.0000002,2 L1.0000002,3 11,3 11,2 z M0,0 L12,0 12,14 0,14 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="TwoPageModeGeometry">M8.99999988079071,12L8.99999988079071,13 13,13 13,12z M1,12L1,13 5,13 5,12z M9.00000011920929,10L9.00000011920929,11 13,11 13,10z M1,10L1,11 5,11 5,10z M9.00000011920929,8L9.00000011920929,9 13,9 13,8z M1,8L1,9 5,9 5,8z M9.00000011920929,6L9.00000011920929,7 13,7 13,6z M1,6L1,7 5,7 5,6z M9.00000011920929,4L9.00000011920929,5 13,5 13,4z M1,4L1,5 5,5 5,4z M8.99999988079071,2L8.99999988079071,3 13,3 13,2z M1,2L1,3 5,3 5,2z M7.99999994039536,0L14,0 14,14 7.99999994039536,14z M0,0L6,0 6,14 0,14z</Geometry>
+  <Geometry o:Freeze="True" x:Key="ScrollModeGeometry">M1,12L1,13 8,13 8,12z M1,10L1,11 8,11 8,10z M1,8L1,9 8,9 8,8z M1,6L1,7 8,7 8,6z M11.0000002384186,5L11.0000002384186,9 13,9 13,5z M1,4L1,5 8,5 8,4z M1,2L1,3 8,3 8,2z M10.0000000298023,0L14,0 14,14 10.0000000298023,14z M0,0L9.00000011920929,0 9.00000011920929,14 0,14z</Geometry>
+  <Geometry o:Freeze="True" x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
+  <Geometry o:Freeze="True" x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
+  <Geometry o:Freeze="True" x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
+  <Geometry o:Freeze="True" x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AddGeometry">M8,0 C8.5522847,0 9,0.44771525 9,1 L9,7 15,7 C15.552285,7 16,7.4477153 16,8 16,8.5522852 15.552285,9 15,9 L9,9 9,15 C9,15.552285 8.5522847,16 8,16 7.4477153,16 7,15.552285 7,15 L7,9 1,9 C0.44771528,9 0,8.5522852 0,8 0,7.4477153 0.44771528,7 1,7 L7,7 7,1 C7,0.44771525 7.4477153,0 8,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="RemoveGeometry">M10.899495,0 C11.155417,0 11.411339,0.097630501 11.606602,0.29289246 11.997126,0.68341732 11.997126,1.3165817 11.606602,1.7071066 L7.3639612,5.9497471 11.606602,10.192388 C11.997126,10.582912 11.997126,11.216077 11.606602,11.606601 11.216077,11.997126 10.582912,11.997126 10.192388,11.606601 L5.9497476,7.3639607 1.7071068,11.606601 C1.3165827,11.997126 0.68341756,11.997126 0.29289341,11.606601 -0.097630978,11.216077 -0.097630978,10.582912 0.29289341,10.192388 L4.5355338,5.9497471 0.29289341,1.7071066 C-0.097630978,1.3165817 -0.097630978,0.68341732 0.29289341,0.29289246 0.48815536,0.097630501 0.74407768,0 1,0 1.2559223,0 1.5118446,0.097630501 1.7071068,0.29289246 L5.9497476,4.5355334 10.192388,0.29289246 C10.38765,0.097630501 10.643572,0 10.899495,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
+  <Geometry o:Freeze="True" x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
+  <Geometry o:Freeze="True" x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
+  <Geometry o:Freeze="True" x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
+  <Geometry o:Freeze="True" x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
+  <Geometry o:Freeze="True" x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
+  <Geometry o:Freeze="True" x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DragVerticalGeometry">M2,12 C3.1045694,12 4,12.895431 4,14 4,15.104569 3.1045694,16 2,16 0.89543051,16 0,15.104569 0,14 0,12.895431 0.89543051,12 2,12 z M2,6 C3.1045694,6 4,6.8954306 4,8 4,9.1045694 3.1045694,10 2,10 0.89543051,10 0,9.1045694 0,8 0,6.8954306 0.89543051,6 2,6 z M2,0 C3.1045694,0 4,0.89543056 4,2 4,3.1045694 3.1045694,4 2,4 0.89543051,4 0,3.1045694 0,2 0,0.89543056 0.89543051,0 2,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DragHorizontalGeometry">M14,0 C15.104569,0 16,0.89543051 16,2 16,3.1045694 15.104569,4 14,4 12.895431,4 12,3.1045694 12,2 12,0.89543051 12.895431,0 14,0 z M8,0 C9.1045694,0 10,0.89543051 10,2 10,3.1045694 9.1045694,4 8,4 6.8954306,4 6,3.1045694 6,2 6,0.89543051 6.8954306,0 8,0 z M2,0 C3.1045694,0 4,0.89543051 4,2 4,3.1045694 3.1045694,4 2,4 0.89543056,4 0,3.1045694 0,2 0,0.89543051 0.89543056,0 2,0 z</Geometry>
+  <Geometry o:Freeze="True" x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
+  <Style x:Key="PathBaseStyle" TargetType="Path">
+    <Setter Property="Stretch" Value="Uniform" />
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="FlowDirection" Value="LeftToRight" />
+  </Style>
+  <system:Double x:Key="DefaultControlHeight">30</system:Double>
+  <Thickness x:Key="DefaultControlPadding">10,6</Thickness>
+  <Thickness x:Key="DefaultInputPadding">8,6</Thickness>
+  <CornerRadius x:Key="DefaultCornerRadius">4</CornerRadius>
+  <system:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">30</system:Double>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorXY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+    <interactivity:FluidMoveBehavior.EaseX>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseX>
+    <interactivity:FluidMoveBehavior.EaseY>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseY>
+  </interactivity:FluidMoveBehavior>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorX200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+    <interactivity:FluidMoveBehavior.EaseX>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseX>
+  </interactivity:FluidMoveBehavior>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+    <interactivity:FluidMoveBehavior.EaseY>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseY>
+  </interactivity:FluidMoveBehavior>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorXY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+    <interactivity:FluidMoveBehavior.EaseX>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseX>
+    <interactivity:FluidMoveBehavior.EaseY>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseY>
+  </interactivity:FluidMoveBehavior>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorX400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+    <interactivity:FluidMoveBehavior.EaseX>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseX>
+  </interactivity:FluidMoveBehavior>
+  <interactivity:FluidMoveBehavior x:Key="BehaviorY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+    <interactivity:FluidMoveBehavior.EaseY>
+      <PowerEase />
+    </interactivity:FluidMoveBehavior.EaseY>
+  </interactivity:FluidMoveBehavior>
+  <Style TargetType="hc:BlendEffectBox">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:BlendEffectBox">
+          <ContentPresenter ContentSource="ActualContent" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="BorderCircular" TargetType="Border">
+    <Setter Property="hc:BorderElement.Circular" Value="True" />
+  </Style>
+  <Style TargetType="hc:Col">
+    <Setter Property="Focusable" Value="False" />
+  </Style>
+  <Style TargetType="ContentControl">
+    <Setter Property="Focusable" Value="False" />
+  </Style>
+  <Style TargetType="hc:FlipClock">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:FlipClock">
+          <StackPanel Orientation="Horizontal">
+            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[0],RelativeSource={RelativeSource TemplatedParent}}" />
+            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[1],RelativeSource={RelativeSource TemplatedParent}}" />
+            <hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[2],RelativeSource={RelativeSource TemplatedParent}}" />
+            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[3],RelativeSource={RelativeSource TemplatedParent}}" />
+            <hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[4],RelativeSource={RelativeSource TemplatedParent}}" />
+            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[5],RelativeSource={RelativeSource TemplatedParent}}" />
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:FloatingBlock">
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:FloatingBlock">
+          <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="GridSplitter">
+    <Setter Property="Focusable" Value="False" />
+  </Style>
+  <Style TargetType="hc:Notification">
+    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+    <Setter Property="SizeToContent" Value="WidthAndHeight" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="ShowActivated" Value="False" />
+    <Setter Property="ShowInTaskbar" Value="False" />
+    <Setter Property="Topmost" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Notification">
+          <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RectangleCircular" TargetType="Rectangle">
+    <Setter Property="hc:RectangleAttach.Circular" Value="True" />
+  </Style>
+  <Style x:Key="SnapRect4ScreenshotStyle" TargetType="Rectangle">
+    <Setter Property="Height" Value="5" />
+    <Setter Property="Width" Value="5" />
+    <Setter Property="Fill" Value="DodgerBlue" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Visibility" Value="Collapsed" />
+    <Style.Triggers>
+      <Trigger Property="hc:TipElement.Placement" Value="LeftTop">
+        <Setter Property="Margin" Value="-3, -3, 0, 0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="Top">
+        <Setter Property="Margin" Value="0, -3, 0, 0" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="RightTop">
+        <Setter Property="Margin" Value="0, -3, -3, 0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="Right">
+        <Setter Property="Margin" Value="0, 0, -3, 0" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="RightBottom">
+        <Setter Property="Margin" Value="0, 0, -3, -3" />
+        <Setter Property="HorizontalAlignment" Value="Right" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="Bottom">
+        <Setter Property="Margin" Value="0, 0, 0, -3" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="LeftBottom">
+        <Setter Property="Margin" Value="-3, 0, 0, -3" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Bottom" />
+      </Trigger>
+      <Trigger Property="hc:TipElement.Placement" Value="Left">
+        <Setter Property="Margin" Value="-3, 0, 0, 0" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+      </Trigger>
+      <DataTrigger Binding="{Binding IsSelecting}" Value="True">
+        <Setter Property="Visibility" Value="Visible" />
+      </DataTrigger>
+      <DataTrigger Binding="{Binding IsDrawing}" Value="True">
+        <Setter Property="Visibility" Value="Visible" />
+      </DataTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TargetArea4ScreenshotStyle" TargetType="Border">
+    <Setter Property="IsHitTestVisible" Value="False" />
+    <Setter Property="BorderThickness" Value="5" />
+    <Setter Property="BorderBrush" Value="DodgerBlue" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Style.Triggers>
+      <DataTrigger Binding="{Binding IsSelecting}" Value="True">
+        <Setter Property="BorderThickness" Value="1" />
+      </DataTrigger>
+      <DataTrigger Binding="{Binding IsDrawing}" Value="True">
+        <Setter Property="IsHitTestVisible" Value="True" />
+        <Setter Property="BorderThickness" Value="1" />
+      </DataTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style TargetType="hc:SimpleItemsControl">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SimpleItemsControl">
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <StackPanel x:Name="PART_Panel" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:Sprite">
+    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+    <Setter Property="SizeToContent" Value="WidthAndHeight" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="ShowActivated" Value="False" />
+    <Setter Property="ShowInTaskbar" Value="False" />
+    <Setter Property="Topmost" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Sprite">
+          <ContentPresenter Margin="{TemplateBinding Padding}" hc:WindowAttach.IsDragElement="True" HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Storyboard x:Key="Right2LeftTransition" x:Shared="False">
+    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Left2RightTransition" x:Shared="False">
+    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Bottom2TopTransition" x:Shared="False">
+    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Top2BottomTransition" x:Shared="False">
+    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Right2LeftWithFadeTransition" x:Shared="False">
+    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Left2RightWithFadeTransition" x:Shared="False">
+    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Bottom2TopWithFadeTransition" x:Shared="False">
+    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="Top2BottomWithFadeTransition" x:Shared="False">
+    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+      <DoubleAnimation.EasingFunction>
+        <CubicEase EasingMode="EaseOut" />
+      </DoubleAnimation.EasingFunction>
+    </DoubleAnimation>
+  </Storyboard>
+  <Storyboard x:Key="FadeTransition" x:Shared="False">
+    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+  </Storyboard>
+  <Style TargetType="hc:TransitioningContentControl">
+    <Setter Property="Focusable" Value="False" />
+  </Style>
+  <Style x:Key="SliderRepeatButtonHorizontalStyle" 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">
+          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Height="2" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SliderRepeatButtonVerticalStyle" 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">
+          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Width="2" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CompareSliderRepeatButtonTransparent" 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">
+          <ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PreviewSliderRepeatButtonHorizontalStyle" 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">
+          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Rectangle Fill="{TemplateBinding Background}" Height="2" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PreviewSliderRepeatButtonVerticalStyle" 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">
+          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+            <Rectangle Fill="{TemplateBinding Background}" Width="2" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ScrollBarBaseRepeatButton" 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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ToggleBlock">
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <hc:SimplePanel Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+              <ContentPresenter Name="ContentPresenterChecked" ContentSource="CheckedContent" Visibility="Collapsed" />
+              <ContentPresenter Name="ContentPresenterUnChecked" ContentSource="UnCheckedContent" />
+              <ContentPresenter Name="ContentPresenterIndeterminate" ContentSource="IndeterminateContent" Visibility="Collapsed" />
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Visible" />
+              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
+              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="False">
+              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
+              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Visible" />
+              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="{x:Null}">
+              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
+              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
+              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Visible" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="GroupBoxBaseTopTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" MinHeight="30" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <Border MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,0,6">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <ControlTemplate x:Key="GroupBoxBaseLeftTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Border MinWidth="30" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="False" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,6,0">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" RenderTransformOrigin="0.5,0.5">
+          <ContentPresenter.LayoutTransform>
+            <TransformGroup>
+              <RotateTransform Angle="-90" />
+            </TransformGroup>
+          </ContentPresenter.LayoutTransform>
+        </ContentPresenter>
+      </Border>
+      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <ControlTemplate x:Key="GroupBoxTabTopTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" MinHeight="30" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,0,1,1'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+      <Border Grid.Row="0" MinHeight="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,1,0'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,1,0,0'}">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <ControlTemplate x:Key="GroupBoxTabLeftTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+      <Border Grid.Column="0" MinWidth="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,0,1'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+          <ContentPresenter.LayoutTransform>
+            <TransformGroup>
+              <RotateTransform Angle="-90" />
+            </TransformGroup>
+          </ContentPresenter.LayoutTransform>
+        </ContentPresenter>
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
+    <UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
+  </ItemsPanelTemplate>
+  <ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
+    <UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
+  </ItemsPanelTemplate>
+  <ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
+    <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+  </ItemsPanelTemplate>
+  <ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
+    <StackPanel FocusVisualStyle="{x:Null}" />
+  </ItemsPanelTemplate>
+  <tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
+  <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
+    <GradientStop Color="#00FFFFFF" Offset="0" />
+    <GradientStop Color="#60FFFFFF" Offset="0.4" />
+    <GradientStop Color="#60FFFFFF" Offset="0.6" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+  </LinearGradientBrush>
+  <ControlTemplate x:Key="CircleProgressBarTemplate" TargetType="hc:CircleProgressBar">
+    <hc:SimplePanel x:Name="TemplateRoot">
+      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
+      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="PART_Indicator" Fill="{TemplateBinding Foreground}" />
+      <TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
+    <GradientStop Color="#FFFFFF" Offset="0.3" />
+    <GradientStop Color="#BBC5D7" Offset="0.75" />
+    <GradientStop Color="#6D83A9" Offset="1" />
+  </LinearGradientBrush>
+  <SineEase x:Key="SineEaseOut" EasingMode="EaseOut" />
+  <ControlTemplate x:Key="BadgeDotTemplate" TargetType="hc:Badge">
+    <hc:SimplePanel>
+      <ContentPresenter />
+      <Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <Style x:Key="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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ColorPickerSliderThumbTemplate" TargetType="Thumb">
+    <Border Width="13" Height="13" Background="White" CornerRadius="6.5" />
+  </ControlTemplate>
+  <LinearGradientBrush x:Key="ColorPickerRainbowBrush">
+    <GradientStop Color="#ff0000" />
+    <GradientStop Color="#ff00ff" Offset="0.167" />
+    <GradientStop Color="#0000ff" Offset="0.334" />
+    <GradientStop Color="#00ffff" Offset="0.501" />
+    <GradientStop Color="#00ff00" Offset="0.668" />
+    <GradientStop Color="#ffff00" Offset="0.835" />
+    <GradientStop Color="#ff0000" Offset="1" />
+  </LinearGradientBrush>
+  <DrawingBrush x:Key="ColorPickerOpacityBrush" Viewport="0,0,12,11" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+    <DrawingBrush.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing Brush="#d0cec7">
+          <GeometryDrawing.Geometry>
+            <GeometryGroup>
+              <RectangleGeometry Rect="0,0,6,5" />
+              <RectangleGeometry Rect="6,6,6,5" />
+            </GeometryGroup>
+          </GeometryDrawing.Geometry>
+        </GeometryDrawing>
+        <GeometryDrawing Brush="#e7e7e2">
+          <GeometryDrawing.Geometry>
+            <RectangleGeometry Rect="0,5,12,1" />
+          </GeometryDrawing.Geometry>
+        </GeometryDrawing>
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+  <Style x:Key="CoverFlowBaseStyle" TargetType="hc:CoverFlow">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CoverFlow">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Viewport3D x:Name="PART_Viewport3D">
+              <Viewport3D.Camera>
+                <PerspectiveCamera x:Name="PART_Camera" Position="0,0,3" UpDirection="0,1,0" LookDirection="0,0,-1" FieldOfView="90" />
+              </Viewport3D.Camera>
+              <Viewport3D.Children>
+                <ModelVisual3D>
+                  <ModelVisual3D.Content>
+                    <DirectionalLight Color="White" Direction="1,0,-4" />
+                  </ModelVisual3D.Content>
+                </ModelVisual3D>
+                <ModelVisual3D>
+                  <ModelVisual3D.Content>
+                    <DirectionalLight Color="White" Direction="-1,0,-4" />
+                  </ModelVisual3D.Content>
+                </ModelVisual3D>
+                <ModelVisual3D x:Name="PART_VisualParent" />
+              </Viewport3D.Children>
+            </Viewport3D>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CoverViewItemBaseStyle" TargetType="hc:CoverViewItem">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CoverViewItem">
+          <Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{TemplateBinding Padding}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
+    <Setter Property="Canvas.Right" Value="-9" />
+    <Setter Property="Width" Value="18" />
+    <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <Border Background="Transparent" Padding="{TemplateBinding Padding}">
+            <Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">
+    <DrawingBrush.Drawing>
+      <DrawingGroup o:Freeze="True">
+        <GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0.9999,-0.000199999999999534L0.9999,15.9998 10.9999,15.9998 10.9999,13.4148 11.9999,14.4138 15.9999,10.4138 15.9999,5.5858 14.0009,7.5858 14.0009,3.0008 10.9999,3.0008 10.9999,-0.000199999999999534z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M10,12.4141L10,15.0001 2,15.0001 2,1.0001 10,1.0001 10,3.0001 10,7.5861 8.414,6.0001 9,6.0001 9,3.0001 3,3.0001 3,6.0001 8,6.0001 8,7.0001 3,7.0001 3,10.0001 8,10.0001 8,10.4141 8.586,11.0001 3,11.0001 3,14.0001 9,14.0001 9,11.4141z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M8.5859,11L2.9999,11 2.9999,14 8.9999,14 8.9999,11.414z M7.9999,7L2.9999,7 2.9999,10 7.9999,10z M7.9999,6L2.9999,6 2.9999,3 8.9999,3 8.9999,6 8.4139,6 7.9999,5.586z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M13,10L13,4 11,4 11,10 9,8 9,10 12,13 15,10 15,8z" />
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+  <DrawingBrush x:Key="SortByNameDrawingBrush" o:Freeze="True">
+    <DrawingBrush.Drawing>
+      <DrawingGroup o:Freeze="True">
+        <GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
+        <GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+  <ContextMenu x:Key="TabItemMenu" x:Shared="False">
+    <MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
+    <MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
+    <MenuItem Command="interactivity:ControlCommands.CloseOther" Header="{x:Static langs:Lang.CloseOther}" />
+  </ContextMenu>
+  <Style x:Key="ToolBarTrayBaseStyle" TargetType="ToolBarTray">
+    <Setter Property="Background" Value="Transparent" />
+  </Style>
+  <PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z" />
+  <Style x:Key="RowHeaderGripperStyle" TargetType="Thumb">
+    <Setter Property="Height" Value="8" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Cursor" Value="SizeNS" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
+    <Setter Property="Width" Value="8" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Cursor" Value="SizeWE" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
+    <Setter Property="Focusable" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ComboBox">
+          <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
+    <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+  </Style>
+  <Style x:Key="CarouselItemBaseStyle" TargetType="hc:CarouselItem">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CarouselItem">
+          <Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:Carousel}}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:GrowlWindow">
+    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+    <Setter Property="Width" Value="340" />
+    <Setter Property="MaxWidth" Value="340" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="ShowActivated" Value="False" />
+    <Setter Property="ShowInTaskbar" Value="False" />
+    <Setter Property="Topmost" Value="True" />
+  </Style>
+  <Style x:Key="ListBoxItemCustom" TargetType="ListBoxItem">
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
+    <Setter Property="VerticalContentAlignment" Value="Top" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBoxItem">
+          <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
+  <hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
+  <hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
+  <SolidColorBrush o:Freeze="True" x:Key="LightPrimaryBrush" Color="{DynamicResource LightPrimaryColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource PrimaryColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource DarkPrimaryColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="BorderBrush" Color="{DynamicResource BorderColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="RegionBrush" Color="{DynamicResource RegionColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource TitleColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource SecondaryTitleColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="LightDangerBrush" Color="{DynamicResource LightDangerColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource DangerColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource DarkDangerColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="LightWarningBrush" Color="{DynamicResource LightWarningColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource WarningColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource DarkWarningColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="LightInfoBrush" Color="{DynamicResource LightInfoColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource InfoColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource DarkInfoColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="LightSuccessBrush" Color="{DynamicResource LightSuccessColor}" />
+  <LinearGradientBrush o:Freeze="True" x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
+    <GradientStop o:Freeze="True" Color="{DynamicResource SuccessColor}" Offset="0" />
+    <GradientStop o:Freeze="True" Color="{DynamicResource DarkSuccessColor}" Offset="1" />
+  </LinearGradientBrush>
+  <SolidColorBrush o:Freeze="True" x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="AccentBrush" Color="{DynamicResource AccentColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}" />
+  <SolidColorBrush o:Freeze="True" x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}" />
+  <DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+  <DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+  <DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+  <DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+  <DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+  <Style x:Key="SearchPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource SearchGeometry}" />
+  </Style>
+  <Style x:Key="FullScreenReturnPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource FullScreenReturnGeometry}" />
+  </Style>
+  <Style x:Key="FullScreenPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource FullScreenGeometry}" />
+  </Style>
+  <Style x:Key="WindowsPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource WindowsGeometry}" />
+  </Style>
+  <Style x:Key="SavePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource SaveGeometry}" />
+  </Style>
+  <Style x:Key="DownloadPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource DownloadGeometry}" />
+  </Style>
+  <Style x:Key="EnlargePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource EnlargeGeometry}" />
+  </Style>
+  <Style x:Key="ReducePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource ReduceGeometry}" />
+  </Style>
+  <Style x:Key="RotatePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource RotateLeftGeometry}" />
+  </Style>
+  <Style x:Key="CalendarPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource CalendarGeometry}" />
+  </Style>
+  <Style x:Key="DeletePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource DeleteGeometry}" />
+  </Style>
+  <Style x:Key="ClosePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource CloseGeometry}" />
+  </Style>
+  <Style x:Key="DownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource DownGeometry}" />
+  </Style>
+  <Style x:Key="ClockPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource ClockGeometry}" />
+  </Style>
+  <Style x:Key="LeftPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource LeftGeometry}" />
+  </Style>
+  <Style x:Key="RightPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="RenderTransformOrigin" Value="0.5, 0.5" />
+    <Setter Property="RenderTransform">
+      <Setter.Value>
+        <TransformGroup>
+          <ScaleTransform ScaleY="1" ScaleX="-1" />
+          <SkewTransform AngleY="0" AngleX="0" />
+          <RotateTransform Angle="0" />
+          <TranslateTransform />
+        </TransformGroup>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Data" Value="{StaticResource LeftGeometry}" />
+  </Style>
+  <Style x:Key="UpDownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+    <Setter Property="Data" Value="{StaticResource UpDownGeometry}" />
+  </Style>
+  <Style x:Key="BorderRegion" TargetType="Border">
+    <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="10" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+  </Style>
+  <Style x:Key="BorderTipBaseStyle" TargetType="Border">
+    <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="10" />
+    <Setter Property="BorderThickness" Value="5,0,0,0" />
+  </Style>
+  <Style x:Key="BorderTipPrimary" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource LightPrimaryBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="BorderTipDanger" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource LightDangerBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="BorderTipWarning" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource LightWarningBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="BorderTipInfo" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource LightInfoBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="BorderTipSuccess" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+    <Setter Property="Background" Value="{DynamicResource LightSuccessBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="BorderVerticallySplitter" TargetType="Border">
+    <Setter Property="Width" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
+  </Style>
+  <Style x:Key="BorderHorizontallySplitter" TargetType="Border">
+    <Setter Property="Height" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
+  </Style>
+  <Style x:Key="BorderClip" TargetType="Border">
+    <Setter Property="Clip">
+      <Setter.Value>
+        <MultiBinding Converter="{StaticResource BorderClipConverter}">
+          <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+          <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+          <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
+        </MultiBinding>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="BorderCircularClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
+    <Setter Property="Clip">
+      <Setter.Value>
+        <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
+          <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+          <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+          <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
+        </MultiBinding>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:FlipNumber">
+    <Setter Property="FontSize" Value="70" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="Width" Value="120" />
+    <Setter Property="Height" Value="180" />
+    <Setter Property="Camera">
+      <Setter.Value>
+        <PerspectiveCamera Position="0 0 120" LookDirection="0 0 -1" />
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RectangleFocusVisual" TargetType="Rectangle">
+    <Setter Property="Margin" Value="-2" />
+    <Setter Property="Opacity" Value=".6" />
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Stroke" Value="{DynamicResource SecondaryBorderBrush}" />
+    <Setter Property="StrokeThickness" Value="2" />
+    <Setter Property="StrokeDashArray" Value="1 1" />
+  </Style>
+  <Style x:Key="RectangleFocusVisualCircular" BasedOn="{StaticResource RectangleFocusVisual}" TargetType="Rectangle">
+    <Setter Property="hc:RectangleAttach.Circular" Value="True" />
+  </Style>
+  <Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="Padding" Value="2,7" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TextBoxBase">
+          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="border" Value="0.4" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
+    <Setter Property="MinWidth" Value="10" />
+  </Style>
+  <Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox" />
+  <Style x:Key="MaskRect4ScreenshotStyle" TargetType="Rectangle">
+    <Setter Property="IsHitTestVisible" Value="False" />
+    <Setter Property="Fill" Value="{DynamicResource DarkOpacityBrush}" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+  </Style>
+  <Style x:Key="Window4ScreenshotStyle" TargetType="hc:ScreenshotWindow">
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="WindowStyle" Value="None" />
+    <Setter Property="WindowState" Value="Maximized" />
+    <Setter Property="Topmost" Value="True" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ScreenshotWindow">
+          <AdornerDecorator>
+            <hc:SimplePanel>
+              <InkCanvas EditingMode="None" Name="PART_Canvas" Background="Transparent" />
+              <Rectangle Name="PART_MaskAreaLeft" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+              <Rectangle Name="PART_MaskAreaTop" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+              <Rectangle Name="PART_MaskAreaRight" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+              <Rectangle Name="PART_MaskAreaBottom" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+              <Border Name="PART_TargetArea" Style="{StaticResource TargetArea4ScreenshotStyle}">
+                <hc:SimplePanel>
+                  <Rectangle hc:TipElement.Placement="LeftTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="Top" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="RightTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="Right" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="RightBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="Bottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="LeftBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <Rectangle hc:TipElement.Placement="Left" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+                  <TextBlock Text="{TemplateBinding SizeStr}" Background="#CC212121" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="8,2" />
+                </hc:SimplePanel>
+              </Border>
+              <Border x:Name="PART_Magnifier" IsHitTestVisible="False" Visibility="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Top" Width="122" Height="122" BorderThickness="1" BorderBrush="#FF333333" CornerRadius="1">
+                <Border.Effect>
+                  <DropShadowEffect BlurRadius="2" Opacity=".2" Direction="-45" RenderingBias="Performance" ShadowDepth="3" />
+                </Border.Effect>
+                <hc:SimplePanel>
+                  <Border Margin="0,0,0,32" Background="{TemplateBinding PreviewBrush}" BorderThickness="2" BorderBrush="White">
+                    <hc:SimplePanel>
+                      <Path Data="M56,0 L60,0 60,40 116,40 116,44 60,44 60,84 56,84 56,44 0,44 0,40 56,40 z" Fill="#CC4CC6FF" />
+                    </hc:SimplePanel>
+                  </Border>
+                  <Border Height="32" VerticalAlignment="Bottom" Background="#CC000000">
+                    <StackPanel VerticalAlignment="Center" Margin="5,0,0,0">
+                      <TextBlock Foreground="White" Text="{TemplateBinding SizeStr}" />
+                    </StackPanel>
+                  </Border>
+                </hc:SimplePanel>
+              </Border>
+            </hc:SimplePanel>
+          </AdornerDecorator>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FocusVisual">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Style="{StaticResource RectangleFocusVisual}" RadiusX="4" RadiusY="4" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FocusVisualRadius0">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Style="{StaticResource RectangleFocusVisual}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FocusVisualMargin0">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FocusVisualRadius0Margin0">
+    <Setter Property="Control.Template">
+      <Setter.Value>
+        <ControlTemplate>
+          <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="BaseStyle" TargetType="Control">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+  </Style>
+  <Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ButtonBase">
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+  </Style>
+  <Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <hc:SimplePanel>
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </StackPanel>
+            </Border>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </hc:DashedBorder>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+        <Setter Property="Margin" Value="0,-1,0,0" />
+      </DataTrigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TextBlockBaseStyle" TargetType="TextBlock">
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+  </Style>
+  <Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontWeight" Value="Bold" />
+  </Style>
+  <Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
+    <Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style x:Key="LabelBaseStyle" TargetType="Label">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Label">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="SliderThumb" TargetType="Thumb">
+    <hc:AxleCanvas>
+      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CompareSliderThumbHorizontal" TargetType="Thumb">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="Storyboard1">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
+          <EasingDoubleKeyFrame KeyTime="0" Value="-2" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
+          <EasingDoubleKeyFrame KeyTime="0" Value="2" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="Storyboard2">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
+          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
+          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <hc:SimplePanel>
+      <Border Width="1" HorizontalAlignment="Center">
+        <Border.Background>
+          <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+            <DrawingBrush.Drawing>
+              <DrawingGroup>
+                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
+                  <GeometryDrawing.Geometry>
+                    <GeometryGroup>
+                      <RectangleGeometry Rect="0,0,1,4" />
+                    </GeometryGroup>
+                  </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+              </DrawingGroup>
+            </DrawingBrush.Drawing>
+          </DrawingBrush>
+        </Border.Background>
+      </Border>
+      <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+        <hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
+          <Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+              <TransformGroup>
+                <TranslateTransform />
+              </TransformGroup>
+            </Path.RenderTransform>
+          </Path>
+          <Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+              <TransformGroup>
+                <TranslateTransform />
+              </TransformGroup>
+            </Path.RenderTransform>
+          </Path>
+        </hc:SimplePanel>
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Stroke" TargetName="PathLeft" Value="White" />
+        <Setter Property="Stroke" TargetName="PathRight" Value="White" />
+      </Trigger>
+      <Trigger Property="IsDragging" Value="true">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
+    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+      <hc:CompareTrack x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+            <ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
+          </RepeatButton>
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+            <ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
+          </RepeatButton>
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
+        </Track.Thumb>
+      </hc:CompareTrack>
+    </Border>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CompareSliderThumbVertical" TargetType="Thumb">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="Storyboard1">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
+          <EasingDoubleKeyFrame KeyTime="0" Value="-2" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
+          <EasingDoubleKeyFrame KeyTime="0" Value="2" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="Storyboard2">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
+          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
+          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <hc:SimplePanel>
+      <Border Height="1" VerticalAlignment="Center">
+        <Border.Background>
+          <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+            <DrawingBrush.Drawing>
+              <DrawingGroup>
+                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
+                  <GeometryDrawing.Geometry>
+                    <GeometryGroup>
+                      <RectangleGeometry Rect="0,0,4,1" />
+                    </GeometryGroup>
+                  </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+              </DrawingGroup>
+            </DrawingBrush.Drawing>
+          </DrawingBrush>
+        </Border.Background>
+      </Border>
+      <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+        <hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
+          <Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+              <TransformGroup>
+                <TranslateTransform />
+              </TransformGroup>
+            </Path.RenderTransform>
+          </Path>
+          <Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+              <TransformGroup>
+                <TranslateTransform />
+              </TransformGroup>
+            </Path.RenderTransform>
+          </Path>
+        </hc:SimplePanel>
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="grip">
+        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Stroke" TargetName="PathUp" Value="White" />
+        <Setter Property="Stroke" TargetName="PathDown" Value="White" />
+      </Trigger>
+      <Trigger Property="IsDragging" Value="true">
+        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Stroke" TargetName="PathUp" Value="White" />
+        <Setter Property="Stroke" TargetName="PathDown" Value="White" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
+    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+      <hc:CompareTrack x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+            <ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
+          </RepeatButton>
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+            <ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
+          </RepeatButton>
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
+        </Track.Thumb>
+      </hc:CompareTrack>
+    </Border>
+  </ControlTemplate>
+  <Style x:Key="CompareSliderBaseStyle" TargetType="hc:CompareSlider">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="MinWidth" Value="30" />
+    <Setter Property="MinHeight" Value="30" />
+    <Setter Property="Template" Value="{StaticResource CompareSliderHorizontal}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource CompareSliderVertical}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="PreviewSliderThumb" TargetType="Thumb">
+    <Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="PreviewSliderHorizontal" TargetType="hc:PreviewSlider">
+    <hc:SimplePanel>
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Height="2" VerticalAlignment="center" Margin="9,0" />
+      <Track VerticalAlignment="center" Margin="9,0" x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb Margin="-9,0" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" VerticalAlignment="Center" Width="18" />
+        </Track.Thumb>
+      </Track>
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <ControlTemplate x:Key="PreviewSliderVertical" TargetType="hc:PreviewSlider">
+    <hc:SimplePanel>
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Width="2" HorizontalAlignment="center" Margin="0,9" />
+      <Track HorizontalAlignment="center" Margin="0,9" x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb Margin="0,-9" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" HorizontalAlignment="Center" Width="18" />
+        </Track.Thumb>
+      </Track>
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <Style x:Key="PreviewSliderBaseStyle" TargetType="hc:PreviewSlider">
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="IsMoveToPointEnabled" Value="True" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template" Value="{StaticResource PreviewSliderHorizontal}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource PreviewSliderVertical}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="RangeSliderThumb" TargetType="hc:RangeThumb">
+    <Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <hc:SimplePanel>
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </StackPanel>
+            </Border>
+            <Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+              <Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="6,0,0,0" />
+    <Setter Property="Width" Value="36" />
+    <Setter Property="Height" Value="22" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardChecked">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="14">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardUnChecked">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Viewbox>
+            <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+              <Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11" />
+              <Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+              <Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
+                <Border.RenderTransform>
+                  <TransformGroup>
+                    <ScaleTransform />
+                  </TransformGroup>
+                </Border.RenderTransform>
+              </Border>
+              <hc:SimplePanel Grid.Column="0" Margin="1">
+                <Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
+                  <Border.RenderTransform>
+                    <TransformGroup>
+                      <TranslateTransform />
+                    </TransformGroup>
+                  </Border.RenderTransform>
+                </Border>
+              </hc:SimplePanel>
+              <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Grid>
+          </Viewbox>
+          <ControlTemplate.Triggers>
+            <Trigger Property="HasContent" Value="true">
+              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
+              </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="8" />
+    <Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
+    <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <hc:SimplePanel>
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+              </ContentControl>
+            </Border>
+            <Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsChecked" Value="True">
+        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+      </Trigger>
+      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+        <Setter Property="Margin" Value="0,-1,0,0" />
+      </DataTrigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ScrollBarBaseThumbVertical" TargetType="Thumb">
+    <Setter Property="OverridesDefaultStyle" Value="true" />
+    <Setter Property="IsTabStop" Value="false" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardMouseEnter">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardMouseLeave">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Border Width="{TemplateBinding Width}" Background="Transparent">
+            <Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" HorizontalAlignment="Right" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="2" Fill="{TemplateBinding Background}">
+              <Rectangle.RenderTransform>
+                <TransformGroup>
+                  <TranslateTransform X="-2" />
+                </TransformGroup>
+              </Rectangle.RenderTransform>
+            </Rectangle>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
+            </Trigger>
+            <Trigger Property="IsDragging" Value="true">
+              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
+            </Trigger>
+            <EventTrigger RoutedEvent="MouseEnter">
+              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
+            </EventTrigger>
+            <EventTrigger RoutedEvent="MouseLeave">
+              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ScrollBarBaseThumbHorizontal" TargetType="Thumb">
+    <Setter Property="OverridesDefaultStyle" Value="true" />
+    <Setter Property="IsTabStop" Value="false" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardMouseEnter">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardMouseLeave">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Border Height="{TemplateBinding Height}" Background="Transparent">
+            <Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" VerticalAlignment="Bottom" Height="2" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" Fill="{TemplateBinding Background}">
+              <Rectangle.RenderTransform>
+                <TransformGroup>
+                  <TranslateTransform Y="-2" />
+                </TransformGroup>
+              </Rectangle.RenderTransform>
+            </Rectangle>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
+            </Trigger>
+            <Trigger Property="IsDragging" Value="true">
+              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
+            </Trigger>
+            <EventTrigger RoutedEvent="MouseEnter">
+              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
+            </EventTrigger>
+            <EventTrigger RoutedEvent="MouseLeave">
+              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ScrollBarBaseStyle" TargetType="ScrollBar">
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Width" Value="8" />
+    <Setter Property="MinWidth" Value="8" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ScrollBar">
+          <hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
+            <Border Background="{TemplateBinding Background}" />
+            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
+              <Track.DecreaseRepeatButton>
+                <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+              </Track.DecreaseRepeatButton>
+              <Track.IncreaseRepeatButton>
+                <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+              </Track.IncreaseRepeatButton>
+              <Track.Thumb>
+                <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbVertical}" />
+              </Track.Thumb>
+            </Track>
+          </hc:SimplePanel>
+        </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="8" />
+        <Setter Property="MinHeight" Value="8" />
+        <Setter Property="BorderThickness" Value="0,1" />
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="ScrollBar">
+              <hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
+                <Border Background="{TemplateBinding Background}" />
+                <Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
+                  <Track.DecreaseRepeatButton>
+                    <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+                  </Track.DecreaseRepeatButton>
+                  <Track.IncreaseRepeatButton>
+                    <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+                  </Track.IncreaseRepeatButton>
+                  <Track.Thumb>
+                    <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbHorizontal}" />
+                  </Track.Thumb>
+                </Track>
+              </hc:SimplePanel>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardMouseOver">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="StoryboardCommon">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardMouseOver">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="StoryboardCommon">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
+    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
+        <Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardMouseOver">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="StoryboardCommon">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+      <ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+      <ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardMouseOver">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+      <Storyboard x:Key="StoryboardCommon">
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+        </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
+    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
+        <Setter Property="Template" Value="{StaticResource ScrollViewerBaseControlTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RepeatButton">
+          <hc:SimplePanel>
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </StackPanel>
+            </Border>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RepeatButtonDashedBaseStyle" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RepeatButton">
+          <hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </hc:DashedBorder>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="GroupBoxBaseStyle" TargetType="GroupBox">
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="hc:TitleElement.TitlePlacement" Value="Top" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="4" />
+    <Setter Property="Template" Value="{StaticResource GroupBoxBaseTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource GroupBoxBaseLeftTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="GroupBoxOriginalTopTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <StackPanel Orientation="Horizontal" Margin="8,6">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+      </StackPanel>
+      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <ControlTemplate x:Key="GroupBoxOriginalLeftTemplate" TargetType="GroupBox">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <StackPanel Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8">
+        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+      </StackPanel>
+      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+      </Border>
+    </Grid>
+  </ControlTemplate>
+  <Style x:Key="GroupBoxOriginalBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="VerticalContentAlignment" Value="Top" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Template" Value="{StaticResource GroupBoxOriginalTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource GroupBoxOriginalLeftTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="GroupBoxTabBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+    <Setter Property="Template" Value="{StaticResource GroupBoxTabTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource GroupBoxTabLeftTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
+    <Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Layout" Value="Uniform" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
+    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="Layout" Value="Uniform" />
+          <Condition Property="Orientation" Value="Vertical" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="Layout" Value="Stack" />
+          <Condition Property="Orientation" Value="Horizontal" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="Layout" Value="Stack" />
+          <Condition Property="Orientation" Value="Vertical" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
+    <Setter Property="hc:VisualElement.Text">
+      <Setter.Value>
+        <MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0:F0} %">
+          <Binding Path="Value" RelativeSource="{RelativeSource Self}" />
+          <Binding Path="Maximum" RelativeSource="{RelativeSource Self}" />
+        </MultiBinding>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Height" Value="20" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ProgressBar">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+                <EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
+                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
+                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
+              </DoubleAnimationUsingKeyFrames>
+              <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
+                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
+                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
+              </PointAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <hc:SimplePanel>
+              <Rectangle x:Name="PART_Track" />
+              <TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+              <Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
+                <hc:SimplePanel>
+                  <Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
+                    <Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
+                      <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+                    </Border>
+                  </Border>
+                  <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
+                  <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+                    <Rectangle.RenderTransform>
+                      <TransformGroup>
+                        <ScaleTransform />
+                      </TransformGroup>
+                    </Rectangle.RenderTransform>
+                  </Rectangle>
+                </hc:SimplePanel>
+              </Border>
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Orientation" Value="Vertical">
+              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                <Setter.Value>
+                  <RotateTransform Angle="-90" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <Trigger Property="IsIndeterminate" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+              </Trigger.EnterActions>
+              <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
+              <Setter Property="Visibility" TargetName="PART_GlowRect" Value="Collapsed" />
+              <Setter Property="Visibility" TargetName="Animation" Value="Visible" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ProgressBar">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="OnLoaded">
+              <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
+                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
+                <LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+            <Rectangle x:Name="PART_Track" />
+            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+              <Border x:Name="Indicator" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}" />
+            </Decorator>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Orientation" Value="Vertical">
+              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                <Setter.Value>
+                  <RotateTransform Angle="-90" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+            <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
+              <BeginStoryboard Storyboard="{StaticResource OnLoaded}" />
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="CircleProgressBarIndeterminateTemplate" TargetType="hc:CircleProgressBar">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+        <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="TemplateRoot">
+          <LinearDoubleKeyFrame KeyTime="0:0:1.568" Value="360" />
+        </DoubleAnimationUsingKeyFrames>
+        <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="arc">
+          <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.TargetProperty="(shapes:Arc.StartAngle)" Storyboard.TargetName="arc">
+          <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.TargetProperty="(shapes:Arc.EndAngle)" Storyboard.TargetName="arc">
+          <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>
+    <hc:SimplePanel x:Name="TemplateRoot" RenderTransformOrigin="0.5,0.5">
+      <hc:SimplePanel.RenderTransform>
+        <TransformGroup>
+          <RotateTransform />
+        </TransformGroup>
+      </hc:SimplePanel.RenderTransform>
+      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
+      <shapes:Arc RenderTransformOrigin="0.5,0.5" StartAngle="-5" EndAngle="5" ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="arc" Fill="{TemplateBinding Foreground}">
+        <shapes:Arc.RenderTransform>
+          <TransformGroup>
+            <RotateTransform />
+          </TransformGroup>
+        </shapes:Arc.RenderTransform>
+      </shapes:Arc>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsIndeterminate" Value="true">
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+        </Trigger.EnterActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ProgressBarCircleBaseStyle" TargetType="hc:CircleProgressBar">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Height" Value="100" />
+    <Setter Property="Width" Value="100" />
+    <Setter Property="ArcThickness" Value="4" />
+    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
+    <Setter Property="Template" Value="{StaticResource CircleProgressBarTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="IsIndeterminate" Value="True">
+        <Setter Property="Template" Value="{StaticResource CircleProgressBarIndeterminateTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ProgressBarWaveBaseStyle" TargetType="hc:WaveProgressBar">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Width" Value="100" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:WaveProgressBar">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardOnLoaded" RepeatBehavior="Forever">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PART_Wave">
+                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="-400" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <StackPanel>
+            <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+              <Viewbox>
+                <Border x:Name="PART_Clip" Style="{StaticResource BorderCircularClip}" CornerRadius="100" Width="200" Height="200">
+                  <Path x:Name="PART_Wave" Stroke="{TemplateBinding WaveStroke}" StrokeThickness="{TemplateBinding WaveThickness}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="250" Fill="{TemplateBinding WaveFill}" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Margin="0,0,-400,-20">
+                    <Path.Data>
+                      <PathGeometry>
+                        <PathFigure StartPoint="0,1">
+                          <PolyBezierSegment Points="0.5,1 0.5,0 1,0" />
+                          <PolyBezierSegment Points="1.5,0 1.5,1 2,1" />
+                          <PolyBezierSegment Points="2.5,1 2.5,0 3,0" />
+                          <PolyLineSegment Points="3,0 3,10, 0,10 0,1" />
+                        </PathFigure>
+                      </PathGeometry>
+                    </Path.Data>
+                  </Path>
+                </Border>
+              </Viewbox>
+            </Border>
+            <TextBlock Margin="0,10,0,0" Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
+          </StackPanel>
+          <ControlTemplate.Triggers>
+            <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="PART_Wave">
+              <BeginStoryboard Name="BeginStoryboardWave" Storyboard="{StaticResource StoryboardOnLoaded}" />
+            </EventTrigger>
+            <EventTrigger RoutedEvent="FrameworkElement.Unloaded" SourceName="PART_Wave">
+              <StopStoryboard BeginStoryboardName="BeginStoryboardWave" />
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Background" Value="White" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="6,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="CheckBox">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardCheckedTrue">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardCheckedFalse">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="8" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Border Height="16" Width="16" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+            <hc:SimplePanel Grid.Column="0" Height="16" Width="16" x:Name="markGrid">
+              <Path FlowDirection="LeftToRight" UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+              <Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0" />
+            </hc:SimplePanel>
+            <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="HasContent" Value="true">
+              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked" Value="true" />
+                <Condition Property="IsPressed" Value="true" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Opacity" Value=".8" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked" Value="false" />
+                <Condition Property="IsPressed" Value="true" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
+              </Trigger.ExitActions>
+              <Setter Property="Opacity" TargetName="indeterminateMark" Value="0" />
+              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="false">
+              <Setter Property="Stroke" Value="{DynamicResource BorderBrush}" TargetName="path" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="{x:Null}">
+              <Setter Property="Opacity" TargetName="indeterminateMark" Value="1" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RadioButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="6,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RadioButton">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardCheckedTrue">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardCheckedFalse">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Border Height="18" Width="18" x:Name="radioButtonBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="100" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <Ellipse x:Name="optionMark" Fill="White" MinWidth="6" MinHeight="6" RenderTransformOrigin="0.5,0.5">
+                <Ellipse.RenderTransform>
+                  <TransformGroup>
+                    <ScaleTransform />
+                  </TransformGroup>
+                </Ellipse.RenderTransform>
+              </Ellipse>
+            </Border>
+            <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="HasContent" Value="true">
+              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked" Value="true" />
+                <Condition Property="IsPressed" Value="true" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Opacity" Value=".8" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsChecked" Value="false" />
+                <Condition Property="IsPressed" Value="true" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
+              </Trigger.ExitActions>
+              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RadioButton">
+          <hc:SimplePanel>
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </StackPanel>
+            </Border>
+            <Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+              <Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="hc:IconElement.Width" Value="16" />
+    <Setter Property="hc:IconElement.Height" Value="16" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RadioButton">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Border Name="BorderHighlight" BorderThickness="3,0,0,0" BorderBrush="Transparent">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                <Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </StackPanel>
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderHighlight" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RadioGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="hc:IconElement.Width" Value="16" />
+    <Setter Property="hc:IconElement.Height" Value="16" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RadioButton">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{Binding Path=(TextElement.Foreground),ElementName=contentPresenter}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsChecked" Value="True">
+        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+      </Trigger>
+      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+        <Setter Property="Margin" Value="0,-1,0,0" />
+      </DataTrigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
+  <Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+            </ContentControl>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Padding" Value="6" />
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+            </ContentControl>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ButtonIconCircular.Small" BasedOn="{StaticResource ButtonIconCircular}" TargetType="Button">
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="1" />
+  </Style>
+  <Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Button">
+          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ButtonGroupItemDefault" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button" />
+  <Style x:Key="ButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ButtonGroupItemHorizontalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+  </Style>
+  <Style x:Key="ButtonGroupItemSingle" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+  </Style>
+  <Style x:Key="ButtonGroupItemVerticalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ButtonGroupItemVerticalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+  </Style>
+  <Style x:Key="TextBlockDefault" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock" />
+  <Style x:Key="TextBlockDefaultAccent" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource AccentBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultPrimary" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultDanger" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultWarning" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultInfo" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultSuccess" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultSecLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultThiLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+  </Style>
+  <Style x:Key="TextBlockLarge" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockSubTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockLargeBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockSubTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+    <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
+  </Style>
+  <Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
+  <Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
+  <Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+  </Style>
+  <Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
+  <Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
+  <Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
+  <Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+              <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+            </ContentControl>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
+  <Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Height" Value="30" />
+    <Setter Property="Width" Value="30" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="StoryboardChecked">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="StoryboardUnChecked">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
+                  <EasingDoubleKeyFrame.EasingFunction>
+                    <PowerEase EasingMode="EaseOut" />
+                  </EasingDoubleKeyFrame.EasingFunction>
+                </EasingDoubleKeyFrame>
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Viewbox>
+            <hc:SimplePanel Height="28" Width="28">
+              <Border Name="UnCheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                <Border.RenderTransform>
+                  <TransformGroup>
+                    <ScaleTransform ScaleX="1" />
+                  </TransformGroup>
+                </Border.RenderTransform>
+                <ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </Border>
+              <Border Name="CheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                <Border.RenderTransform>
+                  <TransformGroup>
+                    <ScaleTransform ScaleX="0" />
+                  </TransformGroup>
+                </Border.RenderTransform>
+                <ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+              </Border>
+            </hc:SimplePanel>
+          </Viewbox>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
+              </Trigger.ExitActions>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <hc:SimplePanel>
+              <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+                <Condition Property="IsChecked" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemDefault" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton" />
+  <Style x:Key="ToggleButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemHorizontalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemSingle" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemVerticalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ToggleButtonGroupItemVerticalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+  </Style>
+  <Style x:Key="ToggleButtonLoadingPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+              <hc:SimplePanel>
+                <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+              </hc:SimplePanel>
+              <Viewbox Margin="0,4">
+                <hc:LoadingCircle x:Name="Loading" Width="22" Height="22" Foreground="{TemplateBinding Foreground}" DotDiameter="3" IsRunning="{TemplateBinding IsChecked}" Visibility="Collapsed" />
+              </Viewbox>
+            </StackPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Visibility" Value="Visible" TargetName="Loading" />
+              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+                <Condition Property="IsChecked" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToggleButtonLoading" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToggleButtonLoadingSuccess" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonLoadingInfo" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonLoadingWarning" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ToggleButtonLoadingDanger" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
+  <Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RepeatButton">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+            </ContentControl>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RepeatButton">
+          <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+            </ContentControl>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RepeatButtonIconCircular.Small" BasedOn="{StaticResource RepeatButtonIconCircular}" TargetType="RepeatButton">
+    <Setter Property="Width" Value="20" />
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RepeatButton">
+          <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer" />
+  <Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="hc:ScrollViewer" />
+  <Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+    <Setter Property="HorizontalAlignment" Value="Stretch" />
+    <Setter Property="Height" Value="10" />
+    <Setter Property="Padding" Value="0,2" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="ClickMode" Value="Hover" />
+  </Style>
+  <ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
+    <Grid x:Name="Grid" Background="{TemplateBinding Background}">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}">
+        <RepeatButton.Visibility>
+          <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+          </MultiBinding>
+        </RepeatButton.Visibility>
+      </RepeatButton>
+      <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1" />
+      <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}">
+        <RepeatButton.Visibility>
+          <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+          </MultiBinding>
+        </RepeatButton.Visibility>
+      </RepeatButton>
+    </Grid>
+  </ControlTemplate>
+  <Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
+    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
+  </Style>
+  <Style x:Key="CalendarButtonStyle" TargetType="CalendarButton">
+    <Setter Property="MinWidth" Value="10" />
+    <Setter Property="MinHeight" Value="10" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="Width" Value="40" />
+    <Setter Property="Height" Value="32" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="CalendarButton">
+          <hc:SimplePanel>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="SelectionStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="Unselected" />
+                <VisualState x:Name="Selected">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
+                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="ActiveStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="Active" />
+                <VisualState x:Name="Inactive">
+                  <Storyboard>
+                    <ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
+            <Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="16" RadiusX="16" />
+            <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <TextElement.Foreground>
+                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
+              </TextElement.Foreground>
+            </ContentPresenter>
+            <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+              <Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CalendarDayButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CalendarDayButton">
+    <Setter Property="MinWidth" Value="10" />
+    <Setter Property="MinHeight" Value="10" />
+    <Setter Property="Width" Value="32" />
+    <Setter Property="Height" Value="32" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="CalendarDayButton">
+          <hc:SimplePanel>
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0:0:0.1" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="Disabled">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="SelectionStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="Unselected" />
+                <VisualState x:Name="Selected">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
+                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="ActiveStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="Active" />
+                <VisualState x:Name="Inactive">
+                  <Storyboard>
+                    <ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+              <VisualStateGroup x:Name="DayStates">
+                <VisualStateGroup.Transitions>
+                  <VisualTransition GeneratedDuration="0" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="RegularDay" />
+                <VisualState x:Name="Today">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground" />
+                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Rectangle RadiusX="16" RadiusY="16" x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" />
+            <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
+            <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+              <TextElement.Foreground>
+                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
+              </TextElement.Foreground>
+            </ContentPresenter>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="CalendarItem">
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="CalendarItem">
+          <ControlTemplate.Resources>
+            <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+              <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center" />
+            </DataTemplate>
+          </ControlTemplate.Resources>
+          <hc:SimplePanel x:Name="PART_Root">
+            <VisualStateManager.VisualStateGroups>
+              <VisualStateGroup x:Name="CommonStates">
+                <VisualState x:Name="Normal" />
+                <VisualState x:Name="Disabled">
+                  <Storyboard>
+                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual" />
+                  </Storyboard>
+                </VisualState>
+              </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+              </Grid.RowDefinitions>
+              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" />
+              <Button x:Name="PART_PreviousButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource LeftGeometry}" />
+              <Button x:Name="PART_HeaderButton" Focusable="False" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}" />
+              <Button x:Name="PART_NextButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RightGeometry}" />
+              <Grid Width="240" Height="240" x:Name="PART_MonthView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Visible">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+              </Grid>
+              <Grid Width="240" Height="240" x:Name="PART_YearView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Hidden">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                  <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                  <RowDefinition />
+                  <RowDefinition />
+                  <RowDefinition />
+                </Grid.RowDefinitions>
+              </Grid>
+            </Grid>
+            <Rectangle x:Name="PART_DisabledVisual" Visibility="Collapsed" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
+              <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
+              <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Decade">
+              <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
+              <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
+            </DataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CalendarBaseStyle" TargetType="Calendar">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Language" Value="{Binding Lang,Source={x:Static tools:ConfigHelper.Instance}}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Margin" Value="8 0" />
+    <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}" />
+    <Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Calendar">
+          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+            <CalendarItem x:Name="PART_CalendarItem" Margin="{TemplateBinding BorderThickness}" />
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="Calendar" BasedOn="{StaticResource CalendarBaseStyle}" />
+  <Style BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock" />
+  <Style x:Key="ToggleBlockIcon" BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ToggleBlock">
+          <ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+            <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+          </ContentControl>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox" />
+  <Style x:Key="GroupBoxOriginal" BasedOn="{StaticResource GroupBoxOriginalBaseStyle}" TargetType="GroupBox" />
+  <Style x:Key="GroupBoxTab" BasedOn="{StaticResource GroupBoxTabBaseStyle}" TargetType="GroupBox" />
+  <Style BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup" />
+  <Style x:Key="ButtonGroupSolid" BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup">
+    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarSuccess" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarInfo" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarWarning" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarDanger" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground">
+      <Setter.Value>
+        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+          <DrawingBrush.Transform>
+            <TransformGroup>
+              <RotateTransform Angle="20" />
+              <TranslateTransform x:Name="MyTransform" X="0" />
+            </TransformGroup>
+          </DrawingBrush.Transform>
+          <DrawingBrush.Drawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0" />
+                  <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,20,32" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingBrush.Drawing>
+        </DrawingBrush>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground">
+      <Setter.Value>
+        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+          <DrawingBrush.Transform>
+            <TransformGroup>
+              <RotateTransform Angle="20" />
+              <TranslateTransform x:Name="MyTransform" X="0" />
+            </TransformGroup>
+          </DrawingBrush.Transform>
+          <DrawingBrush.Drawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0" />
+                  <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,20,32" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingBrush.Drawing>
+        </DrawingBrush>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground">
+      <Setter.Value>
+        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+          <DrawingBrush.Transform>
+            <TransformGroup>
+              <RotateTransform Angle="20" />
+              <TranslateTransform x:Name="MyTransform" X="0" />
+            </TransformGroup>
+          </DrawingBrush.Transform>
+          <DrawingBrush.Drawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0" />
+                  <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,20,32" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingBrush.Drawing>
+        </DrawingBrush>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground">
+      <Setter.Value>
+        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+          <DrawingBrush.Transform>
+            <TransformGroup>
+              <RotateTransform Angle="20" />
+              <TranslateTransform x:Name="MyTransform" X="0" />
+            </TransformGroup>
+          </DrawingBrush.Transform>
+          <DrawingBrush.Drawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0" />
+                  <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,20,32" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingBrush.Drawing>
+        </DrawingBrush>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+    <Setter Property="Foreground">
+      <Setter.Value>
+        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+          <DrawingBrush.Transform>
+            <TransformGroup>
+              <RotateTransform Angle="20" />
+              <TranslateTransform x:Name="MyTransform" X="0" />
+            </TransformGroup>
+          </DrawingBrush.Transform>
+          <DrawingBrush.Drawing>
+            <GeometryDrawing>
+              <GeometryDrawing.Brush>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0" />
+                  <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+                </LinearGradientBrush>
+              </GeometryDrawing.Brush>
+              <GeometryDrawing.Geometry>
+                <RectangleGeometry Rect="0,0,20,32" />
+              </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+          </DrawingBrush.Drawing>
+        </DrawingBrush>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarSuccessCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarInfoCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarWarningCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarDangerCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+    <Setter Property="WaveFill" Value="{DynamicResource DarkPrimaryBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarSuccessWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+    <Setter Property="WaveFill" Value="{DynamicResource DarkSuccessBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarInfoWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+    <Setter Property="WaveFill" Value="{DynamicResource DarkInfoBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarWarningWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+    <Setter Property="WaveFill" Value="{DynamicResource DarkWarningBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarDangerWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+    <Setter Property="WaveFill" Value="{DynamicResource DarkDangerBrush}" />
+  </Style>
+  <Style x:Key="ProgressBarFlat" TargetType="ProgressBar">
+    <Setter Property="Height" Value="4" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ProgressBar">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+                <EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
+                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
+                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
+              </DoubleAnimationUsingKeyFrames>
+              <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
+                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
+                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
+              </PointAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true" ClipToBounds="True">
+            <Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}" />
+            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+              <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" />
+            </Decorator>
+            <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+              <Rectangle.RenderTransform>
+                <TransformGroup>
+                  <ScaleTransform />
+                </TransformGroup>
+              </Rectangle.RenderTransform>
+            </Rectangle>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsIndeterminate" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+              </Trigger.EnterActions>
+              <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
+              <Setter Property="Visibility" TargetName="Animation" Value="Visible" />
+            </Trigger>
+            <Trigger Property="Orientation" Value="Vertical">
+              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+                <Setter.Value>
+                  <RotateTransform Angle="-90" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
+  <Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
+  <Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
+  <Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
+  <Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="RadioGroupItemHorizontalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+  </Style>
+  <Style x:Key="RadioGroupItemSingle" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+  </Style>
+  <Style x:Key="RadioGroupItemVerticalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="RadioGroupItemVerticalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+  </Style>
+  <Style TargetType="ResizeGrip">
+    <Setter Property="MinWidth" Value="11" />
+    <Setter Property="MinHeight" Value="11" />
+    <Setter Property="Width" Value="11" />
+    <Setter Property="Height" Value="11" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ResizeGrip">
+          <hc:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+            <Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
+              <Path.Fill>
+                <DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
+                  <DrawingBrush.Drawing>
+                    <DrawingGroup>
+                      <GeometryDrawing Brush="{StaticResource ResizeGripperForeground}">
+                        <GeometryDrawing.Geometry>
+                          <RectangleGeometry Rect="0,0,2,2" />
+                        </GeometryDrawing.Geometry>
+                      </GeometryDrawing>
+                    </DrawingGroup>
+                  </DrawingBrush.Drawing>
+                </DrawingBrush>
+              </Path.Fill>
+            </Path>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="Window">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+  </Style>
+  <Style x:Key="WindowWin10" TargetType="hc:Window">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="#262e2f" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="CloseButtonBackground" Value="Transparent" />
+    <Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="CloseButtonHoverBackground" Value="#e81123" />
+    <Setter Property="CloseButtonHoverForeground" Value="White" />
+    <Setter Property="OtherButtonBackground" Value="Transparent" />
+    <Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkMaskBrush}" />
+    <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Window">
+          <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel Name="ButtonPanel" WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" hc:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+                </StackPanel>
+                <Grid Grid.Column="0">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+                  <Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
+                    <interactivity:Interaction.Triggers>
+                      <interactivity:EventTrigger EventName="MouseDoubleClick">
+                        <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+                      </interactivity:EventTrigger>
+                    </interactivity:Interaction.Triggers>
+                    <Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
+                  </Button>
+                  <TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
+                    <TextBlock.Visibility>
+                      <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+                        <MultiBinding.Bindings>
+                          <Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
+                        </MultiBinding.Bindings>
+                      </MultiBinding>
+                    </TextBlock.Visibility>
+                  </TextBlock>
+                  <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
+                </Grid>
+              </Grid>
+              <AdornerDecorator Grid.Row="1">
+                <ContentPresenter ClipToBounds="True" />
+              </AdornerDecorator>
+              <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsActive" Value="False">
+              <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
+              <Setter Property="Opacity" Value=".8" TargetName="ButtonPanel" />
+            </Trigger>
+            <Trigger Property="WindowState" Value="Maximized">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+              <Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore" />
+            </Trigger>
+            <Trigger Property="WindowState" Value="Normal">
+              <Setter Property="Visibility" Value="Visible" TargetName="ButtonMax" />
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+            </Trigger>
+            <Trigger Property="ResizeMode" Value="NoResize">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin" />
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+            </Trigger>
+            <Trigger Property="ResizeMode" Value="CanMinimize">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+              <Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
+              <Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
+              <Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
+              <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+            <Trigger Property="WindowStyle" Value="None">
+              <Setter Property="ShowNonClientArea" Value="False" />
+            </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="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="hc:BlurWindow">
+    <Setter Property="Background" Value="Transparent" />
+  </Style>
+  <Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="hc:GlowWindow">
+    <Setter Property="ActiveGlowColor" Value="#262e2f" />
+    <Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}" />
+    <Setter Property="BorderThickness" Value="0" />
+  </Style>
+  <Style TargetType="hc:ImageBrowser">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="MinWidth" Value="400" />
+    <Setter Property="MinHeight" Value="250" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="Black" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ImageBrowser">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="Storyboard1">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
+                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="Storyboard2">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
+                <EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Grid>
+            <Grid.RowDefinitions>
+              <RowDefinition />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <hc:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000" />
+            <hc:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
+              <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
+                <TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0" />
+                <TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0" />
+              </StackPanel>
+              <Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40" />
+            </hc:SimplePanel>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+              </Trigger.ExitActions>
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsFullScreen" Value="True">
+        <Setter Property="WindowState" Value="Maximized" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TagBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Tag">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Tag">
+          <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Border Visibility="{Binding HasHeader,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Width="{Binding ActualHeight,RelativeSource={RelativeSource Self}}" Style="{StaticResource BorderCircularClip}" BorderBrush="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}">
+                <ContentPresenter TextElement.Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+              </Border>
+              <ContentPresenter Margin="{TemplateBinding Padding}" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+              <Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="0,0,6,0" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,11" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+              <Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
+              <Setter Property="Padding" Value="0,6" TargetName="ButtonClose" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource DarkMaskBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="True">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TagContainerBaseStyle" TargetType="hc:TagContainer" BasedOn="{StaticResource BaseStyle}">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TagBaseStyle}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="ItemsPanel">
+      <Setter.Value>
+        <ItemsPanelTemplate>
+          <WrapPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}" />
+        </ItemsPanelTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TagContainer">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <hc:ScrollViewer Focusable="false">
+              <ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </hc:ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+    <Setter Property="OverridesDefaultStyle" Value="true" />
+    <Setter Property="IsTabStop" Value="false" />
+    <Setter Property="Focusable" Value="false" />
+    <Setter Property="ClickMode" Value="Press" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+            <Border Margin="0,0,6,0" BorderThickness="1" BorderBrush="Transparent" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+              <Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </Border>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value=".4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ComboBoxWatermarkToggleButton" TargetType="ToggleButton">
+    <Setter Property="OverridesDefaultStyle" Value="true" />
+    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+    <Setter Property="IsTabStop" Value="false" />
+    <Setter Property="Focusable" Value="false" />
+    <Setter Property="ClickMode" Value="Press" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="30" />
+            </Grid.ColumnDefinitions>
+            <Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
+            <Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
+            <Border Margin="1" Grid.Column="0" Visibility="{Binding Text,RelativeSource={RelativeSource AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}">
+              <ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value=".4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ComboBoxTemplate" TargetType="ComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{Binding Background,RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
+      <Border Grid.Column="0" Margin="1,0">
+        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxTopTemplate" TargetType="ComboBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" Margin="1,0">
+        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxLeftTemplate" TargetType="ComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" Margin="1,0">
+        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ComboBoxEditableTextBox" TargetType="TextBox">
+    <Setter Property="OverridesDefaultStyle" Value="true" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="MinWidth" Value="0" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TextBox">
+          <ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="ComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
+      <Border Grid.Column="0" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxEditableTopTemplate" TargetType="ComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxEditableLeftTemplate" TargetType="ComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ComboBoxItemBaseStyle" TargetType="ComboBoxItem">
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ComboBoxItem">
+          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsSelected" Value="False" />
+                <Condition Property="IsMouseOver" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsSelected" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="Foreground" Value="White" />
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ComboBoxBaseStyle" TargetType="ComboBox">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemBaseStyle}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+    <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Style.Triggers>
+      <Trigger Property="IsEditable" Value="true">
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ComboBoxExtendBaseStyle" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Template" Value="{StaticResource ComboBoxTopTemplate}" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="False" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxLeftTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTopTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxEditableLeftTemplate}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="ComboBoxPlusTopTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" Margin="1,0">
+        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxPlusLeftTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" Margin="1,0">
+        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxPlusEditableTopTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+        <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="hc:ComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer Margin="0,4">
+                  <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      </Border>
+      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+        <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}" />
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="False" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxPlusLeftTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+          <Condition Property="AutoComplete" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsEditable" Value="True" />
+          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+          <Condition Property="AutoComplete" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="MenuItem">
+          <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="26" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="30" />
+                <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
+                <ColumnDefinition Width="20" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+              <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+                <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+              </Border>
+              <ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" Margin="0,3" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              <TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+            </Trigger>
+            <Trigger Property="Icon" Value="{x:Null}">
+              <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="Role" Value="TopLevelHeader">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="MenuItem">
+              <Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+                  <Border Margin="0,0,10,0" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+                  </Border>
+                  <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom">
+                    <hc:SimplePanel Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8">
+                      <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+                        <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+                          <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
+                        </ScrollViewer>
+                      </Border>
+                      <Border hc:MenuTopLineAttach.Popup="{Binding ElementName=PART_Popup}" Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" />
+                    </hc:SimplePanel>
+                  </Popup>
+                </Grid>
+              </Border>
+              <ControlTemplate.Triggers>
+                <Trigger Property="Icon" Value="{x:Null}">
+                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+                </Trigger>
+                <Trigger Property="IsChecked" Value="True">
+                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+                </Trigger>
+                <Trigger Property="IsHighlighted" Value="True">
+                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
+                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+                </Trigger>
+                <Trigger Property="IsSubmenuOpen" Value="True">
+                  <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}" />
+                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}" />
+                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+                </Trigger>
+              </ControlTemplate.Triggers>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+      <Trigger Property="Role" Value="TopLevelItem">
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="MenuItem">
+              <Border x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                <Grid Margin="{TemplateBinding Padding}">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" HorizontalAlignment="Left" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+                  <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+                  </Border>
+                  <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+                </Grid>
+              </Border>
+              <ControlTemplate.Triggers>
+                <Trigger Property="Icon" Value="{x:Null}">
+                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+                </Trigger>
+                <Trigger Property="IsChecked" Value="True">
+                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+                </Trigger>
+                <Trigger Property="IsHighlighted" Value="True">
+                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
+                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+                </Trigger>
+                <Trigger Property="IsSubmenuOpen" Value="True">
+                  <Setter Property="Background" TargetName="templateRoot" Value="White" />
+                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+                </Trigger>
+                <MultiTrigger>
+                  <MultiTrigger.Conditions>
+                    <Condition Property="IsHighlighted" Value="True" />
+                    <Condition Property="IsEnabled" Value="False" />
+                  </MultiTrigger.Conditions>
+                  <Setter Property="Background" TargetName="templateRoot" Value="#0A000000" />
+                  <Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000" />
+                </MultiTrigger>
+              </ControlTemplate.Triggers>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+      <Trigger Property="Role" Value="SubmenuHeader">
+        <Setter Property="DockPanel.Dock" Value="Top" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="MenuItem">
+              <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="26" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="30" />
+                    <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
+                    <ColumnDefinition Width="20" />
+                  </Grid.ColumnDefinitions>
+                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+                  <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+                  </Border>
+                  <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,3" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" />
+                  <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" VerticalOffset="-13" HorizontalOffset="10">
+                    <Border Effect="{StaticResource EffectShadow2}" Margin="8" CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+                      <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
+                      </ScrollViewer>
+                    </Border>
+                  </Popup>
+                </Grid>
+              </Border>
+              <ControlTemplate.Triggers>
+                <Trigger Property="IsChecked" Value="True">
+                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+                </Trigger>
+              </ControlTemplate.Triggers>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+      <Trigger Property="IsHighlighted" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="MenuBaseStyle" TargetType="Menu">
+    <Setter Property="OverridesDefaultStyle" Value="True" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="FontStyle" Value="Normal" />
+    <Setter Property="FontWeight" Value="Normal" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Menu">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="WatermarkTextBoxBaseStyle" TargetType="hc:WatermarkTextBox">
+    <Setter Property="Background" Value="{x:Null}" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="CaretBrush" Value="{Binding Foreground,RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:WatermarkTextBox">
+          <hc:SimplePanel x:Name="WatermarkContent">
+            <TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TextBox">
+          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="border" Value="0.4" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="TextBoxExtendTopTemplate" TargetType="TextBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+      <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="border" Value="0.4" />
+        <Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
+        <Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TextBoxExtendLeftTemplate" TargetType="TextBox">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+      <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="border" Value="0.4" />
+        <Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
+        <Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="TextBoxExtendBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Template" Value="{StaticResource TextBoxExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource TextBoxExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+        <Grid SnapsToDevicePixels="true">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+          <ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+        <Grid SnapsToDevicePixels="true">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+          <ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource TextBoxPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="SearchBarBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="hc:SearchBar">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SearchBar">
+          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="30" />
+              </Grid.ColumnDefinitions>
+              <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+              <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="SearchBarExtendTopTemplate" TargetType="hc:SearchBar">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="SearchBarExtendLeftTemplate" TargetType="hc:SearchBar">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="SearchBarExtendBaseStyle" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="SearchBarPlusBaseStyle" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar">
+    <Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
+  <Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
+  <Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
+  <Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
+  <Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
+  <Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
+  <Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style x:Key="ComboBoxExtend" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="ComboBox" />
+  <Style x:Key="ComboBoxExtend.Small" BasedOn="{StaticResource ComboBoxExtend}" TargetType="ComboBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox" />
+  <Style x:Key="ComboBoxPlus.Small" BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource WatermarkTextBoxBaseStyle}" TargetType="hc:WatermarkTextBox" />
+  <Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
+  <Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
+  <Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
+  <Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
+  <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
+  <ControlTemplate x:Key="BadgeTextTemplate" TargetType="hc:Badge">
+    <hc:SimplePanel>
+      <ContentPresenter />
+      <Border x:Name="Border" Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+        <Border.RenderTransform>
+          <ScaleTransform />
+        </Border.RenderTransform>
+        <ContentPresenter ContentSource="Text" Margin="{TemplateBinding Padding}" />
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <EventTrigger RoutedEvent="hc:Badge.ValueChanged">
+        <BeginStoryboard>
+          <Storyboard AutoReverse="True">
+            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
+            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
+          </Storyboard>
+        </BeginStoryboard>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="hc:Badge">
+    <hc:SimplePanel>
+      <ContentPresenter />
+      <Ellipse Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+        <Ellipse.OpacityMask>
+          <RadialGradientBrush>
+            <GradientStop Offset="0" Color="Transparent" />
+            <GradientStop Offset="1" Color="Black" />
+          </RadialGradientBrush>
+        </Ellipse.OpacityMask>
+        <Ellipse.RenderTransform>
+          <ScaleTransform />
+        </Ellipse.RenderTransform>
+        <Ellipse.Triggers>
+          <EventTrigger RoutedEvent="Loaded">
+            <BeginStoryboard>
+              <Storyboard RepeatBehavior="Forever" DesiredFrameRate="20">
+                <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
+                <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
+                <DoubleAnimation Storyboard.TargetProperty="Opacity" BeginTime="0" Duration="0:0:1" From="1" To="0" EasingFunction="{StaticResource SineEaseOut}" />
+              </Storyboard>
+            </BeginStoryboard>
+          </EventTrigger>
+        </Ellipse.Triggers>
+      </Ellipse>
+      <Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <Style x:Key="BadgeBaseStyle" TargetType="hc:Badge">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Padding" Value="6,2" />
+    <Setter Property="Template" Value="{StaticResource BadgeTextTemplate}" />
+    <Setter Property="HorizontalContentAlignment" Value="Right" />
+    <Setter Property="VerticalContentAlignment" Value="Top" />
+    <Setter Property="BadgeMargin" Value="0,-10,-10,0" />
+    <Style.Triggers>
+      <Trigger Property="Status" Value="Dot">
+        <Setter Property="Template" Value="{StaticResource BadgeDotTemplate}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+        <Setter Property="BadgeMargin" Value="0,-5,-5,0" />
+      </Trigger>
+      <Trigger Property="Status" Value="Processing">
+        <Setter Property="Template" Value="{StaticResource BadgeProcessingTemplate}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+        <Setter Property="BadgeMargin" Value="0,-5,-5,0" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="CardBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Card">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Card">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" />
+              </Border>
+              <ContentPresenter Grid.Row="1" />
+              <Border Grid.Row="2" BorderThickness="0,1,0,0" Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+                <ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}" />
+              </Border>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="hc:ChatBubble">
+    <hc:SimplePanel>
+      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+        <TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Role" Value="Receiver">
+        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+        <Setter TargetName="Tail" Property="RenderTransform">
+          <Setter.Value>
+            <TransformGroup>
+              <ScaleTransform ScaleY="1" ScaleX="-1" />
+            </TransformGroup>
+          </Setter.Value>
+        </Setter>
+        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="hc:ChatBubble">
+    <hc:SimplePanel>
+      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+        <hc:SimplePanel>
+          <Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}" />
+          <Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15" />
+        </hc:SimplePanel>
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Role" Value="Receiver">
+        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+        <Setter TargetName="Tail" Property="RenderTransform">
+          <Setter.Value>
+            <TransformGroup>
+              <ScaleTransform ScaleY="1" ScaleX="-1" />
+            </TransformGroup>
+          </Setter.Value>
+        </Setter>
+        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ChatBubbleAudioBaseTemplate" TargetType="hc:ChatBubble">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="12" Name="Definition1" />
+        <ColumnDefinition Name="Definition2" />
+      </Grid.ColumnDefinitions>
+      <Ellipse Name="Dot" VerticalAlignment="Top" Fill="{DynamicResource DangerBrush}" Width="6" Height="6" Visibility="{TemplateBinding IsRead,Converter={StaticResource Boolean2VisibilityReConverter}}" Margin="0,0,6,0" />
+      <Path Name="Tail" Grid.Column="1" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+      <Border Name="Body" Grid.Column="1" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+        <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <ContentPresenter Name="Presenter" VerticalAlignment="Center" />
+          <Path Name="Audio" Grid.Column="1" Data="{StaticResource AudioGeometry}" Fill="{TemplateBinding Foreground}" Width="16" Height="16" Margin="6,0,0,0" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+              <TransformGroup>
+                <ScaleTransform ScaleY="1" ScaleX="-1" />
+              </TransformGroup>
+            </Path.RenderTransform>
+          </Path>
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Role" Value="Receiver">
+        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+        <Setter TargetName="Tail" Property="RenderTransform">
+          <Setter.Value>
+            <TransformGroup>
+              <ScaleTransform ScaleY="1" ScaleX="-1" />
+            </TransformGroup>
+          </Setter.Value>
+        </Setter>
+        <Setter TargetName="Tail" Property="Grid.Column" Value="0" />
+        <Setter TargetName="Dot" Property="Grid.Column" Value="1" />
+        <Setter TargetName="Dot" Property="Margin" Value="6,0,0,0" />
+        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+        <Setter TargetName="Body" Property="Grid.Column" Value="0" />
+        <Setter TargetName="Definition1" Property="Width" Value="Auto" />
+        <Setter TargetName="Definition2" Property="Width" Value="12" />
+        <Setter TargetName="Audio" Property="Grid.Column" Value="0" />
+        <Setter TargetName="Audio" Property="Margin" Value="0,0,6,0" />
+        <Setter TargetName="Audio" Property="RenderTransform">
+          <Setter.Value>
+            <TransformGroup>
+              <ScaleTransform ScaleY="1" ScaleX="1" />
+            </TransformGroup>
+          </Setter.Value>
+        </Setter>
+        <Setter TargetName="Presenter" Property="Grid.Column" Value="1" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="hc:ChatBubble">
+    <hc:SimplePanel>
+      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+        <ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
+      </Border>
+    </hc:SimplePanel>
+    <ControlTemplate.Triggers>
+      <Trigger Property="Role" Value="Receiver">
+        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+        <Setter TargetName="Tail" Property="RenderTransform">
+          <Setter.Value>
+            <TransformGroup>
+              <ScaleTransform ScaleY="1" ScaleX="-1" />
+            </TransformGroup>
+          </Setter.Value>
+        </Setter>
+        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ChatBubbleBaseStyle" TargetType="hc:ChatBubble">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="HorizontalAlignment" Value="Right" />
+    <Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="Padding" Value="10" />
+    <Setter Property="Margin" Value="10" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template" Value="{StaticResource ChatBubbleStringBaseTemplate}" />
+    <Setter Property="IsRead" Value="{Binding IsSelected,RelativeSource={RelativeSource Self}}" />
+    <Setter Property="MaxWidth" Value="280" />
+    <Style.Triggers>
+      <Trigger Property="Role" Value="Receiver">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+      </Trigger>
+      <Trigger Property="Type" Value="Image">
+        <Setter Property="Template" Value="{StaticResource ChatBubbleImageBaseTemplate}" />
+        <Setter Property="MaxHeight" Value="280" />
+      </Trigger>
+      <Trigger Property="Type" Value="Audio">
+        <Setter Property="Template" Value="{StaticResource ChatBubbleAudioBaseTemplate}" />
+      </Trigger>
+      <Trigger Property="Type" Value="Custom">
+        <Setter Property="Template" Value="{StaticResource ChatBubbleCustomBaseTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="Tag4CheckComboBoxStyle" BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag">
+    <Setter Property="Padding" Value="6,3,4,3" />
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Tag">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+              <Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Height="16" Padding="0,4" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" Foreground="{TemplateBinding Foreground}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+              <Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
+              <Setter Property="Padding" Value="0" TargetName="ButtonClose" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+    <Setter Property="ClickMode" Value="Release" />
+  </Style>
+  <Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+    <Setter Property="ClickMode" Value="Release" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="30" />
+            </Grid.ColumnDefinitions>
+            <Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
+            <Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
+            <Border Margin="1" Grid.Column="0" Visibility="{Binding SelectedItem,RelativeSource={RelativeSource AncestorType=hc:CheckComboBox},Converter={StaticResource Object2VisibilityReConverter}}">
+              <ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value=".4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CheckComboBoxItemBaseStyle" TargetType="hc:CheckComboBoxItem">
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CheckComboBoxItem">
+          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+            <CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
+              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </CheckBox>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="CheckComboBoxTemplate" TargetType="hc:CheckComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <Grid Margin="0,4" ClipToBounds="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+                </Grid>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
+      <Border Grid.Column="0" Margin="-1,1">
+        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="CheckComboBoxBaseStyle" TargetType="hc:CheckComboBox">
+    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle}" />
+    <Setter Property="SelectionMode" Value="Multiple" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource CheckComboBoxItemBaseStyle}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Padding" Value="6,3" />
+    <Setter Property="Template" Value="{StaticResource CheckComboBoxTemplate}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+  </Style>
+  <ControlTemplate x:Key="CheckComboBoxExtendTopTemplate" TargetType="hc:CheckComboBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup x:Name="PART_Popup" Grid.Row="1" Grid.Column="0" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <Grid Margin="0,4" ClipToBounds="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+                </Grid>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
+        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CheckComboBoxExtendLeftTemplate" TargetType="hc:CheckComboBox">
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <Grid Margin="0,4" ClipToBounds="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+                </Grid>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" Margin="-1,1">
+        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="CheckComboBoxExtendBaseStyle" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Template" Value="{StaticResource CheckComboBoxExtendTopTemplate}" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource CheckComboBoxExtendLeftTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="CheckComboBoxPlusTopTemplate" TargetType="hc:CheckComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <Grid Margin="0,4" ClipToBounds="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+                </Grid>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+      <Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
+        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+      </Border>
+      <Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="CheckComboBoxPlusLeftTemplate" TargetType="hc:CheckComboBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" MinWidth="30" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+        <Decorator Margin="8 0">
+          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <Grid Margin="0,4" ClipToBounds="False">
+                  <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition />
+                  </Grid.RowDefinitions>
+                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+                </Grid>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </Decorator>
+      </Popup>
+      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+      <Border Grid.Column="1" Margin="-1,1">
+        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+      </Border>
+      <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="HasItems" Value="false">
+        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+      </Trigger>
+      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="True">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="CheckComboBoxPlusBaseStyle" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource CheckComboBoxPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource CheckComboBoxPlusLeftTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="ColorPickerSliderHorizontal" TargetType="Slider">
+    <hc:SimplePanel>
+      <Border Margin="7,0" Background="{TemplateBinding Background}" MaxHeight="11" CornerRadius="2" />
+      <Border Margin="7,0" Background="{TemplateBinding Foreground}" MaxHeight="11" CornerRadius="2">
+        <Border.OpacityMask>
+          <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+            <GradientStop Color="Transparent" Offset="1" />
+            <GradientStop Color="White" Offset="0" />
+          </LinearGradientBrush>
+        </Border.OpacityMask>
+      </Border>
+      <Track x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb x:Name="Thumb" Focusable="False" Height="13" Width="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Center">
+            <Thumb.Effect>
+              <DropShadowEffect ShadowDepth="0" Opacity=".6" />
+            </Thumb.Effect>
+          </Thumb>
+        </Track.Thumb>
+      </Track>
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ColorPickerSliderVertical" TargetType="Slider">
+    <hc:SimplePanel>
+      <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Background}" />
+      <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Foreground}">
+        <Border.OpacityMask>
+          <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+            <GradientStop Color="Transparent" Offset="1" />
+            <GradientStop Color="White" Offset="0" />
+          </LinearGradientBrush>
+        </Border.OpacityMask>
+      </Border>
+      <Track x:Name="PART_Track">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb x:Name="Thumb" Focusable="False" Height="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Top" Width="13">
+            <Thumb.Effect>
+              <DropShadowEffect ShadowDepth="0" Opacity=".6" />
+            </Thumb.Effect>
+          </Thumb>
+        </Track.Thumb>
+      </Track>
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <Style x:Key="ColorPickerSlider" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="Foreground" Value="Transparent" />
+    <Setter Property="Template" Value="{StaticResource ColorPickerSliderHorizontal}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource ColorPickerSliderVertical}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ColorPickerBaseStyle" TargetType="hc:ColorPicker">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Width" Value="230" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ColorPicker">
+          <Grid>
+            <Grid.RowDefinitions>
+              <RowDefinition Height="122" />
+              <RowDefinition Height="110" />
+              <RowDefinition Height="62" />
+              <RowDefinition Height="62" />
+            </Grid.RowDefinitions>
+            <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}" />
+            <hc:SimplePanel Margin="1" Grid.Row="0">
+              <Border Background="{TemplateBinding BackColor}" />
+              <Border>
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+                    <GradientStop Color="White" Offset="1" />
+                    <GradientStop Color="#80ffffff" Offset=".5" />
+                    <GradientStop Color="#00ffffff" />
+                  </LinearGradientBrush>
+                </Border.Background>
+              </Border>
+              <Border>
+                <Border.Background>
+                  <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                    <GradientStop Color="Black" Offset="1" />
+                    <GradientStop Color="#80000000" Offset=".5" />
+                    <GradientStop Color="#00000000" />
+                  </LinearGradientBrush>
+                </Border.Background>
+              </Border>
+            </hc:SimplePanel>
+            <Border Name="PART_BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
+              <Canvas Margin="-6">
+                <Border Name="PART_BorderPicker" Background="Transparent" Height="12" CornerRadius="6" Width="12" BorderThickness="1" BorderBrush="White">
+                  <Border.Effect>
+                    <DropShadowEffect ShadowDepth="0" Opacity=".4" />
+                  </Border.Effect>
+                </Border>
+              </Canvas>
+            </Border>
+            <Border Grid.Row="0" Background="Transparent" Name="PART_BorderDrag" />
+            <Grid Margin="16,16,10,0" Grid.Row="1">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="28" />
+              </Grid.ColumnDefinitions>
+              <ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+                <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
+                <hc:StatusSwitchElement.CheckedElement>
+                  <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
+                </hc:StatusSwitchElement.CheckedElement>
+              </ToggleButton>
+              <Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
+              <Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{TemplateBinding SelectedBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
+              <Slider Name="PART_SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" Value="6" Maximum="6" Background="{StaticResource ColorPickerRainbowBrush}" Margin="2,1,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
+              <Slider Name="PART_SliderOpacity" Grid.ColumnSpan="2" IsSnapToTickEnabled="True" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Maximum="255" SmallChange="1" Foreground="{TemplateBinding SelectedBrushWithoutOpacity}" Background="{StaticResource ColorPickerOpacityBrush}" Margin="2,0,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Bottom" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
+              <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,14,0,0" VerticalAlignment="Top" Visibility="{Binding ShowList[0],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}">
+                <TextBox Padding="0" HorizontalContentAlignment="Center" Width="176" Text="{Binding SelectedBrush,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,Converter={StaticResource Color2HexStringConverter},UpdateSourceTrigger=LostFocus}" FontSize="10" MaxLength="10" Height="24" />
+                <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="HEX" HorizontalAlignment="Center" />
+              </StackPanel>
+              <UniformGrid Name="PART_PanelRgb" Visibility="{Binding ShowList[1],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Rows="1" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="-2,14,-2,0" VerticalAlignment="Top">
+                <StackPanel Margin="2,0">
+                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="2,0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="R" HorizontalAlignment="Center" />
+                </StackPanel>
+                <StackPanel Margin="2,0">
+                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="G" Value="{Binding ChannelG,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="G" HorizontalAlignment="Center" />
+                </StackPanel>
+                <StackPanel Margin="2,0">
+                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="B" Value="{Binding ChannelB,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="B" HorizontalAlignment="Center" />
+                </StackPanel>
+                <StackPanel Margin="2,0">
+                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="A" HorizontalAlignment="Center" />
+                </StackPanel>
+              </UniformGrid>
+              <Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="3" Grid.Row="1">
+                <Button.Content>
+                  <Path Fill="#323534" Style="{StaticResource UpDownPathStyle}" />
+                </Button.Content>
+              </Button>
+            </Grid>
+            <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
+              <WrapPanel Name="PART_PanelColor" Margin="6" HorizontalAlignment="Center" />
+            </Border>
+            <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
+              <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Button Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Width="80" Margin="0,0,16,0" />
+                <Button Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Width="80" Style="{StaticResource ButtonPrimary}" />
+              </StackPanel>
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ContextMenu">
+          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+            <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+              <ItemsPresenter />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CoverViewContentBaseStyle" TargetType="hc:CoverViewContent">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Margin" Value="0,0,0,8" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CoverViewContent">
+          <Grid>
+            <Grid.RowDefinitions>
+              <RowDefinition Height="16" />
+              <RowDefinition />
+            </Grid.RowDefinitions>
+            <Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
+              <Border.RenderTransform>
+                <TransformGroup>
+                  <TranslateTransform X="5" Y="5" />
+                  <RotateTransform Angle="45" />
+                </TransformGroup>
+              </Border.RenderTransform>
+            </Border>
+            <Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+              <ContentPresenter Margin="{TemplateBinding Padding}" />
+            </Border>
+            <Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">
+              <Rectangle.RenderTransform>
+                <TransformGroup>
+                  <TranslateTransform X="1" />
+                </TransformGroup>
+              </Rectangle.RenderTransform>
+            </Rectangle>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="CoverViewBaseStyle" TargetType="hc:CoverView">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource CoverViewItemBaseStyle}" />
+    <Setter Property="CoverViewContentStyle" Value="{StaticResource CoverViewContentBaseStyle}" />
+    <Setter Property="ItemMargin" Value="8" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CoverView">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <ScrollViewer>
+              <WrapPanel x:Name="PART_Panel" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="DatePickerTextBoxStyle" TargetType="DatePickerTextBox">
+    <Setter Property="Foreground" Value="{Binding Foreground,RelativeSource={RelativeSource AncestorType=DatePicker}}" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DatePickerTextBox">
+          <hc:SimplePanel>
+            <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="DatePickerBaseStyle" TargetType="DatePicker">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="CalendarStyle" Value="{StaticResource CalendarBaseStyle}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="IsTodayHighlighted" Value="True" />
+    <Setter Property="SelectedDateFormat" Value="Short" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DatePicker">
+          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="30" />
+              </Grid.ColumnDefinitions>
+              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+              <DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="DatePickerExtendTopTemplate" TargetType="DatePicker">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="DatePickerExtendLeftTemplate" TargetType="DatePicker">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="DatePickerExtendBaseStyle" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template" Value="{StaticResource DatePickerExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource DatePickerExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="DatePickerPlusTopTemplate" TargetType="hc:DatePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="DatePickerPlusLeftTemplate" TargetType="hc:DatePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
+          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="DatePickerPlusBaseStyle" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="hc:DatePicker">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Template" Value="{StaticResource DatePickerPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource DatePickerPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DateTimePickerBaseStyle" TargetType="hc:DateTimePicker">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:DateTimePicker">
+          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="30" />
+              </Grid.ColumnDefinitions>
+              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+              <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="DateTimePickerExtendTopTemplate" TargetType="hc:DateTimePicker">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="DateTimePickerExtendLeftTemplate" TargetType="hc:DateTimePicker">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="DateTimePickerExtendBaseStyle" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template" Value="{StaticResource DateTimePickerExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource DateTimePickerExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="DateTimePickerPlusTopTemplate" TargetType="hc:DateTimePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="DateTimePickerPlusLeftTemplate" TargetType="hc:DateTimePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource DateTimePickerPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DialogBaseStyle" TargetType="hc:Dialog">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Dialog">
+          <Border Background="{DynamicResource DarkOpacityBrush}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="DividerBaseStyle" TargetType="hc:Divider">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Margin" Value="0,24" />
+    <Setter Property="Padding" Value="24,0" />
+    <Setter Property="LineStroke" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Divider">
+          <hc:Row>
+            <hc:Col Layout="12" x:Name="ColStart">
+              <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+            </hc:Col>
+            <hc:Col Layout="0">
+              <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+            </hc:Col>
+            <hc:Col Layout="12" x:Name="ColEnd">
+              <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+            </hc:Col>
+          </hc:Row>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Padding" Value="0" />
+            </Trigger>
+            <Trigger Property="HorizontalContentAlignment" Value="Left">
+              <Setter TargetName="ColStart" Property="Layout" Value="0" />
+              <Setter TargetName="ColStart" Property="IsFixed" Value="True" />
+              <Setter TargetName="ColStart" Property="Width" Value="20" />
+              <Setter TargetName="ColEnd" Property="Layout" Value="24" />
+            </Trigger>
+            <Trigger Property="HorizontalContentAlignment" Value="Right">
+              <Setter TargetName="ColEnd" Property="Layout" Value="0" />
+              <Setter TargetName="ColEnd" Property="IsFixed" Value="True" />
+              <Setter TargetName="ColEnd" Property="Width" Value="20" />
+              <Setter TargetName="ColStart" Property="Layout" Value="24" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="Content" Value="{x:Null}">
+        <Setter Property="Padding" Value="0" />
+      </Trigger>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Margin" Value="6,0" />
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="hc:Divider">
+              <Line HorizontalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" Y2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DrawerBaseStyle" TargetType="hc:Drawer">
+    <Setter Property="Dock" Value="Right" />
+    <Setter Property="MaskBrush" Value="{DynamicResource DarkOpacityBrush}" />
+  </Style>
+  <DrawingBrush x:Key="EmptySimpleLogo" o:Freeze="True">
+    <DrawingBrush.Drawing>
+      <DrawingGroup o:Freeze="True">
+        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M0,844.8C0,942.250667 361.096533,1021.269333 806.536533,1021.269333 1251.976533,1021.269333 1613.038933,942.250666 1613.038933,844.8 1613.038933,747.383467 1251.9424,668.398933 806.536533,668.398933 361.096533,668.398933 0,747.383467 0,844.8z" />
+        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1398.784,580.164267L214.254933,580.164267 214.254933,330.6496 473.873067,35.771733C486.4,13.1072,509.1328,0.477867,531.797333,0.477867L1081.2416,0.477867C1103.940267,0.477867,1126.638933,13.1072,1141.725867,38.2976L1398.818133,330.6496 1398.818133,580.164267z M239.479467,555.008L1373.627733,555.008 1373.627733,338.261333 1121.553067,50.858667C1108.992,33.245867,1096.362667,23.210667,1081.2416,23.210667L531.797333,23.210667C516.676266,23.210667,504.081066,33.28,493.9776,48.401067L239.445333,340.753067 239.445333,554.973867z" />
+        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M1048.4736,413.832533C1048.4736,373.521066,1073.664,340.753066,1103.940267,340.753067L1386.222933,340.753067 1386.222933,796.945067C1386.222933,849.851734,1353.454933,895.249067,1310.583467,895.249067L302.455467,895.249067C262.109867,895.249067,226.850134,852.3776,226.850133,796.945067L226.850133,340.753067 509.1328,340.753067C539.374933,340.753067 564.565333,373.521067 564.565333,413.832533 564.565333,454.143999 589.755733,486.912 619.997867,486.912L993.041067,486.912C1023.2832,489.437867,1048.4736,454.144,1048.4736,413.832533z" />
+        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1310.583467,907.844267L302.455467,907.844267C254.5664,907.844267,214.2208,857.429334,214.2208,796.910933L214.2208,328.192 509.1328,328.192C546.9184,328.192 577.160533,365.9776 577.160533,413.866667 577.160533,446.634667 597.2992,474.350934 619.997867,474.350933L993.041067,474.350933C1015.7056,474.350933 1035.8784,446.634666 1035.8784,413.866667 1035.8784,365.9776 1066.120533,328.192 1103.940267,328.192L1398.818133,328.192 1398.818133,796.9792C1398.818133,857.463467,1360.9984,907.8784,1310.583467,907.8784z M239.445333,353.348267L239.445333,796.945067C239.445333,844.834134,267.1616,882.619734,302.455467,882.619733L1310.583467,882.619733C1345.877334,882.619733,1373.5936,844.834133,1373.5936,796.945067L1373.5936,353.348267 1103.940267,353.348267C1081.2416,353.348267 1061.0688,381.064534 1061.0688,413.832533 1061.0688,461.7216 1030.826667,499.5072 993.041067,499.5072L619.997867,499.5072C582.212267,499.5072 551.970134,461.7216 551.970133,413.832533 551.970133,381.064533 531.831466,350.8224 509.1328,350.8224L239.445333,350.8224 239.445333,353.348267z" />
+      </DrawingGroup>
+    </DrawingBrush.Drawing>
+  </DrawingBrush>
+  <Rectangle x:Key="LogoRectangle4Empty" x:Shared="False" HorizontalAlignment="Center" Width="64" Height="41" Fill="{StaticResource EmptySimpleLogo}" />
+  <TextBlock x:Key="DescriptionTextBlock4Empty" x:Shared="False" Margin="0,10,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource ThirdlyTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.NoData}}" />
+  <Style x:Key="EmptyBaseStyle" TargetType="hc:Empty">
+    <Setter Property="Logo" Value="{StaticResource LogoRectangle4Empty}" />
+    <Setter Property="Description" Value="{StaticResource DescriptionTextBlock4Empty}" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="Visibility" Value="{Binding Path=(hc:Empty.ShowEmpty),RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Empty">
+          <hc:SimpleStackPanel>
+            <ContentPresenter ContentSource="Logo" />
+            <ContentPresenter ContentSource="Description" />
+            <ContentPresenter HorizontalAlignment="Center" />
+          </hc:SimpleStackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="32" />
+            </Grid.ColumnDefinitions>
+            <Grid.LayoutTransform>
+              <TransformGroup>
+                <RotateTransform Angle="-90" />
+              </TransformGroup>
+            </Grid.LayoutTransform>
+            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+          </Grid>
+        </ToggleButton>
+      </Border>
+      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="0" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsExpanded" Value="true">
+        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}" />
+        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="32" />
+            </Grid.ColumnDefinitions>
+            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+          </Grid>
+        </ToggleButton>
+      </Border>
+      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="0" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsExpanded" Value="true">
+        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}" />
+        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ExpanderRightTemplate" TargetType="Expander">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="32" />
+            </Grid.ColumnDefinitions>
+            <Grid.LayoutTransform>
+              <TransformGroup>
+                <RotateTransform Angle="-90" />
+              </TransformGroup>
+            </Grid.LayoutTransform>
+            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+          </Grid>
+        </ToggleButton>
+      </Border>
+      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="1" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsExpanded" Value="true">
+        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}" />
+        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ExpanderDownTemplate" TargetType="Expander">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition />
+      </Grid.RowDefinitions>
+      <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition />
+              <ColumnDefinition Width="32" />
+            </Grid.ColumnDefinitions>
+            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+          </Grid>
+        </ToggleButton>
+      </Border>
+      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsExpanded" Value="true">
+        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" />
+        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ExpanderBaseStyle" TargetType="Expander">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="MinWidth" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template" Value="{StaticResource ExpanderDownTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="ExpandDirection" Value="Left">
+        <Setter Property="Template" Value="{StaticResource ExpanderLeftTemplate}" />
+      </Trigger>
+      <Trigger Property="ExpandDirection" Value="Up">
+        <Setter Property="Template" Value="{StaticResource ExpanderUpTemplate}" />
+      </Trigger>
+      <Trigger Property="ExpandDirection" Value="Right">
+        <Setter Property="Template" Value="{StaticResource ExpanderRightTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="FlowDocumentScrollViewerBaseStyle" TargetType="FlowDocumentScrollViewer">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="FlowDocumentScrollViewer">
+          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+            <Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+              <Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+              <Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+              </Grid>
+            </Grid>
+            <Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Border>
+          </DockPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FlowDocumentPageViewerBaseStyle" TargetType="FlowDocumentPageViewer">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="FlowDocumentPageViewer">
+          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+            <Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+              <Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+              <StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+                  <Run Text=" " />
+                  <InlineUIContainer>
+                    <TextBlock Text="{Binding MasterPageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </InlineUIContainer>
+                  <Run Text=" " />
+                  <Run Text="/" />
+                  <Run Text=" " />
+                  <InlineUIContainer>
+                    <TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </InlineUIContainer>
+                  <Run Text=" " />
+                </TextBlock>
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
+              </StackPanel>
+              <Grid Grid.Column="2" VerticalAlignment="Center" Margin="32,0,0,0">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+              </Grid>
+            </Grid>
+            <Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <AdornerDecorator>
+                <DocumentPageView HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" DocumentPaginator="{x:Null}" KeyboardNavigation.IsTabStop="False" DocumentViewerBase.IsMasterPage="True" PageNumber="0" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" />
+              </AdornerDecorator>
+            </Border>
+          </DockPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="FlowDocumentReaderBaseStyle" TargetType="FlowDocumentReader">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="FlowDocumentReader">
+          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+            <Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+              </Grid.ColumnDefinitions>
+              <StackPanel Orientation="Horizontal">
+                <ToggleButton Width="24" Height="24" Padding="5" x:Name="FindButton" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Command="ApplicationCommands.Find" Margin="0,0,10,0" ToolTip="{x:Static langs:Lang.Find}" />
+                <Border x:Name="PART_FindToolBarHost" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+              </StackPanel>
+              <StackPanel x:Name="PageCountAndButtons" Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+                  <Run Text=" " />
+                  <InlineUIContainer>
+                    <TextBlock Text="{Binding PageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </InlineUIContainer>
+                  <Run Text=" " />
+                  <Run Text="/" />
+                  <Run Text=" " />
+                  <InlineUIContainer>
+                    <TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
+                  </InlineUIContainer>
+                  <Run Text=" " />
+                </TextBlock>
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
+              </StackPanel>
+              <Grid Grid.Column="2" Margin="32,0,0,0" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <hc:ButtonGroup Width="90">
+                  <RadioButton x:Name="PageViewButton" Padding="0" hc:IconElement.Geometry="{StaticResource PageModeGeometry}" CommandParameter="Page" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsPageViewEnabled}" ToolTip="{x:Static langs:Lang.PageMode}" />
+                  <RadioButton x:Name="TwoPageViewButton" hc:IconElement.Geometry="{StaticResource TwoPageModeGeometry}" Padding="0" CommandParameter="TwoPage" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsTwoPageViewEnabled}" ToolTip="{x:Static langs:Lang.TwoPageMode}" />
+                  <RadioButton x:Name="ScrollViewButton" hc:IconElement.Geometry="{StaticResource ScrollModeGeometry}" Padding="0" CommandParameter="Scroll" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsScrollViewEnabled}" ToolTip="{x:Static langs:Lang.ScrollMode}" />
+                </hc:ButtonGroup>
+                <RepeatButton Margin="32,0,0,0" Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="1" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="2" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="3" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+              </Grid>
+            </Grid>
+            <Border Panel.ZIndex="0" x:Name="PART_ContentHost" KeyboardNavigation.IsTabStop="False" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+          </DockPanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ViewingMode" Value="Page">
+              <Setter Property="IsChecked" TargetName="PageViewButton" Value="True" />
+            </Trigger>
+            <Trigger Property="ViewingMode" Value="TwoPage">
+              <Setter Property="IsChecked" TargetName="TwoPageViewButton" Value="True" />
+              <Setter Property="BorderThickness" Value="0" />
+            </Trigger>
+            <Trigger Property="ViewingMode" Value="Scroll">
+              <Setter Property="IsChecked" TargetName="ScrollViewButton" Value="True" />
+              <Setter Property="Visibility" TargetName="PageCountAndButtons" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="Document" Value="{x:Null}">
+              <Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
+            </Trigger>
+            <Trigger Property="IsFindEnabled" Value="False">
+              <Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="MenuItem4FrameStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
+    <Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
+    <Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
+    <Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
+    <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
+  </Style>
+  <ControlTemplate x:Key="FrameWithNavigationUIStyle" TargetType="Frame">
+    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+      <DockPanel LastChildFill="True">
+        <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
+          <hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
+            <Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
+              <Button.ContextMenu>
+                <ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
+              </Button.ContextMenu>
+            </Button>
+            <Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
+              <Button.ContextMenu>
+                <ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
+              </Button.ContextMenu>
+            </Button>
+            <Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
+          </hc:ButtonGroup>
+        </Border>
+        <ContentPresenter SnapsToDevicePixels="True" x:Name="PART_NavWinCP" ClipToBounds="true" />
+      </DockPanel>
+    </Border>
+  </ControlTemplate>
+  <Style x:Key="FrameBaseStyle" TargetType="Frame">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Frame">
+          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <ContentPresenter SnapsToDevicePixels="True" x:Name="PART_FrameCP" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="NavigationUIVisibility" Value="Visible">
+        <Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="JournalOwnership" Value="OwnsJournal" />
+          <Condition Property="NavigationUIVisibility" Value="Automatic" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="GotoTopBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="hc:GotoTop">
+    <Setter Property="Width" Value="50" />
+    <Setter Property="Height" Value="50" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="25" />
+    <Setter Property="hc:IconElement.Geometry" Value="{StaticResource UpGeometry}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Padding" Value="16" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="GravatarBaseStyle" TargetType="hc:Gravatar">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Width" Value="72" />
+    <Setter Property="Height" Value="72" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="6" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Gravatar">
+          <Border ClipToBounds="True" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ImageSelectorBaseStyle" TargetType="hc:ImageSelector">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Stretch" Value="UniformToFill" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="StrokeThickness" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="StrokeDashArray" Value="2,2" />
+    <Setter Property="hc:IconSwitchElement.Geometry" Value="{StaticResource AddGeometry}" />
+    <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{StaticResource RemoveGeometry}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ImageSelector">
+          <Button Command="interactivity:ControlCommands.Switch" Style="{StaticResource ButtonCustom}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <hc:DashedBorder BorderDashArray="{TemplateBinding StrokeDashArray}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" BorderDashThickness="{TemplateBinding StrokeThickness}" Background="{TemplateBinding PreviewBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                <Border Width="30" Height="30" Background="{TemplateBinding Background}" Style="{StaticResource BorderCircular}">
+                  <hc:ToggleBlock IsChecked="{TemplateBinding HasValue}">
+                    <hc:ToggleBlock.CheckedContent>
+                      <Path Data="{TemplateBinding hc:IconSwitchElement.GeometrySelected}" Width="12" Height="12" Fill="{DynamicResource PrimaryBrush}" />
+                    </hc:ToggleBlock.CheckedContent>
+                    <hc:ToggleBlock.UnCheckedContent>
+                      <Path Data="{TemplateBinding hc:IconSwitchElement.Geometry}" Width="16" Height="16" Fill="{DynamicResource PrimaryBrush}" />
+                    </hc:ToggleBlock.UnCheckedContent>
+                  </hc:ToggleBlock>
+                </Border>
+              </hc:DashedBorder>
+            </Border>
+          </Button>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ListBoxItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ListBoxItem">
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBoxItem">
+          <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="true">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsSelected" Value="true" />
+          <Condition Property="Selector.IsSelectionActive" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+      <Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+              <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                <StackPanel Orientation="Horizontal">
+                  <ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
+                  <ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                </StackPanel>
+              </Border>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ListBoxBaseStyle" TargetType="ListBox">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+    <Setter Property="hc:ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="hc:ScrollViewer.CanContentScroll" Value="true" />
+    <Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListBox">
+          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <hc:ScrollViewer Focusable="false">
+                  <ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </hc:ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="GridViewColumnHeader">
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Padding" Value="12,6,12,12" />
+    <Setter Property="MinHeight" Value="44" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="GridViewColumnHeader">
+          <hc:SimplePanel SnapsToDevicePixels="true">
+            <Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
+              <ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </Border>
+            <Canvas>
+              <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
+            </Canvas>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="SnapsToDevicePixels" Value="true" />
+    <Setter Property="Margin" Value="0,0,0,4" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="MinHeight" Value="44" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListViewItem">
+          <Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="True">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsSelected" Value="true" />
+          <Condition Property="Selector.IsSelectionActive" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="LoadingBaseStyle" TargetType="hc:LoadingBase">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="DotDiameter" Value="10" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="LoadingCircleBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingCircle">
+    <Setter Property="Width" Value="40" />
+    <Setter Property="Height" Value="40" />
+    <Setter Property="DotDiameter" Value="5" />
+    <Setter Property="DotInterval" Value="30" />
+    <Setter Property="DotOffSet" Value="60" />
+    <Setter Property="DotDelayTime" Value="90" />
+    <Setter Property="DotSpeed" Value="4" />
+  </Style>
+  <Style x:Key="LoadingLineBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingLine">
+    <Setter Property="DotDiameter" Value="5" />
+  </Style>
+  <Style x:Key="MagnifierBaseStyle" TargetType="hc:Magnifier">
+    <Setter Property="IsHitTestVisible" Value="False" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Width" Value="180" />
+    <Setter Property="Height" Value="180" />
+    <Setter Property="BorderThickness" Value="8" />
+    <Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Magnifier">
+          <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Ellipse>
+              <Ellipse.Fill>
+                <VisualBrush Visual="{Binding Target,RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute" x:Name="PART_VisualBrush" />
+              </Ellipse.Fill>
+            </Ellipse>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="MenuItem4NavigationWindowStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
+    <Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
+    <Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
+    <Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
+    <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
+  </Style>
+  <Style x:Key="NavigationWindowBaseStyle" TargetType="NavigationWindow">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="NavigationWindow">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <DockPanel LastChildFill="True">
+              <Border DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
+                <hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
+                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
+                    <Button.ContextMenu>
+                      <ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
+                    </Button.ContextMenu>
+                  </Button>
+                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
+                    <Button.ContextMenu>
+                      <ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
+                    </Button.ContextMenu>
+                  </Button>
+                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
+                </hc:ButtonGroup>
+              </Border>
+              <hc:SimplePanel>
+                <AdornerDecorator>
+                  <ContentPresenter x:Name="PART_NavWinCP" ClipToBounds="true" />
+                </AdornerDecorator>
+                <ResizeGrip x:Name="WindowResizeGrip" HorizontalAlignment="Right" IsTabStop="false" Visibility="Collapsed" VerticalAlignment="Bottom" />
+              </hc:SimplePanel>
+            </DockPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ShowsNavigationUI" Value="False">
+              <Setter Property="Visibility" TargetName="NavChrome" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="CanGoBack" Value="False">
+              <Setter Property="IsEnabled" TargetName="BackNavMenu" Value="false" />
+            </Trigger>
+            <Trigger Property="CanGoForward" Value="False">
+              <Setter Property="IsEnabled" TargetName="ForwardNavMenu" Value="false" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
+                <Condition Property="WindowState" Value="Normal" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Visibility" TargetName="WindowResizeGrip" Value="Visible" />
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+    <Setter Property="IsTabStop" Value="False" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:NumericUpDown">
+          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+              <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+              <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="ShowUpDownButton" Value="False">
+              <Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
+            </Trigger>
+            <Trigger Property="IsReadOnly" Value="True">
+              <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+              <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="NumericUpDownExtendTopTemplate" TargetType="hc:NumericUpDown">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsReadOnly" Value="True">
+        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="NumericUpDownExtendLeftTemplate" TargetType="hc:NumericUpDown">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+          <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsReadOnly" Value="True">
+        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="NumericUpDownExtendBaseStyle" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Template" Value="{StaticResource NumericUpDownExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource NumericUpDownExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+          <Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsReadOnly" Value="True">
+        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" />
+          <Condition Property="ShowClearButton" Value="True" />
+          <Condition Property="IsReadOnly" Value="False" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsReadOnly" Value="True">
+        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" />
+          <Condition Property="ShowClearButton" Value="True" />
+          <Condition Property="IsReadOnly" Value="False" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource NumericUpDownPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="PasswordBoxBaseStyle" TargetType="PasswordBox">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+    <Setter Property="PasswordChar" Value="●" />
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="PasswordBox">
+          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="border" Value="0.4" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="true">
+              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="PasswordBoxExtendTopTemplate" TargetType="PasswordBox">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <TextBlock x:Name="placeholder" Padding="1" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+      <ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+        <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+        <Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="PasswordBoxExtendLeftTemplate" TargetType="PasswordBox">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <TextBlock Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" Grid.Column="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+      <ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+        <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value="0.4" TargetName="border" />
+        <Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
+        <Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="PasswordBoxExtendBaseStyle" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
+    <Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource PasswordBoxExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="PasswordBoxPlusInternalStyle" TargetType="PasswordBox">
+    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="PasswordBox">
+          <hc:SimplePanel>
+            <TextBlock Margin="2,-1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+            <ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+              <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="PasswordBoxPlusTopTemplate" TargetType="hc:PasswordBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <DockPanel Grid.ColumnSpan="3" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Grid.Column="0" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+      <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="0" Grid.Row="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
+      <hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      <Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Grid.Column="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+      <ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="1" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="ShowEyeButton" Value="true">
+        <Setter Property="Margin" Value="0" TargetName="ButtonClear" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="PasswordBoxPlusLeftTemplate" TargetType="hc:PasswordBox">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <Border Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+      <PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
+      <hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="1" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+      <Button Height="{x:Static system:Double.NaN}" Grid.Column="2" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+      <ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="3" Foreground="{TemplateBinding BorderBrush}" Focusable="False" />
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+      <Trigger Property="ShowEyeButton" Value="true">
+        <Setter Property="Margin" Value="0" TargetName="ButtonClear" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="PasswordBoxPlusBaseStyle" TargetType="hc:PasswordBox">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+    <Setter Property="PasswordChar" Value="●" />
+    <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="AllowDrop" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template" Value="{StaticResource PasswordBoxPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource PasswordBoxPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="PinBoxBaseStyle" TargetType="hc:PinBox">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemMargin" Value="4,0" />
+    <Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:PinBox">
+          <UniformGrid Name="PART_Panel" Columns="{TemplateBinding Length}" Rows="1" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PoptipBaseStyle" TargetType="hc:Poptip">
+    <Setter Property="IsHitTestVisible" Value="False" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Offset" Value="6" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Poptip">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ProgressBar">
+          <Border x:Name="PART_Track">
+            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+              <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Indicator" Background="{TemplateBinding Foreground}" />
+            </Decorator>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ProgressButtonBaseStyle" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="ProgressStyle" Value="{StaticResource ProgressBarFlat4ProgressButton}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ProgressButton">
+          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <hc:SimplePanel>
+              <ProgressBar x:Name="ProgressBar" Height="Auto" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}" />
+              <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Visibility" Value="Visible" TargetName="ProgressBar" />
+              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+                <Condition Property="IsChecked" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PropertyItemToolTipBaseStyle" BasedOn="{StaticResource {x:Type ToolTip}}" TargetType="ToolTip">
+    <Setter Property="Padding" Value="10" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToolTip">
+          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <ContentPresenter x:Name="Presenter" Margin="0,0,0,10" />
+              <StackPanel Grid.Row="1" Orientation="Horizontal">
+                <TextBlock FontWeight="Bold" Text="{Binding PropertyTypeName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" />
+                <TextBlock Text="{Binding PropertyName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" Margin="6,0,0,0" />
+              </StackPanel>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="Content" Value="">
+              <Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PropertyItemBaseStyle" TargetType="hc:PropertyItem">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Margin" Value="0,0,0,6" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:PropertyItem">
+          <GroupBox Style="{StaticResource GroupBoxOriginal}" hc:TitleElement.TitlePlacement="Left">
+            <GroupBox.Header>
+              <TextBlock Padding="0,0,10,0" Width="{Binding Path=(hc:TitleElement.TitleWidth).Value,RelativeSource={RelativeSource TemplatedParent}}" Text="{TemplateBinding DisplayName}" TextTrimming="CharacterEllipsis">
+                <TextBlock.ToolTip>
+                  <ToolTip Style="{StaticResource PropertyItemToolTipBaseStyle}" Content="{TemplateBinding Description}" />
+                </TextBlock.ToolTip>
+              </TextBlock>
+            </GroupBox.Header>
+            <ContentPresenter ContentSource="EditorElement" />
+          </GroupBox>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PropertyItemsControlBaseStyle" TargetType="hc:PropertyItemsControl">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource PropertyItemBaseStyle}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:PropertyItemsControl">
+          <hc:ScrollViewer Focusable="false" HorizontalScrollBarVisibility="Disabled">
+            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+          </hc:ScrollViewer>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsGrouping" Value="False">
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="PropertyGroupItemBaseStyle" TargetType="GroupItem">
+    <Setter Property="Margin" Value="0,0,0,6" />
+    <Setter Property="Padding" Value="10,6,6,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="GroupItem">
+          <Expander Header="{Binding Name}" IsExpanded="True">
+            <Border BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4">
+              <ItemsPresenter Margin="{TemplateBinding Padding}" />
+            </Border>
+          </Expander>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="PropertyGridBaseStyle" TargetType="hc:PropertyGrid">
+    <Setter Property="MaxTitleWidth" Value="200" />
+    <Setter Property="MinTitleWidth" Value="120" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Padding" Value="10" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:PropertyGrid">
+          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <DockPanel LastChildFill="True" Margin="0,0,0,6">
+                <hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
+                  <RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
+                    <Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
+                  </RadioButton>
+                  <RadioButton Command="interactivity:ControlCommands.SortByName">
+                    <Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
+                  </RadioButton>
+                </hc:ButtonGroup>
+                <hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
+              </DockPanel>
+              <hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
+                <hc:PropertyItemsControl.GroupStyle>
+                  <GroupStyle ContainerStyle="{StaticResource PropertyGroupItemBaseStyle}" />
+                </hc:PropertyItemsControl.GroupStyle>
+              </hc:PropertyItemsControl>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:RateItem">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="OnMouseEnter">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
+                <EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
+                <EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="OnMouseLeave">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
+                <EasingDoubleKeyFrame KeyTime="0" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
+                <EasingDoubleKeyFrame KeyTime="0" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Canvas x:Name="CanvasRoot" RenderTransformOrigin="0.5,0.5">
+            <Canvas.RenderTransform>
+              <TransformGroup>
+                <ScaleTransform />
+              </TransformGroup>
+            </Canvas.RenderTransform>
+            <Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Background}" Stretch="Uniform" />
+            <Border x:Name="PART_Icon" Visibility="Collapsed">
+              <Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" HorizontalAlignment="Left" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" />
+            </Border>
+          </Canvas>
+          <ControlTemplate.Triggers>
+            <EventTrigger RoutedEvent="UIElement.MouseEnter" SourceName="CanvasRoot">
+              <BeginStoryboard Storyboard="{StaticResource OnMouseEnter}" />
+            </EventTrigger>
+            <EventTrigger RoutedEvent="UIElement.MouseLeave" SourceName="CanvasRoot">
+              <BeginStoryboard Storyboard="{StaticResource OnMouseLeave}" />
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RateBaseStyle" TargetType="hc:Rate">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemMargin" Value="5,0" />
+    <Setter Property="HorizontalAlignment" Value="Left" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="Icon" Value="{StaticResource StarGeometry}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource RateRateItemBaseStyle}" />
+    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:0.0}}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Rate">
+          <StackPanel Background="Transparent" Orientation="Horizontal">
+            <UniformGrid Rows="1" Margin="-5,0" x:Name="PART_Panel" />
+            <TextBlock Visibility="{TemplateBinding ShowText,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding Text}" Margin="10,0,0,0" VerticalAlignment="Center" />
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="RunningBlockBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RunningBlock">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="0,10" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:RunningBlock">
+          <hc:RunningBorder CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <hc:SimplePanel ClipToBounds="True">
+              <hc:SimplePanel HorizontalAlignment="Left" x:Name="PART_Panel">
+                <ContentPresenter x:Name="PART_ContentElement" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left">
+                  <ContentPresenter.RenderTransform>
+                    <TransformGroup>
+                      <TranslateTransform />
+                    </TransformGroup>
+                  </ContentPresenter.RenderTransform>
+                </ContentPresenter>
+              </hc:SimplePanel>
+            </hc:SimplePanel>
+          </hc:RunningBorder>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Padding" Value="10,0" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="SeparatorBaseStyle" TargetType="Separator">
+    <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+  </Style>
+  <Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Shield">
+    <Setter Property="Height" Value="20" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="3" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Color" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Shield">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
+              <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
+            </Border>
+            <Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
+              <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
+            </Border>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+    <Setter Property="Role" Value="Item" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="MinHeight" Value="40" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenuItem">
+          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
+            <hc:SimplePanel>
+              <Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
+              <ContentControl Margin="4,0,0,0">
+                <DockPanel Margin="{TemplateBinding Padding}">
+                  <ContentControl Width="40" Name="PresenterIcon">
+                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  </ContentControl>
+                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                </DockPanel>
+              </ContentControl>
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
+              <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+            </DataTrigger>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SideMenuItemAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemBaseStyle}" TargetType="hc:SideMenuItem">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenuItem">
+          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
+            <hc:SimplePanel>
+              <Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
+              <ContentControl Margin="4,0,0,0">
+                <DockPanel Margin="{TemplateBinding Padding}">
+                  <ContentControl Width="40" Name="PresenterIcon">
+                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  </ContentControl>
+                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                </DockPanel>
+              </ContentControl>
+            </hc:SimplePanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
+              <Setter Property="BorderBrush" Value="Transparent" />
+            </DataTrigger>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenuItem">
+          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition MinHeight="48" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Border Name="BorderBack" Background="{TemplateBinding Background}" />
+              <ContentControl Grid.Row="0" Margin="4,0,0,0">
+                <DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
+                  <ContentControl Width="40" Name="PresenterIcon">
+                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  </ContentControl>
+                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                </DockPanel>
+              </ContentControl>
+              <StackPanel Grid.Row="1" x:Name="PART_Panel" Visibility="Collapsed" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
+              <Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+            </Trigger>
+            <Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
+              <Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SideMenuItemHeaderAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemHeaderBaseStyle}" TargetType="hc:SideMenuItem">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemAccordionBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenuItem">
+          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition MinHeight="48" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Border Name="BorderBack" Background="{TemplateBinding Background}" />
+              <ContentControl Grid.Row="0" Margin="4,0,0,0">
+                <DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
+                  <ContentControl Width="40" Name="PresenterIcon">
+                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  </ContentControl>
+                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                </DockPanel>
+              </ContentControl>
+              <ScrollViewer Visibility="{Binding Visibility,ElementName=PART_Panel}" Grid.Row="1" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}">
+                <StackPanel x:Name="PART_Panel" Visibility="Collapsed" />
+              </ScrollViewer>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
+              <Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+            </Trigger>
+            <Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
+              <Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SideMenuBaseStyle" TargetType="hc:SideMenu">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenu">
+          <Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <ScrollViewer>
+              <StackPanel x:Name="PART_Panel" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="SplitButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="HorizontalAlignment" Value="Center" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SplitButton">
+          <hc:SimplePanel x:Name="templateRoot">
+            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+              <Grid>
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+                  <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+                  <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </StackPanel>
+                <ToggleButton x:Name="PART_Arrow" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="22" Height="Auto" Padding="0,10,8,10" HorizontalContentAlignment="Left" Grid.Column="1" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" hc:IconElement.Geometry="{StaticResource DownGeometry}" />
+              </Grid>
+            </Border>
+            <Popup AllowsTransparency="true" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="Fade" Placement="Bottom">
+              <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+                <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+                  <hc:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+                    <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                      <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}" />
+                    </Canvas>
+                    <ContentPresenter ContentSource="DropDownContent" />
+                  </hc:SimplePanel>
+                </ScrollViewer>
+              </Border>
+            </Popup>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="HitMode" Value="Click" />
+                <Condition Property="IsChecked" Value="True" SourceName="PART_Arrow" />
+              </MultiTrigger.Conditions>
+              <Setter Property="IsDropDownOpen" Value="True" />
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Opacity" Value=".9" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Opacity" Value=".6" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
+  <Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
+    <Setter Property="BorderThickness" Value="0,1,0,0" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+  </Style>
+  <Style x:Key="StatusBarItemBaseStyle" TargetType="StatusBarItem">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Style.Triggers>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value="0.4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="StepBarItemBaseStyle" TargetType="hc:StepBarItem">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+    <Style.Triggers>
+      <Trigger Property="Status" Value="Complete">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+      </Trigger>
+      <Trigger Property="Status" Value="UnderWay">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="Status" Value="Waiting">
+        <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="StepBarItemHorizontalTop" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+    <Setter Property="Margin" Value="10,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:StepBarItem">
+          <StackPanel>
+            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Border>
+            <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="StepBarItemHorizontalBottom" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+    <Setter Property="Margin" Value="10,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:StepBarItem">
+          <StackPanel>
+            <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4" />
+            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Border>
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+    <Setter Property="Margin" Value="0, 10" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:StepBarItem">
+          <StackPanel Orientation="Horizontal">
+            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Border>
+            <ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0" />
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="StepBarHorizontalTopControlTemplate" TargetType="hc:StepBar">
+    <hc:SimplePanel>
+      <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Top" Margin="0,10,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
+      <ItemsPresenter />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <ControlTemplate x:Key="StepBarHorizontalBottomControlTemplate" TargetType="hc:StepBar">
+    <hc:SimplePanel>
+      <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Bottom" Margin="0,0,0,10" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
+      <ItemsPresenter VerticalAlignment="Bottom" />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar">
+    <hc:SimplePanel>
+      <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
+        <ProgressBar.RenderTransform>
+          <TransformGroup>
+            <RotateTransform Angle="180" />
+          </TransformGroup>
+        </ProgressBar.RenderTransform>
+      </ProgressBar>
+      <ItemsPresenter />
+    </hc:SimplePanel>
+  </ControlTemplate>
+  <Style x:Key="StepBarBaseStyle" TargetType="hc:StepBar">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
+    <Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
+    <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="Dock" Value="Left">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
+        <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+      </Trigger>
+      <Trigger Property="Dock" Value="Bottom">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
+        <Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+      </Trigger>
+      <Trigger Property="Dock" Value="Right">
+        <Setter Property="FlowDirection" Value="RightToLeft" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
+        <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
+        <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TabItemStyle" TargetType="TabItem">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TabItem">
+          <hc:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
+            <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0" />
+            <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsSelected" Value="False">
+              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+            </Trigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Panel.ZIndex" Value="1" />
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,3" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Panel.ZIndex" Value="1" />
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,3,0" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Bottom" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Panel.ZIndex" Value="1" />
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,3,0,0" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+              <MultiDataTrigger.Conditions>
+                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right" />
+              </MultiDataTrigger.Conditions>
+              <Setter Property="Panel.ZIndex" Value="1" />
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+              <Setter Property="BorderThickness" TargetName="mainBorder" Value="3,0,0,0" />
+            </MultiDataTrigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TabControlBaseStyle" TargetType="TabControl">
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Foreground" Value="White" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TabControl">
+          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition x:Name="ColumnDefinition0" />
+              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
+              <RowDefinition x:Name="RowDefinition1" Height="*" />
+            </Grid.RowDefinitions>
+            <TabPanel x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+            <Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="TabStripPlacement" Value="Bottom">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Left">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Right">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TabItemCapsuleBaseStyle" TargetType="TabItem">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TabItem">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentPresenter x:Name="contentPresenter" ContentSource="Header" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" TargetName="BorderRoot" />
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="true">
+              <Setter Property="BorderBrush" Value="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="Background" Value="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+            </Trigger>
+            <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left">
+              <Setter Property="Margin" Value="0,-1,0,0" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right">
+              <Setter Property="Margin" Value="0,-1,0,0" />
+            </DataTrigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsSelected" Value="True">
+        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TabItemPlusBaseStyle" TargetType="hc:TabItem">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderThickness" Value="1,0,1,1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="Padding" Value="10,0,0,0" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="VerticalContentAlignment" Value="Stretch" />
+    <Setter Property="Menu" Value="{StaticResource TabItemMenu}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TabItem">
+          <Grid x:Name="templateRoot" SnapsToDevicePixels="true" ContextMenu="{TemplateBinding Menu}">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
+              <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Visibility="Collapsed" />
+            </Border>
+            <Path x:Name="PathMain" Margin="10,0,0,0" Grid.Column="0" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+            <ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+            <Border Name="BorderMask" Grid.Column="1" HorizontalAlignment="Right" Width="20" Background="{TemplateBinding Background}" Margin="0,0,1,1">
+              <Border.OpacityMask>
+                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+                  <GradientStop Color="White" Offset="1" />
+                  <GradientStop Offset="0" />
+                </LinearGradientBrush>
+              </Border.OpacityMask>
+            </Border>
+            <Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
+              <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}" />
+            </Button>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsSelected" Value="true">
+              <Setter Property="Panel.ZIndex" Value="1" />
+              <Setter Property="Visibility" TargetName="innerBorder" Value="Visible" />
+              <Setter Property="Background" TargetName="BorderMask" Value="{DynamicResource RegionBrush}" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+            </Trigger>
+            <Trigger Property="ShowCloseButton" Value="True">
+              <Setter Property="Margin" Value="0,0,0,1" TargetName="BorderMask" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="TabControlPlusTemplate" TargetType="hc:TabControl">
+    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+      <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition x:Name="ColumnDefinition0" />
+          <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
+          <hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+            <interactivity:Interaction.Behaviors>
+              <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+                <interactivity:FluidMoveBehavior.EaseX>
+                  <CubicEase EasingMode="EaseOut" />
+                </interactivity:FluidMoveBehavior.EaseX>
+              </interactivity:FluidMoveBehavior>
+            </interactivity:Interaction.Behaviors>
+          </hc:TabPanel>
+        </Border>
+        <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+          <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </Border>
+        <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+          <hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+        </Border>
+      </Grid>
+    </Border>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TabControlPlusScrollableTemplate" TargetType="hc:TabControl">
+    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+      <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition />
+          <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Border Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="0,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left" Panel.ZIndex="2">
+          <Border.CacheMode>
+            <BitmapCache SnapsToDevicePixels="True" />
+          </Border.CacheMode>
+          <RepeatButton Focusable="False" Style="{StaticResource RepeatButtonIcon}" Padding="8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft" />
+        </Border>
+        <hc:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" hc:ScrollViewerAttach.Orientation="Horizontal" IsInertiaEnabled="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
+          <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
+            <hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+              <interactivity:Interaction.Behaviors>
+                <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+                  <interactivity:FluidMoveBehavior.EaseX>
+                    <CubicEase EasingMode="EaseOut" />
+                  </interactivity:FluidMoveBehavior.EaseX>
+                </interactivity:FluidMoveBehavior>
+              </interactivity:Interaction.Behaviors>
+            </hc:TabPanel>
+          </Border>
+        </hc:ScrollViewer>
+        <Border Margin="0,-1,0,0" Grid.Row="0" Grid.Column="2" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+          <Border.CacheMode>
+            <BitmapCache SnapsToDevicePixels="True" />
+          </Border.CacheMode>
+          <StackPanel Orientation="Horizontal">
+            <RepeatButton Focusable="False" Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource RepeatButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" hc:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight" />
+            <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Width="1" Background="{DynamicResource BorderBrush}" />
+            <hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+          </StackPanel>
+        </Border>
+        <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+          <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </Border>
+      </Grid>
+    </Border>
+  </ControlTemplate>
+  <Style x:Key="TabControlPlusBaseStyle" TargetType="hc:TabControl">
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemPlusBaseStyle}" />
+    <Setter Property="Template" Value="{StaticResource TabControlPlusTemplate}" />
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsScrollable" Value="True" />
+          <Condition Property="IsTabFillEnabled" Value="False" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TimePickerBaseStyle" TargetType="hc:TimePicker">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TimePicker">
+          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="30" />
+              </Grid.ColumnDefinitions>
+              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+              <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </MultiTrigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="TimePickerExtendTopTemplate" TargetType="hc:TimePicker">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TimePickerExtendLeftTemplate" TargetType="hc:TimePicker">
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="30" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="TimePickerExtendBaseStyle" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
+    <Setter Property="Height" Value="Auto" />
+    <Setter Property="hc:InfoElement.Symbol" Value="●" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template" Value="{StaticResource TimePickerExtendTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource TimePickerExtendLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="TimePickerPlusTopTemplate" TargetType="hc:TimePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+      </Grid.RowDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TimePickerPlusLeftTemplate" TargetType="hc:TimePicker">
+    <ControlTemplate.Resources>
+      <Storyboard x:Key="StoryboardShow">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+      </Storyboard>
+      <Storyboard x:Key="StoryboardHidden">
+        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+      </Storyboard>
+    </ControlTemplate.Resources>
+    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+        <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+      </DockPanel>
+      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="25" />
+          </Grid.ColumnDefinitions>
+          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+        </Grid>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+        </MultiTrigger.Conditions>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+          <Condition Property="ShowClearButton" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+      </MultiTrigger>
+      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsError" Value="true">
+        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+        <Trigger.EnterActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+        </Trigger.EnterActions>
+        <Trigger.ExitActions>
+          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+        </Trigger.ExitActions>
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="TimePickerPlusBaseStyle" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker">
+    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+    <Setter Property="Template" Value="{StaticResource TimePickerPlusTopTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+        <Setter Property="Template" Value="{StaticResource TimePickerPlusLeftTemplate}" />
+        <Setter Property="Width" Value="Auto" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
+    <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Width" Value="1" />
+  </Style>
+  <Style x:Key="{x:Static ToolBar.ButtonStyleKey}" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}" BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
+  <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
+  <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
+  <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
+  <Style x:Key="{x:Static ToolBar.MenuStyleKey}" BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
+  <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToolBarThumbHorizontalStyle" TargetType="Thumb">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
+            <Path Stretch="Uniform" Width="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragVerticalGeometry}" SnapsToDevicePixels="True" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToolBarThumbVerticalStyle" TargetType="Thumb">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="Thumb">
+          <Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
+            <Path Stretch="Uniform" Height="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragHorizontalGeometry}" SnapsToDevicePixels="True" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToolBarVerticalOverflowButtonStyle" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="MinWidth" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
+            <Path x:Name="PathMore" Data="{StaticResource RightGeometry}" Height="8" Margin="4,4,8,4" HorizontalAlignment="Right" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocused" Value="true">
+              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ToolBarHorizontalOverflowButtonStyle" TargetType="ToggleButton">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="MinHeight" Value="0" />
+    <Setter Property="MinWidth" Value="0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
+            <Path x:Name="PathMore" Data="{StaticResource DownGeometry}" Width="8" Margin="4,4,4,8" VerticalAlignment="Bottom" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocused" Value="true">
+              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Visibility" Value="Collapsed" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <ControlTemplate x:Key="ToolBarVerticalTemplate" TargetType="ToolBar">
+    <Grid x:Name="Grid" SnapsToDevicePixels="true">
+      <Grid.RowDefinitions>
+        <RowDefinition />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <hc:SimplePanel x:Name="OverflowGrid" Grid.Row="1">
+        <ToggleButton Margin="0,4,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarVerticalOverflowButtonStyle}" />
+        <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Right" StaysOpen="false">
+          <Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
+            <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
+          </Border>
+        </Popup>
+      </hc:SimplePanel>
+      <Border x:Name="MainPanelBorder" Grid.Row="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+        <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+          <Thumb x:Name="ToolBarThumb" DockPanel.Dock="Top" Style="{StaticResource ToolBarThumbVerticalStyle}" Height="10" />
+          <ContentPresenter x:Name="ToolBarHeader" DockPanel.Dock="Top" ContentSource="Header" HorizontalAlignment="Center" Margin="0,4,0,4" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+          <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </DockPanel>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsOverflowOpen" Value="true">
+        <Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
+      </Trigger>
+      <Trigger Property="Header" Value="{x:Null}">
+        <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
+      </Trigger>
+      <Trigger Property="ToolBarTray.IsLocked" Value="true">
+        <Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="ToolBarHorizontalTemplate" TargetType="ToolBar">
+    <Grid x:Name="Grid" SnapsToDevicePixels="true">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <hc:SimplePanel x:Name="OverflowGrid" Grid.Column="1">
+        <ToggleButton Margin="4,0,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}" />
+        <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
+          <Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
+            <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
+          </Border>
+        </Popup>
+      </hc:SimplePanel>
+      <Border x:Name="MainPanelBorder" Grid.Column="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+        <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+          <Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbHorizontalStyle}" Width="10" />
+          <ContentPresenter x:Name="ToolBarHeader" ContentSource="Header" HorizontalAlignment="Center" Margin="4,0,4,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+          <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </DockPanel>
+      </Border>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsOverflowOpen" Value="true">
+        <Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
+      </Trigger>
+      <Trigger Property="Header" Value="{x:Null}">
+        <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
+      </Trigger>
+      <Trigger Property="ToolBarTray.IsLocked" Value="true">
+        <Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="ToolBarBaseStyle" TargetType="ToolBar">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Margin" Value="0,0,4,4" />
+    <Setter Property="Template" Value="{StaticResource ToolBarHorizontalTemplate}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource ToolBarVerticalTemplate}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
+    <Setter Property="Padding" Value="0,6" />
+    <Setter Property="Background" Value="White" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="FontSize" Value="12" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="2" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToolTip">
+          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
+            <ContentPresenter Margin="10,0" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="CanDeselect" Value="True" />
+    <Setter Property="SelfManage" Value="True" />
+    <Setter Property="Padding" Value="10, 0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Margin" Value="5,0,5,5" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TransferItem">
+          <Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+            <ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter TargetName="BorderRoot" Property="Background" Value="{DynamicResource PrimaryBrush}" />
+              <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsOrigin" Value="True" />
+          <Condition Property="IsTransferred" Value="False" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsOrigin" Value="True" />
+          <Condition Property="IsTransferred" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Collapsed" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsOrigin" Value="False" />
+          <Condition Property="IsTransferred" Value="True" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Visible" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsOrigin" Value="False" />
+          <Condition Property="IsTransferred" Value="False" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Visibility" Value="Collapsed" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TransferGroup">
+          <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ScrollViewer Margin="0,5">
+              <StackPanel x:Name="PART_Panel" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TransferBaseStyle" TargetType="hc:Transfer">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Transfer">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition MinWidth="200" />
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition MinWidth="200" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition />
+              <RowDefinition />
+              <RowDefinition />
+              <RowDefinition />
+            </Grid.RowDefinitions>
+            <hc:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+            <StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
+              <Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
+              <Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
+            </StackPanel>
+            <hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Width" Value="16" />
+    <Setter Property="Height" Value="16" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border Background="Transparent" Height="16" Padding="4" Width="16">
+            <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeViewItem}}">
+              <Path.RenderTransform>
+                <RotateTransform Angle="-90" />
+              </Path.RenderTransform>
+            </Path>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="RenderTransform" TargetName="ExpandPath">
+                <Setter.Value>
+                  <RotateTransform Angle="0" />
+                </Setter.Value>
+              </Setter>
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
+    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TreeViewItem">
+          <Grid>
+            <Grid.RowDefinitions>
+              <RowDefinition MinHeight="{TemplateBinding MinHeight}" />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+              <DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+                <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}" />
+                <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+              </DockPanel>
+            </Border>
+            <ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true" SourceName="Bd">
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+            </Trigger>
+            <Trigger Property="IsExpanded" Value="false">
+              <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="HasItems" Value="false">
+              <Setter Property="Visibility" TargetName="Expander" Value="Hidden" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="true">
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsSelected" Value="true" />
+                <Condition Property="IsSelectionActive" Value="false" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}" />
+              <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="hc:ScrollViewer.IsInertiaEnabled" Value="False" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TreeView">
+          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                  <ItemsPresenter />
+                </hc:ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}" />
+            </Trigger>
+            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+              <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+        <Setter Property="ItemsPanel">
+          <Setter.Value>
+            <ItemsPanelTemplate>
+              <VirtualizingStackPanel />
+            </ItemsPanelTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="WatermarkBaseStyle" TargetType="hc:Watermark">
+    <Setter Property="MarkBrush" Value="{DynamicResource DarkMaskBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
+    <Setter Property="Angle" Value="20" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Watermark">
+          <Border Name="PART_Root">
+            <ContentPresenter />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="AutoCompleteTextBoxInternal" BasedOn="{StaticResource ComboBoxEditableTextBox}" TargetType="TextBox" />
+  <Style x:Key="AutoCompleteTextBoxItemBaseStyle" TargetType="ComboBoxItem">
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ComboBoxItem">
+          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </Border>
+          <ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsSelected" Value="False" />
+                <Condition Property="IsMouseOver" Value="True" />
+              </MultiTrigger.Conditions>
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsSelected" Value="True">
+              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+              <Setter Property="Foreground" Value="White" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="AutoCompleteTextBoxBaseStyle" TargetType="hc:AutoCompleteTextBox">
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteTextBoxItemBaseStyle}" />
+    <Setter Property="IsTabStop" Value="false" />
+    <Setter Property="hc:Empty.ShowEmpty" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:AutoCompleteTextBox">
+          <hc:SimplePanel>
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+              <TextBox x:Name="PART_SearchTextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Style="{StaticResource AutoCompleteTextBoxInternal}" />
+            </Border>
+            <Popup x:Name="PART_Popup" AllowsTransparency="true" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+              <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+                <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+                  <hc:ToggleBlock.CheckedContent>
+                    <ScrollViewer Margin="0,4">
+                      <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </ScrollViewer>
+                  </hc:ToggleBlock.CheckedContent>
+                  <hc:ToggleBlock.UnCheckedContent>
+                    <hc:Empty />
+                  </hc:ToggleBlock.UnCheckedContent>
+                </hc:ToggleBlock>
+              </Border>
+            </Popup>
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+              <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+            </Trigger>
+            <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+              <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
+              <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
+            </Trigger>
+            <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+              <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+              <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=PART_SearchTextBox}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true" SourceName="PART_SearchTextBox">
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </Trigger>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="IsMouseOver" Value="true" />
+                <Condition Property="IsFocused" Value="false" SourceName="PART_SearchTextBox" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+            </MultiTrigger>
+            <Trigger Property="IsFocused" Value="True" SourceName="PART_SearchTextBox">
+              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+              <Setter Property="Opacity" Value="0.4" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
+    <Setter Property="FocusVisualStyle">
+      <Setter.Value>
+        <Style>
+          <Setter Property="Control.Template">
+            <Setter.Value>
+              <ControlTemplate>
+                <Rectangle Margin="2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+              </ControlTemplate>
+            </Setter.Value>
+          </Setter>
+        </Style>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="BorderBrush" Value="Transparent" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DataGridCell">
+          <Border Background="Transparent">
+            <Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="Cell" />
+        </MultiDataTrigger.Conditions>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+      </MultiDataTrigger>
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
+          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+        </MultiDataTrigger.Conditions>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+      </MultiDataTrigger>
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
+          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+        </MultiDataTrigger.Conditions>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </MultiDataTrigger>
+      <MultiDataTrigger>
+        <MultiDataTrigger.Conditions>
+          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="FullRow" />
+        </MultiDataTrigger.Conditions>
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </MultiDataTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsSelected" Value="true" />
+          <Condition Property="Selector.IsSelectionActive" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="SnapsToDevicePixels" Value="true" />
+    <Setter Property="Margin" Value="0,0,0,4" />
+    <Setter Property="Padding" Value="0,6" />
+    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+    <Setter Property="ValidationErrorTemplate">
+      <Setter.Value>
+        <ControlTemplate>
+          <TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DataGridRow">
+          <SelectiveScrollingGrid>
+            <SelectiveScrollingGrid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="*" />
+            </SelectiveScrollingGrid.ColumnDefinitions>
+            <SelectiveScrollingGrid.RowDefinitions>
+              <RowDefinition Height="*" />
+              <RowDefinition Height="Auto" />
+            </SelectiveScrollingGrid.RowDefinitions>
+            <Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+            <DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            <DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}" />
+            <DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+          </SelectiveScrollingGrid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="True">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsSelected" Value="true" />
+          <Condition Property="Selector.IsSelectionActive" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Padding" Value="12,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DataGridColumnHeader">
+          <hc:SimplePanel>
+            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
+              <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <ContentPresenter RecognizesAccessKey="True" VerticalAlignment="Center" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <ToggleButton Grid.Column="1" VerticalAlignment="Center" Height="{x:Static system:Double.NaN}" Padding="4,0" Width="20" IsEnabled="False" Opacity="1" Foreground="{DynamicResource PrimaryBrush}" x:Name="ToggleButtonSortDirection" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+              </Grid>
+            </Border>
+            <Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
+            <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="SortDirection" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection" />
+            </Trigger>
+            <Trigger Property="SortDirection" Value="Ascending">
+              <Setter Property="IsChecked" Value="True" TargetName="ToggleButtonSortDirection" />
+            </Trigger>
+            <Trigger Property="SortDirection" Value="Descending">
+              <Setter Property="IsChecked" Value="False" TargetName="ToggleButtonSortDirection" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="SortDirection" Value="Ascending">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="SortDirection" Value="Descending">
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DataGridRowHeader">
+          <hc:SimplePanel HorizontalAlignment="Center">
+            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
+              <StackPanel Orientation="Horizontal">
+                <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+              </StackPanel>
+            </Border>
+            <Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
+            <Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+  </Style>
+  <Style x:Key="BadgePrimary" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="BadgeSuccess" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="BadgeInfo" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="BadgeWarning" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="BadgeDanger" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style x:Key="CalendarWithClockBaseStyle" TargetType="hc:CalendarWithClock">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Margin" Value="8 0" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:CalendarWithClock">
+          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+            <Grid>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+              </Grid.ColumnDefinitions>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" Height="42" VerticalAlignment="Top" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" />
+              <ContentPresenter Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_CalendarPresenter" Margin="-8,-4,-8,-8" />
+              <ContentPresenter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_ClockPresenter" Margin="-8,-4,-8,-8" />
+              <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" HorizontalAlignment="Center" Margin="0,0,0,19" Width="180" VerticalAlignment="Bottom" Style="{StaticResource ButtonPrimary}" />
+            </Grid>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:CalendarWithClock" BasedOn="{StaticResource CalendarWithClockBaseStyle}" />
+  <Style BasedOn="{StaticResource CardBaseStyle}" TargetType="hc:Card" />
+  <Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+    <Setter Property="Margin" Value="5,0" />
+    <Setter Property="Width" Value="10" />
+    <Setter Property="Height" Value="10" />
+    <Setter Property="Background" Value="White" />
+    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="Padding" Value="0" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ToggleButton">
+          <Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="Opacity" Value=".9" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+              <Setter Property="Opacity" Value=".6" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:Carousel">
+    <Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselItemBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Carousel">
+          <ControlTemplate.Triggers>
+            <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
+              <BeginStoryboard>
+                <Storyboard>
+                  <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1" />
+                </Storyboard>
+              </BeginStoryboard>
+            </EventTrigger>
+            <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
+              <BeginStoryboard>
+                <Storyboard>
+                  <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1" />
+                </Storyboard>
+              </BeginStoryboard>
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+          <hc:SimplePanel ClipToBounds="True">
+            <StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
+            <hc:SimplePanel x:Name="GridTop" Opacity="0">
+              <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
+                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
+                  <Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}" />
+                </Border>
+              </Button>
+              <Button Command="interactivity:ControlCommands.Next" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource ButtonCustom}">
+                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
+                  <Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}" />
+                </Border>
+              </Button>
+            </hc:SimplePanel>
+            <StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" />
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="hc:ChatBubble" />
+  <Style BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox" />
+  <Style x:Key="Tag4CheckComboBoxStyle.Small" BasedOn="{StaticResource Tag4CheckComboBoxStyle}" TargetType="hc:Tag">
+    <Setter Property="Padding" Value="6,0,4,0" />
+  </Style>
+  <Style x:Key="CheckComboBox.Small" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
+    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="CheckComboBoxExtend" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox" />
+  <Style x:Key="CheckComboBoxExtend.Small" BasedOn="{StaticResource CheckComboBoxExtend}" TargetType="hc:CheckComboBox">
+    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="CheckComboBoxPlus" BasedOn="{StaticResource CheckComboBoxPlusBaseStyle}" TargetType="hc:CheckComboBox" />
+  <Style x:Key="CheckComboBoxPlus.Small" BasedOn="{StaticResource CheckComboBoxPlus}" TargetType="hc:CheckComboBox">
+    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,1" />
+  </Style>
+  <Style x:Key="ClockRadioButtonStyle" TargetType="hc:ClockRadioButton">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Width" Value="28" />
+    <Setter Property="Height" Value="28" />
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ClockRadioButton">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="Storyboard1">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="Storyboard2">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
+                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <hc:SimplePanel x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+            <Ellipse x:Name="optionMark" Fill="{TemplateBinding Background}" MinWidth="6" MinHeight="6" Opacity="0" />
+            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+          </hc:SimplePanel>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+              <Trigger.EnterActions>
+                <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+              </Trigger.EnterActions>
+              <Trigger.ExitActions>
+                <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+              </Trigger.ExitActions>
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsChecked" Value="True">
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ClockBaseStyle" TargetType="hc:Clock">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Margin" Value="8 0" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="ClockRadioButtonStyle" Value="{StaticResource ClockRadioButtonStyle}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Clock">
+          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+              </Grid.ColumnDefinitions>
+              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Name="PART_BorderTitle">
+                <TextBlock x:Name="PART_TimeStr" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Foreground="{DynamicResource TextIconBrush}" />
+              </Border>
+              <Canvas Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="16,16,16,62" VerticalAlignment="Top" Name="PART_Canvas" Width="178" Height="178">
+                <Border Background="{DynamicResource SecondaryRegionBrush}" Width="178" Height="178" CornerRadius="89" />
+                <hc:CirclePanel Diameter="130" x:Name="PART_PanelNum" KeepVertical="True" Margin="24,24,0,0" OffsetAngle="-60" />
+                <Border Focusable="False" Name="PART_BorderClock" Background="{DynamicResource PrimaryBrush}" RenderTransformOrigin="0.5,1" Height="63" Width="2" Canvas.Left="88" Canvas.Top="26" />
+                <Ellipse Fill="White" Width="8" Height="8" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Canvas.Top="85" Canvas.Left="85" />
+              </Canvas>
+              <hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Am}}" Style="{StaticResource ClockRadioButtonStyle}" />
+              <hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Pm}}" Style="{StaticResource ClockRadioButtonStyle}" />
+              <Button Grid.Row="1" Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}" />
+            </Grid>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:Clock" BasedOn="{StaticResource ClockBaseStyle}" />
+  <Style x:Key="ClockListBoxItemStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="true">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="true">
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="false">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+      <Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
+        <Setter Property="Template">
+          <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+              <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                <StackPanel Orientation="Horizontal">
+                  <ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
+                  <ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                </StackPanel>
+              </Border>
+            </ControlTemplate>
+          </Setter.Value>
+        </Setter>
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ClockListBoxStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
+    <Setter Property="MaxHeight" Value="180" />
+    <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ClockListBoxItemStyle}" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+  </Style>
+  <Style x:Key="ListClockBaseStyle" TargetType="hc:ListClock">
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="Margin" Value="8 0" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ListClock">
+          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+            <Grid Margin="0,4" Width="210">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+                <ColumnDefinition />
+              </Grid.ColumnDefinitions>
+              <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <ListBox hc:BorderElement.CornerRadius="0" x:Name="PART_HourList" Style="{StaticResource ClockListBoxStyle}" />
+              <ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="1" x:Name="PART_MinuteList" Style="{StaticResource ClockListBoxStyle}" BorderThickness="1,0" />
+              <ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="2" x:Name="PART_SecondList" Style="{StaticResource ClockListBoxStyle}" />
+              <Border VerticalAlignment="Bottom" Visibility="{Binding Visibility,ElementName=PART_ButtonConfirm}" Height="1" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Background="{DynamicResource BorderBrush}" />
+              <Button Margin="0,10" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Background="Transparent" Style="{StaticResource ButtonCustom}" />
+            </Grid>
+          </hc:SimplePanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}" />
+  <Style BasedOn="{StaticResource ColorPickerBaseStyle}" TargetType="hc:ColorPicker" />
+  <Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu" />
+  <Style BasedOn="{StaticResource CoverFlowBaseStyle}" TargetType="hc:CoverFlow" />
+  <Style BasedOn="{StaticResource CoverViewBaseStyle}" TargetType="hc:CoverView" />
+  <Style x:Key="DataGridBaseStyle" TargetType="DataGrid">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="0" />
+    <Setter Property="GridLinesVisibility" Value="None" />
+    <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="EnableRowVirtualization" Value="True" />
+    <Setter Property="CanUserAddRows" Value="False" />
+    <Setter Property="CanUserDeleteRows" Value="False" />
+    <Setter Property="CanUserReorderColumns" Value="False" />
+    <Setter Property="CanUserResizeRows" Value="False" />
+    <Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle}" />
+    <Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}" />
+    <Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle}" />
+    <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
+    <Setter Property="Padding" Value="6" />
+    <Setter Property="RowHeight" Value="44" />
+    <Setter Property="ColumnHeaderHeight" Value="44" />
+    <Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
+    <Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
+    <Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
+    <Setter Property="hc:DataGridAttach.EditingComboBoxColumnStyle" Value="{StaticResource ComboBoxBaseStyle}" />
+    <Setter Property="hc:DataGridAttach.CheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
+    <Setter Property="hc:DataGridAttach.EditingCheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
+    <Setter Property="hc:DataGridAttach.ApplyDefaultStyle" Value="True" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="DataGrid">
+          <ControlTemplate.Resources>
+            <Storyboard x:Key="Storyboard1">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+            <Storyboard x:Key="Storyboard2">
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+              </DoubleAnimationUsingKeyFrames>
+            </Storyboard>
+          </ControlTemplate.Resources>
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+            <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+              <ScrollViewer.Template>
+                <ControlTemplate TargetType="ScrollViewer">
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="Auto" />
+                      <ColumnDefinition Width="*" />
+                      <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <Button Command="{x:Static DataGrid.SelectAllCommand}" MaxHeight="30" Height="auto" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+                      <Button.Visibility>
+                        <MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+                          <Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+                          <Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+                        </MultiBinding>
+                      </Button.Visibility>
+                    </Button>
+                    <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+                    <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+                      <hc:ToggleBlock.CheckedContent>
+                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
+                      </hc:ToggleBlock.CheckedContent>
+                      <hc:ToggleBlock.UnCheckedContent>
+                        <hc:Empty />
+                      </hc:ToggleBlock.UnCheckedContent>
+                    </hc:ToggleBlock>
+                    <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+                    <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" VerticalAlignment="Bottom" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                    <EventTrigger RoutedEvent="MouseEnter">
+                      <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+                    </EventTrigger>
+                    <EventTrigger RoutedEvent="MouseLeave">
+                      <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+                    </EventTrigger>
+                  </ControlTemplate.Triggers>
+                </ControlTemplate>
+              </ScrollViewer.Template>
+              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </ScrollViewer>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid" />
+  <Style x:Key="DataGridCellStyle.Small" BasedOn="{StaticResource DataGridCellStyle}" TargetType="DataGridCell">
+    <Setter Property="Padding" Value="6,2" />
+  </Style>
+  <Style x:Key="DataGridRowStyle.Small" BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
+    <Setter Property="Margin" Value="0,0,0,2" />
+  </Style>
+  <Style x:Key="DataGridColumnHeaderStyle.Small" BasedOn="{StaticResource DataGridColumnHeaderStyle}" TargetType="DataGridColumnHeader">
+    <Setter Property="Padding" Value="8,0" />
+  </Style>
+  <Style x:Key="DataGrid.Small" BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid">
+    <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle.Small}" />
+    <Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle.Small}" />
+    <Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle.Small}" />
+    <Setter Property="RowHeight" Value="24" />
+    <Setter Property="ColumnHeaderHeight" Value="20" />
+  </Style>
+  <Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
+  <Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
+  <Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
+  <Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
+  <Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
+  <Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
+  <Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
+  <Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
+  <Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
+  <Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
+  <Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
+  <Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
+  <Style BasedOn="{StaticResource FlowDocumentPageViewerBaseStyle}" TargetType="FlowDocumentPageViewer" />
+  <Style BasedOn="{StaticResource FlowDocumentReaderBaseStyle}" TargetType="FlowDocumentReader" />
+  <Style BasedOn="{StaticResource FrameBaseStyle}" TargetType="Frame" />
+  <Style BasedOn="{StaticResource GotoTopBaseStyle}" TargetType="hc:GotoTop" />
+  <Style BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar" />
+  <Style x:Key="GravatarCircle" BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar">
+    <Setter Property="Padding" Value="16" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Gravatar">
+          <Border Style="{StaticResource BorderCircularClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter Margin="{TemplateBinding Padding}" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="GravatarCircleImg" BasedOn="{StaticResource GravatarCircle}" TargetType="hc:Gravatar">
+    <Setter Property="Padding" Value="0" />
+  </Style>
+  <Style TargetType="hc:Growl">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="MinHeight" Value="60" />
+    <Setter Property="Width" Value="320" />
+    <Setter Property="Margin" Value="10,10,10,0" />
+    <Setter Property="MaxWidth" Value="320" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="8" />
+    <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Growl">
+          <Grid Name="PART_GridMain" RenderTransformOrigin="0.5,0.5">
+            <Grid.RenderTransform>
+              <TransformGroup>
+                <TranslateTransform X="{TemplateBinding MaxWidth}" />
+              </TransformGroup>
+            </Grid.RenderTransform>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="50" />
+              <ColumnDefinition />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition />
+              <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+            <Path FlowDirection="LeftToRight" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}" />
+            <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
+              <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap" />
+              <TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=hc:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0" />
+            </StackPanel>
+            <Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
+              <Path FlowDirection="LeftToRight" Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}" />
+            </Button>
+            <UniformGrid Columns="2" Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
+              <Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
+                <TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}" />
+              </Button>
+              <Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
+                <TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}" />
+              </Button>
+            </UniformGrid>
+          </Grid>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ImageSelectorBaseStyle}" TargetType="hc:ImageSelector" />
+  <Style TargetType="hc:ImageViewer">
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="Background" Value="Transparent" />
+    <Setter Property="MinWidth" Value="400" />
+    <Setter Property="MinHeight" Value="250" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:ImageViewer">
+          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <hc:SimplePanel x:Name="PART_PanelMain" ClipToBounds="True" Grid.RowSpan="2">
+                <Border HorizontalAlignment="Left" VerticalAlignment="Top" Height="{TemplateBinding ImageHeight}" Width="{TemplateBinding ImageWidth}" Margin="{TemplateBinding ImageMargin}">
+                  <Image Name="PART_ImageMain" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}" />
+                </Border>
+              </hc:SimplePanel>
+              <Border Grid.Row="0" Grid.RowSpan="2" Width="252" Height="162" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="{DynamicResource DarkOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
+                <Border.Visibility>
+                  <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowSmallImgInternal" />
+                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowImgMap" />
+                  </MultiBinding>
+                </Border.Visibility>
+                <Canvas ClipToBounds="True" Name="PART_CanvasSmallImg" MaxWidth="250" MaxHeight="160">
+                  <Border UseLayoutRounding="True" Name="PART_BorderMove" Background="Transparent" Width="50" Height="70" BorderThickness="1" BorderBrush="Black">
+                    <Border BorderThickness="1" BorderBrush="White" />
+                  </Border>
+                </Canvas>
+              </Border>
+              <Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
+                <StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
+                  <Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
+                  <Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
+                  <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
+                  <Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
+                  <TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
+                  <Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
+                  <Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
+                    <Border BorderThickness="1" BorderBrush="White" Padding="2">
+                      <TextBlock Text="1:1" />
+                    </Border>
+                  </Button>
+                  <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
+                  <Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
+                  <Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
+                  <ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
+                </StackPanel>
+              </Border>
+            </Grid>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
+  <Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
+    <Setter Property="Padding" Value="6,0" />
+    <Setter Property="MinHeight" Value="24" />
+  </Style>
+  <Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
+  </Style>
+  <Style x:Key="ListBoxCustom" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}" />
+    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+  </Style>
+  <Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+    <Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
+  </Style>
+  <Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+    <Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
+  </Style>
+  <Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+    <Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
+  </Style>
+  <Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+    <Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
+  </Style>
+  <Style x:Key="ListViewBaseStyle" TargetType="ListView">
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Padding" Value="6" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ListView">
+          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+              <hc:ToggleBlock.CheckedContent>
+                <ScrollViewer>
+                  <Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <Grid.RowDefinitions>
+                      <RowDefinition Height="Auto" />
+                      <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    <ItemsPresenter Grid.Row="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </Grid>
+                </ScrollViewer>
+              </hc:ToggleBlock.CheckedContent>
+              <hc:ToggleBlock.UnCheckedContent>
+                <hc:Empty />
+              </hc:ToggleBlock.UnCheckedContent>
+            </hc:ToggleBlock>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="IsGrouping" Value="true" />
+          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+        </MultiTrigger.Conditions>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+      </MultiTrigger>
+    </Style.Triggers>
+  </Style>
+  <Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView" />
+  <Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
+  <Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style x:Key="LoadingLineLarge" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
+    <Setter Property="DotDiameter" Value="10" />
+  </Style>
+  <Style x:Key="LoadingLineLargeLight" BasedOn="{StaticResource LoadingLineLarge}" TargetType="hc:LoadingLine">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle" />
+  <Style x:Key="LoadingCircleLight" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style x:Key="LoadingCircleLarge" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
+    <Setter Property="Width" Value="100" />
+    <Setter Property="Height" Value="100" />
+    <Setter Property="DotDiameter" Value="10" />
+    <Setter Property="DotInterval" Value="20" />
+    <Setter Property="DotOffSet" Value="40" />
+    <Setter Property="DotDelayTime" Value="120" />
+  </Style>
+  <Style x:Key="LoadingCircleLargeLight" BasedOn="{StaticResource LoadingCircleLarge}" TargetType="hc:LoadingCircle">
+    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource MagnifierBaseStyle}" TargetType="hc:Magnifier" />
+  <Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
+    <Setter Property="MinWidth" Value="88" />
+    <Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+    <Setter Property="Margin" Value="5,0" />
+  </Style>
+  <Style x:Key="MessageBoxPrimaryButtonStyle" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
+    <Setter Property="MinWidth" Value="88" />
+    <Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+    <Setter Property="Margin" Value="5,0" />
+  </Style>
+  <Style TargetType="hc:MessageBox" BasedOn="{StaticResource WindowWin10}">
+    <Setter Property="MinHeight" Value="172" />
+    <Setter Property="ShowInTaskbar" Value="False" />
+    <Setter Property="MinWidth" Value="335" />
+    <Setter Property="MaxWidth" Value="476" />
+    <Setter Property="MaxHeight" Value="680" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="SizeToContent" Value="WidthAndHeight" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:MessageBox">
+          <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+            <Grid Margin="{TemplateBinding Padding}">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+              </Grid.RowDefinitions>
+              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
+                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" IsTabStop="False" Name="PART_ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+                </StackPanel>
+                <Grid Grid.Column="0">
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+                  <Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
+                    <interactivity:Interaction.Triggers>
+                      <interactivity:EventTrigger EventName="MouseDoubleClick">
+                        <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+                      </interactivity:EventTrigger>
+                    </interactivity:Interaction.Triggers>
+                    <Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
+                  </Button>
+                  <TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
+                    <TextBlock.Visibility>
+                      <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+                        <MultiBinding.Bindings>
+                          <Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
+                          <Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
+                        </MultiBinding.Bindings>
+                      </MultiBinding>
+                    </TextBlock.Visibility>
+                  </TextBlock>
+                  <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
+                </Grid>
+              </Grid>
+              <AdornerDecorator Grid.Row="1">
+                <Grid>
+                  <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                  </Grid.ColumnDefinitions>
+                  <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="Auto" />
+                  </Grid.RowDefinitions>
+                  <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform" />
+                  <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
+                    <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
+                      <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
+                    </Border>
+                  </ScrollViewer>
+                  <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
+                </Grid>
+              </AdornerDecorator>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsActive" Value="False">
+              <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True" SourceName="PART_ButtonClose">
+              <Setter Property="Background" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+              <Setter Property="Foreground" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
+  <Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
+  <Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
+  <Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
+  <Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+    <Setter Property="GroupName" Value="1" />
+    <Setter Property="MinWidth" Value="30" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="HorizontalContentAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="RadioButton">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </StackPanel>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="Content" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+            </Trigger>
+            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsChecked" Value="True">
+        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style TargetType="hc:Pagination">
+    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:Pagination">
+          <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+            <Button x:Name="PART_ButtonLeft" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}" Command="interactivity:ControlCommands.Prev" />
+            <StackPanel ZIndex="999" HorizontalAlignment="Center" Orientation="Horizontal">
+              <interactivity:Interaction.Triggers>
+                <interactivity:RoutedEventTrigger RoutedEvent="RadioButton.Checked">
+                  <interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
+                </interactivity:RoutedEventTrigger>
+              </interactivity:Interaction.Triggers>
+              <RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{StaticResource PaginationButtonStyle}" />
+              <Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
+                <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
+              </Border>
+              <StackPanel Name="PART_PanelMain" Orientation="Horizontal" />
+              <Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
+                <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
+              </Border>
+              <RadioButton Name="PART_ButtonLast" Content="10" Style="{StaticResource PaginationButtonStyle}" />
+            </StackPanel>
+            <Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
+            <hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />
+            <Button IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Content="{ex:Lang {x:Static langs:LangKeys.Jump}}" Margin="6,0,0,0" Command="interactivity:ControlCommands.Jump" />
+          </StackPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox" />
+  <Style x:Key="PasswordBox.Small" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
+    <Setter Property="MinHeight" Value="20" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style x:Key="PasswordBoxExtend" BasedOn="{StaticResource PasswordBoxExtendBaseStyle}" TargetType="PasswordBox" />
+  <Style x:Key="PasswordBoxExtend.Small" BasedOn="{StaticResource PasswordBoxExtend}" TargetType="PasswordBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox" />
+  <Style x:Key="PasswordBoxPlus.Small" BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox">
+    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+    <Setter Property="Padding" Value="6,0" />
+  </Style>
+  <Style BasedOn="{StaticResource PinBoxBaseStyle}" TargetType="hc:PinBox" />
+  <Style BasedOn="{StaticResource PoptipBaseStyle}" TargetType="hc:Poptip" />
+  <Style TargetType="hc:PopupWindow">
+    <Setter Property="WindowStyle" Value="None" />
+    <Setter Property="MinHeight" Value="220" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="BorderThickness" Value="20" />
+    <Setter Property="ShowInTaskbar" Value="False" />
+    <Setter Property="MinWidth" Value="300" />
+    <Setter Property="ResizeMode" Value="NoResize" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="SizeToContent" Value="WidthAndHeight" />
+    <Setter Property="Effect">
+      <Setter.Value>
+        <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15" />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:PopupWindow">
+          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+                <RowDefinition Height="Auto" />
+              </Grid.RowDefinitions>
+              <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
+                <Grid.ColumnDefinitions>
+                  <ColumnDefinition />
+                  <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="{StaticResource DefaultControlPadding}" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis" />
+                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
+                  <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}" />
+                </Button>
+              </Grid>
+              <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
+                <StackPanel>
+                  <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}" />
+                  <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+                    <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" />
+                    <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Style="{StaticResource ButtonPrimary}" />
+                  </StackPanel>
+                </StackPanel>
+              </Border>
+            </Grid>
+          </Border>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ShowBorder" Value="True">
+              <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder" />
+            </Trigger>
+            <Trigger Property="ShowTitle" Value="False">
+              <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid" />
+              <Setter Property="Background" Value="Transparent" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ProgressButtonPrimary" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="ProgressButtonSuccess" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="ProgressButtonInfo" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="ProgressButtonWarning" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="ProgressButtonDanger" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource PropertyGridBaseStyle}" TargetType="hc:PropertyGrid" />
+  <Style x:Key="ComboBoxItemCapsuleBaseStyle" BasedOn="{x:Null}" TargetType="ComboBoxItem">
+    <Setter Property="MinWidth" Value="40" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="VerticalAlignment" Value="Center" />
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+    <Setter Property="Padding" Value="10,0" />
+    <Setter Property="Margin" Value="-1,0,0,0" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ComboBoxItem">
+          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <ContentPresenter x:Name="contentPresenter" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+    <Style.Triggers>
+      <Trigger Property="IsSelected" Value="True">
+        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+      </Trigger>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
+      </Trigger>
+      <Trigger Property="IsSelected" Value="true">
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="ComboBoxItemCapsuleDefault" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem" />
+  <Style x:Key="ComboBoxItemCapsuleHorizontalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ComboBoxItemCapsuleHorizontalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+  </Style>
+  <Style x:Key="ComboBoxItemCapsuleSingle" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+  </Style>
+  <Style x:Key="ComboBoxItemCapsuleVerticalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="ComboBoxItemCapsuleVerticalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+  </Style>
+  <Style x:Key="ComboBoxCapsule" BasedOn="{x:Null}" TargetType="ComboBox">
+    <Setter Property="ItemContainerStyleSelector" Value="{StaticResource ComboBoxItemCapsuleStyleSelector}" />
+    <Setter Property="VerticalAlignment" Value="Top" />
+    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="ComboBox">
+          <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource RateBaseStyle}" TargetType="hc:Rate" />
+  <Style BasedOn="{StaticResource RunningBlockBaseStyle}" TargetType="hc:RunningBlock" />
+  <Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
+  <Style BasedOn="{StaticResource ShieldBaseStyle}" TargetType="hc:Shield" />
+  <Style BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu" />
+  <Style x:Key="SideMenuAccordion" BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu">
+    <Setter Property="ExpandMode" Value="Accordion" />
+    <Setter Property="PanelAreaLength" Value="200" />
+    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderAccordionBaseStyle}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:SideMenu">
+          <Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+            <StackPanel x:Name="PART_Panel" />
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+    <Setter Property="BorderThickness" Value="1" />
+    <Style.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+      </Trigger>
+      <Trigger Property="IsPressed" Value="True">
+        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style x:Key="SplitButtonPrimary" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+  </Style>
+  <Style x:Key="SplitButtonSuccess" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+  </Style>
+  <Style x:Key="SplitButtonInfo" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+  </Style>
+  <Style x:Key="SplitButtonWarning" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+  </Style>
+  <Style x:Key="SplitButtonDanger" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+  </Style>
+  <Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar" />
+  <Style BasedOn="{StaticResource StatusBarItemBaseStyle}" TargetType="StatusBarItem" />
+  <Style BasedOn="{StaticResource StepBarBaseStyle}" TargetType="hc:StepBar" />
+  <Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl" />
+  <Style BasedOn="{StaticResource TabControlPlusBaseStyle}" TargetType="hc:TabControl" />
+  <Style x:Key="TabItemInLine" BasedOn="{StaticResource TabItemStyle}" TargetType="TabItem">
+    <Setter Property="MinWidth" Value="0" />
+  </Style>
+  <Style x:Key="TabControlInLine" BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemInLine}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TabControl">
+          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition x:Name="ColumnDefinition0" />
+              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
+              <RowDefinition x:Name="RowDefinition1" Height="*" />
+            </Grid.RowDefinitions>
+            <UniformGrid Rows="1" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+            <Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="TabStripPlacement" Value="Bottom">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Left">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
+              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Right">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
+              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TabItemCapsuleDefault" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem" />
+  <Style x:Key="TabItemCapsuleHorizontalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="TabItemCapsuleHorizontalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+  </Style>
+  <Style x:Key="TabItemCapsuleSingle" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+  </Style>
+  <Style x:Key="TabItemCapsuleVerticalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+    <Setter Property="Margin" Value="0" />
+  </Style>
+  <Style x:Key="TabItemCapsuleVerticalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+  </Style>
+  <Style x:Key="TabControlCapsule" TargetType="TabControl">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource RegionBrush}" />
+    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
+    <Setter Property="ItemContainerStyleSelector">
+      <Setter.Value>
+        <tools:TabItemCapsuleStyleSelector />
+      </Setter.Value>
+    </Setter>
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="TabControl">
+          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition x:Name="ColumnDefinition0" />
+              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
+              <RowDefinition x:Name="RowDefinition1" Height="*" />
+            </Grid.RowDefinitions>
+            <UniformGrid Rows="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+            <Border x:Name="contentPanel" Margin="0,6,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+            </Border>
+          </Grid>
+          <ControlTemplate.Triggers>
+            <Trigger Property="TabStripPlacement" Value="Bottom">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+              <Setter TargetName="contentPanel" Property="Margin" Value="0,0,0,6" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Left">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
+              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="Margin" Value="6,0,0,0" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Right">
+              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
+              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
+              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+              <Setter TargetName="contentPanel" Property="Margin" Value="0,0,6,0" />
+            </Trigger>
+          </ControlTemplate.Triggers>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style x:Key="TabControlCapsuleSolid" BasedOn="{StaticResource TabControlCapsule}" TargetType="TabControl">
+    <Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+  </Style>
+  <Style TargetType="hc:TimeBar">
+    <Setter Property="HotspotsBrush" Value="{DynamicResource AccentBrush}" />
+    <Setter Property="Focusable" Value="False" />
+    <Setter Property="UseLayoutRounding" Value="True" />
+    <Setter Property="BorderThickness" Value="0,1,0,0" />
+    <Setter Property="Foreground" Value="White" />
+    <Setter Property="Background" Value="{DynamicResource TitleBrush}" />
+    <Setter Property="Height" Value="60" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="hc:TimeBar">
+          <ControlTemplate.Triggers>
+            <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
+              <BeginStoryboard>
+                <Storyboard>
+                  <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
+                    <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                  </ObjectAnimationUsingKeyFrames>
+                </Storyboard>
+              </BeginStoryboard>
+            </EventTrigger>
+            <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
+              <BeginStoryboard>
+                <Storyboard>
+                  <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
+                    <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                  </ObjectAnimationUsingKeyFrames>
+                </Storyboard>
+              </BeginStoryboard>
+            </EventTrigger>
+          </ControlTemplate.Triggers>
+          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <hc:SimplePanel ClipToBounds="True">
+              <Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
+                <TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center" />
+              </Border>
+              <TextBlock Visibility="{TemplateBinding ShowSpeStr,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding SpeStr}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,14,10,0" />
+              <TextBlock Visibility="Collapsed" Name="PART_TextBlockMove" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,2,0,0" />
+              <Canvas Name="PART_CanvasSpe" VerticalAlignment="Bottom" Height="28" />
+              <hc:SimplePanel x:Name="PART_Hotspots" Margin="0,48,0,0" VerticalAlignment="Top" Visibility="{Binding Hotspots,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Object2VisibilityConverter}}" />
+              <Border Width="1" Background="{DynamicResource DangerBrush}" />
+              <Border Name="PART_BorderTop" Background="Transparent" Cursor="Hand" />
+            </hc:SimplePanel>
+          </Border>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
+  <Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
+  <Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
+  <Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
+  <Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
+  <Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
+  <Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
+  <Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
+  <Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
+  <Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
+  <Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
+    <Setter Property="Padding" Value="6,0" />
+    <Setter Property="MinHeight" Value="24" />
+  </Style>
+  <Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
+    <Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
+  </Style>
+  <Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
+  <Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
+  <ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
+    <hc:AxleCanvas>
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
+    <hc:AxleCanvas>
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
+    <hc:AxleCanvas Orientation="Vertical">
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
+    <hc:AxleCanvas Orientation="Vertical">
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="SliderHorizontal" TargetType="Slider">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+      <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
+        <Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
+          <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
+        </Canvas>
+      </Border>
+      <Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
+        </Track.Thumb>
+      </Track>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Top" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalTop}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Bottom" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalBottom}" />
+      </MultiTrigger>
+      <Trigger Property="TickPlacement" Value="TopLeft">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="BottomRight">
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="Both">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="IsSelectionRangeEnabled" Value="true">
+        <Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="SliderVertical" TargetType="Slider">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
+      <TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
+        <Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
+          <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
+        </Canvas>
+      </Border>
+      <Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
+        <Track.DecreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+        </Track.DecreaseRepeatButton>
+        <Track.IncreaseRepeatButton>
+          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+        </Track.IncreaseRepeatButton>
+        <Track.Thumb>
+          <Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
+        </Track.Thumb>
+      </Track>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Left" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalLeft}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Right" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}" />
+      </MultiTrigger>
+      <Trigger Property="TickPlacement" Value="TopLeft">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="BottomRight">
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="Both">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="IsSelectionRangeEnabled" Value="true">
+        <Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="SliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
+    <Setter Property="Template" Value="{StaticResource SliderHorizontal}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource SliderVertical}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <ControlTemplate x:Key="TipRangeSliderThumbHorizontalTop" TargetType="hc:RangeThumb">
+    <hc:AxleCanvas>
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipRangeSliderThumbHorizontalBottom" TargetType="hc:RangeThumb">
+    <hc:AxleCanvas>
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipRangeSliderThumbVerticalLeft" TargetType="hc:RangeThumb">
+    <hc:AxleCanvas Orientation="Vertical">
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="TipRangeSliderThumbVerticalRight" TargetType="hc:RangeThumb">
+    <hc:AxleCanvas Orientation="Vertical">
+      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+    </hc:AxleCanvas>
+    <ControlTemplate.Triggers>
+      <Trigger Property="IsMouseOver" Value="True">
+        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+      </Trigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+        <EventTrigger.Actions>
+          <BeginStoryboard>
+            <Storyboard>
+              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+            </Storyboard>
+          </BeginStoryboard>
+        </EventTrigger.Actions>
+      </EventTrigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="RangeSliderHorizontal" TargetType="hc:RangeSlider">
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+        <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <TickBar x:Name="TopTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+      <TickBar x:Name="BottomTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="9,0" Grid.Row="1" Height="2" VerticalAlignment="center" />
+      <hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="9,0" x:Name="PART_Track" Grid.Row="1">
+        <hc:RangeTrack.DecreaseRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+        </hc:RangeTrack.DecreaseRepeatButton>
+        <hc:RangeTrack.CenterRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+        </hc:RangeTrack.CenterRepeatButton>
+        <hc:RangeTrack.IncreaseRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+        </hc:RangeTrack.IncreaseRepeatButton>
+        <hc:RangeTrack.ThumbStart>
+          <hc:RangeThumb Content="{TemplateBinding ValueStart}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbStart" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
+        </hc:RangeTrack.ThumbStart>
+        <hc:RangeTrack.ThumbEnd>
+          <hc:RangeThumb Content="{TemplateBinding ValueEnd}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbEnd" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
+        </hc:RangeTrack.ThumbEnd>
+      </hc:RangeTrack>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Top" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
+        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Bottom" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
+        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
+      </MultiTrigger>
+      <Trigger Property="TickPlacement" Value="TopLeft">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="BottomRight">
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="Both">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <ControlTemplate x:Key="RangeSliderVertical" TargetType="hc:RangeSlider">
+    <Grid>
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
+        <ColumnDefinition Width="Auto" />
+      </Grid.ColumnDefinitions>
+      <TickBar x:Name="TopTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
+      <TickBar x:Name="BottomTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
+      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="0,9" Grid.Column="1" HorizontalAlignment="center" Width="2" />
+      <hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="0,9" x:Name="PART_Track" Grid.Column="1">
+        <hc:RangeTrack.DecreaseRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+        </hc:RangeTrack.DecreaseRepeatButton>
+        <hc:RangeTrack.CenterRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+        </hc:RangeTrack.CenterRepeatButton>
+        <hc:RangeTrack.IncreaseRepeatButton>
+          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+        </hc:RangeTrack.IncreaseRepeatButton>
+        <hc:RangeTrack.ThumbStart>
+          <hc:RangeThumb Content="{TemplateBinding ValueStart}" Margin="0,-9" x:Name="ThumbStart" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
+        </hc:RangeTrack.ThumbStart>
+        <hc:RangeTrack.ThumbEnd>
+          <hc:RangeThumb Content="{TemplateBinding ValueEnd}" Margin="0,-9" x:Name="ThumbEnd" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
+        </hc:RangeTrack.ThumbEnd>
+      </hc:RangeTrack>
+    </Grid>
+    <ControlTemplate.Triggers>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Left" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
+        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
+      </MultiTrigger>
+      <MultiTrigger>
+        <MultiTrigger.Conditions>
+          <Condition Property="hc:TipElement.Placement" Value="Right" />
+          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
+        </MultiTrigger.Conditions>
+        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
+        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
+      </MultiTrigger>
+      <Trigger Property="TickPlacement" Value="TopLeft">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="BottomRight">
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+      <Trigger Property="TickPlacement" Value="Both">
+        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+      </Trigger>
+    </ControlTemplate.Triggers>
+  </ControlTemplate>
+  <Style x:Key="RangeSliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RangeSlider">
+    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
+    <Setter Property="Template" Value="{StaticResource RangeSliderHorizontal}" />
+    <Style.Triggers>
+      <Trigger Property="Orientation" Value="Vertical">
+        <Setter Property="Template" Value="{StaticResource RangeSliderVertical}" />
+      </Trigger>
+      <Trigger Property="IsEnabled" Value="False">
+        <Setter Property="Opacity" Value=".4" />
+      </Trigger>
+    </Style.Triggers>
+  </Style>
+  <Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
+  <Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
 </ResourceDictionary>
\ No newline at end of file

From 70a732474b3a090b3c5510e178ce146e5d3c3b4e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 23 Feb 2022 22:37:56 +0800
Subject: [PATCH 08/32] Update Theme.xaml

---
 .../HandyControl_Shared/Themes/Theme.xaml     | 27970 ++++++++--------
 .../Tools/Interop/InteropValues.cs            |     1 -
 2 files changed, 14018 insertions(+), 13953 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index d6b25685..c72999a7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1,13954 +1,14020 @@
+<!--
+    This code was generated by a tool.
+
+    Changes to this file may cause incorrect behavior and will be lost if
+    the code is regenerated.
+-->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:langs="clr-namespace:HandyControl.Properties.Langs" xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:converter="clr-namespace:HandyControl.Tools.Converter" xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:interactivity="clr-namespace:HandyControl.Interactivity" xmlns:hc="clr-namespace:HandyControl.Controls" xmlns:tools="clr-namespace:HandyControl.Tools" xmlns:shapes="clr-namespace:HandyControl.Expression.Shapes" xmlns:ex="clr-namespace:HandyControl.Tools.Extension">
-  <langs:LangProvider x:Key="Langs" />
-  <converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
-  <converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
-  <converter:BooleanArr2VisibilityConverter x:Key="BooleanArr2VisibilityConverter" />
-  <converter:BooleanArr2BooleanConverter x:Key="BooleanArr2BooleanConverter" />
-  <converter:Long2FileSizeConverter x:Key="Long2FileSizeConverter" />
-  <converter:String2VisibilityConverter x:Key="String2VisibilityConverter" />
-  <converter:String2VisibilityReConverter x:Key="String2VisibilityReConverter" />
-  <BooleanToVisibilityConverter x:Key="Boolean2VisibilityConverter" />
-  <converter:TreeViewItemMarginConverter x:Key="TreeViewItemMarginConverter" />
-  <converter:Color2HexStringConverter x:Key="Color2HexStringConverter" />
-  <converter:Object2BooleanConverter x:Key="Object2BooleanConverter" />
-  <converter:Boolean2StringConverter x:Key="Boolean2StringConverter" />
-  <converter:Int2StringConverter x:Key="Int2StringConverter" />
-  <converter:BorderClipConverter x:Key="BorderClipConverter" />
-  <converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
-  <converter:BorderCircularConverter x:Key="BorderCircularConverter" />
-  <converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter" />
-  <converter:Object2VisibilityReConverter x:Key="Object2VisibilityReConverter" />
-  <converter:Number2PercentageConverter x:Key="Number2PercentageConverter" />
-  <converter:RectangleCircularConverter x:Key="RectangleCircularConverter" />
-  <converter:ThicknessSplitConverter x:Key="ThicknessSplitConverter" />
-  <converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
-  <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
-  <converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
-  <converter:DoubleMinConverter x:Key="DoubleMinConverter" />
-  <converter:Object2StringConverter x:Key="Object2StringConverter" />
-  <converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
-  <Color x:Key="EffectShadowColor">#88000000</Color>
-  <system:Double x:Key="LargeFontSize">24</system:Double>
-  <system:Double x:Key="HeadFontSize">20</system:Double>
-  <system:Double x:Key="SubHeadFontSize">16</system:Double>
-  <system:Double x:Key="TextFontSize">12</system:Double>
-  <Geometry o:Freeze="True" x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
-  <Geometry o:Freeze="True" x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
-  <Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
-  <Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
-  <Geometry o:Freeze="True" x:Key="RotateRightGeometry">M13.1117823382705,0.00108644926083379C18.7165758868546,0.0742913923738762 23.9197352191299,3.84162509632329 25.6893389483779,9.62980814885544 26.1165926715226,11.0273168346189 26.3185999652236,12.461670228202 26.296833302626,13.8899238456496L28.4974711200089,11.6892569876356C28.8483088275283,11.3384168617557 29.4089472552627,11.330238049977 29.7496950885147,11.6709881771838 30.0904429217666,12.0117402117628 30.0822642108291,12.572387459387 29.7314265033096,12.923229492639L25.9199488421768,16.7347560556155C25.5691111346572,17.0855980888674 25.0084688922257,17.0937769006462 24.6677210589736,16.7530248660672 24.5891077777236,16.674408708165 24.5290644427627,16.5840870073788 24.4875185748428,16.4873374624474L20.9957621356339,12.9955379708416C20.6550143023818,12.6547878436347 20.6631930133193,12.0941405960106 21.0140307208389,11.7432985627585 21.3648684283584,11.3924565295065 21.9255068560928,11.3842777177278 22.2662546893447,11.7250297523068L24.4968645831436,13.9556652415401C24.5284846087783,12.6830303030582 24.3545000811904,11.4030042974954 23.9728319903702,10.1546044295501 22.0890505572647,3.99295504901009 15.7152140399307,0.483677352708723 9.73950221742095,2.3106585349176 3.76379420960845,4.13763876344051 0.441986348280352,10.6112083411418 2.32576778138575,16.7728577216819 4.20954921449125,22.9345051948497 10.5833819171279,26.4437838448372 16.5590937396377,24.6168036163144 18.3326227923721,24.0745720467974 19.9086878558486,23.1123447593618 21.1902544757217,21.8133823630949 21.5398485919327,21.4590441166922 22.1090319415421,21.4627806587338 22.4615595599502,21.8217271162507 22.8140871783584,22.1806735737676 22.8164675494522,22.7589048852417 22.4668734332412,23.1132431316444 20.9798891803115,24.6204085496776 19.1496775409072,25.7378005615073 17.0939638873428,26.3663063881084 10.1663286944717,28.484321088751 2.78723170960845,24.4215726325395 0.609260823377952,17.2976520950044 -1.56871387754975,10.1737353722136 2.27700069154205,2.6791733248245 9.20463588441315,0.561156716809679 10.5035670062393,0.164028483596132 11.8183710833877,-0.0158071458708005 13.1117823382705,0.00108644926083379z</Geometry>
-  <Geometry o:Freeze="True" x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
-  <Geometry o:Freeze="True" x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
-  <Geometry o:Freeze="True" x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
-  <Geometry o:Freeze="True" x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
-  <Geometry o:Freeze="True" x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
-  <Geometry o:Freeze="True" x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
-  <Geometry o:Freeze="True" x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
-  <Geometry o:Freeze="True" x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignLeftGeometry">M0,8 L4,8 4,10 0,10 z M0,4 L8,4 8,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignRightGeometry">M8,8 L12,8 12,10 8,10 z M4,4 L12,4 12,6 4,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignHCenterGeometry">M4,8 L8,8 8,10 4,10 z M2,4 L10,4 10,6 2,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignHStretchGeometry">M0,8 L12,8 12,10 0,10 z M0,4 L12,4 12,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignTopGeometry">M8,0 L10,0 10,4 8,4 z M4,0 L6,0 6,8 4,8 z M0,0 L2,0 2,12 0,12 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignBottomGeometry">M8,8 L10,8 10,12 8,12 z M4,4 L6,4 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignVCenterGeometry">M8,4 L10,4 10,8 8,8 z M4,2 L6,2 6,10 4,10 z M0,0 L2,0 2,12 0,12 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AlignVStretchGeometry">M8,0 L10,0 10,12 8,12 z M4,0 L6,0 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="PageModeGeometry">M1.0000002,12 L1.0000002,13 11,13 11,12 z M1.0000002,10 L1.0000002,11 11,11 11,10 z M1.0000002,8 L1.0000002,9 11,9 11,8 z M1.0000002,6 L1.0000002,7 11,7 11,6 z M1.0000002,4 L1.0000002,5 11,5 11,4 z M1.0000002,2 L1.0000002,3 11,3 11,2 z M0,0 L12,0 12,14 0,14 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="TwoPageModeGeometry">M8.99999988079071,12L8.99999988079071,13 13,13 13,12z M1,12L1,13 5,13 5,12z M9.00000011920929,10L9.00000011920929,11 13,11 13,10z M1,10L1,11 5,11 5,10z M9.00000011920929,8L9.00000011920929,9 13,9 13,8z M1,8L1,9 5,9 5,8z M9.00000011920929,6L9.00000011920929,7 13,7 13,6z M1,6L1,7 5,7 5,6z M9.00000011920929,4L9.00000011920929,5 13,5 13,4z M1,4L1,5 5,5 5,4z M8.99999988079071,2L8.99999988079071,3 13,3 13,2z M1,2L1,3 5,3 5,2z M7.99999994039536,0L14,0 14,14 7.99999994039536,14z M0,0L6,0 6,14 0,14z</Geometry>
-  <Geometry o:Freeze="True" x:Key="ScrollModeGeometry">M1,12L1,13 8,13 8,12z M1,10L1,11 8,11 8,10z M1,8L1,9 8,9 8,8z M1,6L1,7 8,7 8,6z M11.0000002384186,5L11.0000002384186,9 13,9 13,5z M1,4L1,5 8,5 8,4z M1,2L1,3 8,3 8,2z M10.0000000298023,0L14,0 14,14 10.0000000298023,14z M0,0L9.00000011920929,0 9.00000011920929,14 0,14z</Geometry>
-  <Geometry o:Freeze="True" x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
-  <Geometry o:Freeze="True" x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
-  <Geometry o:Freeze="True" x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
-  <Geometry o:Freeze="True" x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AddGeometry">M8,0 C8.5522847,0 9,0.44771525 9,1 L9,7 15,7 C15.552285,7 16,7.4477153 16,8 16,8.5522852 15.552285,9 15,9 L9,9 9,15 C9,15.552285 8.5522847,16 8,16 7.4477153,16 7,15.552285 7,15 L7,9 1,9 C0.44771528,9 0,8.5522852 0,8 0,7.4477153 0.44771528,7 1,7 L7,7 7,1 C7,0.44771525 7.4477153,0 8,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="RemoveGeometry">M10.899495,0 C11.155417,0 11.411339,0.097630501 11.606602,0.29289246 11.997126,0.68341732 11.997126,1.3165817 11.606602,1.7071066 L7.3639612,5.9497471 11.606602,10.192388 C11.997126,10.582912 11.997126,11.216077 11.606602,11.606601 11.216077,11.997126 10.582912,11.997126 10.192388,11.606601 L5.9497476,7.3639607 1.7071068,11.606601 C1.3165827,11.997126 0.68341756,11.997126 0.29289341,11.606601 -0.097630978,11.216077 -0.097630978,10.582912 0.29289341,10.192388 L4.5355338,5.9497471 0.29289341,1.7071066 C-0.097630978,1.3165817 -0.097630978,0.68341732 0.29289341,0.29289246 0.48815536,0.097630501 0.74407768,0 1,0 1.2559223,0 1.5118446,0.097630501 1.7071068,0.29289246 L5.9497476,4.5355334 10.192388,0.29289246 C10.38765,0.097630501 10.643572,0 10.899495,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
-  <Geometry o:Freeze="True" x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
-  <Geometry o:Freeze="True" x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
-  <Geometry o:Freeze="True" x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
-  <Geometry o:Freeze="True" x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
-  <Geometry o:Freeze="True" x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
-  <Geometry o:Freeze="True" x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DragVerticalGeometry">M2,12 C3.1045694,12 4,12.895431 4,14 4,15.104569 3.1045694,16 2,16 0.89543051,16 0,15.104569 0,14 0,12.895431 0.89543051,12 2,12 z M2,6 C3.1045694,6 4,6.8954306 4,8 4,9.1045694 3.1045694,10 2,10 0.89543051,10 0,9.1045694 0,8 0,6.8954306 0.89543051,6 2,6 z M2,0 C3.1045694,0 4,0.89543056 4,2 4,3.1045694 3.1045694,4 2,4 0.89543051,4 0,3.1045694 0,2 0,0.89543056 0.89543051,0 2,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DragHorizontalGeometry">M14,0 C15.104569,0 16,0.89543051 16,2 16,3.1045694 15.104569,4 14,4 12.895431,4 12,3.1045694 12,2 12,0.89543051 12.895431,0 14,0 z M8,0 C9.1045694,0 10,0.89543051 10,2 10,3.1045694 9.1045694,4 8,4 6.8954306,4 6,3.1045694 6,2 6,0.89543051 6.8954306,0 8,0 z M2,0 C3.1045694,0 4,0.89543051 4,2 4,3.1045694 3.1045694,4 2,4 0.89543056,4 0,3.1045694 0,2 0,0.89543051 0.89543056,0 2,0 z</Geometry>
-  <Geometry o:Freeze="True" x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
-  <Style x:Key="PathBaseStyle" TargetType="Path">
-    <Setter Property="Stretch" Value="Uniform" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="FlowDirection" Value="LeftToRight" />
-  </Style>
-  <system:Double x:Key="DefaultControlHeight">30</system:Double>
-  <Thickness x:Key="DefaultControlPadding">10,6</Thickness>
-  <Thickness x:Key="DefaultInputPadding">8,6</Thickness>
-  <CornerRadius x:Key="DefaultCornerRadius">4</CornerRadius>
-  <system:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">30</system:Double>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorXY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-    <interactivity:FluidMoveBehavior.EaseX>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseX>
-    <interactivity:FluidMoveBehavior.EaseY>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseY>
-  </interactivity:FluidMoveBehavior>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorX200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-    <interactivity:FluidMoveBehavior.EaseX>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseX>
-  </interactivity:FluidMoveBehavior>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
-    <interactivity:FluidMoveBehavior.EaseY>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseY>
-  </interactivity:FluidMoveBehavior>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorXY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-    <interactivity:FluidMoveBehavior.EaseX>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseX>
-    <interactivity:FluidMoveBehavior.EaseY>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseY>
-  </interactivity:FluidMoveBehavior>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorX400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-    <interactivity:FluidMoveBehavior.EaseX>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseX>
-  </interactivity:FluidMoveBehavior>
-  <interactivity:FluidMoveBehavior x:Key="BehaviorY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
-    <interactivity:FluidMoveBehavior.EaseY>
-      <PowerEase />
-    </interactivity:FluidMoveBehavior.EaseY>
-  </interactivity:FluidMoveBehavior>
-  <Style TargetType="hc:BlendEffectBox">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:BlendEffectBox">
-          <ContentPresenter ContentSource="ActualContent" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="BorderCircular" TargetType="Border">
-    <Setter Property="hc:BorderElement.Circular" Value="True" />
-  </Style>
-  <Style TargetType="hc:Col">
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-  <Style TargetType="ContentControl">
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-  <Style TargetType="hc:FlipClock">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:FlipClock">
-          <StackPanel Orientation="Horizontal">
-            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[0],RelativeSource={RelativeSource TemplatedParent}}" />
-            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[1],RelativeSource={RelativeSource TemplatedParent}}" />
-            <hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[2],RelativeSource={RelativeSource TemplatedParent}}" />
-            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[3],RelativeSource={RelativeSource TemplatedParent}}" />
-            <hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[4],RelativeSource={RelativeSource TemplatedParent}}" />
-            <hc:FlipNumber Margin="-20" Number="{Binding NumberList[5],RelativeSource={RelativeSource TemplatedParent}}" />
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:FloatingBlock">
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:FloatingBlock">
-          <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="GridSplitter">
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-  <Style TargetType="hc:Notification">
-    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-    <Setter Property="SizeToContent" Value="WidthAndHeight" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="ShowActivated" Value="False" />
-    <Setter Property="ShowInTaskbar" Value="False" />
-    <Setter Property="Topmost" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Notification">
-          <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RectangleCircular" TargetType="Rectangle">
-    <Setter Property="hc:RectangleAttach.Circular" Value="True" />
-  </Style>
-  <Style x:Key="SnapRect4ScreenshotStyle" TargetType="Rectangle">
-    <Setter Property="Height" Value="5" />
-    <Setter Property="Width" Value="5" />
-    <Setter Property="Fill" Value="DodgerBlue" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Visibility" Value="Collapsed" />
-    <Style.Triggers>
-      <Trigger Property="hc:TipElement.Placement" Value="LeftTop">
-        <Setter Property="Margin" Value="-3, -3, 0, 0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="Top">
-        <Setter Property="Margin" Value="0, -3, 0, 0" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="RightTop">
-        <Setter Property="Margin" Value="0, -3, -3, 0" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="Right">
-        <Setter Property="Margin" Value="0, 0, -3, 0" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="RightBottom">
-        <Setter Property="Margin" Value="0, 0, -3, -3" />
-        <Setter Property="HorizontalAlignment" Value="Right" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="Bottom">
-        <Setter Property="Margin" Value="0, 0, 0, -3" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="LeftBottom">
-        <Setter Property="Margin" Value="-3, 0, 0, -3" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-      </Trigger>
-      <Trigger Property="hc:TipElement.Placement" Value="Left">
-        <Setter Property="Margin" Value="-3, 0, 0, 0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-      </Trigger>
-      <DataTrigger Binding="{Binding IsSelecting}" Value="True">
-        <Setter Property="Visibility" Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding IsDrawing}" Value="True">
-        <Setter Property="Visibility" Value="Visible" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TargetArea4ScreenshotStyle" TargetType="Border">
-    <Setter Property="IsHitTestVisible" Value="False" />
-    <Setter Property="BorderThickness" Value="5" />
-    <Setter Property="BorderBrush" Value="DodgerBlue" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Style.Triggers>
-      <DataTrigger Binding="{Binding IsSelecting}" Value="True">
-        <Setter Property="BorderThickness" Value="1" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding IsDrawing}" Value="True">
-        <Setter Property="IsHitTestVisible" Value="True" />
-        <Setter Property="BorderThickness" Value="1" />
-      </DataTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style TargetType="hc:SimpleItemsControl">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SimpleItemsControl">
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-            <StackPanel x:Name="PART_Panel" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:Sprite">
-    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-    <Setter Property="SizeToContent" Value="WidthAndHeight" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="ShowActivated" Value="False" />
-    <Setter Property="ShowInTaskbar" Value="False" />
-    <Setter Property="Topmost" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Sprite">
-          <ContentPresenter Margin="{TemplateBinding Padding}" hc:WindowAttach.IsDragElement="True" HorizontalAlignment="Center" VerticalAlignment="Center" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Storyboard x:Key="Right2LeftTransition" x:Shared="False">
-    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Left2RightTransition" x:Shared="False">
-    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Bottom2TopTransition" x:Shared="False">
-    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Top2BottomTransition" x:Shared="False">
-    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Right2LeftWithFadeTransition" x:Shared="False">
-    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Left2RightWithFadeTransition" x:Shared="False">
-    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Bottom2TopWithFadeTransition" x:Shared="False">
-    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-    <DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="Top2BottomWithFadeTransition" x:Shared="False">
-    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-    <DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-      <DoubleAnimation.EasingFunction>
-        <CubicEase EasingMode="EaseOut" />
-      </DoubleAnimation.EasingFunction>
-    </DoubleAnimation>
-  </Storyboard>
-  <Storyboard x:Key="FadeTransition" x:Shared="False">
-    <DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
-  </Storyboard>
-  <Style TargetType="hc:TransitioningContentControl">
-    <Setter Property="Focusable" Value="False" />
-  </Style>
-  <Style x:Key="SliderRepeatButtonHorizontalStyle" 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">
-          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-            <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Height="2" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SliderRepeatButtonVerticalStyle" 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">
-          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-            <Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Width="2" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CompareSliderRepeatButtonTransparent" 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">
-          <ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PreviewSliderRepeatButtonHorizontalStyle" 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">
-          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-            <Rectangle Fill="{TemplateBinding Background}" Height="2" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PreviewSliderRepeatButtonVerticalStyle" 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">
-          <Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
-            <Rectangle Fill="{TemplateBinding Background}" Width="2" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ScrollBarBaseRepeatButton" 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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ToggleBlock">
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-            <hc:SimplePanel Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-              <ContentPresenter Name="ContentPresenterChecked" ContentSource="CheckedContent" Visibility="Collapsed" />
-              <ContentPresenter Name="ContentPresenterUnChecked" ContentSource="UnCheckedContent" />
-              <ContentPresenter Name="ContentPresenterIndeterminate" ContentSource="IndeterminateContent" Visibility="Collapsed" />
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Visible" />
-              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
-              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="False">
-              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
-              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Visible" />
-              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="{x:Null}">
-              <Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
-              <Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
-              <Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Visible" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="GroupBoxBaseTopTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" MinHeight="30" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Border MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,0,6">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <ControlTemplate x:Key="GroupBoxBaseLeftTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <Border MinWidth="30" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="False" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,6,0">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" RenderTransformOrigin="0.5,0.5">
-          <ContentPresenter.LayoutTransform>
-            <TransformGroup>
-              <RotateTransform Angle="-90" />
-            </TransformGroup>
-          </ContentPresenter.LayoutTransform>
-        </ContentPresenter>
-      </Border>
-      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <ControlTemplate x:Key="GroupBoxTabTopTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" MinHeight="30" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,0,1,1'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-      <Border Grid.Row="0" MinHeight="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,1,0'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,1,0,0'}">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <ControlTemplate x:Key="GroupBoxTabLeftTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-      <Border Grid.Column="0" MinWidth="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,0,1'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-          <ContentPresenter.LayoutTransform>
-            <TransformGroup>
-              <RotateTransform Angle="-90" />
-            </TransformGroup>
-          </ContentPresenter.LayoutTransform>
-        </ContentPresenter>
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
-    <UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
-  </ItemsPanelTemplate>
-  <ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
-    <UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
-  </ItemsPanelTemplate>
-  <ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
-    <StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
-  </ItemsPanelTemplate>
-  <ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
-    <StackPanel FocusVisualStyle="{x:Null}" />
-  </ItemsPanelTemplate>
-  <tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
-  <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
-    <GradientStop Color="#00FFFFFF" Offset="0" />
-    <GradientStop Color="#60FFFFFF" Offset="0.4" />
-    <GradientStop Color="#60FFFFFF" Offset="0.6" />
-    <GradientStop Color="#00FFFFFF" Offset="1" />
-  </LinearGradientBrush>
-  <ControlTemplate x:Key="CircleProgressBarTemplate" TargetType="hc:CircleProgressBar">
-    <hc:SimplePanel x:Name="TemplateRoot">
-      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
-      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="PART_Indicator" Fill="{TemplateBinding Foreground}" />
-      <TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
-    <GradientStop Color="#FFFFFF" Offset="0.3" />
-    <GradientStop Color="#BBC5D7" Offset="0.75" />
-    <GradientStop Color="#6D83A9" Offset="1" />
-  </LinearGradientBrush>
-  <SineEase x:Key="SineEaseOut" EasingMode="EaseOut" />
-  <ControlTemplate x:Key="BadgeDotTemplate" TargetType="hc:Badge">
-    <hc:SimplePanel>
-      <ContentPresenter />
-      <Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <Style x:Key="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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ColorPickerSliderThumbTemplate" TargetType="Thumb">
-    <Border Width="13" Height="13" Background="White" CornerRadius="6.5" />
-  </ControlTemplate>
-  <LinearGradientBrush x:Key="ColorPickerRainbowBrush">
-    <GradientStop Color="#ff0000" />
-    <GradientStop Color="#ff00ff" Offset="0.167" />
-    <GradientStop Color="#0000ff" Offset="0.334" />
-    <GradientStop Color="#00ffff" Offset="0.501" />
-    <GradientStop Color="#00ff00" Offset="0.668" />
-    <GradientStop Color="#ffff00" Offset="0.835" />
-    <GradientStop Color="#ff0000" Offset="1" />
-  </LinearGradientBrush>
-  <DrawingBrush x:Key="ColorPickerOpacityBrush" Viewport="0,0,12,11" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-    <DrawingBrush.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="#d0cec7">
-          <GeometryDrawing.Geometry>
-            <GeometryGroup>
-              <RectangleGeometry Rect="0,0,6,5" />
-              <RectangleGeometry Rect="6,6,6,5" />
-            </GeometryGroup>
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-        <GeometryDrawing Brush="#e7e7e2">
-          <GeometryDrawing.Geometry>
-            <RectangleGeometry Rect="0,5,12,1" />
-          </GeometryDrawing.Geometry>
-        </GeometryDrawing>
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <Style x:Key="CoverFlowBaseStyle" TargetType="hc:CoverFlow">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CoverFlow">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Viewport3D x:Name="PART_Viewport3D">
-              <Viewport3D.Camera>
-                <PerspectiveCamera x:Name="PART_Camera" Position="0,0,3" UpDirection="0,1,0" LookDirection="0,0,-1" FieldOfView="90" />
-              </Viewport3D.Camera>
-              <Viewport3D.Children>
-                <ModelVisual3D>
-                  <ModelVisual3D.Content>
-                    <DirectionalLight Color="White" Direction="1,0,-4" />
-                  </ModelVisual3D.Content>
-                </ModelVisual3D>
-                <ModelVisual3D>
-                  <ModelVisual3D.Content>
-                    <DirectionalLight Color="White" Direction="-1,0,-4" />
-                  </ModelVisual3D.Content>
-                </ModelVisual3D>
-                <ModelVisual3D x:Name="PART_VisualParent" />
-              </Viewport3D.Children>
-            </Viewport3D>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CoverViewItemBaseStyle" TargetType="hc:CoverViewItem">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CoverViewItem">
-          <Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{TemplateBinding Padding}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
-    <Setter Property="Canvas.Right" Value="-9" />
-    <Setter Property="Width" Value="18" />
-    <Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <Border Background="Transparent" Padding="{TemplateBinding Padding}">
-            <Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">
-    <DrawingBrush.Drawing>
-      <DrawingGroup o:Freeze="True">
-        <GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0.9999,-0.000199999999999534L0.9999,15.9998 10.9999,15.9998 10.9999,13.4148 11.9999,14.4138 15.9999,10.4138 15.9999,5.5858 14.0009,7.5858 14.0009,3.0008 10.9999,3.0008 10.9999,-0.000199999999999534z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M10,12.4141L10,15.0001 2,15.0001 2,1.0001 10,1.0001 10,3.0001 10,7.5861 8.414,6.0001 9,6.0001 9,3.0001 3,3.0001 3,6.0001 8,6.0001 8,7.0001 3,7.0001 3,10.0001 8,10.0001 8,10.4141 8.586,11.0001 3,11.0001 3,14.0001 9,14.0001 9,11.4141z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M8.5859,11L2.9999,11 2.9999,14 8.9999,14 8.9999,11.414z M7.9999,7L2.9999,7 2.9999,10 7.9999,10z M7.9999,6L2.9999,6 2.9999,3 8.9999,3 8.9999,6 8.4139,6 7.9999,5.586z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M13,10L13,4 11,4 11,10 9,8 9,10 12,13 15,10 15,8z" />
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <DrawingBrush x:Key="SortByNameDrawingBrush" o:Freeze="True">
-    <DrawingBrush.Drawing>
-      <DrawingGroup o:Freeze="True">
-        <GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
-        <GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <ContextMenu x:Key="TabItemMenu" x:Shared="False">
-    <MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
-    <MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
-    <MenuItem Command="interactivity:ControlCommands.CloseOther" Header="{x:Static langs:Lang.CloseOther}" />
-  </ContextMenu>
-  <Style x:Key="ToolBarTrayBaseStyle" TargetType="ToolBarTray">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
-  <PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z" />
-  <Style x:Key="RowHeaderGripperStyle" TargetType="Thumb">
-    <Setter Property="Height" Value="8" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Cursor" Value="SizeNS" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
-    <Setter Property="Width" Value="8" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Cursor" Value="SizeWE" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
-    <Setter Property="Focusable" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBox">
-          <TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
-    <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-  </Style>
-  <Style x:Key="CarouselItemBaseStyle" TargetType="hc:CarouselItem">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CarouselItem">
-          <Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:Carousel}}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:GrowlWindow">
-    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-    <Setter Property="Width" Value="340" />
-    <Setter Property="MaxWidth" Value="340" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="ShowActivated" Value="False" />
-    <Setter Property="ShowInTaskbar" Value="False" />
-    <Setter Property="Topmost" Value="True" />
-  </Style>
-  <Style x:Key="ListBoxItemCustom" TargetType="ListBoxItem">
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListBoxItem">
-          <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
-  <hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
-  <hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
-  <SolidColorBrush o:Freeze="True" x:Key="LightPrimaryBrush" Color="{DynamicResource LightPrimaryColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource PrimaryColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource DarkPrimaryColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="BorderBrush" Color="{DynamicResource BorderColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="RegionBrush" Color="{DynamicResource RegionColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource TitleColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource SecondaryTitleColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="LightDangerBrush" Color="{DynamicResource LightDangerColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource DangerColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource DarkDangerColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="LightWarningBrush" Color="{DynamicResource LightWarningColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource WarningColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource DarkWarningColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="LightInfoBrush" Color="{DynamicResource LightInfoColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource InfoColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource DarkInfoColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="LightSuccessBrush" Color="{DynamicResource LightSuccessColor}" />
-  <LinearGradientBrush o:Freeze="True" x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
-    <GradientStop o:Freeze="True" Color="{DynamicResource SuccessColor}" Offset="0" />
-    <GradientStop o:Freeze="True" Color="{DynamicResource DarkSuccessColor}" Offset="1" />
-  </LinearGradientBrush>
-  <SolidColorBrush o:Freeze="True" x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="AccentBrush" Color="{DynamicResource AccentColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}" />
-  <SolidColorBrush o:Freeze="True" x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}" />
-  <DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-  <DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-  <DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-  <DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-  <DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
-  <Style x:Key="SearchPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource SearchGeometry}" />
-  </Style>
-  <Style x:Key="FullScreenReturnPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource FullScreenReturnGeometry}" />
-  </Style>
-  <Style x:Key="FullScreenPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource FullScreenGeometry}" />
-  </Style>
-  <Style x:Key="WindowsPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource WindowsGeometry}" />
-  </Style>
-  <Style x:Key="SavePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource SaveGeometry}" />
-  </Style>
-  <Style x:Key="DownloadPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource DownloadGeometry}" />
-  </Style>
-  <Style x:Key="EnlargePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource EnlargeGeometry}" />
-  </Style>
-  <Style x:Key="ReducePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource ReduceGeometry}" />
-  </Style>
-  <Style x:Key="RotatePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource RotateLeftGeometry}" />
-  </Style>
-  <Style x:Key="CalendarPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource CalendarGeometry}" />
-  </Style>
-  <Style x:Key="DeletePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource DeleteGeometry}" />
-  </Style>
-  <Style x:Key="ClosePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource CloseGeometry}" />
-  </Style>
-  <Style x:Key="DownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource DownGeometry}" />
-  </Style>
-  <Style x:Key="ClockPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource ClockGeometry}" />
-  </Style>
-  <Style x:Key="LeftPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource LeftGeometry}" />
-  </Style>
-  <Style x:Key="RightPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="RenderTransformOrigin" Value="0.5, 0.5" />
-    <Setter Property="RenderTransform">
-      <Setter.Value>
-        <TransformGroup>
-          <ScaleTransform ScaleY="1" ScaleX="-1" />
-          <SkewTransform AngleY="0" AngleX="0" />
-          <RotateTransform Angle="0" />
-          <TranslateTransform />
-        </TransformGroup>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Data" Value="{StaticResource LeftGeometry}" />
-  </Style>
-  <Style x:Key="UpDownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
-    <Setter Property="Data" Value="{StaticResource UpDownGeometry}" />
-  </Style>
-  <Style x:Key="BorderRegion" TargetType="Border">
-    <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-  </Style>
-  <Style x:Key="BorderTipBaseStyle" TargetType="Border">
-    <Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="BorderThickness" Value="5,0,0,0" />
-  </Style>
-  <Style x:Key="BorderTipPrimary" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-    <Setter Property="Background" Value="{DynamicResource LightPrimaryBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="BorderTipDanger" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-    <Setter Property="Background" Value="{DynamicResource LightDangerBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="BorderTipWarning" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-    <Setter Property="Background" Value="{DynamicResource LightWarningBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="BorderTipInfo" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-    <Setter Property="Background" Value="{DynamicResource LightInfoBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="BorderTipSuccess" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
-    <Setter Property="Background" Value="{DynamicResource LightSuccessBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="BorderVerticallySplitter" TargetType="Border">
-    <Setter Property="Width" Value="1" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
-  </Style>
-  <Style x:Key="BorderHorizontallySplitter" TargetType="Border">
-    <Setter Property="Height" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
-  </Style>
-  <Style x:Key="BorderClip" TargetType="Border">
-    <Setter Property="Clip">
-      <Setter.Value>
-        <MultiBinding Converter="{StaticResource BorderClipConverter}">
-          <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-          <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-          <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-        </MultiBinding>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="BorderCircularClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
-    <Setter Property="Clip">
-      <Setter.Value>
-        <MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
-          <Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
-          <Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
-          <Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
-        </MultiBinding>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:FlipNumber">
-    <Setter Property="FontSize" Value="70" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="Width" Value="120" />
-    <Setter Property="Height" Value="180" />
-    <Setter Property="Camera">
-      <Setter.Value>
-        <PerspectiveCamera Position="0 0 120" LookDirection="0 0 -1" />
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RectangleFocusVisual" TargetType="Rectangle">
-    <Setter Property="Margin" Value="-2" />
-    <Setter Property="Opacity" Value=".6" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Stroke" Value="{DynamicResource SecondaryBorderBrush}" />
-    <Setter Property="StrokeThickness" Value="2" />
-    <Setter Property="StrokeDashArray" Value="1 1" />
-  </Style>
-  <Style x:Key="RectangleFocusVisualCircular" BasedOn="{StaticResource RectangleFocusVisual}" TargetType="Rectangle">
-    <Setter Property="hc:RectangleAttach.Circular" Value="True" />
-  </Style>
-  <Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="Padding" Value="2,7" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TextBoxBase">
-          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-            <ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="border" Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
-    <Setter Property="MinWidth" Value="10" />
-  </Style>
-  <Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox" />
-  <Style x:Key="MaskRect4ScreenshotStyle" TargetType="Rectangle">
-    <Setter Property="IsHitTestVisible" Value="False" />
-    <Setter Property="Fill" Value="{DynamicResource DarkOpacityBrush}" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-  </Style>
-  <Style x:Key="Window4ScreenshotStyle" TargetType="hc:ScreenshotWindow">
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="WindowStyle" Value="None" />
-    <Setter Property="WindowState" Value="Maximized" />
-    <Setter Property="Topmost" Value="True" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
-    <Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ScreenshotWindow">
-          <AdornerDecorator>
-            <hc:SimplePanel>
-              <InkCanvas EditingMode="None" Name="PART_Canvas" Background="Transparent" />
-              <Rectangle Name="PART_MaskAreaLeft" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-              <Rectangle Name="PART_MaskAreaTop" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-              <Rectangle Name="PART_MaskAreaRight" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-              <Rectangle Name="PART_MaskAreaBottom" Style="{StaticResource MaskRect4ScreenshotStyle}" />
-              <Border Name="PART_TargetArea" Style="{StaticResource TargetArea4ScreenshotStyle}">
-                <hc:SimplePanel>
-                  <Rectangle hc:TipElement.Placement="LeftTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="Top" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="RightTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="Right" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="RightBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="Bottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="LeftBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <Rectangle hc:TipElement.Placement="Left" Style="{StaticResource SnapRect4ScreenshotStyle}" />
-                  <TextBlock Text="{TemplateBinding SizeStr}" Background="#CC212121" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="8,2" />
-                </hc:SimplePanel>
-              </Border>
-              <Border x:Name="PART_Magnifier" IsHitTestVisible="False" Visibility="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Top" Width="122" Height="122" BorderThickness="1" BorderBrush="#FF333333" CornerRadius="1">
-                <Border.Effect>
-                  <DropShadowEffect BlurRadius="2" Opacity=".2" Direction="-45" RenderingBias="Performance" ShadowDepth="3" />
-                </Border.Effect>
-                <hc:SimplePanel>
-                  <Border Margin="0,0,0,32" Background="{TemplateBinding PreviewBrush}" BorderThickness="2" BorderBrush="White">
-                    <hc:SimplePanel>
-                      <Path Data="M56,0 L60,0 60,40 116,40 116,44 60,44 60,84 56,84 56,44 0,44 0,40 56,40 z" Fill="#CC4CC6FF" />
-                    </hc:SimplePanel>
-                  </Border>
-                  <Border Height="32" VerticalAlignment="Bottom" Background="#CC000000">
-                    <StackPanel VerticalAlignment="Center" Margin="5,0,0,0">
-                      <TextBlock Foreground="White" Text="{TemplateBinding SizeStr}" />
-                    </StackPanel>
-                  </Border>
-                </hc:SimplePanel>
-              </Border>
-            </hc:SimplePanel>
-          </AdornerDecorator>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FocusVisual">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Style="{StaticResource RectangleFocusVisual}" RadiusX="4" RadiusY="4" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FocusVisualRadius0">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Style="{StaticResource RectangleFocusVisual}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FocusVisualMargin0">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FocusVisualRadius0Margin0">
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="BaseStyle" TargetType="Control">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
-  </Style>
-  <Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ButtonBase">
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-  </Style>
-  <Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <hc:SimplePanel>
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </Border>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </hc:DashedBorder>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-        <Setter Property="Margin" Value="0,-1,0,0" />
-      </DataTrigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TextBlockBaseStyle" TargetType="TextBlock">
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-  </Style>
-  <Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontWeight" Value="Bold" />
-  </Style>
-  <Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
-    <Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style x:Key="LabelBaseStyle" TargetType="Label">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Label">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="SliderThumb" TargetType="Thumb">
-    <hc:AxleCanvas>
-      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CompareSliderThumbHorizontal" TargetType="Thumb">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="Storyboard1">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
-          <EasingDoubleKeyFrame KeyTime="0" Value="-2" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
-          <EasingDoubleKeyFrame KeyTime="0" Value="2" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="Storyboard2">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
-          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
-          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <hc:SimplePanel>
-      <Border Width="1" HorizontalAlignment="Center">
-        <Border.Background>
-          <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-            <DrawingBrush.Drawing>
-              <DrawingGroup>
-                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
-                  <GeometryDrawing.Geometry>
-                    <GeometryGroup>
-                      <RectangleGeometry Rect="0,0,1,4" />
-                    </GeometryGroup>
-                  </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-              </DrawingGroup>
-            </DrawingBrush.Drawing>
-          </DrawingBrush>
-        </Border.Background>
-      </Border>
-      <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-        <hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
-          <Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-          <Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-        </hc:SimplePanel>
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Stroke" TargetName="PathLeft" Value="White" />
-        <Setter Property="Stroke" TargetName="PathRight" Value="White" />
-      </Trigger>
-      <Trigger Property="IsDragging" Value="true">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
-    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-      <hc:CompareTrack x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-            <ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
-          </RepeatButton>
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-            <ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
-          </RepeatButton>
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
-        </Track.Thumb>
-      </hc:CompareTrack>
-    </Border>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CompareSliderThumbVertical" TargetType="Thumb">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="Storyboard1">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
-          <EasingDoubleKeyFrame KeyTime="0" Value="-2" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
-          <EasingDoubleKeyFrame KeyTime="0" Value="2" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="Storyboard2">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
-          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
-          <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <hc:SimplePanel>
-      <Border Height="1" VerticalAlignment="Center">
-        <Border.Background>
-          <DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
-            <DrawingBrush.Drawing>
-              <DrawingGroup>
-                <GeometryDrawing Brush="{DynamicResource BorderBrush}">
-                  <GeometryDrawing.Geometry>
-                    <GeometryGroup>
-                      <RectangleGeometry Rect="0,0,4,1" />
-                    </GeometryGroup>
-                  </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-              </DrawingGroup>
-            </DrawingBrush.Drawing>
-          </DrawingBrush>
-        </Border.Background>
-      </Border>
-      <Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
-        <hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
-          <Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-          <Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-        </hc:SimplePanel>
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="grip">
-        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Stroke" TargetName="PathUp" Value="White" />
-        <Setter Property="Stroke" TargetName="PathDown" Value="White" />
-      </Trigger>
-      <Trigger Property="IsDragging" Value="true">
-        <Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Stroke" TargetName="PathUp" Value="White" />
-        <Setter Property="Stroke" TargetName="PathDown" Value="White" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
-    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-      <hc:CompareTrack x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-            <ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
-          </RepeatButton>
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
-            <ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
-          </RepeatButton>
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
-        </Track.Thumb>
-      </hc:CompareTrack>
-    </Border>
-  </ControlTemplate>
-  <Style x:Key="CompareSliderBaseStyle" TargetType="hc:CompareSlider">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="MinHeight" Value="30" />
-    <Setter Property="Template" Value="{StaticResource CompareSliderHorizontal}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource CompareSliderVertical}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="PreviewSliderThumb" TargetType="Thumb">
-    <Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="PreviewSliderHorizontal" TargetType="hc:PreviewSlider">
-    <hc:SimplePanel>
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Height="2" VerticalAlignment="center" Margin="9,0" />
-      <Track VerticalAlignment="center" Margin="9,0" x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb Margin="-9,0" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" VerticalAlignment="Center" Width="18" />
-        </Track.Thumb>
-      </Track>
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <ControlTemplate x:Key="PreviewSliderVertical" TargetType="hc:PreviewSlider">
-    <hc:SimplePanel>
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Width="2" HorizontalAlignment="center" Margin="0,9" />
-      <Track HorizontalAlignment="center" Margin="0,9" x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb Margin="0,-9" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" HorizontalAlignment="Center" Width="18" />
-        </Track.Thumb>
-      </Track>
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <Style x:Key="PreviewSliderBaseStyle" TargetType="hc:PreviewSlider">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="IsMoveToPointEnabled" Value="True" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template" Value="{StaticResource PreviewSliderHorizontal}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource PreviewSliderVertical}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="RangeSliderThumb" TargetType="hc:RangeThumb">
-    <Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <hc:SimplePanel>
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </Border>
-            <Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="Width" Value="36" />
-    <Setter Property="Height" Value="22" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardChecked">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="14">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardUnChecked">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Viewbox>
-            <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11" />
-              <Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-              <Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
-                <Border.RenderTransform>
-                  <TransformGroup>
-                    <ScaleTransform />
-                  </TransformGroup>
-                </Border.RenderTransform>
-              </Border>
-              <hc:SimplePanel Grid.Column="0" Margin="1">
-                <Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
-                  <Border.RenderTransform>
-                    <TransformGroup>
-                      <TranslateTransform />
-                    </TransformGroup>
-                  </Border.RenderTransform>
-                </Border>
-              </hc:SimplePanel>
-              <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Grid>
-          </Viewbox>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasContent" Value="true">
-              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
-              </Trigger.ExitActions>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="8" />
-    <Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
-    <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <hc:SimplePanel>
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-              </ContentControl>
-            </Border>
-            <Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsChecked" Value="True">
-        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-      </Trigger>
-      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-        <Setter Property="Margin" Value="0,-1,0,0" />
-      </DataTrigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ScrollBarBaseThumbVertical" TargetType="Thumb">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardMouseEnter">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardMouseLeave">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Border Width="{TemplateBinding Width}" Background="Transparent">
-            <Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" HorizontalAlignment="Right" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="2" Fill="{TemplateBinding Background}">
-              <Rectangle.RenderTransform>
-                <TransformGroup>
-                  <TranslateTransform X="-2" />
-                </TransformGroup>
-              </Rectangle.RenderTransform>
-            </Rectangle>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
-            </Trigger>
-            <Trigger Property="IsDragging" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
-            </Trigger>
-            <EventTrigger RoutedEvent="MouseEnter">
-              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
-            </EventTrigger>
-            <EventTrigger RoutedEvent="MouseLeave">
-              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ScrollBarBaseThumbHorizontal" TargetType="Thumb">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardMouseEnter">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardMouseLeave">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Border Height="{TemplateBinding Height}" Background="Transparent">
-            <Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" VerticalAlignment="Bottom" Height="2" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" Fill="{TemplateBinding Background}">
-              <Rectangle.RenderTransform>
-                <TransformGroup>
-                  <TranslateTransform Y="-2" />
-                </TransformGroup>
-              </Rectangle.RenderTransform>
-            </Rectangle>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
-            </Trigger>
-            <Trigger Property="IsDragging" Value="true">
-              <Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
-            </Trigger>
-            <EventTrigger RoutedEvent="MouseEnter">
-              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
-            </EventTrigger>
-            <EventTrigger RoutedEvent="MouseLeave">
-              <BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ScrollBarBaseStyle" TargetType="ScrollBar">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Width" Value="8" />
-    <Setter Property="MinWidth" Value="8" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ScrollBar">
-          <hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
-            <Border Background="{TemplateBinding Background}" />
-            <Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
-              <Track.DecreaseRepeatButton>
-                <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-              </Track.DecreaseRepeatButton>
-              <Track.IncreaseRepeatButton>
-                <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-              </Track.IncreaseRepeatButton>
-              <Track.Thumb>
-                <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbVertical}" />
-              </Track.Thumb>
-            </Track>
-          </hc:SimplePanel>
-        </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="8" />
-        <Setter Property="MinHeight" Value="8" />
-        <Setter Property="BorderThickness" Value="0,1" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="ScrollBar">
-              <hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
-                <Border Background="{TemplateBinding Background}" />
-                <Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
-                  <Track.DecreaseRepeatButton>
-                    <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-                  </Track.DecreaseRepeatButton>
-                  <Track.IncreaseRepeatButton>
-                    <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
-                  </Track.IncreaseRepeatButton>
-                  <Track.Thumb>
-                    <Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbHorizontal}" />
-                  </Track.Thumb>
-                </Track>
-              </hc:SimplePanel>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardMouseOver">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="StoryboardCommon">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardMouseOver">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="StoryboardCommon">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
-        <Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardMouseOver">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="StoryboardCommon">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-      <ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-      <ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardMouseOver">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-      <Storyboard x:Key="StoryboardCommon">
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-          <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-        </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
-      <ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-      <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
-        <Setter Property="Template" Value="{StaticResource ScrollViewerBaseControlTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RepeatButton">
-          <hc:SimplePanel>
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </Border>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RepeatButtonDashedBaseStyle" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RepeatButton">
-          <hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </hc:DashedBorder>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="GroupBoxBaseStyle" TargetType="GroupBox">
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="hc:TitleElement.TitlePlacement" Value="Top" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="4" />
-    <Setter Property="Template" Value="{StaticResource GroupBoxBaseTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource GroupBoxBaseLeftTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="GroupBoxOriginalTopTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <StackPanel Orientation="Horizontal" Margin="8,6">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-      </StackPanel>
-      <Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <ControlTemplate x:Key="GroupBoxOriginalLeftTemplate" TargetType="GroupBox">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <StackPanel Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8">
-        <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        <ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-      </StackPanel>
-      <Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-        <ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-  <Style x:Key="GroupBoxOriginalBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="Template" Value="{StaticResource GroupBoxOriginalTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource GroupBoxOriginalLeftTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="GroupBoxTabBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
-    <Setter Property="Template" Value="{StaticResource GroupBoxTabTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource GroupBoxTabLeftTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
-    <Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Layout" Value="Uniform" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
-    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="Layout" Value="Uniform" />
-          <Condition Property="Orientation" Value="Vertical" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="Layout" Value="Stack" />
-          <Condition Property="Orientation" Value="Horizontal" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="Layout" Value="Stack" />
-          <Condition Property="Orientation" Value="Vertical" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
-    <Setter Property="hc:VisualElement.Text">
-      <Setter.Value>
-        <MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0:F0} %">
-          <Binding Path="Value" RelativeSource="{RelativeSource Self}" />
-          <Binding Path="Maximum" RelativeSource="{RelativeSource Self}" />
-        </MultiBinding>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Height" Value="20" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ProgressBar">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
-                <EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
-                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
-                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
-              </DoubleAnimationUsingKeyFrames>
-              <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
-                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
-                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
-                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
-              </PointAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <hc:SimplePanel>
-              <Rectangle x:Name="PART_Track" />
-              <TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
-              <Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
-                <hc:SimplePanel>
-                  <Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
-                    <Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
-                      <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Border>
-                  </Border>
-                  <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
-                  <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
-                    <Rectangle.RenderTransform>
-                      <TransformGroup>
-                        <ScaleTransform />
-                      </TransformGroup>
-                    </Rectangle.RenderTransform>
-                  </Rectangle>
-                </hc:SimplePanel>
-              </Border>
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
-                <Setter.Value>
-                  <RotateTransform Angle="-90" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <Trigger Property="IsIndeterminate" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-              </Trigger.EnterActions>
-              <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
-              <Setter Property="Visibility" TargetName="PART_GlowRect" Value="Collapsed" />
-              <Setter Property="Visibility" TargetName="Animation" Value="Visible" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ProgressBar">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="OnLoaded">
-              <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
-                <LinearDoubleKeyFrame KeyTime="0" Value="0" />
-                <LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
-            <Rectangle x:Name="PART_Track" />
-            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-              <Border x:Name="Indicator" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}" />
-            </Decorator>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
-                <Setter.Value>
-                  <RotateTransform Angle="-90" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-            <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
-              <BeginStoryboard Storyboard="{StaticResource OnLoaded}" />
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="CircleProgressBarIndeterminateTemplate" TargetType="hc:CircleProgressBar">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-        <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="TemplateRoot">
-          <LinearDoubleKeyFrame KeyTime="0:0:1.568" Value="360" />
-        </DoubleAnimationUsingKeyFrames>
-        <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="arc">
-          <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.TargetProperty="(shapes:Arc.StartAngle)" Storyboard.TargetName="arc">
-          <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.TargetProperty="(shapes:Arc.EndAngle)" Storyboard.TargetName="arc">
-          <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>
-    <hc:SimplePanel x:Name="TemplateRoot" RenderTransformOrigin="0.5,0.5">
-      <hc:SimplePanel.RenderTransform>
-        <TransformGroup>
-          <RotateTransform />
-        </TransformGroup>
-      </hc:SimplePanel.RenderTransform>
-      <shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
-      <shapes:Arc RenderTransformOrigin="0.5,0.5" StartAngle="-5" EndAngle="5" ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="arc" Fill="{TemplateBinding Foreground}">
-        <shapes:Arc.RenderTransform>
-          <TransformGroup>
-            <RotateTransform />
-          </TransformGroup>
-        </shapes:Arc.RenderTransform>
-      </shapes:Arc>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsIndeterminate" Value="true">
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-        </Trigger.EnterActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ProgressBarCircleBaseStyle" TargetType="hc:CircleProgressBar">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Height" Value="100" />
-    <Setter Property="Width" Value="100" />
-    <Setter Property="ArcThickness" Value="4" />
-    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
-    <Setter Property="Template" Value="{StaticResource CircleProgressBarTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="IsIndeterminate" Value="True">
-        <Setter Property="Template" Value="{StaticResource CircleProgressBarIndeterminateTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ProgressBarWaveBaseStyle" TargetType="hc:WaveProgressBar">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Width" Value="100" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:WaveProgressBar">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardOnLoaded" RepeatBehavior="Forever">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PART_Wave">
-                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="-400" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <StackPanel>
-            <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-              <Viewbox>
-                <Border x:Name="PART_Clip" Style="{StaticResource BorderCircularClip}" CornerRadius="100" Width="200" Height="200">
-                  <Path x:Name="PART_Wave" Stroke="{TemplateBinding WaveStroke}" StrokeThickness="{TemplateBinding WaveThickness}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="250" Fill="{TemplateBinding WaveFill}" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Margin="0,0,-400,-20">
-                    <Path.Data>
-                      <PathGeometry>
-                        <PathFigure StartPoint="0,1">
-                          <PolyBezierSegment Points="0.5,1 0.5,0 1,0" />
-                          <PolyBezierSegment Points="1.5,0 1.5,1 2,1" />
-                          <PolyBezierSegment Points="2.5,1 2.5,0 3,0" />
-                          <PolyLineSegment Points="3,0 3,10, 0,10 0,1" />
-                        </PathFigure>
-                      </PathGeometry>
-                    </Path.Data>
-                  </Path>
-                </Border>
-              </Viewbox>
-            </Border>
-            <TextBlock Margin="0,10,0,0" Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
-          </StackPanel>
-          <ControlTemplate.Triggers>
-            <EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="PART_Wave">
-              <BeginStoryboard Name="BeginStoryboardWave" Storyboard="{StaticResource StoryboardOnLoaded}" />
-            </EventTrigger>
-            <EventTrigger RoutedEvent="FrameworkElement.Unloaded" SourceName="PART_Wave">
-              <StopStoryboard BeginStoryboardName="BeginStoryboardWave" />
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background" Value="White" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="CheckBox">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardCheckedTrue">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardCheckedFalse">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="8" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border Height="16" Width="16" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <hc:SimplePanel Grid.Column="0" Height="16" Width="16" x:Name="markGrid">
-              <Path FlowDirection="LeftToRight" UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-              <Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0" />
-            </hc:SimplePanel>
-            <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasContent" Value="true">
-              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked" Value="true" />
-                <Condition Property="IsPressed" Value="true" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Opacity" Value=".8" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked" Value="false" />
-                <Condition Property="IsPressed" Value="true" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
-              </Trigger.ExitActions>
-              <Setter Property="Opacity" TargetName="indeterminateMark" Value="0" />
-              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="false">
-              <Setter Property="Stroke" Value="{DynamicResource BorderBrush}" TargetName="path" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="{x:Null}">
-              <Setter Property="Opacity" TargetName="indeterminateMark" Value="1" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RadioButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="6,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardCheckedTrue">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardCheckedFalse">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border Height="18" Width="18" x:Name="radioButtonBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="100" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <Ellipse x:Name="optionMark" Fill="White" MinWidth="6" MinHeight="6" RenderTransformOrigin="0.5,0.5">
-                <Ellipse.RenderTransform>
-                  <TransformGroup>
-                    <ScaleTransform />
-                  </TransformGroup>
-                </Ellipse.RenderTransform>
-              </Ellipse>
-            </Border>
-            <ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasContent" Value="true">
-              <Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked" Value="true" />
-                <Condition Property="IsPressed" Value="true" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Opacity" Value=".8" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsChecked" Value="false" />
-                <Condition Property="IsPressed" Value="true" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
-              </Trigger.ExitActions>
-              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <hc:SimplePanel>
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </Border>
-            <Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="hc:IconElement.Width" Value="16" />
-    <Setter Property="hc:IconElement.Height" Value="16" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Border Name="BorderHighlight" BorderThickness="3,0,0,0" BorderBrush="Transparent">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                <Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </StackPanel>
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderHighlight" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RadioGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="hc:IconElement.Width" Value="16" />
-    <Setter Property="hc:IconElement.Height" Value="16" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{Binding Path=(TextElement.Foreground),ElementName=contentPresenter}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsChecked" Value="True">
-        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-      </Trigger>
-      <DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
-        <Setter Property="Margin" Value="0,-1,0,0" />
-      </DataTrigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
-  <Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-            </ContentControl>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Padding" Value="6" />
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-            </ContentControl>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ButtonIconCircular.Small" BasedOn="{StaticResource ButtonIconCircular}" TargetType="Button">
-    <Setter Property="Width" Value="20" />
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="1" />
-  </Style>
-  <Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
-    <Setter Property="Background" Value="{x:Null}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Button">
-          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ButtonGroupItemDefault" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button" />
-  <Style x:Key="ButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ButtonGroupItemHorizontalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-  </Style>
-  <Style x:Key="ButtonGroupItemSingle" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-  </Style>
-  <Style x:Key="ButtonGroupItemVerticalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ButtonGroupItemVerticalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-  </Style>
-  <Style x:Key="TextBlockDefault" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock" />
-  <Style x:Key="TextBlockDefaultAccent" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource AccentBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultPrimary" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultDanger" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultWarning" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultInfo" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultSuccess" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultSecLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultThiLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-  </Style>
-  <Style x:Key="TextBlockLarge" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockSubTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockLargeBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockSubTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
-    <Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
-  </Style>
-  <Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
-  <Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
-  <Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-  </Style>
-  <Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
-  <Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
-  <Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
-  <Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-              <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-            </ContentControl>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
-  <Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Height" Value="30" />
-    <Setter Property="Width" Value="30" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardChecked">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardUnChecked">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
-                  <EasingDoubleKeyFrame.EasingFunction>
-                    <PowerEase EasingMode="EaseOut" />
-                  </EasingDoubleKeyFrame.EasingFunction>
-                </EasingDoubleKeyFrame>
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Viewbox>
-            <hc:SimplePanel Height="28" Width="28">
-              <Border Name="UnCheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                <Border.RenderTransform>
-                  <TransformGroup>
-                    <ScaleTransform ScaleX="1" />
-                  </TransformGroup>
-                </Border.RenderTransform>
-                <ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </Border>
-              <Border Name="CheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                <Border.RenderTransform>
-                  <TransformGroup>
-                    <ScaleTransform ScaleX="0" />
-                  </TransformGroup>
-                </Border.RenderTransform>
-                <ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-              </Border>
-            </hc:SimplePanel>
-          </Viewbox>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
-              </Trigger.ExitActions>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <hc:SimplePanel>
-              <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-                <Condition Property="IsChecked" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-            </MultiTrigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemDefault" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton" />
-  <Style x:Key="ToggleButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemHorizontalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemSingle" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemVerticalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ToggleButtonGroupItemVerticalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-  </Style>
-  <Style x:Key="ToggleButtonLoadingPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-              <hc:SimplePanel>
-                <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-              </hc:SimplePanel>
-              <Viewbox Margin="0,4">
-                <hc:LoadingCircle x:Name="Loading" Width="22" Height="22" Foreground="{TemplateBinding Foreground}" DotDiameter="3" IsRunning="{TemplateBinding IsChecked}" Visibility="Collapsed" />
-              </Viewbox>
-            </StackPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Visibility" Value="Visible" TargetName="Loading" />
-              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-                <Condition Property="IsChecked" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-            </MultiTrigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToggleButtonLoading" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToggleButtonLoadingSuccess" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonLoadingInfo" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonLoadingWarning" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ToggleButtonLoadingDanger" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
-  <Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RepeatButton">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-            </ContentControl>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RepeatButton">
-          <Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-              <Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
-            </ContentControl>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RepeatButtonIconCircular.Small" BasedOn="{StaticResource RepeatButtonIconCircular}" TargetType="RepeatButton">
-    <Setter Property="Width" Value="20" />
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
-    <Setter Property="Background" Value="{x:Null}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RepeatButton">
-          <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-              <Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer" />
-  <Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="hc:ScrollViewer" />
-  <Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
-    <Setter Property="HorizontalAlignment" Value="Stretch" />
-    <Setter Property="Height" Value="10" />
-    <Setter Property="Padding" Value="0,2" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="ClickMode" Value="Hover" />
-  </Style>
-  <ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
-    <Grid x:Name="Grid" Background="{TemplateBinding Background}">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}">
-        <RepeatButton.Visibility>
-          <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-          </MultiBinding>
-        </RepeatButton.Visibility>
-      </RepeatButton>
-      <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1" />
-      <RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}">
-        <RepeatButton.Visibility>
-          <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
-            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
-          </MultiBinding>
-        </RepeatButton.Visibility>
-      </RepeatButton>
-    </Grid>
-  </ControlTemplate>
-  <Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
-    <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
-  </Style>
-  <Style x:Key="CalendarButtonStyle" TargetType="CalendarButton">
-    <Setter Property="MinWidth" Value="10" />
-    <Setter Property="MinHeight" Value="10" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="Width" Value="40" />
-    <Setter Property="Height" Value="32" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="CalendarButton">
-          <hc:SimplePanel>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="SelectionStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Unselected" />
-                <VisualState x:Name="Selected">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
-                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ActiveStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Active" />
-                <VisualState x:Name="Inactive">
-                  <Storyboard>
-                    <ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
-            <Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="16" RadiusX="16" />
-            <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <TextElement.Foreground>
-                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
-              </TextElement.Foreground>
-            </ContentPresenter>
-            <Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsFocused" Value="True">
-              <Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CalendarDayButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CalendarDayButton">
-    <Setter Property="MinWidth" Value="10" />
-    <Setter Property="MinHeight" Value="10" />
-    <Setter Property="Width" Value="32" />
-    <Setter Property="Height" Value="32" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="CalendarDayButton">
-          <hc:SimplePanel>
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0:0:0.1" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="SelectionStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Unselected" />
-                <VisualState x:Name="Selected">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
-                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="ActiveStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="Active" />
-                <VisualState x:Name="Inactive">
-                  <Storyboard>
-                    <ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-              <VisualStateGroup x:Name="DayStates">
-                <VisualStateGroup.Transitions>
-                  <VisualTransition GeneratedDuration="0" />
-                </VisualStateGroup.Transitions>
-                <VisualState x:Name="RegularDay" />
-                <VisualState x:Name="Today">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground" />
-                    <ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Rectangle RadiusX="16" RadiusY="16" x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" />
-            <Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
-            <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-              <TextElement.Foreground>
-                <SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
-              </TextElement.Foreground>
-            </ContentPresenter>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="CalendarItem">
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="CalendarItem">
-          <ControlTemplate.Resources>
-            <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
-              <TextBlock Foreground="{DynamicResource PrimaryTextBrush}" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center" />
-            </DataTemplate>
-          </ControlTemplate.Resources>
-          <hc:SimplePanel x:Name="PART_Root">
-            <VisualStateManager.VisualStateGroups>
-              <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="Disabled">
-                  <Storyboard>
-                    <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual" />
-                  </Storyboard>
-                </VisualState>
-              </VisualStateGroup>
-            </VisualStateManager.VisualStateGroups>
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-              </Grid.RowDefinitions>
-              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" />
-              <Button x:Name="PART_PreviousButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource LeftGeometry}" />
-              <Button x:Name="PART_HeaderButton" Focusable="False" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}" />
-              <Button x:Name="PART_NextButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RightGeometry}" />
-              <Grid Width="240" Height="240" x:Name="PART_MonthView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Visible">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-              </Grid>
-              <Grid Width="240" Height="240" x:Name="PART_YearView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Hidden">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                  <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                  <RowDefinition />
-                  <RowDefinition />
-                  <RowDefinition />
-                </Grid.RowDefinitions>
-              </Grid>
-            </Grid>
-            <Rectangle x:Name="PART_DisabledVisual" Visibility="Collapsed" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
-              <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
-              <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Decade">
-              <Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
-              <Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
-            </DataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CalendarBaseStyle" TargetType="Calendar">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Language" Value="{Binding Lang,Source={x:Static tools:ConfigHelper.Instance}}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Margin" Value="8 0" />
-    <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}" />
-    <Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Calendar">
-          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-            <CalendarItem x:Name="PART_CalendarItem" Margin="{TemplateBinding BorderThickness}" />
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="Calendar" BasedOn="{StaticResource CalendarBaseStyle}" />
-  <Style BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock" />
-  <Style x:Key="ToggleBlockIcon" BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ToggleBlock">
-          <ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-            <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-          </ContentControl>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox" />
-  <Style x:Key="GroupBoxOriginal" BasedOn="{StaticResource GroupBoxOriginalBaseStyle}" TargetType="GroupBox" />
-  <Style x:Key="GroupBoxTab" BasedOn="{StaticResource GroupBoxTabBaseStyle}" TargetType="GroupBox" />
-  <Style BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup" />
-  <Style x:Key="ButtonGroupSolid" BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup">
-    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarSuccess" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarInfo" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarWarning" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarDanger" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground">
-      <Setter.Value>
-        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-          <DrawingBrush.Transform>
-            <TransformGroup>
-              <RotateTransform Angle="20" />
-              <TranslateTransform x:Name="MyTransform" X="0" />
-            </TransformGroup>
-          </DrawingBrush.Transform>
-          <DrawingBrush.Drawing>
-            <GeometryDrawing>
-              <GeometryDrawing.Brush>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0" />
-                  <GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-                </LinearGradientBrush>
-              </GeometryDrawing.Brush>
-              <GeometryDrawing.Geometry>
-                <RectangleGeometry Rect="0,0,20,32" />
-              </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-          </DrawingBrush.Drawing>
-        </DrawingBrush>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground">
-      <Setter.Value>
-        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-          <DrawingBrush.Transform>
-            <TransformGroup>
-              <RotateTransform Angle="20" />
-              <TranslateTransform x:Name="MyTransform" X="0" />
-            </TransformGroup>
-          </DrawingBrush.Transform>
-          <DrawingBrush.Drawing>
-            <GeometryDrawing>
-              <GeometryDrawing.Brush>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0" />
-                  <GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-                </LinearGradientBrush>
-              </GeometryDrawing.Brush>
-              <GeometryDrawing.Geometry>
-                <RectangleGeometry Rect="0,0,20,32" />
-              </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-          </DrawingBrush.Drawing>
-        </DrawingBrush>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground">
-      <Setter.Value>
-        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-          <DrawingBrush.Transform>
-            <TransformGroup>
-              <RotateTransform Angle="20" />
-              <TranslateTransform x:Name="MyTransform" X="0" />
-            </TransformGroup>
-          </DrawingBrush.Transform>
-          <DrawingBrush.Drawing>
-            <GeometryDrawing>
-              <GeometryDrawing.Brush>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0" />
-                  <GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-                </LinearGradientBrush>
-              </GeometryDrawing.Brush>
-              <GeometryDrawing.Geometry>
-                <RectangleGeometry Rect="0,0,20,32" />
-              </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-          </DrawingBrush.Drawing>
-        </DrawingBrush>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground">
-      <Setter.Value>
-        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-          <DrawingBrush.Transform>
-            <TransformGroup>
-              <RotateTransform Angle="20" />
-              <TranslateTransform x:Name="MyTransform" X="0" />
-            </TransformGroup>
-          </DrawingBrush.Transform>
-          <DrawingBrush.Drawing>
-            <GeometryDrawing>
-              <GeometryDrawing.Brush>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0" />
-                  <GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-                </LinearGradientBrush>
-              </GeometryDrawing.Brush>
-              <GeometryDrawing.Geometry>
-                <RectangleGeometry Rect="0,0,20,32" />
-              </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-          </DrawingBrush.Drawing>
-        </DrawingBrush>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
-    <Setter Property="Foreground">
-      <Setter.Value>
-        <DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
-          <DrawingBrush.Transform>
-            <TransformGroup>
-              <RotateTransform Angle="20" />
-              <TranslateTransform x:Name="MyTransform" X="0" />
-            </TransformGroup>
-          </DrawingBrush.Transform>
-          <DrawingBrush.Drawing>
-            <GeometryDrawing>
-              <GeometryDrawing.Brush>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0" />
-                  <GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
-                  <GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
-                </LinearGradientBrush>
-              </GeometryDrawing.Brush>
-              <GeometryDrawing.Geometry>
-                <RectangleGeometry Rect="0,0,20,32" />
-              </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-          </DrawingBrush.Drawing>
-        </DrawingBrush>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarSuccessCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarInfoCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarWarningCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarDangerCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
-    <Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-    <Setter Property="WaveFill" Value="{DynamicResource DarkPrimaryBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarSuccessWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-    <Setter Property="WaveFill" Value="{DynamicResource DarkSuccessBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarInfoWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-    <Setter Property="WaveFill" Value="{DynamicResource DarkInfoBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarWarningWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-    <Setter Property="WaveFill" Value="{DynamicResource DarkWarningBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarDangerWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
-    <Setter Property="WaveFill" Value="{DynamicResource DarkDangerBrush}" />
-  </Style>
-  <Style x:Key="ProgressBarFlat" TargetType="ProgressBar">
-    <Setter Property="Height" Value="4" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ProgressBar">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
-                <EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
-                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
-                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
-              </DoubleAnimationUsingKeyFrames>
-              <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
-                <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
-                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
-                <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
-              </PointAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true" ClipToBounds="True">
-            <Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}" />
-            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-              <Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" />
-            </Decorator>
-            <Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
-              <Rectangle.RenderTransform>
-                <TransformGroup>
-                  <ScaleTransform />
-                </TransformGroup>
-              </Rectangle.RenderTransform>
-            </Rectangle>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsIndeterminate" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
-              </Trigger.EnterActions>
-              <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
-              <Setter Property="Visibility" TargetName="Animation" Value="Visible" />
-            </Trigger>
-            <Trigger Property="Orientation" Value="Vertical">
-              <Setter Property="Height" Value="{x:Static system:Double.NaN}" />
-              <Setter Property="LayoutTransform" TargetName="TemplateRoot">
-                <Setter.Value>
-                  <RotateTransform Angle="-90" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
-  <Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
-  <Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
-  <Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
-  <Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="RadioGroupItemHorizontalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-  </Style>
-  <Style x:Key="RadioGroupItemSingle" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-  </Style>
-  <Style x:Key="RadioGroupItemVerticalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="RadioGroupItemVerticalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-  </Style>
-  <Style TargetType="ResizeGrip">
-    <Setter Property="MinWidth" Value="11" />
-    <Setter Property="MinHeight" Value="11" />
-    <Setter Property="Width" Value="11" />
-    <Setter Property="Height" Value="11" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ResizeGrip">
-          <hc:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-            <Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
-              <Path.Fill>
-                <DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
-                  <DrawingBrush.Drawing>
-                    <DrawingGroup>
-                      <GeometryDrawing Brush="{StaticResource ResizeGripperForeground}">
-                        <GeometryDrawing.Geometry>
-                          <RectangleGeometry Rect="0,0,2,2" />
-                        </GeometryDrawing.Geometry>
-                      </GeometryDrawing>
-                    </DrawingGroup>
-                  </DrawingBrush.Drawing>
-                </DrawingBrush>
-              </Path.Fill>
-            </Path>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="Window">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-  </Style>
-  <Style x:Key="WindowWin10" TargetType="hc:Window">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="#262e2f" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="CloseButtonBackground" Value="Transparent" />
-    <Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="CloseButtonHoverBackground" Value="#e81123" />
-    <Setter Property="CloseButtonHoverForeground" Value="White" />
-    <Setter Property="OtherButtonBackground" Value="Transparent" />
-    <Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkMaskBrush}" />
-    <Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Window">
-          <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <StackPanel Name="ButtonPanel" WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" hc:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-                  <Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-                </StackPanel>
-                <Grid Grid.Column="0">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-                  <Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
-                    <interactivity:Interaction.Triggers>
-                      <interactivity:EventTrigger EventName="MouseDoubleClick">
-                        <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-                      </interactivity:EventTrigger>
-                    </interactivity:Interaction.Triggers>
-                    <Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
-                  </Button>
-                  <TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
-                    <TextBlock.Visibility>
-                      <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-                        <MultiBinding.Bindings>
-                          <Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
-                          <Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
-                        </MultiBinding.Bindings>
-                      </MultiBinding>
-                    </TextBlock.Visibility>
-                  </TextBlock>
-                  <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
-                </Grid>
-              </Grid>
-              <AdornerDecorator Grid.Row="1">
-                <ContentPresenter ClipToBounds="True" />
-              </AdornerDecorator>
-              <ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsActive" Value="False">
-              <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
-              <Setter Property="Opacity" Value=".8" TargetName="ButtonPanel" />
-            </Trigger>
-            <Trigger Property="WindowState" Value="Maximized">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-              <Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore" />
-            </Trigger>
-            <Trigger Property="WindowState" Value="Normal">
-              <Setter Property="Visibility" Value="Visible" TargetName="ButtonMax" />
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-            </Trigger>
-            <Trigger Property="ResizeMode" Value="NoResize">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin" />
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-            </Trigger>
-            <Trigger Property="ResizeMode" Value="CanMinimize">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-              <Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
-              <Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
-              <Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
-              <Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-            <Trigger Property="WindowStyle" Value="None">
-              <Setter Property="ShowNonClientArea" Value="False" />
-            </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="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="hc:BlurWindow">
-    <Setter Property="Background" Value="Transparent" />
-  </Style>
-  <Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="hc:GlowWindow">
-    <Setter Property="ActiveGlowColor" Value="#262e2f" />
-    <Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}" />
-    <Setter Property="BorderThickness" Value="0" />
-  </Style>
-  <Style TargetType="hc:ImageBrowser">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="MinWidth" Value="400" />
-    <Setter Property="MinHeight" Value="250" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="Black" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ImageBrowser">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="Storyboard1">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-                <EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="Storyboard2">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
-                <EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <hc:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000" />
-            <hc:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
-              <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
-                <TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0" />
-                <TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0" />
-              </StackPanel>
-              <Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40" />
-            </hc:SimplePanel>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-              </Trigger.ExitActions>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsFullScreen" Value="True">
-        <Setter Property="WindowState" Value="Maximized" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TagBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Tag">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Tag">
-          <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Border Visibility="{Binding HasHeader,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Width="{Binding ActualHeight,RelativeSource={RelativeSource Self}}" Style="{StaticResource BorderCircularClip}" BorderBrush="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}">
-                <ContentPresenter TextElement.Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" VerticalAlignment="Center" HorizontalAlignment="Center" />
-              </Border>
-              <ContentPresenter Margin="{TemplateBinding Padding}" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-              <Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="0,0,6,0" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,11" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-              <Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
-              <Setter Property="Padding" Value="0,6" TargetName="ButtonClose" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource DarkMaskBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TagContainerBaseStyle" TargetType="hc:TagContainer" BasedOn="{StaticResource BaseStyle}">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TagBaseStyle}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="ItemsPanel">
-      <Setter.Value>
-        <ItemsPanelTemplate>
-          <WrapPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}" />
-        </ItemsPanelTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TagContainer">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <hc:ScrollViewer Focusable="false">
-              <ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </hc:ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Focusable" Value="false" />
-    <Setter Property="ClickMode" Value="Press" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-            <Border Margin="0,0,6,0" BorderThickness="1" BorderBrush="Transparent" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-              <Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-            </Border>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value=".4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ComboBoxWatermarkToggleButton" TargetType="ToggleButton">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="Focusable" Value="false" />
-    <Setter Property="ClickMode" Value="Press" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="30" />
-            </Grid.ColumnDefinitions>
-            <Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
-            <Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
-            <Border Margin="1" Grid.Column="0" Visibility="{Binding Text,RelativeSource={RelativeSource AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}">
-              <ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value=".4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ComboBoxTemplate" TargetType="ComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{Binding Background,RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
-      <Border Grid.Column="0" Margin="1,0">
-        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxTopTemplate" TargetType="ComboBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" Margin="1,0">
-        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxLeftTemplate" TargetType="ComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" Margin="1,0">
-        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ComboBoxEditableTextBox" TargetType="TextBox">
-    <Setter Property="OverridesDefaultStyle" Value="true" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="MinWidth" Value="0" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TextBox">
-          <ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="ComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
-      <Border Grid.Column="0" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxEditableTopTemplate" TargetType="ComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxEditableLeftTemplate" TargetType="ComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ComboBoxItemBaseStyle" TargetType="ComboBoxItem">
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBoxItem">
-          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsSelected" Value="False" />
-                <Condition Property="IsMouseOver" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsSelected" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="Foreground" Value="White" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ComboBoxBaseStyle" TargetType="ComboBox">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemBaseStyle}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-    <Setter Property="Template" Value="{StaticResource ComboBoxTemplate}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Style.Triggers>
-      <Trigger Property="IsEditable" Value="true">
-        <Setter Property="IsTabStop" Value="false" />
-        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ComboBoxExtendBaseStyle" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Template" Value="{StaticResource ComboBoxTopTemplate}" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="False" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxLeftTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTopTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxEditableLeftTemplate}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="ComboBoxPlusTopTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" Margin="1,0">
-        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxPlusLeftTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" Margin="1,0">
-        <ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxPlusEditableTopTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-        <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="hc:ComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer Margin="0,4">
-                  <StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
-        <TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-      <Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-        <Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-        <Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="border" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}" />
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="False" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxPlusLeftTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
-          <Condition Property="AutoComplete" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsEditable" Value="True" />
-          <Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
-          <Condition Property="AutoComplete" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="OverridesDefaultStyle" Value="True" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="MenuItem">
-          <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-            <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="26" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="30" />
-                <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
-                <ColumnDefinition Width="20" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-              <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-                <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-              </Border>
-              <ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" Margin="0,3" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              <TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-            </Trigger>
-            <Trigger Property="Icon" Value="{x:Null}">
-              <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Role" Value="TopLevelHeader">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="MenuItem">
-              <Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                  </Grid.ColumnDefinitions>
-                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-                  <Border Margin="0,0,10,0" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-                  </Border>
-                  <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  <Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom">
-                    <hc:SimplePanel Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8">
-                      <Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-                        <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-                          <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
-                        </ScrollViewer>
-                      </Border>
-                      <Border hc:MenuTopLineAttach.Popup="{Binding ElementName=PART_Popup}" Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" />
-                    </hc:SimplePanel>
-                  </Popup>
-                </Grid>
-              </Border>
-              <ControlTemplate.Triggers>
-                <Trigger Property="Icon" Value="{x:Null}">
-                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-                </Trigger>
-                <Trigger Property="IsChecked" Value="True">
-                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-                </Trigger>
-                <Trigger Property="IsHighlighted" Value="True">
-                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
-                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-                </Trigger>
-                <Trigger Property="IsSubmenuOpen" Value="True">
-                  <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}" />
-                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}" />
-                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-      <Trigger Property="Role" Value="TopLevelItem">
-        <Setter Property="Margin" Value="0" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="MenuItem">
-              <Border x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid Margin="{TemplateBinding Padding}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" HorizontalAlignment="Left" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-                  <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
-                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-                  </Border>
-                  <ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-                </Grid>
-              </Border>
-              <ControlTemplate.Triggers>
-                <Trigger Property="Icon" Value="{x:Null}">
-                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-                </Trigger>
-                <Trigger Property="IsChecked" Value="True">
-                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-                  <Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
-                </Trigger>
-                <Trigger Property="IsHighlighted" Value="True">
-                  <Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
-                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-                </Trigger>
-                <Trigger Property="IsSubmenuOpen" Value="True">
-                  <Setter Property="Background" TargetName="templateRoot" Value="White" />
-                  <Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
-                </Trigger>
-                <MultiTrigger>
-                  <MultiTrigger.Conditions>
-                    <Condition Property="IsHighlighted" Value="True" />
-                    <Condition Property="IsEnabled" Value="False" />
-                  </MultiTrigger.Conditions>
-                  <Setter Property="Background" TargetName="templateRoot" Value="#0A000000" />
-                  <Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000" />
-                </MultiTrigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-      <Trigger Property="Role" Value="SubmenuHeader">
-        <Setter Property="DockPanel.Dock" Value="Top" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="MenuItem">
-              <Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="26" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="30" />
-                    <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
-                    <ColumnDefinition Width="20" />
-                  </Grid.ColumnDefinitions>
-                  <ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
-                  <Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
-                    <Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
-                  </Border>
-                  <ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,3" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  <Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" />
-                  <Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" VerticalOffset="-13" HorizontalOffset="10">
-                    <Border Effect="{StaticResource EffectShadow2}" Margin="8" CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-                      <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
-                      </ScrollViewer>
-                    </Border>
-                  </Popup>
-                </Grid>
-              </Border>
-              <ControlTemplate.Triggers>
-                <Trigger Property="IsChecked" Value="True">
-                  <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-      <Trigger Property="IsHighlighted" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="MenuBaseStyle" TargetType="Menu">
-    <Setter Property="OverridesDefaultStyle" Value="True" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="FontStyle" Value="Normal" />
-    <Setter Property="FontWeight" Value="Normal" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Menu">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="WatermarkTextBoxBaseStyle" TargetType="hc:WatermarkTextBox">
-    <Setter Property="Background" Value="{x:Null}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="CaretBrush" Value="{Binding Foreground,RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:WatermarkTextBox">
-          <hc:SimplePanel x:Name="WatermarkContent">
-            <TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TextBox">
-          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="border" Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="TextBoxExtendTopTemplate" TargetType="TextBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-      <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="border" Value="0.4" />
-        <Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
-        <Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TextBoxExtendLeftTemplate" TargetType="TextBox">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-      <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="border" Value="0.4" />
-        <Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
-        <Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="TextBoxExtendBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Template" Value="{StaticResource TextBoxExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource TextBoxExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-        <Grid SnapsToDevicePixels="true">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-          <ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-        <Grid SnapsToDevicePixels="true">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-          <ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource TextBoxPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="SearchBarBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="hc:SearchBar">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SearchBar">
-          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="30" />
-              </Grid.ColumnDefinitions>
-              <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-              <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="SearchBarExtendTopTemplate" TargetType="hc:SearchBar">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="SearchBarExtendLeftTemplate" TargetType="hc:SearchBar">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="SearchBarExtendBaseStyle" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-          <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="SearchBarPlusBaseStyle" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar">
-    <Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
-  <Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
-  <Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
-  <Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
-  <Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
-  <Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
-  <Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style x:Key="ComboBoxExtend" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="ComboBox" />
-  <Style x:Key="ComboBoxExtend.Small" BasedOn="{StaticResource ComboBoxExtend}" TargetType="ComboBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox" />
-  <Style x:Key="ComboBoxPlus.Small" BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource WatermarkTextBoxBaseStyle}" TargetType="hc:WatermarkTextBox" />
-  <Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
-  <Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
-  <Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
-  <Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
-  <Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
-  <ControlTemplate x:Key="BadgeTextTemplate" TargetType="hc:Badge">
-    <hc:SimplePanel>
-      <ContentPresenter />
-      <Border x:Name="Border" Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-        <Border.RenderTransform>
-          <ScaleTransform />
-        </Border.RenderTransform>
-        <ContentPresenter ContentSource="Text" Margin="{TemplateBinding Padding}" />
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <EventTrigger RoutedEvent="hc:Badge.ValueChanged">
-        <BeginStoryboard>
-          <Storyboard AutoReverse="True">
-            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
-            <DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
-          </Storyboard>
-        </BeginStoryboard>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="hc:Badge">
-    <hc:SimplePanel>
-      <ContentPresenter />
-      <Ellipse Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-        <Ellipse.OpacityMask>
-          <RadialGradientBrush>
-            <GradientStop Offset="0" Color="Transparent" />
-            <GradientStop Offset="1" Color="Black" />
-          </RadialGradientBrush>
-        </Ellipse.OpacityMask>
-        <Ellipse.RenderTransform>
-          <ScaleTransform />
-        </Ellipse.RenderTransform>
-        <Ellipse.Triggers>
-          <EventTrigger RoutedEvent="Loaded">
-            <BeginStoryboard>
-              <Storyboard RepeatBehavior="Forever" DesiredFrameRate="20">
-                <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
-                <DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
-                <DoubleAnimation Storyboard.TargetProperty="Opacity" BeginTime="0" Duration="0:0:1" From="1" To="0" EasingFunction="{StaticResource SineEaseOut}" />
-              </Storyboard>
-            </BeginStoryboard>
-          </EventTrigger>
-        </Ellipse.Triggers>
-      </Ellipse>
-      <Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <Style x:Key="BadgeBaseStyle" TargetType="hc:Badge">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Padding" Value="6,2" />
-    <Setter Property="Template" Value="{StaticResource BadgeTextTemplate}" />
-    <Setter Property="HorizontalContentAlignment" Value="Right" />
-    <Setter Property="VerticalContentAlignment" Value="Top" />
-    <Setter Property="BadgeMargin" Value="0,-10,-10,0" />
-    <Style.Triggers>
-      <Trigger Property="Status" Value="Dot">
-        <Setter Property="Template" Value="{StaticResource BadgeDotTemplate}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-        <Setter Property="BadgeMargin" Value="0,-5,-5,0" />
-      </Trigger>
-      <Trigger Property="Status" Value="Processing">
-        <Setter Property="Template" Value="{StaticResource BadgeProcessingTemplate}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-        <Setter Property="BadgeMargin" Value="0,-5,-5,0" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="CardBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Card">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Card">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
-                <ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" />
-              </Border>
-              <ContentPresenter Grid.Row="1" />
-              <Border Grid.Row="2" BorderThickness="0,1,0,0" Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
-                <ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}" />
-              </Border>
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="hc:ChatBubble">
-    <hc:SimplePanel>
-      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-        <TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="Role" Value="Receiver">
-        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-        <Setter TargetName="Tail" Property="RenderTransform">
-          <Setter.Value>
-            <TransformGroup>
-              <ScaleTransform ScaleY="1" ScaleX="-1" />
-            </TransformGroup>
-          </Setter.Value>
-        </Setter>
-        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="hc:ChatBubble">
-    <hc:SimplePanel>
-      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-        <hc:SimplePanel>
-          <Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}" />
-          <Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15" />
-        </hc:SimplePanel>
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="Role" Value="Receiver">
-        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-        <Setter TargetName="Tail" Property="RenderTransform">
-          <Setter.Value>
-            <TransformGroup>
-              <ScaleTransform ScaleY="1" ScaleX="-1" />
-            </TransformGroup>
-          </Setter.Value>
-        </Setter>
-        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ChatBubbleAudioBaseTemplate" TargetType="hc:ChatBubble">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="12" Name="Definition1" />
-        <ColumnDefinition Name="Definition2" />
-      </Grid.ColumnDefinitions>
-      <Ellipse Name="Dot" VerticalAlignment="Top" Fill="{DynamicResource DangerBrush}" Width="6" Height="6" Visibility="{TemplateBinding IsRead,Converter={StaticResource Boolean2VisibilityReConverter}}" Margin="0,0,6,0" />
-      <Path Name="Tail" Grid.Column="1" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-      <Border Name="Body" Grid.Column="1" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-        <Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <ContentPresenter Name="Presenter" VerticalAlignment="Center" />
-          <Path Name="Audio" Grid.Column="1" Data="{StaticResource AudioGeometry}" Fill="{TemplateBinding Foreground}" Width="16" Height="16" Margin="6,0,0,0" RenderTransformOrigin="0.5,0.5">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <ScaleTransform ScaleY="1" ScaleX="-1" />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="Role" Value="Receiver">
-        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-        <Setter TargetName="Tail" Property="RenderTransform">
-          <Setter.Value>
-            <TransformGroup>
-              <ScaleTransform ScaleY="1" ScaleX="-1" />
-            </TransformGroup>
-          </Setter.Value>
-        </Setter>
-        <Setter TargetName="Tail" Property="Grid.Column" Value="0" />
-        <Setter TargetName="Dot" Property="Grid.Column" Value="1" />
-        <Setter TargetName="Dot" Property="Margin" Value="6,0,0,0" />
-        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-        <Setter TargetName="Body" Property="Grid.Column" Value="0" />
-        <Setter TargetName="Definition1" Property="Width" Value="Auto" />
-        <Setter TargetName="Definition2" Property="Width" Value="12" />
-        <Setter TargetName="Audio" Property="Grid.Column" Value="0" />
-        <Setter TargetName="Audio" Property="Margin" Value="0,0,6,0" />
-        <Setter TargetName="Audio" Property="RenderTransform">
-          <Setter.Value>
-            <TransformGroup>
-              <ScaleTransform ScaleY="1" ScaleX="1" />
-            </TransformGroup>
-          </Setter.Value>
-        </Setter>
-        <Setter TargetName="Presenter" Property="Grid.Column" Value="1" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="hc:ChatBubble">
-    <hc:SimplePanel>
-      <Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
-      <Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
-        <ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
-      </Border>
-    </hc:SimplePanel>
-    <ControlTemplate.Triggers>
-      <Trigger Property="Role" Value="Receiver">
-        <Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
-        <Setter TargetName="Tail" Property="RenderTransform">
-          <Setter.Value>
-            <TransformGroup>
-              <ScaleTransform ScaleY="1" ScaleX="-1" />
-            </TransformGroup>
-          </Setter.Value>
-        </Setter>
-        <Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ChatBubbleBaseStyle" TargetType="hc:ChatBubble">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="HorizontalAlignment" Value="Right" />
-    <Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="Margin" Value="10" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template" Value="{StaticResource ChatBubbleStringBaseTemplate}" />
-    <Setter Property="IsRead" Value="{Binding IsSelected,RelativeSource={RelativeSource Self}}" />
-    <Setter Property="MaxWidth" Value="280" />
-    <Style.Triggers>
-      <Trigger Property="Role" Value="Receiver">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-      </Trigger>
-      <Trigger Property="Type" Value="Image">
-        <Setter Property="Template" Value="{StaticResource ChatBubbleImageBaseTemplate}" />
-        <Setter Property="MaxHeight" Value="280" />
-      </Trigger>
-      <Trigger Property="Type" Value="Audio">
-        <Setter Property="Template" Value="{StaticResource ChatBubbleAudioBaseTemplate}" />
-      </Trigger>
-      <Trigger Property="Type" Value="Custom">
-        <Setter Property="Template" Value="{StaticResource ChatBubbleCustomBaseTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="Tag4CheckComboBoxStyle" BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag">
-    <Setter Property="Padding" Value="6,3,4,3" />
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Tag">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-              <Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Height="16" Padding="0,4" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" Foreground="{TemplateBinding Foreground}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
-              <Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
-              <Setter Property="Padding" Value="0" TargetName="ButtonClose" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
-    <Setter Property="ClickMode" Value="Release" />
-  </Style>
-  <Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
-    <Setter Property="ClickMode" Value="Release" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="30" />
-            </Grid.ColumnDefinitions>
-            <Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
-            <Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
-            <Border Margin="1" Grid.Column="0" Visibility="{Binding SelectedItem,RelativeSource={RelativeSource AncestorType=hc:CheckComboBox},Converter={StaticResource Object2VisibilityReConverter}}">
-              <ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value=".4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CheckComboBoxItemBaseStyle" TargetType="hc:CheckComboBoxItem">
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CheckComboBoxItem">
-          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
-            <CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
-              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </CheckBox>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="CheckComboBoxTemplate" TargetType="hc:CheckComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <Grid Margin="0,4" ClipToBounds="False">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                  </Grid.RowDefinitions>
-                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-                </Grid>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
-      <Border Grid.Column="0" Margin="-1,1">
-        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="CheckComboBoxBaseStyle" TargetType="hc:CheckComboBox">
-    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle}" />
-    <Setter Property="SelectionMode" Value="Multiple" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource CheckComboBoxItemBaseStyle}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Padding" Value="6,3" />
-    <Setter Property="Template" Value="{StaticResource CheckComboBoxTemplate}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-  </Style>
-  <ControlTemplate x:Key="CheckComboBoxExtendTopTemplate" TargetType="hc:CheckComboBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup x:Name="PART_Popup" Grid.Row="1" Grid.Column="0" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <Grid Margin="0,4" ClipToBounds="False">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                  </Grid.RowDefinitions>
-                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-                </Grid>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
-        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CheckComboBoxExtendLeftTemplate" TargetType="hc:CheckComboBox">
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <Grid Margin="0,4" ClipToBounds="False">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                  </Grid.RowDefinitions>
-                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-                </Grid>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" Margin="-1,1">
-        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="CheckComboBoxExtendBaseStyle" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Template" Value="{StaticResource CheckComboBoxExtendTopTemplate}" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource CheckComboBoxExtendLeftTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="CheckComboBoxPlusTopTemplate" TargetType="hc:CheckComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <Grid Margin="0,4" ClipToBounds="False">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                  </Grid.RowDefinitions>
-                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-                </Grid>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-      <Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
-        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-      </Border>
-      <Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="CheckComboBoxPlusLeftTemplate" TargetType="hc:CheckComboBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" MinWidth="30" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-        <Decorator Margin="8 0">
-          <Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <Grid Margin="0,4" ClipToBounds="False">
-                  <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                  </Grid.RowDefinitions>
-                  <hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
-                  <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
-                    <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </ScrollViewer>
-                </Grid>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </Decorator>
-      </Popup>
-      <TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
-      <Border Grid.Column="1" Margin="-1,1">
-        <hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
-      </Border>
-      <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="HasItems" Value="false">
-        <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-      </Trigger>
-      <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-        <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-        <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="True">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="CheckComboBoxPlusBaseStyle" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource CheckComboBoxPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource CheckComboBoxPlusLeftTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="ColorPickerSliderHorizontal" TargetType="Slider">
-    <hc:SimplePanel>
-      <Border Margin="7,0" Background="{TemplateBinding Background}" MaxHeight="11" CornerRadius="2" />
-      <Border Margin="7,0" Background="{TemplateBinding Foreground}" MaxHeight="11" CornerRadius="2">
-        <Border.OpacityMask>
-          <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-            <GradientStop Color="Transparent" Offset="1" />
-            <GradientStop Color="White" Offset="0" />
-          </LinearGradientBrush>
-        </Border.OpacityMask>
-      </Border>
-      <Track x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb x:Name="Thumb" Focusable="False" Height="13" Width="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Center">
-            <Thumb.Effect>
-              <DropShadowEffect ShadowDepth="0" Opacity=".6" />
-            </Thumb.Effect>
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ColorPickerSliderVertical" TargetType="Slider">
-    <hc:SimplePanel>
-      <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Background}" />
-      <Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Foreground}">
-        <Border.OpacityMask>
-          <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-            <GradientStop Color="Transparent" Offset="1" />
-            <GradientStop Color="White" Offset="0" />
-          </LinearGradientBrush>
-        </Border.OpacityMask>
-      </Border>
-      <Track x:Name="PART_Track">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb x:Name="Thumb" Focusable="False" Height="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Top" Width="13">
-            <Thumb.Effect>
-              <DropShadowEffect ShadowDepth="0" Opacity=".6" />
-            </Thumb.Effect>
-          </Thumb>
-        </Track.Thumb>
-      </Track>
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <Style x:Key="ColorPickerSlider" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="Foreground" Value="Transparent" />
-    <Setter Property="Template" Value="{StaticResource ColorPickerSliderHorizontal}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource ColorPickerSliderVertical}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ColorPickerBaseStyle" TargetType="hc:ColorPicker">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Width" Value="230" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ColorPicker">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="122" />
-              <RowDefinition Height="110" />
-              <RowDefinition Height="62" />
-              <RowDefinition Height="62" />
-            </Grid.RowDefinitions>
-            <Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}" />
-            <hc:SimplePanel Margin="1" Grid.Row="0">
-              <Border Background="{TemplateBinding BackColor}" />
-              <Border>
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
-                    <GradientStop Color="White" Offset="1" />
-                    <GradientStop Color="#80ffffff" Offset=".5" />
-                    <GradientStop Color="#00ffffff" />
-                  </LinearGradientBrush>
-                </Border.Background>
-              </Border>
-              <Border>
-                <Border.Background>
-                  <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="Black" Offset="1" />
-                    <GradientStop Color="#80000000" Offset=".5" />
-                    <GradientStop Color="#00000000" />
-                  </LinearGradientBrush>
-                </Border.Background>
-              </Border>
-            </hc:SimplePanel>
-            <Border Name="PART_BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
-              <Canvas Margin="-6">
-                <Border Name="PART_BorderPicker" Background="Transparent" Height="12" CornerRadius="6" Width="12" BorderThickness="1" BorderBrush="White">
-                  <Border.Effect>
-                    <DropShadowEffect ShadowDepth="0" Opacity=".4" />
-                  </Border.Effect>
-                </Border>
-              </Canvas>
-            </Border>
-            <Border Grid.Row="0" Background="Transparent" Name="PART_BorderDrag" />
-            <Grid Margin="16,16,10,0" Grid.Row="1">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-                <ColumnDefinition Width="28" />
-              </Grid.ColumnDefinitions>
-              <ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
-                <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
-                <hc:StatusSwitchElement.CheckedElement>
-                  <Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
-                </hc:StatusSwitchElement.CheckedElement>
-              </ToggleButton>
-              <Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
-              <Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{TemplateBinding SelectedBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
-              <Slider Name="PART_SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" Value="6" Maximum="6" Background="{StaticResource ColorPickerRainbowBrush}" Margin="2,1,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
-              <Slider Name="PART_SliderOpacity" Grid.ColumnSpan="2" IsSnapToTickEnabled="True" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Maximum="255" SmallChange="1" Foreground="{TemplateBinding SelectedBrushWithoutOpacity}" Background="{StaticResource ColorPickerOpacityBrush}" Margin="2,0,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Bottom" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
-              <StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,14,0,0" VerticalAlignment="Top" Visibility="{Binding ShowList[0],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}">
-                <TextBox Padding="0" HorizontalContentAlignment="Center" Width="176" Text="{Binding SelectedBrush,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,Converter={StaticResource Color2HexStringConverter},UpdateSourceTrigger=LostFocus}" FontSize="10" MaxLength="10" Height="24" />
-                <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="HEX" HorizontalAlignment="Center" />
-              </StackPanel>
-              <UniformGrid Name="PART_PanelRgb" Visibility="{Binding ShowList[1],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Rows="1" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="-2,14,-2,0" VerticalAlignment="Top">
-                <StackPanel Margin="2,0">
-                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="2,0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="R" HorizontalAlignment="Center" />
-                </StackPanel>
-                <StackPanel Margin="2,0">
-                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="G" Value="{Binding ChannelG,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="G" HorizontalAlignment="Center" />
-                </StackPanel>
-                <StackPanel Margin="2,0">
-                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="B" Value="{Binding ChannelB,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="B" HorizontalAlignment="Center" />
-                </StackPanel>
-                <StackPanel Margin="2,0">
-                  <hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
-                  <TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="A" HorizontalAlignment="Center" />
-                </StackPanel>
-              </UniformGrid>
-              <Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="3" Grid.Row="1">
-                <Button.Content>
-                  <Path Fill="#323534" Style="{StaticResource UpDownPathStyle}" />
-                </Button.Content>
-              </Button>
-            </Grid>
-            <Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
-              <WrapPanel Name="PART_PanelColor" Margin="6" HorizontalAlignment="Center" />
-            </Border>
-            <Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
-              <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Button Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Width="80" Margin="0,0,16,0" />
-                <Button Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Width="80" Style="{StaticResource ButtonPrimary}" />
-              </StackPanel>
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ContextMenu">
-          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-            <ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
-              <ItemsPresenter />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CoverViewContentBaseStyle" TargetType="hc:CoverViewContent">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Margin" Value="0,0,0,8" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CoverViewContent">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition Height="16" />
-              <RowDefinition />
-            </Grid.RowDefinitions>
-            <Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
-              <Border.RenderTransform>
-                <TransformGroup>
-                  <TranslateTransform X="5" Y="5" />
-                  <RotateTransform Angle="45" />
-                </TransformGroup>
-              </Border.RenderTransform>
-            </Border>
-            <Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-              <ContentPresenter Margin="{TemplateBinding Padding}" />
-            </Border>
-            <Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">
-              <Rectangle.RenderTransform>
-                <TransformGroup>
-                  <TranslateTransform X="1" />
-                </TransformGroup>
-              </Rectangle.RenderTransform>
-            </Rectangle>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="CoverViewBaseStyle" TargetType="hc:CoverView">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource CoverViewItemBaseStyle}" />
-    <Setter Property="CoverViewContentStyle" Value="{StaticResource CoverViewContentBaseStyle}" />
-    <Setter Property="ItemMargin" Value="8" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CoverView">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <ScrollViewer>
-              <WrapPanel x:Name="PART_Panel" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="DatePickerTextBoxStyle" TargetType="DatePickerTextBox">
-    <Setter Property="Foreground" Value="{Binding Foreground,RelativeSource={RelativeSource AncestorType=DatePicker}}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DatePickerTextBox">
-          <hc:SimplePanel>
-            <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="DatePickerBaseStyle" TargetType="DatePicker">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="CalendarStyle" Value="{StaticResource CalendarBaseStyle}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="IsTodayHighlighted" Value="True" />
-    <Setter Property="SelectedDateFormat" Value="Short" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DatePicker">
-          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="30" />
-              </Grid.ColumnDefinitions>
-              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-              <DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="DatePickerExtendTopTemplate" TargetType="DatePicker">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="DatePickerExtendLeftTemplate" TargetType="DatePicker">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="DatePickerExtendBaseStyle" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template" Value="{StaticResource DatePickerExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource DatePickerExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="DatePickerPlusTopTemplate" TargetType="hc:DatePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="DatePickerPlusLeftTemplate" TargetType="hc:DatePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
-          <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="DatePickerPlusBaseStyle" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="hc:DatePicker">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Template" Value="{StaticResource DatePickerPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource DatePickerPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DateTimePickerBaseStyle" TargetType="hc:DateTimePicker">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:DateTimePicker">
-          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="30" />
-              </Grid.ColumnDefinitions>
-              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-              <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="DateTimePickerExtendTopTemplate" TargetType="hc:DateTimePicker">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="DateTimePickerExtendLeftTemplate" TargetType="hc:DateTimePicker">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="DateTimePickerExtendBaseStyle" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template" Value="{StaticResource DateTimePickerExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource DateTimePickerExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="DateTimePickerPlusTopTemplate" TargetType="hc:DateTimePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="DateTimePickerPlusLeftTemplate" TargetType="hc:DateTimePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource DateTimePickerPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DialogBaseStyle" TargetType="hc:Dialog">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Dialog">
-          <Border Background="{DynamicResource DarkOpacityBrush}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="DividerBaseStyle" TargetType="hc:Divider">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Margin" Value="0,24" />
-    <Setter Property="Padding" Value="24,0" />
-    <Setter Property="LineStroke" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Divider">
-          <hc:Row>
-            <hc:Col Layout="12" x:Name="ColStart">
-              <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-            </hc:Col>
-            <hc:Col Layout="0">
-              <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-            </hc:Col>
-            <hc:Col Layout="12" x:Name="ColEnd">
-              <Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-            </hc:Col>
-          </hc:Row>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Padding" Value="0" />
-            </Trigger>
-            <Trigger Property="HorizontalContentAlignment" Value="Left">
-              <Setter TargetName="ColStart" Property="Layout" Value="0" />
-              <Setter TargetName="ColStart" Property="IsFixed" Value="True" />
-              <Setter TargetName="ColStart" Property="Width" Value="20" />
-              <Setter TargetName="ColEnd" Property="Layout" Value="24" />
-            </Trigger>
-            <Trigger Property="HorizontalContentAlignment" Value="Right">
-              <Setter TargetName="ColEnd" Property="Layout" Value="0" />
-              <Setter TargetName="ColEnd" Property="IsFixed" Value="True" />
-              <Setter TargetName="ColEnd" Property="Width" Value="20" />
-              <Setter TargetName="ColStart" Property="Layout" Value="24" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Content" Value="{x:Null}">
-        <Setter Property="Padding" Value="0" />
-      </Trigger>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Margin" Value="6,0" />
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="hc:Divider">
-              <Line HorizontalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" Y2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DrawerBaseStyle" TargetType="hc:Drawer">
-    <Setter Property="Dock" Value="Right" />
-    <Setter Property="MaskBrush" Value="{DynamicResource DarkOpacityBrush}" />
-  </Style>
-  <DrawingBrush x:Key="EmptySimpleLogo" o:Freeze="True">
-    <DrawingBrush.Drawing>
-      <DrawingGroup o:Freeze="True">
-        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M0,844.8C0,942.250667 361.096533,1021.269333 806.536533,1021.269333 1251.976533,1021.269333 1613.038933,942.250666 1613.038933,844.8 1613.038933,747.383467 1251.9424,668.398933 806.536533,668.398933 361.096533,668.398933 0,747.383467 0,844.8z" />
-        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1398.784,580.164267L214.254933,580.164267 214.254933,330.6496 473.873067,35.771733C486.4,13.1072,509.1328,0.477867,531.797333,0.477867L1081.2416,0.477867C1103.940267,0.477867,1126.638933,13.1072,1141.725867,38.2976L1398.818133,330.6496 1398.818133,580.164267z M239.479467,555.008L1373.627733,555.008 1373.627733,338.261333 1121.553067,50.858667C1108.992,33.245867,1096.362667,23.210667,1081.2416,23.210667L531.797333,23.210667C516.676266,23.210667,504.081066,33.28,493.9776,48.401067L239.445333,340.753067 239.445333,554.973867z" />
-        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M1048.4736,413.832533C1048.4736,373.521066,1073.664,340.753066,1103.940267,340.753067L1386.222933,340.753067 1386.222933,796.945067C1386.222933,849.851734,1353.454933,895.249067,1310.583467,895.249067L302.455467,895.249067C262.109867,895.249067,226.850134,852.3776,226.850133,796.945067L226.850133,340.753067 509.1328,340.753067C539.374933,340.753067 564.565333,373.521067 564.565333,413.832533 564.565333,454.143999 589.755733,486.912 619.997867,486.912L993.041067,486.912C1023.2832,489.437867,1048.4736,454.144,1048.4736,413.832533z" />
-        <GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1310.583467,907.844267L302.455467,907.844267C254.5664,907.844267,214.2208,857.429334,214.2208,796.910933L214.2208,328.192 509.1328,328.192C546.9184,328.192 577.160533,365.9776 577.160533,413.866667 577.160533,446.634667 597.2992,474.350934 619.997867,474.350933L993.041067,474.350933C1015.7056,474.350933 1035.8784,446.634666 1035.8784,413.866667 1035.8784,365.9776 1066.120533,328.192 1103.940267,328.192L1398.818133,328.192 1398.818133,796.9792C1398.818133,857.463467,1360.9984,907.8784,1310.583467,907.8784z M239.445333,353.348267L239.445333,796.945067C239.445333,844.834134,267.1616,882.619734,302.455467,882.619733L1310.583467,882.619733C1345.877334,882.619733,1373.5936,844.834133,1373.5936,796.945067L1373.5936,353.348267 1103.940267,353.348267C1081.2416,353.348267 1061.0688,381.064534 1061.0688,413.832533 1061.0688,461.7216 1030.826667,499.5072 993.041067,499.5072L619.997867,499.5072C582.212267,499.5072 551.970134,461.7216 551.970133,413.832533 551.970133,381.064533 531.831466,350.8224 509.1328,350.8224L239.445333,350.8224 239.445333,353.348267z" />
-      </DrawingGroup>
-    </DrawingBrush.Drawing>
-  </DrawingBrush>
-  <Rectangle x:Key="LogoRectangle4Empty" x:Shared="False" HorizontalAlignment="Center" Width="64" Height="41" Fill="{StaticResource EmptySimpleLogo}" />
-  <TextBlock x:Key="DescriptionTextBlock4Empty" x:Shared="False" Margin="0,10,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource ThirdlyTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.NoData}}" />
-  <Style x:Key="EmptyBaseStyle" TargetType="hc:Empty">
-    <Setter Property="Logo" Value="{StaticResource LogoRectangle4Empty}" />
-    <Setter Property="Description" Value="{StaticResource DescriptionTextBlock4Empty}" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="Visibility" Value="{Binding Path=(hc:Empty.ShowEmpty),RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Empty">
-          <hc:SimpleStackPanel>
-            <ContentPresenter ContentSource="Logo" />
-            <ContentPresenter ContentSource="Description" />
-            <ContentPresenter HorizontalAlignment="Center" />
-          </hc:SimpleStackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="32" />
-            </Grid.ColumnDefinitions>
-            <Grid.LayoutTransform>
-              <TransformGroup>
-                <RotateTransform Angle="-90" />
-              </TransformGroup>
-            </Grid.LayoutTransform>
-            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-          </Grid>
-        </ToggleButton>
-      </Border>
-      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="0" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsExpanded" Value="true">
-        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}" />
-        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="32" />
-            </Grid.ColumnDefinitions>
-            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-          </Grid>
-        </ToggleButton>
-      </Border>
-      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="0" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsExpanded" Value="true">
-        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}" />
-        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ExpanderRightTemplate" TargetType="Expander">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="32" />
-            </Grid.ColumnDefinitions>
-            <Grid.LayoutTransform>
-              <TransformGroup>
-                <RotateTransform Angle="-90" />
-              </TransformGroup>
-            </Grid.LayoutTransform>
-            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-          </Grid>
-        </ToggleButton>
-      </Border>
-      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="1" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsExpanded" Value="true">
-        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}" />
-        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ExpanderDownTemplate" TargetType="Expander">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition />
-      </Grid.RowDefinitions>
-      <Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition />
-              <ColumnDefinition Width="32" />
-            </Grid.ColumnDefinitions>
-            <ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            <Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
-          </Grid>
-        </ToggleButton>
-      </Border>
-      <ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsExpanded" Value="true">
-        <Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" />
-        <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
-        <Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ExpanderBaseStyle" TargetType="Expander">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="MinWidth" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template" Value="{StaticResource ExpanderDownTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="ExpandDirection" Value="Left">
-        <Setter Property="Template" Value="{StaticResource ExpanderLeftTemplate}" />
-      </Trigger>
-      <Trigger Property="ExpandDirection" Value="Up">
-        <Setter Property="Template" Value="{StaticResource ExpanderUpTemplate}" />
-      </Trigger>
-      <Trigger Property="ExpandDirection" Value="Right">
-        <Setter Property="Template" Value="{StaticResource ExpanderRightTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="FlowDocumentScrollViewerBaseStyle" TargetType="FlowDocumentScrollViewer">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="FlowDocumentScrollViewer">
-          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-            <Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-              <Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-              </Grid>
-            </Grid>
-            <Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Border>
-          </DockPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FlowDocumentPageViewerBaseStyle" TargetType="FlowDocumentPageViewer">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="FlowDocumentPageViewer">
-          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-            <Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-              <StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
-                  <Run Text=" " />
-                  <InlineUIContainer>
-                    <TextBlock Text="{Binding MasterPageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
-                  </InlineUIContainer>
-                  <Run Text=" " />
-                  <Run Text="/" />
-                  <Run Text=" " />
-                  <InlineUIContainer>
-                    <TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
-                  </InlineUIContainer>
-                  <Run Text=" " />
-                </TextBlock>
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
-              </StackPanel>
-              <Grid Grid.Column="2" VerticalAlignment="Center" Margin="32,0,0,0">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-              </Grid>
-            </Grid>
-            <Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <AdornerDecorator>
-                <DocumentPageView HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" DocumentPaginator="{x:Null}" KeyboardNavigation.IsTabStop="False" DocumentViewerBase.IsMasterPage="True" PageNumber="0" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" />
-              </AdornerDecorator>
-            </Border>
-          </DockPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="FlowDocumentReaderBaseStyle" TargetType="FlowDocumentReader">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="FlowDocumentReader">
-          <DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
-            <Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-              </Grid.ColumnDefinitions>
-              <StackPanel Orientation="Horizontal">
-                <ToggleButton Width="24" Height="24" Padding="5" x:Name="FindButton" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Command="ApplicationCommands.Find" Margin="0,0,10,0" ToolTip="{x:Static langs:Lang.Find}" />
-                <Border x:Name="PART_FindToolBarHost" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
-              </StackPanel>
-              <StackPanel x:Name="PageCountAndButtons" Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
-                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
-                  <Run Text=" " />
-                  <InlineUIContainer>
-                    <TextBlock Text="{Binding PageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
-                  </InlineUIContainer>
-                  <Run Text=" " />
-                  <Run Text="/" />
-                  <Run Text=" " />
-                  <InlineUIContainer>
-                    <TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
-                  </InlineUIContainer>
-                  <Run Text=" " />
-                </TextBlock>
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
-              </StackPanel>
-              <Grid Grid.Column="2" Margin="32,0,0,0" VerticalAlignment="Center">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <hc:ButtonGroup Width="90">
-                  <RadioButton x:Name="PageViewButton" Padding="0" hc:IconElement.Geometry="{StaticResource PageModeGeometry}" CommandParameter="Page" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsPageViewEnabled}" ToolTip="{x:Static langs:Lang.PageMode}" />
-                  <RadioButton x:Name="TwoPageViewButton" hc:IconElement.Geometry="{StaticResource TwoPageModeGeometry}" Padding="0" CommandParameter="TwoPage" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsTwoPageViewEnabled}" ToolTip="{x:Static langs:Lang.TwoPageMode}" />
-                  <RadioButton x:Name="ScrollViewButton" hc:IconElement.Geometry="{StaticResource ScrollModeGeometry}" Padding="0" CommandParameter="Scroll" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsScrollViewEnabled}" ToolTip="{x:Static langs:Lang.ScrollMode}" />
-                </hc:ButtonGroup>
-                <RepeatButton Margin="32,0,0,0" Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="1" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
-                <Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="2" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-                <RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="3" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
-              </Grid>
-            </Grid>
-            <Border Panel.ZIndex="0" x:Name="PART_ContentHost" KeyboardNavigation.IsTabStop="False" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-          </DockPanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ViewingMode" Value="Page">
-              <Setter Property="IsChecked" TargetName="PageViewButton" Value="True" />
-            </Trigger>
-            <Trigger Property="ViewingMode" Value="TwoPage">
-              <Setter Property="IsChecked" TargetName="TwoPageViewButton" Value="True" />
-              <Setter Property="BorderThickness" Value="0" />
-            </Trigger>
-            <Trigger Property="ViewingMode" Value="Scroll">
-              <Setter Property="IsChecked" TargetName="ScrollViewButton" Value="True" />
-              <Setter Property="Visibility" TargetName="PageCountAndButtons" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="Document" Value="{x:Null}">
-              <Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
-            </Trigger>
-            <Trigger Property="IsFindEnabled" Value="False">
-              <Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="MenuItem4FrameStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
-    <Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
-    <Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
-    <Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
-    <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-  </Style>
-  <ControlTemplate x:Key="FrameWithNavigationUIStyle" TargetType="Frame">
-    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-      <DockPanel LastChildFill="True">
-        <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
-          <hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
-            <Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
-              <Button.ContextMenu>
-                <ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
-              </Button.ContextMenu>
-            </Button>
-            <Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
-              <Button.ContextMenu>
-                <ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
-              </Button.ContextMenu>
-            </Button>
-            <Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
-          </hc:ButtonGroup>
-        </Border>
-        <ContentPresenter SnapsToDevicePixels="True" x:Name="PART_NavWinCP" ClipToBounds="true" />
-      </DockPanel>
-    </Border>
-  </ControlTemplate>
-  <Style x:Key="FrameBaseStyle" TargetType="Frame">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Frame">
-          <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <ContentPresenter SnapsToDevicePixels="True" x:Name="PART_FrameCP" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="NavigationUIVisibility" Value="Visible">
-        <Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="JournalOwnership" Value="OwnsJournal" />
-          <Condition Property="NavigationUIVisibility" Value="Automatic" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="GotoTopBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="hc:GotoTop">
-    <Setter Property="Width" Value="50" />
-    <Setter Property="Height" Value="50" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="25" />
-    <Setter Property="hc:IconElement.Geometry" Value="{StaticResource UpGeometry}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Padding" Value="16" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="GravatarBaseStyle" TargetType="hc:Gravatar">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Width" Value="72" />
-    <Setter Property="Height" Value="72" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="6" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Gravatar">
-          <Border ClipToBounds="True" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ImageSelectorBaseStyle" TargetType="hc:ImageSelector">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Stretch" Value="UniformToFill" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="StrokeThickness" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="StrokeDashArray" Value="2,2" />
-    <Setter Property="hc:IconSwitchElement.Geometry" Value="{StaticResource AddGeometry}" />
-    <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{StaticResource RemoveGeometry}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ImageSelector">
-          <Button Command="interactivity:ControlCommands.Switch" Style="{StaticResource ButtonCustom}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <hc:DashedBorder BorderDashArray="{TemplateBinding StrokeDashArray}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" BorderDashThickness="{TemplateBinding StrokeThickness}" Background="{TemplateBinding PreviewBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                <Border Width="30" Height="30" Background="{TemplateBinding Background}" Style="{StaticResource BorderCircular}">
-                  <hc:ToggleBlock IsChecked="{TemplateBinding HasValue}">
-                    <hc:ToggleBlock.CheckedContent>
-                      <Path Data="{TemplateBinding hc:IconSwitchElement.GeometrySelected}" Width="12" Height="12" Fill="{DynamicResource PrimaryBrush}" />
-                    </hc:ToggleBlock.CheckedContent>
-                    <hc:ToggleBlock.UnCheckedContent>
-                      <Path Data="{TemplateBinding hc:IconSwitchElement.Geometry}" Width="16" Height="16" Fill="{DynamicResource PrimaryBrush}" />
-                    </hc:ToggleBlock.UnCheckedContent>
-                  </hc:ToggleBlock>
-                </Border>
-              </hc:DashedBorder>
-            </Border>
-          </Button>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ListBoxItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ListBoxItem">
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListBoxItem">
-          <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="true">
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsSelected" Value="true" />
-          <Condition Property="Selector.IsSelectionActive" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-      <Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="ListBoxItem">
-              <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                <StackPanel Orientation="Horizontal">
-                  <ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
-                  <ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ListBoxBaseStyle" TargetType="ListBox">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-    <Setter Property="hc:ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="hc:ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListBox">
-          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <hc:ScrollViewer Focusable="false">
-                  <ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </hc:ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="GridViewColumnHeader">
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Padding" Value="12,6,12,12" />
-    <Setter Property="MinHeight" Value="44" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="GridViewColumnHeader">
-          <hc:SimplePanel SnapsToDevicePixels="true">
-            <Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
-              <ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Border>
-            <Canvas>
-              <Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
-            </Canvas>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="SnapsToDevicePixels" Value="true" />
-    <Setter Property="Margin" Value="0,0,0,4" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="MinHeight" Value="44" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListViewItem">
-          <Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsSelected" Value="true" />
-          <Condition Property="Selector.IsSelectionActive" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="LoadingBaseStyle" TargetType="hc:LoadingBase">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="DotDiameter" Value="10" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="LoadingCircleBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingCircle">
-    <Setter Property="Width" Value="40" />
-    <Setter Property="Height" Value="40" />
-    <Setter Property="DotDiameter" Value="5" />
-    <Setter Property="DotInterval" Value="30" />
-    <Setter Property="DotOffSet" Value="60" />
-    <Setter Property="DotDelayTime" Value="90" />
-    <Setter Property="DotSpeed" Value="4" />
-  </Style>
-  <Style x:Key="LoadingLineBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingLine">
-    <Setter Property="DotDiameter" Value="5" />
-  </Style>
-  <Style x:Key="MagnifierBaseStyle" TargetType="hc:Magnifier">
-    <Setter Property="IsHitTestVisible" Value="False" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Width" Value="180" />
-    <Setter Property="Height" Value="180" />
-    <Setter Property="BorderThickness" Value="8" />
-    <Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Magnifier">
-          <Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Ellipse>
-              <Ellipse.Fill>
-                <VisualBrush Visual="{Binding Target,RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute" x:Name="PART_VisualBrush" />
-              </Ellipse.Fill>
-            </Ellipse>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="MenuItem4NavigationWindowStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
-    <Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
-    <Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
-    <Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
-    <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
-  </Style>
-  <Style x:Key="NavigationWindowBaseStyle" TargetType="NavigationWindow">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="NavigationWindow">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <DockPanel LastChildFill="True">
-              <Border DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
-                <hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
-                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
-                    <Button.ContextMenu>
-                      <ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Button.ContextMenu>
-                  </Button>
-                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
-                    <Button.ContextMenu>
-                      <ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
-                    </Button.ContextMenu>
-                  </Button>
-                  <Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
-                </hc:ButtonGroup>
-              </Border>
-              <hc:SimplePanel>
-                <AdornerDecorator>
-                  <ContentPresenter x:Name="PART_NavWinCP" ClipToBounds="true" />
-                </AdornerDecorator>
-                <ResizeGrip x:Name="WindowResizeGrip" HorizontalAlignment="Right" IsTabStop="false" Visibility="Collapsed" VerticalAlignment="Bottom" />
-              </hc:SimplePanel>
-            </DockPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowsNavigationUI" Value="False">
-              <Setter Property="Visibility" TargetName="NavChrome" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="CanGoBack" Value="False">
-              <Setter Property="IsEnabled" TargetName="BackNavMenu" Value="false" />
-            </Trigger>
-            <Trigger Property="CanGoForward" Value="False">
-              <Setter Property="IsEnabled" TargetName="ForwardNavMenu" Value="false" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
-                <Condition Property="WindowState" Value="Normal" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Visibility" TargetName="WindowResizeGrip" Value="Visible" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
-    <Setter Property="IsTabStop" Value="False" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:NumericUpDown">
-          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-              <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-              <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-              <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="ShowUpDownButton" Value="False">
-              <Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
-            </Trigger>
-            <Trigger Property="IsReadOnly" Value="True">
-              <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-              <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="NumericUpDownExtendTopTemplate" TargetType="hc:NumericUpDown">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsReadOnly" Value="True">
-        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="NumericUpDownExtendLeftTemplate" TargetType="hc:NumericUpDown">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsReadOnly" Value="True">
-        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="NumericUpDownExtendBaseStyle" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Template" Value="{StaticResource NumericUpDownExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource NumericUpDownExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-          <Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsReadOnly" Value="True">
-        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" />
-          <Condition Property="ShowClearButton" Value="True" />
-          <Condition Property="IsReadOnly" Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-          <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsReadOnly" Value="True">
-        <Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-        <Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" />
-          <Condition Property="ShowClearButton" Value="True" />
-          <Condition Property="IsReadOnly" Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource NumericUpDownPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="PasswordBoxBaseStyle" TargetType="PasswordBox">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-    <Setter Property="PasswordChar" Value="●" />
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="PasswordBox">
-          <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="border" Value="0.4" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <Trigger Property="IsFocused" Value="true">
-              <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="PasswordBoxExtendTopTemplate" TargetType="PasswordBox">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <TextBlock x:Name="placeholder" Padding="1" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-      <ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-        <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-        <Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="PasswordBoxExtendLeftTemplate" TargetType="PasswordBox">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <TextBlock Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" Grid.Column="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-      <ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-        <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value="0.4" TargetName="border" />
-        <Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
-        <Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="PasswordBoxExtendBaseStyle" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
-    <Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource PasswordBoxExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="PasswordBoxPlusInternalStyle" TargetType="PasswordBox">
-    <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="PasswordBox">
-          <hc:SimplePanel>
-            <TextBlock Margin="2,-1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-            <ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
-              <Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="PasswordBoxPlusTopTemplate" TargetType="hc:PasswordBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <DockPanel Grid.ColumnSpan="3" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Grid.Column="0" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
-      <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="0" Grid.Row="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
-      <hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Grid.Column="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-      <ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="1" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="ShowEyeButton" Value="true">
-        <Setter Property="Margin" Value="0" TargetName="ButtonClear" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="PasswordBoxPlusLeftTemplate" TargetType="hc:PasswordBox">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <Border Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-      <PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
-      <hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="1" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-      <Button Height="{x:Static system:Double.NaN}" Grid.Column="2" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
-      <ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="3" Foreground="{TemplateBinding BorderBrush}" Focusable="False" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-      <Trigger Property="ShowEyeButton" Value="true">
-        <Setter Property="Margin" Value="0" TargetName="ButtonClear" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="PasswordBoxPlusBaseStyle" TargetType="hc:PasswordBox">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
-    <Setter Property="PasswordChar" Value="●" />
-    <Setter Property="HorizontalContentAlignment" Value="Left" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="AllowDrop" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template" Value="{StaticResource PasswordBoxPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource PasswordBoxPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="PinBoxBaseStyle" TargetType="hc:PinBox">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemMargin" Value="4,0" />
-    <Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:PinBox">
-          <UniformGrid Name="PART_Panel" Columns="{TemplateBinding Length}" Rows="1" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PoptipBaseStyle" TargetType="hc:Poptip">
-    <Setter Property="IsHitTestVisible" Value="False" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Offset" Value="6" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Poptip">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ProgressBar">
-          <Border x:Name="PART_Track">
-            <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-              <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Indicator" Background="{TemplateBinding Foreground}" />
-            </Decorator>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ProgressButtonBaseStyle" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="ProgressStyle" Value="{StaticResource ProgressBarFlat4ProgressButton}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ProgressButton">
-          <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <hc:SimplePanel>
-              <ProgressBar x:Name="ProgressBar" Height="Auto" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}" />
-              <ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              <ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Visibility" Value="Visible" TargetName="ProgressBar" />
-              <Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
-                <Condition Property="IsChecked" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
-            </MultiTrigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PropertyItemToolTipBaseStyle" BasedOn="{StaticResource {x:Type ToolTip}}" TargetType="ToolTip">
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToolTip">
-          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <ContentPresenter x:Name="Presenter" Margin="0,0,0,10" />
-              <StackPanel Grid.Row="1" Orientation="Horizontal">
-                <TextBlock FontWeight="Bold" Text="{Binding PropertyTypeName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" />
-                <TextBlock Text="{Binding PropertyName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" Margin="6,0,0,0" />
-              </StackPanel>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="Content" Value="">
-              <Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PropertyItemBaseStyle" TargetType="hc:PropertyItem">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Margin" Value="0,0,0,6" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:PropertyItem">
-          <GroupBox Style="{StaticResource GroupBoxOriginal}" hc:TitleElement.TitlePlacement="Left">
-            <GroupBox.Header>
-              <TextBlock Padding="0,0,10,0" Width="{Binding Path=(hc:TitleElement.TitleWidth).Value,RelativeSource={RelativeSource TemplatedParent}}" Text="{TemplateBinding DisplayName}" TextTrimming="CharacterEllipsis">
-                <TextBlock.ToolTip>
-                  <ToolTip Style="{StaticResource PropertyItemToolTipBaseStyle}" Content="{TemplateBinding Description}" />
-                </TextBlock.ToolTip>
-              </TextBlock>
-            </GroupBox.Header>
-            <ContentPresenter ContentSource="EditorElement" />
-          </GroupBox>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PropertyItemsControlBaseStyle" TargetType="hc:PropertyItemsControl">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource PropertyItemBaseStyle}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:PropertyItemsControl">
-          <hc:ScrollViewer Focusable="false" HorizontalScrollBarVisibility="Disabled">
-            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </hc:ScrollViewer>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsGrouping" Value="False">
-        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="PropertyGroupItemBaseStyle" TargetType="GroupItem">
-    <Setter Property="Margin" Value="0,0,0,6" />
-    <Setter Property="Padding" Value="10,6,6,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="GroupItem">
-          <Expander Header="{Binding Name}" IsExpanded="True">
-            <Border BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4">
-              <ItemsPresenter Margin="{TemplateBinding Padding}" />
-            </Border>
-          </Expander>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="PropertyGridBaseStyle" TargetType="hc:PropertyGrid">
-    <Setter Property="MaxTitleWidth" Value="200" />
-    <Setter Property="MinTitleWidth" Value="120" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Padding" Value="10" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:PropertyGrid">
-          <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <DockPanel LastChildFill="True" Margin="0,0,0,6">
-                <hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
-                  <RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
-                    <Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
-                  </RadioButton>
-                  <RadioButton Command="interactivity:ControlCommands.SortByName">
-                    <Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
-                  </RadioButton>
-                </hc:ButtonGroup>
-                <hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
-              </DockPanel>
-              <hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
-                <hc:PropertyItemsControl.GroupStyle>
-                  <GroupStyle ContainerStyle="{StaticResource PropertyGroupItemBaseStyle}" />
-                </hc:PropertyItemsControl.GroupStyle>
-              </hc:PropertyItemsControl>
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:RateItem">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="OnMouseEnter">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
-                <EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
-                <EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="OnMouseLeave">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
-                <EasingDoubleKeyFrame KeyTime="0" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
-                <EasingDoubleKeyFrame KeyTime="0" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Canvas x:Name="CanvasRoot" RenderTransformOrigin="0.5,0.5">
-            <Canvas.RenderTransform>
-              <TransformGroup>
-                <ScaleTransform />
-              </TransformGroup>
-            </Canvas.RenderTransform>
-            <Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Background}" Stretch="Uniform" />
-            <Border x:Name="PART_Icon" Visibility="Collapsed">
-              <Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" HorizontalAlignment="Left" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" />
-            </Border>
-          </Canvas>
-          <ControlTemplate.Triggers>
-            <EventTrigger RoutedEvent="UIElement.MouseEnter" SourceName="CanvasRoot">
-              <BeginStoryboard Storyboard="{StaticResource OnMouseEnter}" />
-            </EventTrigger>
-            <EventTrigger RoutedEvent="UIElement.MouseLeave" SourceName="CanvasRoot">
-              <BeginStoryboard Storyboard="{StaticResource OnMouseLeave}" />
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RateBaseStyle" TargetType="hc:Rate">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemMargin" Value="5,0" />
-    <Setter Property="HorizontalAlignment" Value="Left" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="Icon" Value="{StaticResource StarGeometry}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource RateRateItemBaseStyle}" />
-    <Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:0.0}}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Rate">
-          <StackPanel Background="Transparent" Orientation="Horizontal">
-            <UniformGrid Rows="1" Margin="-5,0" x:Name="PART_Panel" />
-            <TextBlock Visibility="{TemplateBinding ShowText,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding Text}" Margin="10,0,0,0" VerticalAlignment="Center" />
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="RunningBlockBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RunningBlock">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="0,10" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:RunningBlock">
-          <hc:RunningBorder CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <hc:SimplePanel ClipToBounds="True">
-              <hc:SimplePanel HorizontalAlignment="Left" x:Name="PART_Panel">
-                <ContentPresenter x:Name="PART_ContentElement" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left">
-                  <ContentPresenter.RenderTransform>
-                    <TransformGroup>
-                      <TranslateTransform />
-                    </TransformGroup>
-                  </ContentPresenter.RenderTransform>
-                </ContentPresenter>
-              </hc:SimplePanel>
-            </hc:SimplePanel>
-          </hc:RunningBorder>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Padding" Value="10,0" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="SeparatorBaseStyle" TargetType="Separator">
-    <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-  </Style>
-  <Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Shield">
-    <Setter Property="Height" Value="20" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="3" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Color" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Shield">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
-              <TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
-            </Border>
-            <Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
-              <ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
-            </Border>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-    <Setter Property="Role" Value="Item" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="MinHeight" Value="40" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenuItem">
-          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
-            <hc:SimplePanel>
-              <Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
-              <ContentControl Margin="4,0,0,0">
-                <DockPanel Margin="{TemplateBinding Padding}">
-                  <ContentControl Width="40" Name="PresenterIcon">
-                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </ContentControl>
-                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </DockPanel>
-              </ContentControl>
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Icon" Value="{x:Null}">
-              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
-              <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-            </DataTrigger>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SideMenuItemAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemBaseStyle}" TargetType="hc:SideMenuItem">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenuItem">
-          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
-            <hc:SimplePanel>
-              <Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
-              <ContentControl Margin="4,0,0,0">
-                <DockPanel Margin="{TemplateBinding Padding}">
-                  <ContentControl Width="40" Name="PresenterIcon">
-                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </ContentControl>
-                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </DockPanel>
-              </ContentControl>
-            </hc:SimplePanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Icon" Value="{x:Null}">
-              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
-              <Setter Property="BorderBrush" Value="Transparent" />
-            </DataTrigger>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenuItem">
-          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition MinHeight="48" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Border Name="BorderBack" Background="{TemplateBinding Background}" />
-              <ContentControl Grid.Row="0" Margin="4,0,0,0">
-                <DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
-                  <ContentControl Width="40" Name="PresenterIcon">
-                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </ContentControl>
-                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </DockPanel>
-              </ContentControl>
-              <StackPanel Grid.Row="1" x:Name="PART_Panel" Visibility="Collapsed" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Icon" Value="{x:Null}">
-              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
-              <Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-            </Trigger>
-            <Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
-              <Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SideMenuItemHeaderAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemHeaderBaseStyle}" TargetType="hc:SideMenuItem">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemAccordionBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenuItem">
-          <Border Name="BorderRoot" Background="{TemplateBinding Background}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition MinHeight="48" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Border Name="BorderBack" Background="{TemplateBinding Background}" />
-              <ContentControl Grid.Row="0" Margin="4,0,0,0">
-                <DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
-                  <ContentControl Width="40" Name="PresenterIcon">
-                    <ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  </ContentControl>
-                  <ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                </DockPanel>
-              </ContentControl>
-              <ScrollViewer Visibility="{Binding Visibility,ElementName=PART_Panel}" Grid.Row="1" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}">
-                <StackPanel x:Name="PART_Panel" Visibility="Collapsed" />
-              </ScrollViewer>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Icon" Value="{x:Null}">
-              <Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
-              <Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-              <Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
-            </Trigger>
-            <Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
-              <Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SideMenuBaseStyle" TargetType="hc:SideMenu">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenu">
-          <Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <ScrollViewer>
-              <StackPanel x:Name="PART_Panel" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="SplitButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="HorizontalAlignment" Value="Center" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SplitButton">
-          <hc:SimplePanel x:Name="templateRoot">
-            <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-              <Grid>
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-                  <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-                  <ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                </StackPanel>
-                <ToggleButton x:Name="PART_Arrow" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="22" Height="Auto" Padding="0,10,8,10" HorizontalContentAlignment="Left" Grid.Column="1" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" hc:IconElement.Geometry="{StaticResource DownGeometry}" />
-              </Grid>
-            </Border>
-            <Popup AllowsTransparency="true" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="Fade" Placement="Bottom">
-              <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
-                <ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
-                  <hc:SimplePanel RenderOptions.ClearTypeHint="Enabled">
-                    <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                      <Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}" />
-                    </Canvas>
-                    <ContentPresenter ContentSource="DropDownContent" />
-                  </hc:SimplePanel>
-                </ScrollViewer>
-              </Border>
-            </Popup>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="HitMode" Value="Click" />
-                <Condition Property="IsChecked" Value="True" SourceName="PART_Arrow" />
-              </MultiTrigger.Conditions>
-              <Setter Property="IsDropDownOpen" Value="True" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Opacity" Value=".9" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Opacity" Value=".6" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
-  <Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
-    <Setter Property="BorderThickness" Value="0,1,0,0" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-  </Style>
-  <Style x:Key="StatusBarItemBaseStyle" TargetType="StatusBarItem">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Style.Triggers>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value="0.4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="StepBarItemBaseStyle" TargetType="hc:StepBarItem">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-    <Style.Triggers>
-      <Trigger Property="Status" Value="Complete">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-      </Trigger>
-      <Trigger Property="Status" Value="UnderWay">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="Status" Value="Waiting">
-        <Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="StepBarItemHorizontalTop" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-    <Setter Property="Margin" Value="10,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:StepBarItem">
-          <StackPanel>
-            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Border>
-            <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="StepBarItemHorizontalBottom" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-    <Setter Property="Margin" Value="10,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:StepBarItem">
-          <StackPanel>
-            <ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4" />
-            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Border>
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
-    <Setter Property="Margin" Value="0, 10" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:StepBarItem">
-          <StackPanel Orientation="Horizontal">
-            <Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
-              <TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Border>
-            <ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0" />
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="StepBarHorizontalTopControlTemplate" TargetType="hc:StepBar">
-    <hc:SimplePanel>
-      <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Top" Margin="0,10,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
-      <ItemsPresenter />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <ControlTemplate x:Key="StepBarHorizontalBottomControlTemplate" TargetType="hc:StepBar">
-    <hc:SimplePanel>
-      <ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Bottom" Margin="0,0,0,10" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
-      <ItemsPresenter VerticalAlignment="Bottom" />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar">
-    <hc:SimplePanel>
-      <ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
-        <ProgressBar.RenderTransform>
-          <TransformGroup>
-            <RotateTransform Angle="180" />
-          </TransformGroup>
-        </ProgressBar.RenderTransform>
-      </ProgressBar>
-      <ItemsPresenter />
-    </hc:SimplePanel>
-  </ControlTemplate>
-  <Style x:Key="StepBarBaseStyle" TargetType="hc:StepBar">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
-    <Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
-    <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="Dock" Value="Left">
-        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
-        <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-        <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
-      </Trigger>
-      <Trigger Property="Dock" Value="Bottom">
-        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
-        <Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
-        <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-      </Trigger>
-      <Trigger Property="Dock" Value="Right">
-        <Setter Property="FlowDirection" Value="RightToLeft" />
-        <Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
-        <Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
-        <Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TabItemStyle" TargetType="TabItem">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TabItem">
-          <hc:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
-            <Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0" />
-            <ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsSelected" Value="False">
-              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-            </Trigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Panel.ZIndex" Value="1" />
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,3" />
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Panel.ZIndex" Value="1" />
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,3,0" />
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Bottom" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Panel.ZIndex" Value="1" />
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-              <Setter Property="BorderThickness" TargetName="mainBorder" Value="0,3,0,0" />
-            </MultiDataTrigger>
-            <MultiDataTrigger>
-              <MultiDataTrigger.Conditions>
-                <Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
-                <Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right" />
-              </MultiDataTrigger.Conditions>
-              <Setter Property="Panel.ZIndex" Value="1" />
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-              <Setter Property="BorderThickness" TargetName="mainBorder" Value="3,0,0,0" />
-            </MultiDataTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TabControlBaseStyle" TargetType="TabControl">
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Foreground" Value="White" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TabControl">
-          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition x:Name="ColumnDefinition0" />
-              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
-              <RowDefinition x:Name="RowDefinition1" Height="*" />
-            </Grid.RowDefinitions>
-            <TabPanel x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-            <Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TabStripPlacement" Value="Bottom">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Left">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Right">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TabItemCapsuleBaseStyle" TargetType="TabItem">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TabItem">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentPresenter x:Name="contentPresenter" ContentSource="Header" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" TargetName="BorderRoot" />
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="IsSelected" Value="true">
-              <Setter Property="BorderBrush" Value="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="Background" Value="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-            </Trigger>
-            <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left">
-              <Setter Property="Margin" Value="0,-1,0,0" />
-            </DataTrigger>
-            <DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right">
-              <Setter Property="Margin" Value="0,-1,0,0" />
-            </DataTrigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TabItemPlusBaseStyle" TargetType="hc:TabItem">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderThickness" Value="1,0,1,1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Margin" Value="0" />
-    <Setter Property="Padding" Value="10,0,0,0" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="VerticalContentAlignment" Value="Stretch" />
-    <Setter Property="Menu" Value="{StaticResource TabItemMenu}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TabItem">
-          <Grid x:Name="templateRoot" SnapsToDevicePixels="true" ContextMenu="{TemplateBinding Menu}">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
-              <Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Visibility="Collapsed" />
-            </Border>
-            <Path x:Name="PathMain" Margin="10,0,0,0" Grid.Column="0" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-            <ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-            <Border Name="BorderMask" Grid.Column="1" HorizontalAlignment="Right" Width="20" Background="{TemplateBinding Background}" Margin="0,0,1,1">
-              <Border.OpacityMask>
-                <LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
-                  <GradientStop Color="White" Offset="1" />
-                  <GradientStop Offset="0" />
-                </LinearGradientBrush>
-              </Border.OpacityMask>
-            </Border>
-            <Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
-              <Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}" />
-            </Button>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsSelected" Value="true">
-              <Setter Property="Panel.ZIndex" Value="1" />
-              <Setter Property="Visibility" TargetName="innerBorder" Value="Visible" />
-              <Setter Property="Background" TargetName="BorderMask" Value="{DynamicResource RegionBrush}" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-            </Trigger>
-            <Trigger Property="ShowCloseButton" Value="True">
-              <Setter Property="Margin" Value="0,0,0,1" TargetName="BorderMask" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-              <Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="TabControlPlusTemplate" TargetType="hc:TabControl">
-    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-      <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition x:Name="ColumnDefinition0" />
-          <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
-          <hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
-            <interactivity:Interaction.Behaviors>
-              <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
-                <interactivity:FluidMoveBehavior.EaseX>
-                  <CubicEase EasingMode="EaseOut" />
-                </interactivity:FluidMoveBehavior.EaseX>
-              </interactivity:FluidMoveBehavior>
-            </interactivity:Interaction.Behaviors>
-          </hc:TabPanel>
-        </Border>
-        <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-          <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        </Border>
-        <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
-          <hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-        </Border>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TabControlPlusScrollableTemplate" TargetType="hc:TabControl">
-    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-      <Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition />
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-          <RowDefinition Height="Auto" />
-          <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Border Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="0,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left" Panel.ZIndex="2">
-          <Border.CacheMode>
-            <BitmapCache SnapsToDevicePixels="True" />
-          </Border.CacheMode>
-          <RepeatButton Focusable="False" Style="{StaticResource RepeatButtonIcon}" Padding="8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft" />
-        </Border>
-        <hc:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" hc:ScrollViewerAttach.Orientation="Horizontal" IsInertiaEnabled="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
-          <Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
-            <hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
-              <interactivity:Interaction.Behaviors>
-                <interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
-                  <interactivity:FluidMoveBehavior.EaseX>
-                    <CubicEase EasingMode="EaseOut" />
-                  </interactivity:FluidMoveBehavior.EaseX>
-                </interactivity:FluidMoveBehavior>
-              </interactivity:Interaction.Behaviors>
-            </hc:TabPanel>
-          </Border>
-        </hc:ScrollViewer>
-        <Border Margin="0,-1,0,0" Grid.Row="0" Grid.Column="2" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
-          <Border.CacheMode>
-            <BitmapCache SnapsToDevicePixels="True" />
-          </Border.CacheMode>
-          <StackPanel Orientation="Horizontal">
-            <RepeatButton Focusable="False" Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource RepeatButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" hc:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight" />
-            <Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Width="1" Background="{DynamicResource BorderBrush}" />
-            <hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-          </StackPanel>
-        </Border>
-        <Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-          <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        </Border>
-      </Grid>
-    </Border>
-  </ControlTemplate>
-  <Style x:Key="TabControlPlusBaseStyle" TargetType="hc:TabControl">
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemPlusBaseStyle}" />
-    <Setter Property="Template" Value="{StaticResource TabControlPlusTemplate}" />
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsScrollable" Value="True" />
-          <Condition Property="IsTabFillEnabled" Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TimePickerBaseStyle" TargetType="hc:TimePicker">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TimePicker">
-          <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="30" />
-              </Grid.ColumnDefinitions>
-              <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-              <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-              <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="TimePickerExtendTopTemplate" TargetType="hc:TimePicker">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TimePickerExtendLeftTemplate" TargetType="hc:TimePicker">
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="30" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="TimePickerExtendBaseStyle" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
-    <Setter Property="Height" Value="Auto" />
-    <Setter Property="hc:InfoElement.Symbol" Value="●" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template" Value="{StaticResource TimePickerExtendTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource TimePickerExtendLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="TimePickerPlusTopTemplate" TargetType="hc:TimePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
-      </Grid.RowDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-      <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TimePickerPlusLeftTemplate" TargetType="hc:TimePicker">
-    <ControlTemplate.Resources>
-      <Storyboard x:Key="StoryboardShow">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-      </Storyboard>
-      <Storyboard x:Key="StoryboardHidden">
-        <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-      </Storyboard>
-    </ControlTemplate.Resources>
-    <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
-        <ColumnDefinition />
-      </Grid.ColumnDefinitions>
-      <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
-        <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-        <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
-      </DockPanel>
-      <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-      <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-        <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="25" />
-          </Grid.ColumnDefinitions>
-          <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-          <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-          <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-          <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
-        </Grid>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
-        </MultiTrigger.Conditions>
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-          <Condition Property="ShowClearButton" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
-      </MultiTrigger>
-      <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsError" Value="true">
-        <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-        <Trigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-        </Trigger.EnterActions>
-        <Trigger.ExitActions>
-          <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-        </Trigger.ExitActions>
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="TimePickerPlusBaseStyle" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker">
-    <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
-    <Setter Property="Template" Value="{StaticResource TimePickerPlusTopTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
-        <Setter Property="Template" Value="{StaticResource TimePickerPlusLeftTemplate}" />
-        <Setter Property="Width" Value="Auto" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
-    <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Width" Value="1" />
-  </Style>
-  <Style x:Key="{x:Static ToolBar.ButtonStyleKey}" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}" BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
-  <Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
-  <Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
-  <Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
-  <Style x:Key="{x:Static ToolBar.MenuStyleKey}" BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
-  <Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToolBarThumbHorizontalStyle" TargetType="Thumb">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
-            <Path Stretch="Uniform" Width="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragVerticalGeometry}" SnapsToDevicePixels="True" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Cursor" Value="SizeAll" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToolBarThumbVerticalStyle" TargetType="Thumb">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="Thumb">
-          <Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
-            <Path Stretch="Uniform" Height="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragHorizontalGeometry}" SnapsToDevicePixels="True" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Cursor" Value="SizeAll" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToolBarVerticalOverflowButtonStyle" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="MinWidth" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
-            <Path x:Name="PathMore" Data="{StaticResource RightGeometry}" Height="8" Margin="4,4,8,4" HorizontalAlignment="Right" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocused" Value="true">
-              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Visibility" Value="Collapsed" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ToolBarHorizontalOverflowButtonStyle" TargetType="ToggleButton">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="MinHeight" Value="0" />
-    <Setter Property="MinWidth" Value="0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
-            <Path x:Name="PathMore" Data="{StaticResource DownGeometry}" Width="8" Margin="4,4,4,8" VerticalAlignment="Bottom" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true">
-              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsKeyboardFocused" Value="true">
-              <Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Visibility" Value="Collapsed" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <ControlTemplate x:Key="ToolBarVerticalTemplate" TargetType="ToolBar">
-    <Grid x:Name="Grid" SnapsToDevicePixels="true">
-      <Grid.RowDefinitions>
-        <RowDefinition />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <hc:SimplePanel x:Name="OverflowGrid" Grid.Row="1">
-        <ToggleButton Margin="0,4,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarVerticalOverflowButtonStyle}" />
-        <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Right" StaysOpen="false">
-          <Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
-            <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
-          </Border>
-        </Popup>
-      </hc:SimplePanel>
-      <Border x:Name="MainPanelBorder" Grid.Row="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
-        <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
-          <Thumb x:Name="ToolBarThumb" DockPanel.Dock="Top" Style="{StaticResource ToolBarThumbVerticalStyle}" Height="10" />
-          <ContentPresenter x:Name="ToolBarHeader" DockPanel.Dock="Top" ContentSource="Header" HorizontalAlignment="Center" Margin="0,4,0,4" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-          <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        </DockPanel>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsOverflowOpen" Value="true">
-        <Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
-      </Trigger>
-      <Trigger Property="Header" Value="{x:Null}">
-        <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
-      </Trigger>
-      <Trigger Property="ToolBarTray.IsLocked" Value="true">
-        <Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="ToolBarHorizontalTemplate" TargetType="ToolBar">
-    <Grid x:Name="Grid" SnapsToDevicePixels="true">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <hc:SimplePanel x:Name="OverflowGrid" Grid.Column="1">
-        <ToggleButton Margin="4,0,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}" />
-        <Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
-          <Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
-            <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
-          </Border>
-        </Popup>
-      </hc:SimplePanel>
-      <Border x:Name="MainPanelBorder" Grid.Column="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
-        <DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
-          <Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbHorizontalStyle}" Width="10" />
-          <ContentPresenter x:Name="ToolBarHeader" ContentSource="Header" HorizontalAlignment="Center" Margin="4,0,4,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-          <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        </DockPanel>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsOverflowOpen" Value="true">
-        <Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
-      </Trigger>
-      <Trigger Property="Header" Value="{x:Null}">
-        <Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
-      </Trigger>
-      <Trigger Property="ToolBarTray.IsLocked" Value="true">
-        <Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="ToolBarBaseStyle" TargetType="ToolBar">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Margin" Value="0,0,4,4" />
-    <Setter Property="Template" Value="{StaticResource ToolBarHorizontalTemplate}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource ToolBarVerticalTemplate}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
-    <Setter Property="Padding" Value="0,6" />
-    <Setter Property="Background" Value="White" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="FontSize" Value="12" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="2" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToolTip">
-          <Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
-            <ContentPresenter Margin="10,0" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="CanDeselect" Value="True" />
-    <Setter Property="SelfManage" Value="True" />
-    <Setter Property="Padding" Value="10, 0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Margin" Value="5,0,5,5" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TransferItem">
-          <Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-            <ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter TargetName="BorderRoot" Property="Background" Value="{DynamicResource PrimaryBrush}" />
-              <Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsOrigin" Value="True" />
-          <Condition Property="IsTransferred" Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsOrigin" Value="True" />
-          <Condition Property="IsTransferred" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Collapsed" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsOrigin" Value="False" />
-          <Condition Property="IsTransferred" Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Visible" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsOrigin" Value="False" />
-          <Condition Property="IsTransferred" Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Visibility" Value="Collapsed" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TransferGroup">
-          <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ScrollViewer Margin="0,5">
-              <StackPanel x:Name="PART_Panel" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TransferBaseStyle" TargetType="hc:Transfer">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Transfer">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition MinWidth="200" />
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition MinWidth="200" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition />
-              <RowDefinition />
-              <RowDefinition />
-              <RowDefinition />
-            </Grid.RowDefinitions>
-            <hc:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
-            <StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
-              <Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
-              <Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
-            </StackPanel>
-            <hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Width" Value="16" />
-    <Setter Property="Height" Value="16" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border Background="Transparent" Height="16" Padding="4" Width="16">
-            <Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeViewItem}}">
-              <Path.RenderTransform>
-                <RotateTransform Angle="-90" />
-              </Path.RenderTransform>
-            </Path>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="RenderTransform" TargetName="ExpandPath">
-                <Setter.Value>
-                  <RotateTransform Angle="0" />
-                </Setter.Value>
-              </Setter>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
-    <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TreeViewItem">
-          <Grid>
-            <Grid.RowDefinitions>
-              <RowDefinition MinHeight="{TemplateBinding MinHeight}" />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-              <DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
-                <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}" />
-                <ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-              </DockPanel>
-            </Border>
-            <ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="Bd">
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-            </Trigger>
-            <Trigger Property="IsExpanded" Value="false">
-              <Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed" />
-            </Trigger>
-            <Trigger Property="HasItems" Value="false">
-              <Setter Property="Visibility" TargetName="Expander" Value="Hidden" />
-            </Trigger>
-            <Trigger Property="IsSelected" Value="true">
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsSelected" Value="true" />
-                <Condition Property="IsSelectionActive" Value="false" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}" />
-              <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="hc:ScrollViewer.IsInertiaEnabled" Value="False" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TreeView">
-          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
-                  <ItemsPresenter />
-                </hc:ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}" />
-            </Trigger>
-            <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-              <Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
-        <Setter Property="ItemsPanel">
-          <Setter.Value>
-            <ItemsPanelTemplate>
-              <VirtualizingStackPanel />
-            </ItemsPanelTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="WatermarkBaseStyle" TargetType="hc:Watermark">
-    <Setter Property="MarkBrush" Value="{DynamicResource DarkMaskBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
-    <Setter Property="Angle" Value="20" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Watermark">
-          <Border Name="PART_Root">
-            <ContentPresenter />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="AutoCompleteTextBoxInternal" BasedOn="{StaticResource ComboBoxEditableTextBox}" TargetType="TextBox" />
-  <Style x:Key="AutoCompleteTextBoxItemBaseStyle" TargetType="ComboBoxItem">
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="SnapsToDevicePixels" Value="True" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBoxItem">
-          <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsSelected" Value="False" />
-                <Condition Property="IsMouseOver" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsSelected" Value="True">
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
-              <Setter Property="Foreground" Value="White" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="AutoCompleteTextBoxBaseStyle" TargetType="hc:AutoCompleteTextBox">
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteTextBoxItemBaseStyle}" />
-    <Setter Property="IsTabStop" Value="false" />
-    <Setter Property="hc:Empty.ShowEmpty" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:AutoCompleteTextBox">
-          <hc:SimplePanel>
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-              <TextBox x:Name="PART_SearchTextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Style="{StaticResource AutoCompleteTextBoxInternal}" />
-            </Border>
-            <Popup x:Name="PART_Popup" AllowsTransparency="true" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-              <Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
-                <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-                  <hc:ToggleBlock.CheckedContent>
-                    <ScrollViewer Margin="0,4">
-                      <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                    </ScrollViewer>
-                  </hc:ToggleBlock.CheckedContent>
-                  <hc:ToggleBlock.UnCheckedContent>
-                    <hc:Empty />
-                  </hc:ToggleBlock.UnCheckedContent>
-                </hc:ToggleBlock>
-              </Border>
-            </Popup>
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="HasItems" Value="false">
-              <Setter Property="Height" TargetName="dropDownBorder" Value="95" />
-            </Trigger>
-            <Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
-              <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
-              <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
-            </Trigger>
-            <Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
-              <Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
-              <Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=PART_SearchTextBox}" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="PART_SearchTextBox">
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </Trigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="true" />
-                <Condition Property="IsFocused" Value="false" SourceName="PART_SearchTextBox" />
-              </MultiTrigger.Conditions>
-              <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
-            </MultiTrigger>
-            <Trigger Property="IsFocused" Value="True" SourceName="PART_SearchTextBox">
-              <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="false">
-              <Setter Property="Opacity" Value="0.4" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
-    <Setter Property="FocusVisualStyle">
-      <Setter.Value>
-        <Style>
-          <Setter Property="Control.Template">
-            <Setter.Value>
-              <ControlTemplate>
-                <Rectangle Margin="2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
-              </ControlTemplate>
-            </Setter.Value>
-          </Setter>
-        </Style>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="BorderBrush" Value="Transparent" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-    <Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DataGridCell">
-          <Border Background="Transparent">
-            <Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Border>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="Cell" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-      </MultiDataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
-          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-      </MultiDataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
-          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </MultiDataTrigger>
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
-          <Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="FullRow" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </MultiDataTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsSelected" Value="true" />
-          <Condition Property="Selector.IsSelectionActive" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="SnapsToDevicePixels" Value="true" />
-    <Setter Property="Margin" Value="0,0,0,4" />
-    <Setter Property="Padding" Value="0,6" />
-    <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-    <Setter Property="ValidationErrorTemplate">
-      <Setter.Value>
-        <ControlTemplate>
-          <TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DataGridRow">
-          <SelectiveScrollingGrid>
-            <SelectiveScrollingGrid.ColumnDefinitions>
-              <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="*" />
-            </SelectiveScrollingGrid.ColumnDefinitions>
-            <SelectiveScrollingGrid.RowDefinitions>
-              <RowDefinition Height="*" />
-              <RowDefinition Height="Auto" />
-            </SelectiveScrollingGrid.RowDefinitions>
-            <Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-            <DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            <DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}" />
-            <DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-          </SelectiveScrollingGrid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsSelected" Value="true" />
-          <Condition Property="Selector.IsSelectionActive" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Padding" Value="12,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DataGridColumnHeader">
-          <hc:SimplePanel>
-            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
-              <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <ContentPresenter RecognizesAccessKey="True" VerticalAlignment="Center" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                <ToggleButton Grid.Column="1" VerticalAlignment="Center" Height="{x:Static system:Double.NaN}" Padding="4,0" Width="20" IsEnabled="False" Opacity="1" Foreground="{DynamicResource PrimaryBrush}" x:Name="ToggleButtonSortDirection" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
-              </Grid>
-            </Border>
-            <Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
-            <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="SortDirection" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection" />
-            </Trigger>
-            <Trigger Property="SortDirection" Value="Ascending">
-              <Setter Property="IsChecked" Value="True" TargetName="ToggleButtonSortDirection" />
-            </Trigger>
-            <Trigger Property="SortDirection" Value="Descending">
-              <Setter Property="IsChecked" Value="False" TargetName="ToggleButtonSortDirection" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="SortDirection" Value="Ascending">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="SortDirection" Value="Descending">
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DataGridRowHeader">
-          <hc:SimplePanel HorizontalAlignment="Center">
-            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
-              <StackPanel Orientation="Horizontal">
-                <ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-              </StackPanel>
-            </Border>
-            <Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
-            <Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-  </Style>
-  <Style x:Key="BadgePrimary" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="BadgeSuccess" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="BadgeInfo" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="BadgeWarning" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="BadgeDanger" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style x:Key="CalendarWithClockBaseStyle" TargetType="hc:CalendarWithClock">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Margin" Value="8 0" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:CalendarWithClock">
-          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-            <Grid>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" Height="42" VerticalAlignment="Top" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" />
-              <ContentPresenter Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_CalendarPresenter" Margin="-8,-4,-8,-8" />
-              <ContentPresenter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_ClockPresenter" Margin="-8,-4,-8,-8" />
-              <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" HorizontalAlignment="Center" Margin="0,0,0,19" Width="180" VerticalAlignment="Bottom" Style="{StaticResource ButtonPrimary}" />
-            </Grid>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:CalendarWithClock" BasedOn="{StaticResource CalendarWithClockBaseStyle}" />
-  <Style BasedOn="{StaticResource CardBaseStyle}" TargetType="hc:Card" />
-  <Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-    <Setter Property="Margin" Value="5,0" />
-    <Setter Property="Width" Value="10" />
-    <Setter Property="Height" Value="10" />
-    <Setter Property="Background" Value="White" />
-    <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="Padding" Value="0" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ToggleButton">
-          <Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="Opacity" Value=".9" />
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-              <Setter Property="Opacity" Value=".6" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="True">
-              <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:Carousel">
-    <Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource CarouselItemBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Carousel">
-          <ControlTemplate.Triggers>
-            <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1" />
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-            <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
-              <BeginStoryboard>
-                <Storyboard>
-                  <DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1" />
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-          <hc:SimplePanel ClipToBounds="True">
-            <StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
-            <hc:SimplePanel x:Name="GridTop" Opacity="0">
-              <Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
-                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-                  <Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}" />
-                </Border>
-              </Button>
-              <Button Command="interactivity:ControlCommands.Next" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource ButtonCustom}">
-                <Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
-                  <Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}" />
-                </Border>
-              </Button>
-            </hc:SimplePanel>
-            <StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" />
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="hc:ChatBubble" />
-  <Style BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox" />
-  <Style x:Key="Tag4CheckComboBoxStyle.Small" BasedOn="{StaticResource Tag4CheckComboBoxStyle}" TargetType="hc:Tag">
-    <Setter Property="Padding" Value="6,0,4,0" />
-  </Style>
-  <Style x:Key="CheckComboBox.Small" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
-    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="CheckComboBoxExtend" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox" />
-  <Style x:Key="CheckComboBoxExtend.Small" BasedOn="{StaticResource CheckComboBoxExtend}" TargetType="hc:CheckComboBox">
-    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="CheckComboBoxPlus" BasedOn="{StaticResource CheckComboBoxPlusBaseStyle}" TargetType="hc:CheckComboBox" />
-  <Style x:Key="CheckComboBoxPlus.Small" BasedOn="{StaticResource CheckComboBoxPlus}" TargetType="hc:CheckComboBox">
-    <Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,1" />
-  </Style>
-  <Style x:Key="ClockRadioButtonStyle" TargetType="hc:ClockRadioButton">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Width" Value="28" />
-    <Setter Property="Height" Value="28" />
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ClockRadioButton">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="Storyboard1">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="Storyboard2">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
-                <EasingDoubleKeyFrame KeyTime="0" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <hc:SimplePanel x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
-            <Ellipse x:Name="optionMark" Fill="{TemplateBinding Background}" MinWidth="6" MinHeight="6" Opacity="0" />
-            <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-          </hc:SimplePanel>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-              <Trigger.EnterActions>
-                <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-              </Trigger.EnterActions>
-              <Trigger.ExitActions>
-                <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-              </Trigger.ExitActions>
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsChecked" Value="True">
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ClockBaseStyle" TargetType="hc:Clock">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Margin" Value="8 0" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="ClockRadioButtonStyle" Value="{StaticResource ClockRadioButtonStyle}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Clock">
-          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="50" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-              </Grid.ColumnDefinitions>
-              <Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Name="PART_BorderTitle">
-                <TextBlock x:Name="PART_TimeStr" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Foreground="{DynamicResource TextIconBrush}" />
-              </Border>
-              <Canvas Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="16,16,16,62" VerticalAlignment="Top" Name="PART_Canvas" Width="178" Height="178">
-                <Border Background="{DynamicResource SecondaryRegionBrush}" Width="178" Height="178" CornerRadius="89" />
-                <hc:CirclePanel Diameter="130" x:Name="PART_PanelNum" KeepVertical="True" Margin="24,24,0,0" OffsetAngle="-60" />
-                <Border Focusable="False" Name="PART_BorderClock" Background="{DynamicResource PrimaryBrush}" RenderTransformOrigin="0.5,1" Height="63" Width="2" Canvas.Left="88" Canvas.Top="26" />
-                <Ellipse Fill="White" Width="8" Height="8" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Canvas.Top="85" Canvas.Left="85" />
-              </Canvas>
-              <hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Am}}" Style="{StaticResource ClockRadioButtonStyle}" />
-              <hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Pm}}" Style="{StaticResource ClockRadioButtonStyle}" />
-              <Button Grid.Row="1" Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}" />
-            </Grid>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:Clock" BasedOn="{StaticResource ClockBaseStyle}" />
-  <Style x:Key="ClockListBoxItemStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="true">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="true">
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="false">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-      <Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
-        <Setter Property="Template">
-          <Setter.Value>
-            <ControlTemplate TargetType="ListBoxItem">
-              <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                <StackPanel Orientation="Horizontal">
-                  <ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
-                  <ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-                </StackPanel>
-              </Border>
-            </ControlTemplate>
-          </Setter.Value>
-        </Setter>
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ClockListBoxStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
-    <Setter Property="MaxHeight" Value="180" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ClockListBoxItemStyle}" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-  </Style>
-  <Style x:Key="ListClockBaseStyle" TargetType="hc:ListClock">
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="Margin" Value="8 0" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ListClock">
-          <hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
-            <Grid Margin="0,4" Width="210">
-              <Grid.ColumnDefinitions>
-                <ColumnDefinition />
-                <ColumnDefinition />
-                <ColumnDefinition />
-              </Grid.ColumnDefinitions>
-              <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <ListBox hc:BorderElement.CornerRadius="0" x:Name="PART_HourList" Style="{StaticResource ClockListBoxStyle}" />
-              <ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="1" x:Name="PART_MinuteList" Style="{StaticResource ClockListBoxStyle}" BorderThickness="1,0" />
-              <ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="2" x:Name="PART_SecondList" Style="{StaticResource ClockListBoxStyle}" />
-              <Border VerticalAlignment="Bottom" Visibility="{Binding Visibility,ElementName=PART_ButtonConfirm}" Height="1" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Background="{DynamicResource BorderBrush}" />
-              <Button Margin="0,10" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Background="Transparent" Style="{StaticResource ButtonCustom}" />
-            </Grid>
-          </hc:SimplePanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}" />
-  <Style BasedOn="{StaticResource ColorPickerBaseStyle}" TargetType="hc:ColorPicker" />
-  <Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu" />
-  <Style BasedOn="{StaticResource CoverFlowBaseStyle}" TargetType="hc:CoverFlow" />
-  <Style BasedOn="{StaticResource CoverViewBaseStyle}" TargetType="hc:CoverView" />
-  <Style x:Key="DataGridBaseStyle" TargetType="DataGrid">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="0" />
-    <Setter Property="GridLinesVisibility" Value="None" />
-    <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="EnableRowVirtualization" Value="True" />
-    <Setter Property="CanUserAddRows" Value="False" />
-    <Setter Property="CanUserDeleteRows" Value="False" />
-    <Setter Property="CanUserReorderColumns" Value="False" />
-    <Setter Property="CanUserResizeRows" Value="False" />
-    <Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle}" />
-    <Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}" />
-    <Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle}" />
-    <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
-    <Setter Property="Padding" Value="6" />
-    <Setter Property="RowHeight" Value="44" />
-    <Setter Property="ColumnHeaderHeight" Value="44" />
-    <Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
-    <Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
-    <Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
-    <Setter Property="hc:DataGridAttach.EditingComboBoxColumnStyle" Value="{StaticResource ComboBoxBaseStyle}" />
-    <Setter Property="hc:DataGridAttach.CheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
-    <Setter Property="hc:DataGridAttach.EditingCheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
-    <Setter Property="hc:DataGridAttach.ApplyDefaultStyle" Value="True" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="DataGrid">
-          <ControlTemplate.Resources>
-            <Storyboard x:Key="Storyboard1">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-            <Storyboard x:Key="Storyboard2">
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-              <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
-                <EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
-              </DoubleAnimationUsingKeyFrames>
-            </Storyboard>
-          </ControlTemplate.Resources>
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-            <ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
-              <ScrollViewer.Template>
-                <ControlTemplate TargetType="ScrollViewer">
-                  <Grid>
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <Button Command="{x:Static DataGrid.SelectAllCommand}" MaxHeight="30" Height="auto" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
-                      <Button.Visibility>
-                        <MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
-                          <Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
-                          <Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
-                        </MultiBinding>
-                      </Button.Visibility>
-                    </Button>
-                    <DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
-                    <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-                      <hc:ToggleBlock.CheckedContent>
-                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
-                      </hc:ToggleBlock.CheckedContent>
-                      <hc:ToggleBlock.UnCheckedContent>
-                        <hc:Empty />
-                      </hc:ToggleBlock.UnCheckedContent>
-                    </hc:ToggleBlock>
-                    <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
-                    <ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" VerticalAlignment="Bottom" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
-                  </Grid>
-                  <ControlTemplate.Triggers>
-                    <EventTrigger RoutedEvent="MouseEnter">
-                      <BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
-                    </EventTrigger>
-                    <EventTrigger RoutedEvent="MouseLeave">
-                      <BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
-                    </EventTrigger>
-                  </ControlTemplate.Triggers>
-                </ControlTemplate>
-              </ScrollViewer.Template>
-              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </ScrollViewer>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid" />
-  <Style x:Key="DataGridCellStyle.Small" BasedOn="{StaticResource DataGridCellStyle}" TargetType="DataGridCell">
-    <Setter Property="Padding" Value="6,2" />
-  </Style>
-  <Style x:Key="DataGridRowStyle.Small" BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
-    <Setter Property="Margin" Value="0,0,0,2" />
-  </Style>
-  <Style x:Key="DataGridColumnHeaderStyle.Small" BasedOn="{StaticResource DataGridColumnHeaderStyle}" TargetType="DataGridColumnHeader">
-    <Setter Property="Padding" Value="8,0" />
-  </Style>
-  <Style x:Key="DataGrid.Small" BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid">
-    <Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle.Small}" />
-    <Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle.Small}" />
-    <Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle.Small}" />
-    <Setter Property="RowHeight" Value="24" />
-    <Setter Property="ColumnHeaderHeight" Value="20" />
-  </Style>
-  <Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
-  <Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
-  <Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
-  <Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
-  <Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
-  <Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
-  <Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
-  <Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
-  <Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
-  <Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
-  <Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
-  <Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
-  <Style BasedOn="{StaticResource FlowDocumentPageViewerBaseStyle}" TargetType="FlowDocumentPageViewer" />
-  <Style BasedOn="{StaticResource FlowDocumentReaderBaseStyle}" TargetType="FlowDocumentReader" />
-  <Style BasedOn="{StaticResource FrameBaseStyle}" TargetType="Frame" />
-  <Style BasedOn="{StaticResource GotoTopBaseStyle}" TargetType="hc:GotoTop" />
-  <Style BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar" />
-  <Style x:Key="GravatarCircle" BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar">
-    <Setter Property="Padding" Value="16" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Gravatar">
-          <Border Style="{StaticResource BorderCircularClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-            <ContentPresenter Margin="{TemplateBinding Padding}" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="GravatarCircleImg" BasedOn="{StaticResource GravatarCircle}" TargetType="hc:Gravatar">
-    <Setter Property="Padding" Value="0" />
-  </Style>
-  <Style TargetType="hc:Growl">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="MinHeight" Value="60" />
-    <Setter Property="Width" Value="320" />
-    <Setter Property="Margin" Value="10,10,10,0" />
-    <Setter Property="MaxWidth" Value="320" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="8" />
-    <Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Growl">
-          <Grid Name="PART_GridMain" RenderTransformOrigin="0.5,0.5">
-            <Grid.RenderTransform>
-              <TransformGroup>
-                <TranslateTransform X="{TemplateBinding MaxWidth}" />
-              </TransformGroup>
-            </Grid.RenderTransform>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="50" />
-              <ColumnDefinition />
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition />
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-            <Path FlowDirection="LeftToRight" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}" />
-            <StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
-              <TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap" />
-              <TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=hc:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0" />
-            </StackPanel>
-            <Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
-              <Path FlowDirection="LeftToRight" Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}" />
-            </Button>
-            <UniformGrid Columns="2" Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
-              <Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
-                <TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}" />
-              </Button>
-              <Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
-                <TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}" />
-              </Button>
-            </UniformGrid>
-          </Grid>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ImageSelectorBaseStyle}" TargetType="hc:ImageSelector" />
-  <Style TargetType="hc:ImageViewer">
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="Background" Value="Transparent" />
-    <Setter Property="MinWidth" Value="400" />
-    <Setter Property="MinHeight" Value="250" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:ImageViewer">
-          <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <hc:SimplePanel x:Name="PART_PanelMain" ClipToBounds="True" Grid.RowSpan="2">
-                <Border HorizontalAlignment="Left" VerticalAlignment="Top" Height="{TemplateBinding ImageHeight}" Width="{TemplateBinding ImageWidth}" Margin="{TemplateBinding ImageMargin}">
-                  <Image Name="PART_ImageMain" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}" />
-                </Border>
-              </hc:SimplePanel>
-              <Border Grid.Row="0" Grid.RowSpan="2" Width="252" Height="162" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="{DynamicResource DarkOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
-                <Border.Visibility>
-                  <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowSmallImgInternal" />
-                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowImgMap" />
-                  </MultiBinding>
-                </Border.Visibility>
-                <Canvas ClipToBounds="True" Name="PART_CanvasSmallImg" MaxWidth="250" MaxHeight="160">
-                  <Border UseLayoutRounding="True" Name="PART_BorderMove" Background="Transparent" Width="50" Height="70" BorderThickness="1" BorderBrush="Black">
-                    <Border BorderThickness="1" BorderBrush="White" />
-                  </Border>
-                </Canvas>
-              </Border>
-              <Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
-                <StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
-                  <Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
-                  <Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
-                  <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-                  <Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
-                  <TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
-                  <Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
-                  <Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
-                    <Border BorderThickness="1" BorderBrush="White" Padding="2">
-                      <TextBlock Text="1:1" />
-                    </Border>
-                  </Button>
-                  <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-                  <Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
-                  <Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
-                  <ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
-  <Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
-    <Setter Property="Padding" Value="6,0" />
-    <Setter Property="MinHeight" Value="24" />
-  </Style>
-  <Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
-  </Style>
-  <Style x:Key="ListBoxCustom" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}" />
-    <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-  </Style>
-  <Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-    <Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
-  </Style>
-  <Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-    <Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
-  </Style>
-  <Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-    <Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
-  </Style>
-  <Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
-    <Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
-  </Style>
-  <Style x:Key="ListViewBaseStyle" TargetType="ListView">
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Padding" Value="6" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-    <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-    <Setter Property="ScrollViewer.PanningMode" Value="Both" />
-    <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ListView">
-          <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-            <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
-              <hc:ToggleBlock.CheckedContent>
-                <ScrollViewer>
-                  <Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                    <Grid.RowDefinitions>
-                      <RowDefinition Height="Auto" />
-                      <RowDefinition Height="*" />
-                    </Grid.RowDefinitions>
-                    <GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                    <ItemsPresenter Grid.Row="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                  </Grid>
-                </ScrollViewer>
-              </hc:ToggleBlock.CheckedContent>
-              <hc:ToggleBlock.UnCheckedContent>
-                <hc:Empty />
-              </hc:ToggleBlock.UnCheckedContent>
-            </hc:ToggleBlock>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsGrouping" Value="true" />
-          <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
-        </MultiTrigger.Conditions>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
-      </MultiTrigger>
-    </Style.Triggers>
-  </Style>
-  <Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView" />
-  <Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
-  <Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style x:Key="LoadingLineLarge" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
-    <Setter Property="DotDiameter" Value="10" />
-  </Style>
-  <Style x:Key="LoadingLineLargeLight" BasedOn="{StaticResource LoadingLineLarge}" TargetType="hc:LoadingLine">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle" />
-  <Style x:Key="LoadingCircleLight" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style x:Key="LoadingCircleLarge" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
-    <Setter Property="Width" Value="100" />
-    <Setter Property="Height" Value="100" />
-    <Setter Property="DotDiameter" Value="10" />
-    <Setter Property="DotInterval" Value="20" />
-    <Setter Property="DotOffSet" Value="40" />
-    <Setter Property="DotDelayTime" Value="120" />
-  </Style>
-  <Style x:Key="LoadingCircleLargeLight" BasedOn="{StaticResource LoadingCircleLarge}" TargetType="hc:LoadingCircle">
-    <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource MagnifierBaseStyle}" TargetType="hc:Magnifier" />
-  <Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
-    <Setter Property="MinWidth" Value="88" />
-    <Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-    <Setter Property="Margin" Value="5,0" />
-  </Style>
-  <Style x:Key="MessageBoxPrimaryButtonStyle" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
-    <Setter Property="MinWidth" Value="88" />
-    <Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
-    <Setter Property="Margin" Value="5,0" />
-  </Style>
-  <Style TargetType="hc:MessageBox" BasedOn="{StaticResource WindowWin10}">
-    <Setter Property="MinHeight" Value="172" />
-    <Setter Property="ShowInTaskbar" Value="False" />
-    <Setter Property="MinWidth" Value="335" />
-    <Setter Property="MaxWidth" Value="476" />
-    <Setter Property="MaxHeight" Value="680" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="SizeToContent" Value="WidthAndHeight" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:MessageBox">
-          <Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-              </Grid.RowDefinitions>
-              <Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
-                  <Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" IsTabStop="False" Name="PART_ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
-                </StackPanel>
-                <Grid Grid.Column="0">
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-                  <Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
-                    <interactivity:Interaction.Triggers>
-                      <interactivity:EventTrigger EventName="MouseDoubleClick">
-                        <interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
-                      </interactivity:EventTrigger>
-                    </interactivity:Interaction.Triggers>
-                    <Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
-                  </Button>
-                  <TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
-                    <TextBlock.Visibility>
-                      <MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
-                        <MultiBinding.Bindings>
-                          <Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
-                          <Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
-                        </MultiBinding.Bindings>
-                      </MultiBinding>
-                    </TextBlock.Visibility>
-                  </TextBlock>
-                  <ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
-                </Grid>
-              </Grid>
-              <AdornerDecorator Grid.Row="1">
-                <Grid>
-                  <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition />
-                  </Grid.ColumnDefinitions>
-                  <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="Auto" />
-                  </Grid.RowDefinitions>
-                  <Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform" />
-                  <ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
-                    <Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
-                      <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
-                    </Border>
-                  </ScrollViewer>
-                  <StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
-                </Grid>
-              </AdornerDecorator>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsActive" Value="False">
-              <Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
-            </Trigger>
-            <Trigger Property="IsMouseOver" Value="True" SourceName="PART_ButtonClose">
-              <Setter Property="Background" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
-              <Setter Property="Foreground" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
-  <Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
-  <Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
-  <Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
-  <Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-    <Setter Property="GroupName" Value="1" />
-    <Setter Property="MinWidth" Value="30" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="VerticalContentAlignment" Value="Center" />
-    <Setter Property="HorizontalContentAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="RadioButton">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
-              <Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
-              <ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </StackPanel>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-              <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="IsChecked" Value="true">
-              <Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
-              <Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="Content" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
-            </Trigger>
-            <Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
-              <Setter Property="Margin" Value="0" TargetName="contentPresenter" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsChecked" Value="True">
-        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style TargetType="hc:Pagination">
-    <Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:Pagination">
-          <StackPanel Orientation="Horizontal" VerticalAlignment="Top">
-            <Button x:Name="PART_ButtonLeft" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}" Command="interactivity:ControlCommands.Prev" />
-            <StackPanel ZIndex="999" HorizontalAlignment="Center" Orientation="Horizontal">
-              <interactivity:Interaction.Triggers>
-                <interactivity:RoutedEventTrigger RoutedEvent="RadioButton.Checked">
-                  <interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
-                </interactivity:RoutedEventTrigger>
-              </interactivity:Interaction.Triggers>
-              <RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{StaticResource PaginationButtonStyle}" />
-              <Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
-                <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
-              </Border>
-              <StackPanel Name="PART_PanelMain" Orientation="Horizontal" />
-              <Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
-                <hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
-              </Border>
-              <RadioButton Name="PART_ButtonLast" Content="10" Style="{StaticResource PaginationButtonStyle}" />
-            </StackPanel>
-            <Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
-            <hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />
-            <Button IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Content="{ex:Lang {x:Static langs:LangKeys.Jump}}" Margin="6,0,0,0" Command="interactivity:ControlCommands.Jump" />
-          </StackPanel>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox" />
-  <Style x:Key="PasswordBox.Small" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
-    <Setter Property="MinHeight" Value="20" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style x:Key="PasswordBoxExtend" BasedOn="{StaticResource PasswordBoxExtendBaseStyle}" TargetType="PasswordBox" />
-  <Style x:Key="PasswordBoxExtend.Small" BasedOn="{StaticResource PasswordBoxExtend}" TargetType="PasswordBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox" />
-  <Style x:Key="PasswordBoxPlus.Small" BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox">
-    <Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
-    <Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-    <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-    <Setter Property="Padding" Value="6,0" />
-  </Style>
-  <Style BasedOn="{StaticResource PinBoxBaseStyle}" TargetType="hc:PinBox" />
-  <Style BasedOn="{StaticResource PoptipBaseStyle}" TargetType="hc:Poptip" />
-  <Style TargetType="hc:PopupWindow">
-    <Setter Property="WindowStyle" Value="None" />
-    <Setter Property="MinHeight" Value="220" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="BorderThickness" Value="20" />
-    <Setter Property="ShowInTaskbar" Value="False" />
-    <Setter Property="MinWidth" Value="300" />
-    <Setter Property="ResizeMode" Value="NoResize" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="SizeToContent" Value="WidthAndHeight" />
-    <Setter Property="Effect">
-      <Setter.Value>
-        <DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15" />
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:PopupWindow">
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
-            <Grid>
-              <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-              <Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
-                <Grid.ColumnDefinitions>
-                  <ColumnDefinition />
-                  <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="{StaticResource DefaultControlPadding}" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis" />
-                <Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
-                  <Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}" />
-                </Button>
-              </Grid>
-              <Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
-                <StackPanel>
-                  <TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}" />
-                  <StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
-                    <Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" />
-                    <Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Style="{StaticResource ButtonPrimary}" />
-                  </StackPanel>
-                </StackPanel>
-              </Border>
-            </Grid>
-          </Border>
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowBorder" Value="True">
-              <Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder" />
-            </Trigger>
-            <Trigger Property="ShowTitle" Value="False">
-              <Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid" />
-              <Setter Property="Background" Value="Transparent" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ProgressButtonPrimary" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="ProgressButtonSuccess" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="ProgressButtonInfo" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="ProgressButtonWarning" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="ProgressButtonDanger" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource PropertyGridBaseStyle}" TargetType="hc:PropertyGrid" />
-  <Style x:Key="ComboBoxItemCapsuleBaseStyle" BasedOn="{x:Null}" TargetType="ComboBoxItem">
-    <Setter Property="MinWidth" Value="40" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="VerticalAlignment" Value="Center" />
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-    <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-    <Setter Property="Padding" Value="10,0" />
-    <Setter Property="Margin" Value="-1,0,0,0" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBoxItem">
-          <Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <ContentPresenter x:Name="contentPresenter" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-    <Style.Triggers>
-      <Trigger Property="IsSelected" Value="True">
-        <Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
-      </Trigger>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
-      </Trigger>
-      <Trigger Property="IsSelected" Value="true">
-        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-        <Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="ComboBoxItemCapsuleDefault" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem" />
-  <Style x:Key="ComboBoxItemCapsuleHorizontalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ComboBoxItemCapsuleHorizontalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-  </Style>
-  <Style x:Key="ComboBoxItemCapsuleSingle" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-  </Style>
-  <Style x:Key="ComboBoxItemCapsuleVerticalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="ComboBoxItemCapsuleVerticalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-  </Style>
-  <Style x:Key="ComboBoxCapsule" BasedOn="{x:Null}" TargetType="ComboBox">
-    <Setter Property="ItemContainerStyleSelector" Value="{StaticResource ComboBoxItemCapsuleStyleSelector}" />
-    <Setter Property="VerticalAlignment" Value="Top" />
-    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="ComboBox">
-          <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource RateBaseStyle}" TargetType="hc:Rate" />
-  <Style BasedOn="{StaticResource RunningBlockBaseStyle}" TargetType="hc:RunningBlock" />
-  <Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
-  <Style BasedOn="{StaticResource ShieldBaseStyle}" TargetType="hc:Shield" />
-  <Style BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu" />
-  <Style x:Key="SideMenuAccordion" BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu">
-    <Setter Property="ExpandMode" Value="Accordion" />
-    <Setter Property="PanelAreaLength" Value="200" />
-    <Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderAccordionBaseStyle}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:SideMenu">
-          <Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-            <StackPanel x:Name="PART_Panel" />
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-    <Setter Property="BorderThickness" Value="1" />
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed" Value="True">
-        <Setter Property="Background" Value="{DynamicResource BorderBrush}" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style x:Key="SplitButtonPrimary" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
-  </Style>
-  <Style x:Key="SplitButtonSuccess" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
-  </Style>
-  <Style x:Key="SplitButtonInfo" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Background" Value="{DynamicResource InfoBrush}" />
-  </Style>
-  <Style x:Key="SplitButtonWarning" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Background" Value="{DynamicResource WarningBrush}" />
-  </Style>
-  <Style x:Key="SplitButtonDanger" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
-    <Setter Property="Background" Value="{DynamicResource DangerBrush}" />
-  </Style>
-  <Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar" />
-  <Style BasedOn="{StaticResource StatusBarItemBaseStyle}" TargetType="StatusBarItem" />
-  <Style BasedOn="{StaticResource StepBarBaseStyle}" TargetType="hc:StepBar" />
-  <Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl" />
-  <Style BasedOn="{StaticResource TabControlPlusBaseStyle}" TargetType="hc:TabControl" />
-  <Style x:Key="TabItemInLine" BasedOn="{StaticResource TabItemStyle}" TargetType="TabItem">
-    <Setter Property="MinWidth" Value="0" />
-  </Style>
-  <Style x:Key="TabControlInLine" BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TabItemInLine}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TabControl">
-          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition x:Name="ColumnDefinition0" />
-              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
-              <RowDefinition x:Name="RowDefinition1" Height="*" />
-            </Grid.RowDefinitions>
-            <UniformGrid Rows="1" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-            <Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TabStripPlacement" Value="Bottom">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Left">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
-              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Right">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
-              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TabItemCapsuleDefault" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem" />
-  <Style x:Key="TabItemCapsuleHorizontalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="TabItemCapsuleHorizontalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
-  </Style>
-  <Style x:Key="TabItemCapsuleSingle" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-  </Style>
-  <Style x:Key="TabItemCapsuleVerticalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
-    <Setter Property="Margin" Value="0" />
-  </Style>
-  <Style x:Key="TabItemCapsuleVerticalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
-    <Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
-  </Style>
-  <Style x:Key="TabControlCapsule" TargetType="TabControl">
-    <Setter Property="BorderThickness" Value="1" />
-    <Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource RegionBrush}" />
-    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
-    <Setter Property="ItemContainerStyleSelector">
-      <Setter.Value>
-        <tools:TabItemCapsuleStyleSelector />
-      </Setter.Value>
-    </Setter>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="TabControl">
-          <Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition x:Name="ColumnDefinition0" />
-              <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-              <RowDefinition x:Name="RowDefinition0" Height="Auto" />
-              <RowDefinition x:Name="RowDefinition1" Height="*" />
-            </Grid.RowDefinitions>
-            <UniformGrid Rows="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
-            <Border x:Name="contentPanel" Margin="0,6,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
-              <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-            <Trigger Property="TabStripPlacement" Value="Bottom">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
-              <Setter TargetName="contentPanel" Property="Margin" Value="0,0,0,6" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Left">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
-              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="Margin" Value="6,0,0,0" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Right">
-              <Setter TargetName="RowDefinition0" Property="Height" Value="*" />
-              <Setter TargetName="RowDefinition1" Property="Height" Value="0" />
-              <Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
-              <Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
-              <Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
-              <Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="headerPanel" Property="Rows" Value="0" />
-              <Setter TargetName="headerPanel" Property="Columns" Value="1" />
-              <Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
-              <Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
-              <Setter TargetName="contentPanel" Property="Margin" Value="0,0,6,0" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style x:Key="TabControlCapsuleSolid" BasedOn="{StaticResource TabControlCapsule}" TargetType="TabControl">
-    <Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
-  </Style>
-  <Style TargetType="hc:TimeBar">
-    <Setter Property="HotspotsBrush" Value="{DynamicResource AccentBrush}" />
-    <Setter Property="Focusable" Value="False" />
-    <Setter Property="UseLayoutRounding" Value="True" />
-    <Setter Property="BorderThickness" Value="0,1,0,0" />
-    <Setter Property="Foreground" Value="White" />
-    <Setter Property="Background" Value="{DynamicResource TitleBrush}" />
-    <Setter Property="Height" Value="60" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="hc:TimeBar">
-          <ControlTemplate.Triggers>
-            <EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
-              <BeginStoryboard>
-                <Storyboard>
-                  <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
-                    <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-                  </ObjectAnimationUsingKeyFrames>
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-            <EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
-              <BeginStoryboard>
-                <Storyboard>
-                  <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
-                    <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
-                  </ObjectAnimationUsingKeyFrames>
-                </Storyboard>
-              </BeginStoryboard>
-            </EventTrigger>
-          </ControlTemplate.Triggers>
-          <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <hc:SimplePanel ClipToBounds="True">
-              <Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
-                <TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center" />
-              </Border>
-              <TextBlock Visibility="{TemplateBinding ShowSpeStr,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding SpeStr}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,14,10,0" />
-              <TextBlock Visibility="Collapsed" Name="PART_TextBlockMove" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,2,0,0" />
-              <Canvas Name="PART_CanvasSpe" VerticalAlignment="Bottom" Height="28" />
-              <hc:SimplePanel x:Name="PART_Hotspots" Margin="0,48,0,0" VerticalAlignment="Top" Visibility="{Binding Hotspots,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Object2VisibilityConverter}}" />
-              <Border Width="1" Background="{DynamicResource DangerBrush}" />
-              <Border Name="PART_BorderTop" Background="Transparent" Cursor="Hand" />
-            </hc:SimplePanel>
-          </Border>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-  <Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
-  <Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
-  <Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
-  <Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
-  <Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
-  <Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
-  <Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
-  <Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
-  <Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
-  <Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
-    <Setter Property="Padding" Value="6,0" />
-    <Setter Property="MinHeight" Value="24" />
-  </Style>
-  <Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
-    <Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
-  </Style>
-  <Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
-  <Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
-  <ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
-    <hc:AxleCanvas>
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
-    <hc:AxleCanvas>
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
-    <hc:AxleCanvas Orientation="Vertical">
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
-    <hc:AxleCanvas Orientation="Vertical">
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
-      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="SliderHorizontal" TargetType="Slider">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
-      <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
-        <Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
-          <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
-        </Canvas>
-      </Border>
-      <Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
-        </Track.Thumb>
-      </Track>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Top" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalTop}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Bottom" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalBottom}" />
-      </MultiTrigger>
-      <Trigger Property="TickPlacement" Value="TopLeft">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="BottomRight">
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="Both">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="IsSelectionRangeEnabled" Value="true">
-        <Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="SliderVertical" TargetType="Slider">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
-      <TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
-        <Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
-          <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
-        </Canvas>
-      </Border>
-      <Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
-        <Track.DecreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-        </Track.DecreaseRepeatButton>
-        <Track.IncreaseRepeatButton>
-          <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-        </Track.IncreaseRepeatButton>
-        <Track.Thumb>
-          <Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
-        </Track.Thumb>
-      </Track>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Left" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalLeft}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Right" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}" />
-      </MultiTrigger>
-      <Trigger Property="TickPlacement" Value="TopLeft">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="BottomRight">
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="Both">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="IsSelectionRangeEnabled" Value="true">
-        <Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="SliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
-    <Setter Property="Template" Value="{StaticResource SliderHorizontal}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource SliderVertical}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <ControlTemplate x:Key="TipRangeSliderThumbHorizontalTop" TargetType="hc:RangeThumb">
-    <hc:AxleCanvas>
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipRangeSliderThumbHorizontalBottom" TargetType="hc:RangeThumb">
-    <hc:AxleCanvas>
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-      <Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipRangeSliderThumbVerticalLeft" TargetType="hc:RangeThumb">
-    <hc:AxleCanvas Orientation="Vertical">
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="TipRangeSliderThumbVerticalRight" TargetType="hc:RangeThumb">
-    <hc:AxleCanvas Orientation="Vertical">
-      <Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
-      <Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
-    </hc:AxleCanvas>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver" Value="True">
-        <Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
-        <Setter Property="Opacity" Value="1" TargetName="LabelValue" />
-      </Trigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-      <EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
-        <EventTrigger.Actions>
-          <BeginStoryboard>
-            <Storyboard>
-              <ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
-            </Storyboard>
-          </BeginStoryboard>
-        </EventTrigger.Actions>
-      </EventTrigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="RangeSliderHorizontal" TargetType="hc:RangeSlider">
-    <Grid>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-        <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <TickBar x:Name="TopTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
-      <TickBar x:Name="BottomTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="9,0" Grid.Row="1" Height="2" VerticalAlignment="center" />
-      <hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="9,0" x:Name="PART_Track" Grid.Row="1">
-        <hc:RangeTrack.DecreaseRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-        </hc:RangeTrack.DecreaseRepeatButton>
-        <hc:RangeTrack.CenterRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-        </hc:RangeTrack.CenterRepeatButton>
-        <hc:RangeTrack.IncreaseRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
-        </hc:RangeTrack.IncreaseRepeatButton>
-        <hc:RangeTrack.ThumbStart>
-          <hc:RangeThumb Content="{TemplateBinding ValueStart}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbStart" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
-        </hc:RangeTrack.ThumbStart>
-        <hc:RangeTrack.ThumbEnd>
-          <hc:RangeThumb Content="{TemplateBinding ValueEnd}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbEnd" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
-        </hc:RangeTrack.ThumbEnd>
-      </hc:RangeTrack>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Top" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
-        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Bottom" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
-        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
-      </MultiTrigger>
-      <Trigger Property="TickPlacement" Value="TopLeft">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="BottomRight">
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="Both">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <ControlTemplate x:Key="RangeSliderVertical" TargetType="hc:RangeSlider">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <TickBar x:Name="TopTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
-      <TickBar x:Name="BottomTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
-      <Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="0,9" Grid.Column="1" HorizontalAlignment="center" Width="2" />
-      <hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="0,9" x:Name="PART_Track" Grid.Column="1">
-        <hc:RangeTrack.DecreaseRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-        </hc:RangeTrack.DecreaseRepeatButton>
-        <hc:RangeTrack.CenterRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-        </hc:RangeTrack.CenterRepeatButton>
-        <hc:RangeTrack.IncreaseRepeatButton>
-          <RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
-        </hc:RangeTrack.IncreaseRepeatButton>
-        <hc:RangeTrack.ThumbStart>
-          <hc:RangeThumb Content="{TemplateBinding ValueStart}" Margin="0,-9" x:Name="ThumbStart" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
-        </hc:RangeTrack.ThumbStart>
-        <hc:RangeTrack.ThumbEnd>
-          <hc:RangeThumb Content="{TemplateBinding ValueEnd}" Margin="0,-9" x:Name="ThumbEnd" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
-        </hc:RangeTrack.ThumbEnd>
-      </hc:RangeTrack>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Left" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
-        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
-      </MultiTrigger>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="hc:TipElement.Placement" Value="Right" />
-          <Condition Property="hc:TipElement.Visibility" Value="Visible" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
-        <Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
-      </MultiTrigger>
-      <Trigger Property="TickPlacement" Value="TopLeft">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="BottomRight">
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-      <Trigger Property="TickPlacement" Value="Both">
-        <Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
-        <Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-  <Style x:Key="RangeSliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RangeSlider">
-    <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-    <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
-    <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-    <Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
-    <Setter Property="Template" Value="{StaticResource RangeSliderHorizontal}" />
-    <Style.Triggers>
-      <Trigger Property="Orientation" Value="Vertical">
-        <Setter Property="Template" Value="{StaticResource RangeSliderVertical}" />
-      </Trigger>
-      <Trigger Property="IsEnabled" Value="False">
-        <Setter Property="Opacity" Value=".4" />
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-  <Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
-  <Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
+	<langs:LangProvider x:Key="Langs" />
+	<converter:Boolean2BooleanReConverter x:Key="Boolean2BooleanReConverter" />
+	<converter:Boolean2VisibilityReConverter x:Key="Boolean2VisibilityReConverter" />
+	<converter:BooleanArr2VisibilityConverter x:Key="BooleanArr2VisibilityConverter" />
+	<converter:BooleanArr2BooleanConverter x:Key="BooleanArr2BooleanConverter" />
+	<converter:Long2FileSizeConverter x:Key="Long2FileSizeConverter" />
+	<converter:String2VisibilityConverter x:Key="String2VisibilityConverter" />
+	<converter:String2VisibilityReConverter x:Key="String2VisibilityReConverter" />
+	<BooleanToVisibilityConverter x:Key="Boolean2VisibilityConverter" />
+	<converter:TreeViewItemMarginConverter x:Key="TreeViewItemMarginConverter" />
+	<converter:Color2HexStringConverter x:Key="Color2HexStringConverter" />
+	<converter:Object2BooleanConverter x:Key="Object2BooleanConverter" />
+	<converter:Boolean2StringConverter x:Key="Boolean2StringConverter" />
+	<converter:Int2StringConverter x:Key="Int2StringConverter" />
+	<converter:BorderClipConverter x:Key="BorderClipConverter" />
+	<converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
+	<converter:BorderCircularConverter x:Key="BorderCircularConverter" />
+	<converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter" />
+	<converter:Object2VisibilityReConverter x:Key="Object2VisibilityReConverter" />
+	<converter:Number2PercentageConverter x:Key="Number2PercentageConverter" />
+	<converter:RectangleCircularConverter x:Key="RectangleCircularConverter" />
+	<converter:ThicknessSplitConverter x:Key="ThicknessSplitConverter" />
+	<converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
+	<MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
+	<converter:Double2GridLengthConverter x:Key="Double2GridLengthConverter" />
+	<converter:DoubleMinConverter x:Key="DoubleMinConverter" />
+	<converter:Object2StringConverter x:Key="Object2StringConverter" />
+	<converter:DataGridSelectAllButtonVisibilityConverter x:Key="DataGridSelectAllButtonVisibilityConverter" />
+	<Color x:Key="EffectShadowColor">#88000000</Color>
+	<system:Double x:Key="LargeFontSize">24</system:Double>
+	<system:Double x:Key="HeadFontSize">20</system:Double>
+	<system:Double x:Key="SubHeadFontSize">16</system:Double>
+	<system:Double x:Key="TextFontSize">12</system:Double>
+	<Geometry o:Freeze="True" x:Key="CalendarGeometry">M377.897477 116.291025l265.298718 0 0 47.459125-265.298718 0 0-47.459125ZM888.317416 116.291025 748.229288 116.291025l0 47.459125 123.54866 0c18.167626 0 32.894732 14.727106 32.894732 32.894732l0 92.92987L115.42936 289.574752l0-92.92987c0-18.167626 14.727106-32.894732 32.894732-32.894732l123.54866 0 0-47.459125L131.776437 116.291025c-35.244356 0-63.814389 28.571056-63.814389 63.815412l0.004093 713.966329c0 35.243333 28.571056 63.814389 63.814389 63.814389l756.540979 0c35.244356 0 63.814389-28.571056 63.814389-63.815412l-0.004093-713.966329C952.131805 144.861058 923.560749 116.291025 888.317416 116.291025zM904.67268 337.033877l0 540.498398c0 18.167626-14.727106 32.894732-32.894732 32.894732L148.324092 910.427007c-18.167626 0-32.894732-14.727106-32.894732-32.894732L115.42936 337.033877 904.67268 337.033877zM300.659736 64.801927l47.459125 0 0 170.241292-47.459125 0 0-170.241292ZM672.97481 64.801927l47.450938 0 0 170.241292-47.450938 0 0-170.241292ZM358.384138 547.939214l0 231.021432 52.863464 0L411.247602 459.226591l-34.580198 0-2.651514 3.804835c-18.000819 25.896006-41.448959 48.758786-69.681285 67.955908l-3.886703 2.643327 0 53.742526 13.441772-8.069156C330.690097 569.215794 345.588103 558.712075 358.384138 547.939214zM618.031888 726.552576c-10.287791 6.395971-24.435678 8.069156-42.059902 4.948946-16.094309-2.842881-27.898712-18.373321-35.082666-46.159464l-2.261615-8.753781-48.312603 13.424375 1.68956 8.129534c6.270098 30.168514 18.347737 52.052967 35.884976 65.017855 17.120734 12.705979 35.542152 19.777364 54.731087 21.043255 3.358652 0.225138 6.655903 0.337707 9.897892 0.337707 14.859119 0 28.430857-2.374184 40.452211-7.072408 14.417029-5.641758 26.88866-13.338413 37.076162-22.86278 10.365566-9.723922 18.230051-22.143362 23.378552-36.920612 4.918246-14.170401 7.739636-28.296797 8.385373-42.025108 0.60685-13.658723-0.667228-26.650218-3.791531-38.619382l-0.008187-0.017397c-3.111-11.777796-8.133628-23.738773-14.946104-35.551363-7.353831-12.679372-19.028268-22.750211-34.710165-29.952586-15.037183-6.872854-30.927843-10.685876-47.24729-11.32752-11.414505-0.415482-23.487027 1.386646-36.04462 5.434017 3.813022-14.568486 7.648557-31.884681 11.465673-51.775637l113.87693 0 0-49.357449L535.645647 464.492778l-1.495122 7.028404c-24.621928 115.77116-31.589954 145.497585-33.102473 150.039235l-3.432334 10.338958 45.829943 5.391036 3.054716-4.20292c8.146931-11.214951 18.247448-18.139996 30.879746-21.164011 13.004799-3.137607 24.743707-3.180588 34.879018-0.129966 9.857981 2.95545 17.822756 8.771178 24.327202 17.758284 6.512633 9.03111 10.084143 20.392401 10.617311 33.757421 0.519864 13.849067-1.603598 26.442477-6.314102 37.440476C636.315153 711.429431 628.843637 719.871089 618.031888 726.552576z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DeleteGeometry">M512 620.544l253.3376 253.3376a76.6976 76.6976 0 1 0 108.544-108.544L620.6464 512l253.2352-253.3376a76.6976 76.6976 0 1 0-108.544-108.544L512 403.3536 258.6624 150.1184a76.6976 76.6976 0 1 0-108.544 108.544L403.3536 512 150.1184 765.3376a76.6976 76.6976 0 1 0 108.544 108.544L512 620.6464z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DeleteFillCircleGeometry">M7.4038057,6.4038057 C7.1478834,6.4038057 6.8919611,6.5014372 6.6966991,6.6966991 6.3061748,7.0872235 6.3061748,7.7203884 6.6966991,8.1109123 L10.585787,12 6.6966991,15.889088 C6.3061748,16.279612 6.3061748,16.912777 6.6966991,17.303301 7.0872235,17.693825 7.7203879,17.693825 8.1109123,17.303301 L12,13.414213 15.889088,17.303301 C16.279612,17.693825 16.912777,17.693825 17.303301,17.303301 17.693825,16.912777 17.693825,16.279612 17.303301,15.889088 L13.414213,12 17.303301,8.1109123 C17.693825,7.7203884 17.693825,7.0872235 17.303301,6.6966991 16.912777,6.3061748 16.279612,6.3061748 15.889088,6.6966991 L12,10.585787 8.1109123,6.6966991 C7.9156504,6.5014372 7.6597281,6.4038057 7.4038057,6.4038057 z M12,0 C18.627417,0 24,5.3725829 24,12 24,18.627417 18.627417,24 12,24 5.3725829,24 0,18.627417 0,12 0,5.3725829 5.3725829,0 12,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="CloseGeometry">M0.7,0 L5,4.3 L9.3,0 L10,0.7 L5.7,5 L10,9.3 L9.3,10 L5,5.7 L0.7,10 L0,9.3 L4.3,5 L0,0.7 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DownGeometry">M512 801.6896L5.12 282.0096l58.1632-59.5968L512 682.3936l448.7168-460.0832 58.1632 59.5968-506.88 519.7824z</Geometry>
+	<Geometry o:Freeze="True" x:Key="UpGeometry">M50.000001,0 L100,51.262779 94.262627,57.141584 50.000001,11.767713 5.7373757,57.151686 0,51.27288 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="ClockGeometry">M498.506684 256.571517 425.359734 256.571517 425.359734 622.190635 720.166063 622.190635 720.166063 549.725206 498.506684 549.725206ZM512.714268 80.162738c-245.740844 0-445.181175 197.577914-445.181175 441.024505s199.439308 441.024505 445.181175 441.024505c245.738797 0 445.178105-197.577914 445.178105-441.024505S758.453065 80.162738 512.714268 80.162738zM512.714268 874.005824c-195.880249 0-356.145349-158.768003-356.145349-352.818581s160.2651-352.821651 356.145349-352.821651c195.877179 0 356.14228 158.77005 356.14228 352.821651S708.591447 874.005824 512.714268 874.005824z</Geometry>
+	<Geometry o:Freeze="True" x:Key="LeftGeometry">M394.24 512L683.52 248.32c10.24-10.24 10.24-25.6 0-35.84-10.24-10.24-25.6-10.24-35.84 0l-307.2 279.04c-5.12 5.12-7.68 12.8-7.68 20.48 0 7.68 2.56 15.36 7.68 20.48l307.2 279.04c10.24 10.24 25.6 10.24 35.84 0 10.24-10.24 10.24-25.6 0-35.84L394.24 512z</Geometry>
+	<Geometry o:Freeze="True" x:Key="RightGeometry">M4.1666641,0 C5.2083321,0 6.25,0.41666794 7.0833321,1.25 L57.083331,46.666664 C57.916664,47.499998 58.33333,48.749998 58.333329,49.999998 58.33333,51.249997 57.916664,52.499997 57.083331,53.333331 L7.0833321,98.749996 C5.4166641,100.41666 2.9166641,100.41666 1.2499962,98.749996 -0.41666794,97.083328 -0.41666794,94.583328 1.2499962,92.916664 L48.333331,49.999998 1.2499962,7.0833321 C-0.41666794,5.4166641 -0.41666794,2.9166641 1.2499962,1.25 2.0833282,0.41666794 3.1249962,0 4.1666641,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="RotateLeftGeometry">M165.238899 508.178506C164.450369 456.442676 171.767779 404.485842 187.244542 353.863631 266.138632 95.812692 533.436225-51.353028 784.380224 25.368251 1035.324219 102.08953 1174.62994 373.566359 1095.735851 631.617298 1016.84176 889.66824 749.544168 1036.833959 498.600172 960.11268 424.134741 937.346313 357.837833 896.870788 303.973868 842.276436 291.310328 829.441176 291.396506 808.495802 304.166356 795.493625 316.936205 782.491452 337.554042 782.356136 350.217582 795.191397 396.640587 842.243889 453.73137 877.098901 517.975091 896.740177 734.436966 962.919213 965.320335 835.802028 1033.557737 612.607541 1101.795139 389.413057 981.467179 154.919792 765.005305 88.740755 548.543428 22.561718 317.660056 149.678904 249.422655 372.873388 235.597198 418.094418 229.294871 464.461039 230.4403 510.559881L311.240978 429.759202C323.584094 417.416085 343.892513 417.712357 356.601099 430.420946 369.309686 443.129535 369.605959 463.437952 357.262842 475.781068L230.778782 602.265128C229.273826 605.769679 227.098877 609.041396 224.251145 611.889128 211.908029 624.232245 191.59961 623.935974 178.891024 611.227385L40.825428 473.16179C28.11684 460.453206 27.820569 440.144784 40.163685 427.801668 52.506801 415.458551 72.815218 415.754827 85.523806 428.463411L165.238899 508.178506Z</Geometry>
+	<Geometry o:Freeze="True" x:Key="RotateRightGeometry">M13.1117823382705,0.00108644926083379C18.7165758868546,0.0742913923738762 23.9197352191299,3.84162509632329 25.6893389483779,9.62980814885544 26.1165926715226,11.0273168346189 26.3185999652236,12.461670228202 26.296833302626,13.8899238456496L28.4974711200089,11.6892569876356C28.8483088275283,11.3384168617557 29.4089472552627,11.330238049977 29.7496950885147,11.6709881771838 30.0904429217666,12.0117402117628 30.0822642108291,12.572387459387 29.7314265033096,12.923229492639L25.9199488421768,16.7347560556155C25.5691111346572,17.0855980888674 25.0084688922257,17.0937769006462 24.6677210589736,16.7530248660672 24.5891077777236,16.674408708165 24.5290644427627,16.5840870073788 24.4875185748428,16.4873374624474L20.9957621356339,12.9955379708416C20.6550143023818,12.6547878436347 20.6631930133193,12.0941405960106 21.0140307208389,11.7432985627585 21.3648684283584,11.3924565295065 21.9255068560928,11.3842777177278 22.2662546893447,11.7250297523068L24.4968645831436,13.9556652415401C24.5284846087783,12.6830303030582 24.3545000811904,11.4030042974954 23.9728319903702,10.1546044295501 22.0890505572647,3.99295504901009 15.7152140399307,0.483677352708723 9.73950221742095,2.3106585349176 3.76379420960845,4.13763876344051 0.441986348280352,10.6112083411418 2.32576778138575,16.7728577216819 4.20954921449125,22.9345051948497 10.5833819171279,26.4437838448372 16.5590937396377,24.6168036163144 18.3326227923721,24.0745720467974 19.9086878558486,23.1123447593618 21.1902544757217,21.8133823630949 21.5398485919327,21.4590441166922 22.1090319415421,21.4627806587338 22.4615595599502,21.8217271162507 22.8140871783584,22.1806735737676 22.8164675494522,22.7589048852417 22.4668734332412,23.1132431316444 20.9798891803115,24.6204085496776 19.1496775409072,25.7378005615073 17.0939638873428,26.3663063881084 10.1663286944717,28.484321088751 2.78723170960845,24.4215726325395 0.609260823377952,17.2976520950044 -1.56871387754975,10.1737353722136 2.27700069154205,2.6791733248245 9.20463588441315,0.561156716809679 10.5035670062393,0.164028483596132 11.8183710833877,-0.0158071458708005 13.1117823382705,0.00108644926083379z</Geometry>
+	<Geometry o:Freeze="True" x:Key="EnlargeGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H496v175h-50V502H271v-50h175V277h50v175h175v50z</Geometry>
+	<Geometry o:Freeze="True" x:Key="ReduceGeometry">M750.3 198.7C598 46.4 351.1 46.4 198.7 198.7s-152.3 399.2 0 551.5C345.1 896.6 578.8 902.3 732 767.3l172.1 172.1 35.4-35.4-172.1-171.9c135-153.2 129.3-387-17.1-533.4z m39.3 403.8c-17.1 42.1-42.2 80-74.7 112.4-32.5 32.5-70.3 57.6-112.4 74.7-40.7 16.5-83.8 24.9-128 24.9s-87.2-8.4-128-24.9c-42.1-17.1-80-42.2-112.4-74.7s-57.6-70.3-74.7-112.4c-16.5-40.7-24.9-83.8-24.9-128s8.4-87.2 24.9-128c17.1-42.1 42.2-80 74.7-112.4s70.3-57.6 112.4-74.7c40.7-16.5 83.8-24.9 128-24.9s87.2 8.4 128 24.9c42.1 17.1 80 42.2 112.4 74.7 32.5 32.5 57.6 70.3 74.7 112.4 16.5 40.7 24.9 83.8 24.9 128s-8.4 87.3-24.9 128zM671 502H271v-50h400v50z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DownloadGeometry">M868.100096 742.600704l-0.049152 0L216.246272 742.600704l-0.049152 0c-13.98784 0-25.327616 11.33568-25.327616 25.352192 0 13.993984 11.360256 25.327616 25.327616 25.327616l0.049152 0 651.804672 0 0.049152 0c13.996032 0 25.33376-11.333632 25.33376-25.327616C893.431808 753.936384 882.096128 742.600704 868.100096 742.600704L868.100096 742.600704 868.100096 742.600704M523.15136 688.433152c4.728832 4.757504 11.237376 7.733248 18.47296 7.733248l0 0 0 0c7.231488 0 13.740032-2.951168 18.42176-7.757824l314.836992-314.83904c4.732928-4.704256 7.714816-11.214848 7.7312-18.395136 0-14.342144-11.712512-25.9584-25.972736-25.9584-7.213056-0.02048-13.694976 2.930688-18.376704 7.636992L567.578624 607.51872 567.578624 117.52448c-0.024576-0.026624-0.024576-0.026624-0.024576-0.0512 0.024576-14.344192-11.59168-25.980928-25.901056-25.980928-14.348288 0-25.960448 11.634688-25.960448 25.980928 0 0 0 0.024576 0.024576 0.0512l0 489.967616L245.055488 336.826368c-4.683776-4.704256-11.2128-7.6288-18.374656-7.60832-14.342144-0.02048-25.954304 11.614208-26.005504 25.9072 0 7.20896 2.951168 13.768704 7.684096 18.423808L523.15136 688.433152 523.15136 688.433152 523.15136 688.433152M523.15136 688.433152 523.15136 688.433152z</Geometry>
+	<Geometry o:Freeze="True" x:Key="SaveGeometry">M608 320C625.664 320 640 305.696 640 288L640 160C640 142.304 625.664 128 608 128 590.336 128 576 142.304 576 160L576 288C576 305.696 590.336 320 608 320L608 320ZM960 896C960 931.328 931.328 960 896 960L128 960C92.672 960 64 931.328 64 896L64 128C64 92.672 92.672 64 128 64L192 64 192 384C192 419.328 220.672 448 256 448L768 448C803.328 448 832 419.328 832 384L832 64 896 64C931.328 64 960 92.672 960 128L960 896 960 896ZM256 64 768 64 768 352C768 369.696 753.664 384 736 384L288 384C270.336 384 256 369.696 256 352L256 64 256 64ZM896 0 128 0C57.312 0 0 57.312 0 128L0 896C0 966.688 57.312 1024 128 1024L896 1024C966.688 1024 1024 966.688 1024 896L1024 128C1024 57.312 966.688 0 896 0L896 0Z</Geometry>
+	<Geometry o:Freeze="True" x:Key="WindowsGeometry">M426.276571 574.829714l0 372.004571-389.705143-53.686857 0-318.317714 389.705143 0zM426.276571 150.308571l0 376.539429-389.705143 0 0-322.852571zM987.428571 574.829714l0 449.170286-518.290286-71.460571 0-377.709714 518.290286 0zM987.428571 73.142857l0 453.705143-518.290286 0 0-382.317714z</Geometry>
+	<Geometry o:Freeze="True" x:Key="FullScreenGeometry">M942 82v320h-50V167.4l-274 274-35.4-35.4 274-274H622V82h320zM406 582.6l-274 274V622H82v320h320v-50H167.4l274-274-35.4-35.4zM132 132h302V82H82v352h50V132z m760 760H590v50h352V590h-50v302z</Geometry>
+	<Geometry o:Freeze="True" x:Key="FullScreenReturnGeometry">M94.186081,59.07 L100,59.07 100,100 59.07,100 59.07,94.186081 94.186081,94.186081 z M4.5814285,58.208999 L41.791,58.208999 41.791,95.418571 35.977005,95.418571 35.977005,68.139304 4.1163101,100 0,95.88369 31.860695,64.022995 4.5814285,64.022995 z M95.88369,0 L100,4.1163101 68.139304,35.977005 95.418571,35.977005 95.418571,41.791 58.208999,41.791 58.208999,4.5814285 64.022995,4.5814285 64.022995,31.860695 z M0,0 L40.929998,0 40.929998,5.8139191 5.8139191,5.8139191 5.8139191,40.929998 0,40.929998 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="SearchGeometry">M716.6003 213.800623c-138.851102-138.915088-364.020238-138.915088-502.935326 0s-138.915088 364.084225 0 502.935326a355.573996 355.573996 0 0 0 502.935326 0 355.573996 355.573996 0 0 0 0-502.935326z m-580.359212 580.359212a465.183184 465.183184 0 1 1 657.783099 0 465.183184 465.183184 0 0 1-657.783099 0z m868.939152 211.156054a63.474789 63.474789 0 0 1-89.837303 0l-89.773316-89.837303a63.410803 63.410803 0 1 1 89.773316-89.773316l89.837303 89.773316a63.346816 63.346816 0 0 1 0 89.837303z</Geometry>
+	<Geometry o:Freeze="True" x:Key="UpDownGeometry">M454.464 143.68l-253.44 253.44c-12.032 12.032-12.032 31.36 0 43.392 11.968 11.968 31.36 11.968 43.328 0l237.376-237.376 237.376 237.376c11.968 11.968 31.36 11.968 43.328 0 12.032-12.032 12.032-31.36 0-43.392l-253.44-253.44C491.264 126.016 478.016 124.032 454.464 143.68zM507.968 947.648l252.48-253.376c11.968-11.968 11.968-31.36 0-43.392-11.968-11.968-31.296-11.968-43.264 0l-236.48 237.376L244.16 650.88c-11.968-11.968-31.296-11.968-43.264 0-11.968 12.032-11.968 31.424 0 43.392l252.48 253.376C465.984 960 491.136 964.48 507.968 947.648z</Geometry>
+	<Geometry o:Freeze="True" x:Key="WindowMinGeometry">M0,4 L10,4 L10,5 L0,5 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="WindowRestoreGeometry">M1,3 L1,9 L7,9 L7,3 z M3,1 L3,2 L8,2 L8,7 L9,7 L9,1 z M2,0 L10,0 L10,8 L8,8 L8,10 L0,10 L0,2 L2,2 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="WindowMaxGeometry">M1,1 L1,9 L9,9 L9,1 z M0,0 L10,0 L10,10 L0,10 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="CheckedGeometry">M 0,2 3,5 8,0</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignLeftGeometry">M0,8 L4,8 4,10 0,10 z M0,4 L8,4 8,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignRightGeometry">M8,8 L12,8 12,10 8,10 z M4,4 L12,4 12,6 4,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignHCenterGeometry">M4,8 L8,8 8,10 4,10 z M2,4 L10,4 10,6 2,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignHStretchGeometry">M0,8 L12,8 12,10 0,10 z M0,4 L12,4 12,6 0,6 z M0,0 L12,0 12,2 0,2 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignTopGeometry">M8,0 L10,0 10,4 8,4 z M4,0 L6,0 6,8 4,8 z M0,0 L2,0 2,12 0,12 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignBottomGeometry">M8,8 L10,8 10,12 8,12 z M4,4 L6,4 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignVCenterGeometry">M8,4 L10,4 10,8 8,8 z M4,2 L6,2 6,10 4,10 z M0,0 L2,0 2,12 0,12 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AlignVStretchGeometry">M8,0 L10,0 10,12 8,12 z M4,0 L6,0 6,12 4,12 z M0,0 L2,0 2,12 0,12 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="PageModeGeometry">M1.0000002,12 L1.0000002,13 11,13 11,12 z M1.0000002,10 L1.0000002,11 11,11 11,10 z M1.0000002,8 L1.0000002,9 11,9 11,8 z M1.0000002,6 L1.0000002,7 11,7 11,6 z M1.0000002,4 L1.0000002,5 11,5 11,4 z M1.0000002,2 L1.0000002,3 11,3 11,2 z M0,0 L12,0 12,14 0,14 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="TwoPageModeGeometry">M8.99999988079071,12L8.99999988079071,13 13,13 13,12z M1,12L1,13 5,13 5,12z M9.00000011920929,10L9.00000011920929,11 13,11 13,10z M1,10L1,11 5,11 5,10z M9.00000011920929,8L9.00000011920929,9 13,9 13,8z M1,8L1,9 5,9 5,8z M9.00000011920929,6L9.00000011920929,7 13,7 13,6z M1,6L1,7 5,7 5,6z M9.00000011920929,4L9.00000011920929,5 13,5 13,4z M1,4L1,5 5,5 5,4z M8.99999988079071,2L8.99999988079071,3 13,3 13,2z M1,2L1,3 5,3 5,2z M7.99999994039536,0L14,0 14,14 7.99999994039536,14z M0,0L6,0 6,14 0,14z</Geometry>
+	<Geometry o:Freeze="True" x:Key="ScrollModeGeometry">M1,12L1,13 8,13 8,12z M1,10L1,11 8,11 8,10z M1,8L1,9 8,9 8,8z M1,6L1,7 8,7 8,6z M11.0000002384186,5L11.0000002384186,9 13,9 13,5z M1,4L1,5 8,5 8,4z M1,2L1,3 8,3 8,2z M10.0000000298023,0L14,0 14,14 10.0000000298023,14z M0,0L9.00000011920929,0 9.00000011920929,14 0,14z</Geometry>
+	<Geometry o:Freeze="True" x:Key="EyeOpenGeometry">M928 406.4c-100.8-137.6-249.6-224-416-224s-315.2 86.4-416 224c-44.8 60.8-44.8 150.4 0 211.2 102.4 137.6 251.2 224 416 224 166.4 0 315.2-86.4 416-224 46.4-60.8 46.4-150.4 0-211.2zM512 721.6c-115.2 0-209.6-94.4-209.6-209.6 0-115.2 94.4-209.6 209.6-209.6 115.2 0 209.6 94.4 209.6 209.6 1.6 115.2-92.8 209.6-209.6 209.6z m0-360c-83.2 0-150.4 67.2-150.4 150.4s67.2 150.4 150.4 150.4 150.4-67.2 150.4-150.4-67.2-150.4-150.4-150.4z m0 0</Geometry>
+	<Geometry o:Freeze="True" x:Key="EyeCloseGeometry">M950.4 361.6c8-20.8 0-43.2-19.2-54.4-9.6-4.8-20.8-6.4-32-3.2s-19.2 11.2-24 22.4c-56 132.8-208 228.8-361.6 228.8-155.2 0-307.2-97.6-363.2-232-4.8-11.2-12.8-19.2-24-24-9.6-4.8-20.8-3.2-32 0-20.8 9.6-30.4 35.2-20.8 56 25.6 60.8 67.2 118.4 123.2 164.8l-67.2 70.4c-14.4 16-14.4 40 0 57.6 8 8 17.6 14.4 28.8 14.4s22.4-3.2 30.4-11.2l76.8-81.6c35.2 20.8 73.6 38.4 113.6 49.6l-28.8 83.2c-8 22.4 3.2 46.4 24 54.4 4.8 1.6 9.6 3.2 14.4 3.2 6.4 0 11.2-1.6 17.6-3.2 9.6-4.8 17.6-12.8 22.4-24l33.6-96c41.6 4.8 81.6 3.2 123.2-3.2l32 94.4c3.2 11.2 11.2 19.2 22.4 24 9.6 4.8 20.8 4.8 32 1.6 20.8-8 32-32 24-54.4l-28.8-84.8c30.4-9.6 59.2-22.4 86.4-38.4l62.4 65.6c14.4 16 43.2 16 57.6 0 16-16 16-43.2 0-60.8l-51.2-54.4c56-43.2 100.8-100.8 128-164.8z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AudioGeometry">M627.52666696 962L550.66666696 890.47999971c116.82-92.99999971 191.09999971-230.94 191.09999971-385.2 0-146.99999971-67.61999971-279-174.96-371.57999942L643.84666667 62C770.86666638 172.99999971 850.66666667 330.2 850.66666667 505.09999971c0 182.27999971-86.58 345.42-223.13999971 456.90000029zM405.64666638 782l-76.32-77.22a227.88 227.88 0 0 0 116.40000058-199.26A228.06 228.06 0 0 0 347.86666638 317.84000029L422.86666696 242A334.37999971 334.37999971 0 0 1 550.66666696 505.52 334.62 334.62 0 0 1 405.64666638 782zM205.66666638 596.6C164.26666638 596.6 130.66666667 562.51999971 130.66666667 520.64 130.66666667 478.76000029 164.26666638 444.79999971 205.66666638 444.79999971s74.99999971 33.95999971 75.00000058 75.90000058c0 41.87999971-33.59999971 75.84000029-75.00000058 75.83999942z</Geometry>
+	<Geometry o:Freeze="True" x:Key="BubbleTailGeometry">M0,0L28,0 28,14.0000006258488 28,15.0010000765324 28.0151405334473,15.0010000765324 28.0455417633057,15.8010965883732C28.4084091186524,22.9596563875675,30.92209815979,29.5507589876652,34.9532623291016,34.9410597383976L34.9984359741211,34.9999815523624 34.0966339111328,34.9885679781437C15.1841707229614,34.5094191133976,2.0535663480814E-07,19.0279375612736,0,0z</Geometry>
+	<Geometry o:Freeze="True" x:Key="StarGeometry">M535.9 165.2l96.5 195.4c3.9 7.9 11.4 13.3 20.1 14.6l215.7 31.3c21.9 3.2 30.6 30 14.8 45.5L726.8 604.1c-6.3 6.1-9.1 14.9-7.7 23.6L756 842.5c3.7 21.8-19.1 38.4-38.7 28.1L524.4 769.2c-7.8-4.1-17-4.1-24.8 0L306.7 870.6c-19.6 10.3-42.4-6.3-38.7-28.1l36.8-214.8c1.5-8.6-1.4-17.5-7.7-23.6L141.1 452c-15.8-15.4-7.1-42.3 14.8-45.5l215.7-31.3c8.7-1.3 16.2-6.7 20.1-14.6l96.5-195.4c9.7-19.9 37.9-19.9 47.7 0z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AddGeometry">M8,0 C8.5522847,0 9,0.44771525 9,1 L9,7 15,7 C15.552285,7 16,7.4477153 16,8 16,8.5522852 15.552285,9 15,9 L9,9 9,15 C9,15.552285 8.5522847,16 8,16 7.4477153,16 7,15.552285 7,15 L7,9 1,9 C0.44771528,9 0,8.5522852 0,8 0,7.4477153 0.44771528,7 1,7 L7,7 7,1 C7,0.44771525 7.4477153,0 8,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="RemoveGeometry">M10.899495,0 C11.155417,0 11.411339,0.097630501 11.606602,0.29289246 11.997126,0.68341732 11.997126,1.3165817 11.606602,1.7071066 L7.3639612,5.9497471 11.606602,10.192388 C11.997126,10.582912 11.997126,11.216077 11.606602,11.606601 11.216077,11.997126 10.582912,11.997126 10.192388,11.606601 L5.9497476,7.3639607 1.7071068,11.606601 C1.3165827,11.997126 0.68341756,11.997126 0.29289341,11.606601 -0.097630978,11.216077 -0.097630978,10.582912 0.29289341,10.192388 L4.5355338,5.9497471 0.29289341,1.7071066 C-0.097630978,1.3165817 -0.097630978,0.68341732 0.29289341,0.29289246 0.48815536,0.097630501 0.74407768,0 1,0 1.2559223,0 1.5118446,0.097630501 1.7071068,0.29289246 L5.9497476,4.5355334 10.192388,0.29289246 C10.38765,0.097630501 10.643572,0 10.899495,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="SubGeometry">M62.5797 488.9508c0.2632 42.5185 34.985 77.2116 77.5035 77.5035l743.0216-0.6728c42.5185 0.3215 76.7437-33.9333 76.4518-76.4805l0 0c-0.2918-42.5175-34.985-77.2106-77.5045-77.5035l-743.0216-0.087C96.513 411.4473 62.2879 446.4323 62.5797 488.9508L62.5797 488.9508z</Geometry>
+	<Geometry o:Freeze="True" x:Key="WarningGeometry">M943.644188 827.215696l-351.176649-608.204749c-42.945473-74.36249-113.147387-74.36249-156.092861 0l-351.176649 608.204749c-42.946498 74.431167-7.811716 135.14955 78.012605 135.14955l702.420949 0C951.455904 962.36422 986.555836 901.645838 943.644188 827.215696zM466.187532 391.579035c12.621133-13.644108 28.66175-20.466675 48.233578-20.466675 19.580028 0 35.612444 6.75389 48.241778 20.194018 12.544256 13.473954 18.820484 30.325365 18.820484 50.587035 0 17.430551-26.19759 145.621205-34.929778 238.882082l-63.105666 0c-7.666162-93.259852-36.090106-221.450507-36.090106-238.882082C447.358847 421.938226 453.643275 405.155491 466.187532 391.579035zM561.76804 835.026386c-13.268949 12.928641-29.062535 19.375023-47.345906 19.375023-18.275171 0-34.076957-6.447407-47.346931-19.375023-13.235123-12.89379-19.818859-28.517221-19.818859-46.869269 0-18.249546 6.583736-34.043131 19.818859-47.278254 13.268949-13.235123 29.07176-19.852685 47.346931-19.852685 18.283371 0 34.076957 6.617562 47.345906 19.852685 13.235123 13.235123 19.827059 29.028709 19.827059 47.278254C581.595099 806.51019 575.003163 822.132597 561.76804 835.026386z</Geometry>
+	<Geometry o:Freeze="True" x:Key="InfoGeometry">M505.6512 39.0144c-261.2224 3.4816-470.1184 218.112-466.6368 479.4368 3.4816 261.12 218.112 470.1184 479.3344 466.6368 261.2224-3.4816 470.1184-218.112 466.7392-479.3344C981.504 244.4288 766.8736 35.5328 505.6512 39.0144zM558.08 196.608c48.128 0 62.2592 27.9552 62.2592 59.8016 0 39.8336-31.9488 76.6976-86.3232 76.6976-45.568 0-67.1744-22.9376-65.9456-60.8256C468.0704 240.4352 494.7968 196.608 558.08 196.608zM434.7904 807.6288c-32.8704 0-56.9344-19.968-33.8944-107.6224l37.6832-155.5456c6.5536-24.8832 7.68-34.9184 0-34.9184-9.8304 0-52.5312 17.2032-77.7216 34.2016l-16.384-26.9312c79.9744-66.7648 171.8272-105.8816 211.2512-105.8816 32.8704 0 38.2976 38.912 21.9136 98.6112l-43.2128 163.5328c-7.68 28.8768-4.4032 38.912 3.2768 38.912 9.9328 0 42.1888-11.9808 73.9328-36.9664l18.6368 24.8832C552.5504 777.728 467.6608 807.6288 434.7904 807.6288z</Geometry>
+	<Geometry o:Freeze="True" x:Key="ErrorGeometry">M495.469714 0C224.621714 0 0 224.621714 0 495.469714c0 270.884571 224.621714 495.506286 495.469714 495.506286 270.884571 0 495.506286-224.621714 495.506286-495.506286C990.976 224.621714 766.354286 0 495.469714 0z m211.419429 634.221714c19.821714 19.821714 19.821714 46.226286 0 66.048s-46.226286 19.821714-66.048 0l-138.752-138.715428-145.334857 145.334857a51.858286 51.858286 0 0 1-72.667429 0 51.858286 51.858286 0 0 1 0-72.667429l145.334857-145.334857-138.752-138.752c-19.821714-19.821714-19.821714-46.226286 0-66.048s46.262857-19.821714 66.084572 0l138.715428 138.715429 145.371429-145.334857a51.858286 51.858286 0 0 1 72.667428 0 51.858286 51.858286 0 0 1 0 72.667428l-145.371428 145.334857 138.752 138.752z</Geometry>
+	<Geometry o:Freeze="True" x:Key="SuccessGeometry">M512.66048 64.64c-247.424 0-448 200.57728-448 448s200.576 448 448 448 448-200.57728 448-448c0-247.424-200.57728-448-448-448z m250.71232 334.86336L480.98176 681.89312c-15.49568 15.49696-40.61952 15.49696-56.11648 0l-162.9184-162.9184c-15.49568-15.49568-15.49568-40.61824 0-56.1152s40.61952-15.49568 56.11648 0l134.85952 134.85952L707.25504 343.3856c15.49568-15.49568 40.61952-15.49568 56.11648 0s15.49696 40.6208 0.00128 56.11776z</Geometry>
+	<Geometry o:Freeze="True" x:Key="FatalGeometry">M716.8 375.466667l34.133333 34.133333c17.066667 17.066667 42.666667 17.066667 59.733334 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133334-34.133334 34.133334-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733334 0l-34.133333 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733334 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133334 34.133333-34.133334 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733334 0l34.133333-34.133333z m-426.666667 0l34.133334 34.133333c17.066667 17.066667 42.666667 17.066667 59.733333 0 17.066667-17.066667 17.066667-42.666667 0-59.733333l-34.133333-34.133334 34.133333-34.133333c17.066667-17.066667 17.066667-42.666667 0-59.733333-17.066667-17.066667-42.666667-17.066667-59.733333 0l-34.133334 34.133333-34.133333-34.133333c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l34.133333 34.133333-34.133333 34.133334c-17.066667 17.066667-17.066667 42.666667 0 59.733333 17.066667 17.066667 42.666667 17.066667 59.733333 0l34.133333-34.133333zM0 85.333333c0-51.2 42.666667-85.333333 85.333333-85.333333h853.333334c51.2 0 85.333333 42.666667 85.333333 85.333333v853.333334c0 51.2-42.666667 85.333333-85.333333 85.333333H85.333333c-51.2 0-85.333333-42.666667-85.333333-85.333333V85.333333z m512 469.333334c-136.533333 0-230.4 68.266667-290.133333 196.266666-8.533333 17.066667 0 42.666667 17.066666 59.733334s42.666667 0 59.733334-17.066667c51.2-93.866667 110.933333-145.066667 221.866666-145.066667 102.4 0 170.666667 51.2 221.866667 145.066667 8.533333 17.066667 34.133333 25.6 59.733333 17.066667 17.066667-8.533333 25.6-34.133333 17.066667-59.733334-76.8-128-170.666667-196.266667-307.2-196.266666z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AskGeometry">M512 0 30.11843 240.941297l0 542.117406 481.88157 240.941297 481.88157-240.941297L993.88157 240.941297 512 0zM575.776472 768.799969 460.188012 768.799969 460.188012 656.222073l115.588459 0L575.776472 768.799969zM623.335603 509.329685c-52.375829 36.723353-59.600363 55.988096-59.600363 84.885211l0 19.866447L468.616977 614.081343l0-26.489278c0-45.754021 13.846342-80.67124 61.406497-116.791866 46.957428-36.723353 57.79423-62.0082 57.79423-84.282484 0-25.284848-21.67258-54.181962-55.386393-54.181962-42.743457 0-70.436142 26.489278-82.477374 85.486914l-105.956088-21.67258c24.683144-111.976192 82.477374-157.127486 205.289345-157.127486 98.12985 0 157.72919 63.212631 157.72919 131.842639C707.017407 423.240044 688.956071 461.76953 623.335603 509.329685z</Geometry>
+	<Geometry o:Freeze="True" x:Key="AllGeometry">M 721.005 638.949 C 758.74 638.949 789.333 669.56 789.333 707.312 C 789.333 745.047 758.74 775.657 721.005 775.657 C 683.253 775.657 652.66 745.047 652.66 707.312 C 652.66 669.56 683.253 638.949 721.005 638.949 Z M 512.017 638.949 C 549.77 638.949 580.38 669.56 580.38 707.312 C 580.38 745.047 549.77 775.657 512.017 775.657 C 474.265 775.657 443.672 745.047 443.672 707.312 C 443.672 669.56 474.265 638.949 512.017 638.949 Z M 303.029 638.949 C 340.781 638.949 371.392 669.56 371.392 707.312 C 371.392 745.047 340.781 775.657 303.029 775.657 C 265.277 775.657 234.667 745.047 234.667 707.312 C 234.667 669.56 265.277 638.949 303.029 638.949 Z M 721.005 443.655 C 758.74 443.655 789.333 474.265 789.333 512.017 C 789.333 549.769 758.74 580.363 721.005 580.363 C 683.253 580.363 652.66 549.769 652.66 512.017 C 652.66 474.265 683.253 443.655 721.005 443.655 Z M 512.017 443.655 C 549.77 443.655 580.38 474.265 580.38 512.017 C 580.38 549.769 549.77 580.363 512.017 580.363 C 474.265 580.363 443.672 549.769 443.672 512.017 C 443.672 474.265 474.265 443.655 512.017 443.655 Z M 303.029 443.655 C 340.781 443.655 371.392 474.265 371.392 512.017 C 371.392 549.769 340.781 580.363 303.029 580.363 C 265.277 580.363 234.667 549.769 234.667 512.017 C 234.667 474.265 265.277 443.655 303.029 443.655 Z M 721.005 248.343 C 758.74 248.343 789.333 278.953 789.333 316.688 C 789.333 354.44 758.74 385.051 721.005 385.051 C 683.253 385.051 652.66 354.44 652.66 316.688 C 652.66 278.953 683.253 248.343 721.005 248.343 Z M 512.017 248.343 C 549.77 248.343 580.38 278.953 580.38 316.688 C 580.38 354.44 549.77 385.051 512.017 385.051 C 474.265 385.051 443.672 354.44 443.672 316.688 C 443.672 278.953 474.265 248.343 512.017 248.343 Z M 303.029 248.343 C 340.781 248.343 371.392 278.953 371.392 316.688 C 371.392 354.44 340.781 385.051 303.029 385.051 C 265.277 385.051 234.667 354.44 234.667 316.688 C 234.667 278.953 265.277 248.343 303.029 248.343 Z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DragVerticalGeometry">M2,12 C3.1045694,12 4,12.895431 4,14 4,15.104569 3.1045694,16 2,16 0.89543051,16 0,15.104569 0,14 0,12.895431 0.89543051,12 2,12 z M2,6 C3.1045694,6 4,6.8954306 4,8 4,9.1045694 3.1045694,10 2,10 0.89543051,10 0,9.1045694 0,8 0,6.8954306 0.89543051,6 2,6 z M2,0 C3.1045694,0 4,0.89543056 4,2 4,3.1045694 3.1045694,4 2,4 0.89543051,4 0,3.1045694 0,2 0,0.89543056 0.89543051,0 2,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DragHorizontalGeometry">M14,0 C15.104569,0 16,0.89543051 16,2 16,3.1045694 15.104569,4 14,4 12.895431,4 12,3.1045694 12,2 12,0.89543051 12.895431,0 14,0 z M8,0 C9.1045694,0 10,0.89543051 10,2 10,3.1045694 9.1045694,4 8,4 6.8954306,4 6,3.1045694 6,2 6,0.89543051 6.8954306,0 8,0 z M2,0 C3.1045694,0 4,0.89543051 4,2 4,3.1045694 3.1045694,4 2,4 0.89543056,4 0,3.1045694 0,2 0,0.89543051 0.89543056,0 2,0 z</Geometry>
+	<Geometry o:Freeze="True" x:Key="DropperGeometry">M798.165333 97.834667a42.624 42.624 0 0 0-60.330666 0l-140.629334 140.629333-55.381333-55.296-60.330667 60.330667 55.381334 55.296-353.706667 353.706666a42.709333 42.709333 0 0 0-11.221333 19.84l-42.666667 170.666667a42.538667 42.538667 0 0 0 51.712 51.712l170.666667-42.666667c7.509333-1.877333 14.378667-5.76 19.84-11.221333l353.792-353.792 55.210666 55.125333 60.330667-60.330666-55.210667-55.125334 140.544-140.544a42.624 42.624 0 0 0 0-60.330666l-128-128zM319.488 772.138667l-90.197333 22.570666 22.570666-90.197333 345.386667-345.386667 67.669333 67.584-345.429333 345.429334z</Geometry>
+	<Style x:Key="PathBaseStyle" TargetType="Path">
+		<Setter Property="Stretch" Value="Uniform" />
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="FlowDirection" Value="LeftToRight" />
+	</Style>
+	<system:Double x:Key="DefaultControlHeight">30</system:Double>
+	<Thickness x:Key="DefaultControlPadding">10,6</Thickness>
+	<Thickness x:Key="DefaultInputPadding">8,6</Thickness>
+	<CornerRadius x:Key="DefaultCornerRadius">4</CornerRadius>
+	<system:Double x:Key="{x:Static SystemParameters.VerticalScrollBarButtonHeightKey}">30</system:Double>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorXY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+		<interactivity:FluidMoveBehavior.EaseX>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseX>
+		<interactivity:FluidMoveBehavior.EaseY>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseY>
+	</interactivity:FluidMoveBehavior>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorX200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+		<interactivity:FluidMoveBehavior.EaseX>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseX>
+	</interactivity:FluidMoveBehavior>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorY200" x:Shared="False" AppliesTo="Children" Duration="0:0:.2">
+		<interactivity:FluidMoveBehavior.EaseY>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseY>
+	</interactivity:FluidMoveBehavior>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorXY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+		<interactivity:FluidMoveBehavior.EaseX>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseX>
+		<interactivity:FluidMoveBehavior.EaseY>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseY>
+	</interactivity:FluidMoveBehavior>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorX400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+		<interactivity:FluidMoveBehavior.EaseX>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseX>
+	</interactivity:FluidMoveBehavior>
+	<interactivity:FluidMoveBehavior x:Key="BehaviorY400" x:Shared="False" AppliesTo="Children" Duration="0:0:.4">
+		<interactivity:FluidMoveBehavior.EaseY>
+			<PowerEase />
+		</interactivity:FluidMoveBehavior.EaseY>
+	</interactivity:FluidMoveBehavior>
+	<Style TargetType="hc:BlendEffectBox">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:BlendEffectBox">
+					<ContentPresenter ContentSource="ActualContent" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="BorderCircular" TargetType="Border">
+		<Setter Property="hc:BorderElement.Circular" Value="True" />
+	</Style>
+	<Style TargetType="hc:Col">
+		<Setter Property="Focusable" Value="False" />
+	</Style>
+	<Style TargetType="ContentControl">
+		<Setter Property="Focusable" Value="False" />
+	</Style>
+	<Style TargetType="hc:FlipClock">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:FlipClock">
+					<StackPanel Orientation="Horizontal">
+						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[0],RelativeSource={RelativeSource TemplatedParent}}" />
+						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[1],RelativeSource={RelativeSource TemplatedParent}}" />
+						<hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[2],RelativeSource={RelativeSource TemplatedParent}}" />
+						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[3],RelativeSource={RelativeSource TemplatedParent}}" />
+						<hc:FlipNumber Margin="0,-20,-20,-20" Number="{Binding NumberList[4],RelativeSource={RelativeSource TemplatedParent}}" />
+						<hc:FlipNumber Margin="-20" Number="{Binding NumberList[5],RelativeSource={RelativeSource TemplatedParent}}" />
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:FloatingBlock">
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:FloatingBlock">
+					<ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="GridSplitter">
+		<Setter Property="Focusable" Value="False" />
+	</Style>
+	<Style TargetType="hc:Notification">
+		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+		<Setter Property="SizeToContent" Value="WidthAndHeight" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="ShowActivated" Value="False" />
+		<Setter Property="ShowInTaskbar" Value="False" />
+		<Setter Property="Topmost" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Notification">
+					<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RectangleCircular" TargetType="Rectangle">
+		<Setter Property="hc:RectangleAttach.Circular" Value="True" />
+	</Style>
+	<Style x:Key="SnapRect4ScreenshotStyle" TargetType="Rectangle">
+		<Setter Property="Height" Value="5" />
+		<Setter Property="Width" Value="5" />
+		<Setter Property="Fill" Value="DodgerBlue" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Visibility" Value="Collapsed" />
+		<Style.Triggers>
+			<Trigger Property="hc:TipElement.Placement" Value="LeftTop">
+				<Setter Property="Margin" Value="-3, -3, 0, 0" />
+				<Setter Property="HorizontalAlignment" Value="Left" />
+				<Setter Property="VerticalAlignment" Value="Top" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="Top">
+				<Setter Property="Margin" Value="0, -3, 0, 0" />
+				<Setter Property="HorizontalAlignment" Value="Center" />
+				<Setter Property="VerticalAlignment" Value="Top" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="RightTop">
+				<Setter Property="Margin" Value="0, -3, -3, 0" />
+				<Setter Property="HorizontalAlignment" Value="Right" />
+				<Setter Property="VerticalAlignment" Value="Top" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="Right">
+				<Setter Property="Margin" Value="0, 0, -3, 0" />
+				<Setter Property="HorizontalAlignment" Value="Right" />
+				<Setter Property="VerticalAlignment" Value="Center" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="RightBottom">
+				<Setter Property="Margin" Value="0, 0, -3, -3" />
+				<Setter Property="HorizontalAlignment" Value="Right" />
+				<Setter Property="VerticalAlignment" Value="Bottom" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="Bottom">
+				<Setter Property="Margin" Value="0, 0, 0, -3" />
+				<Setter Property="HorizontalAlignment" Value="Center" />
+				<Setter Property="VerticalAlignment" Value="Bottom" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="LeftBottom">
+				<Setter Property="Margin" Value="-3, 0, 0, -3" />
+				<Setter Property="HorizontalAlignment" Value="Left" />
+				<Setter Property="VerticalAlignment" Value="Bottom" />
+			</Trigger>
+			<Trigger Property="hc:TipElement.Placement" Value="Left">
+				<Setter Property="Margin" Value="-3, 0, 0, 0" />
+				<Setter Property="HorizontalAlignment" Value="Left" />
+				<Setter Property="VerticalAlignment" Value="Center" />
+			</Trigger>
+			<DataTrigger Binding="{Binding IsSelecting}" Value="True">
+				<Setter Property="Visibility" Value="Visible" />
+			</DataTrigger>
+			<DataTrigger Binding="{Binding IsDrawing}" Value="True">
+				<Setter Property="Visibility" Value="Visible" />
+			</DataTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TargetArea4ScreenshotStyle" TargetType="Border">
+		<Setter Property="IsHitTestVisible" Value="False" />
+		<Setter Property="BorderThickness" Value="5" />
+		<Setter Property="BorderBrush" Value="DodgerBlue" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Style.Triggers>
+			<DataTrigger Binding="{Binding IsSelecting}" Value="True">
+				<Setter Property="BorderThickness" Value="1" />
+			</DataTrigger>
+			<DataTrigger Binding="{Binding IsDrawing}" Value="True">
+				<Setter Property="IsHitTestVisible" Value="True" />
+				<Setter Property="BorderThickness" Value="1" />
+			</DataTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style TargetType="hc:SimpleItemsControl">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SimpleItemsControl">
+					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<StackPanel x:Name="PART_Panel" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:Sprite">
+		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+		<Setter Property="SizeToContent" Value="WidthAndHeight" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="ShowActivated" Value="False" />
+		<Setter Property="ShowInTaskbar" Value="False" />
+		<Setter Property="Topmost" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Sprite">
+					<ContentPresenter Margin="{TemplateBinding Padding}" hc:WindowAttach.IsDragElement="True" HorizontalAlignment="Center" VerticalAlignment="Center" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Storyboard x:Key="Right2LeftTransition" x:Shared="False">
+		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Left2RightTransition" x:Shared="False">
+		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Bottom2TopTransition" x:Shared="False">
+		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Top2BottomTransition" x:Shared="False">
+		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Right2LeftWithFadeTransition" x:Shared="False">
+		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Left2RightWithFadeTransition" x:Shared="False">
+		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Bottom2TopWithFadeTransition" x:Shared="False">
+		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+		<DoubleAnimation From="50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="Top2BottomWithFadeTransition" x:Shared="False">
+		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+		<DoubleAnimation From="-50" To="0" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+			<DoubleAnimation.EasingFunction>
+				<CubicEase EasingMode="EaseOut" />
+			</DoubleAnimation.EasingFunction>
+		</DoubleAnimation>
+	</Storyboard>
+	<Storyboard x:Key="FadeTransition" x:Shared="False">
+		<DoubleAnimation From="0" To="1" Duration="0:0:0.4" Storyboard.TargetProperty="(UIElement.Opacity)" />
+	</Storyboard>
+	<Style TargetType="hc:TransitioningContentControl">
+		<Setter Property="Focusable" Value="False" />
+	</Style>
+	<Style x:Key="SliderRepeatButtonHorizontalStyle" 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">
+					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+						<Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Height="2" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SliderRepeatButtonVerticalStyle" 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">
+					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+						<Rectangle StrokeThickness="0" Fill="{TemplateBinding Background}" Width="2" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CompareSliderRepeatButtonTransparent" 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">
+					<ContentPresenter Content="{TemplateBinding Content}" Height="{TemplateBinding ActualHeight}" Width="{TemplateBinding ActualWidth}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PreviewSliderRepeatButtonHorizontalStyle" 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">
+					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+						<Rectangle Fill="{TemplateBinding Background}" Height="2" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PreviewSliderRepeatButtonVerticalStyle" 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">
+					<Border Background="Transparent" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}">
+						<Rectangle Fill="{TemplateBinding Background}" Width="2" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ScrollBarBaseRepeatButton" 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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ToggleBlock">
+					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<hc:SimplePanel Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+							<ContentPresenter Name="ContentPresenterChecked" ContentSource="CheckedContent" Visibility="Collapsed" />
+							<ContentPresenter Name="ContentPresenterUnChecked" ContentSource="UnCheckedContent" />
+							<ContentPresenter Name="ContentPresenterIndeterminate" ContentSource="IndeterminateContent" Visibility="Collapsed" />
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Visible" />
+							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="False">
+							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Visible" />
+							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="{x:Null}">
+							<Setter TargetName="ContentPresenterChecked" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="ContentPresenterUnChecked" Property="Visibility" Value="Collapsed" />
+							<Setter TargetName="ContentPresenterIndeterminate" Property="Visibility" Value="Visible" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="GroupBoxBaseTopTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" MinHeight="30" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+			<Border MinHeight="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,0,6">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<ControlTemplate x:Key="GroupBoxBaseLeftTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<Border MinWidth="30" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="False" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,0,6,0">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" RenderTransformOrigin="0.5,0.5">
+					<ContentPresenter.LayoutTransform>
+						<TransformGroup>
+							<RotateTransform Angle="-90" />
+						</TransformGroup>
+					</ContentPresenter.LayoutTransform>
+				</ContentPresenter>
+			</Border>
+			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<ControlTemplate x:Key="GroupBoxTabTopTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" MinHeight="30" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,0,1,1'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+			<Border Grid.Row="0" MinHeight="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,1,0'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,1,0,0'}">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<ControlTemplate x:Key="GroupBoxTabLeftTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+			<Border Grid.Column="0" MinWidth="30" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,1,0,1'}" BorderBrush="{TemplateBinding BorderBrush}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,10" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+					<ContentPresenter.LayoutTransform>
+						<TransformGroup>
+							<RotateTransform Angle="-90" />
+						</TransformGroup>
+					</ContentPresenter.LayoutTransform>
+				</ContentPresenter>
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalUniformItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalUniformItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupHorizontalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="ButtonGroupVerticalStackItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
+	<tools:ButtonGroupItemStyleSelector x:Key="ButtonGroupItemStyleSelector" />
+	<LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
+		<GradientStop Color="#00FFFFFF" Offset="0" />
+		<GradientStop Color="#60FFFFFF" Offset="0.4" />
+		<GradientStop Color="#60FFFFFF" Offset="0.6" />
+		<GradientStop Color="#00FFFFFF" Offset="1" />
+	</LinearGradientBrush>
+	<ControlTemplate x:Key="CircleProgressBarTemplate" TargetType="hc:CircleProgressBar">
+		<hc:SimplePanel x:Name="TemplateRoot">
+			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
+			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="PART_Indicator" Fill="{TemplateBinding Foreground}" />
+			<TextBlock Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<ItemsPanelTemplate x:Key="UniformHorizontalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Rows="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="UniformVerticalItemsPanelTemplate">
+		<UniformGrid FocusVisualStyle="{x:Null}" Columns="1" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackHorizontalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" Orientation="Horizontal" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="StackVerticalItemsPanelTemplate">
+		<StackPanel FocusVisualStyle="{x:Null}" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapHorizontalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="WrapVerticalItemsPanelTemplate">
+		<WrapPanel FocusVisualStyle="{x:Null}" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" />
+	</ItemsPanelTemplate>
+	<ItemsPanelTemplate x:Key="DockItemsPanelTemplate">
+		<DockPanel FocusVisualStyle="{x:Null}" LastChildFill="True" />
+	</ItemsPanelTemplate>
+	<LinearGradientBrush x:Key="ResizeGripperForeground" EndPoint="1,0.75" StartPoint="0,0.25">
+		<GradientStop Color="#FFFFFF" Offset="0.3" />
+		<GradientStop Color="#BBC5D7" Offset="0.75" />
+		<GradientStop Color="#6D83A9" Offset="1" />
+	</LinearGradientBrush>
+	<SineEase x:Key="SineEaseOut" EasingMode="EaseOut" />
+	<ControlTemplate x:Key="BadgeDotTemplate" TargetType="hc:Badge">
+		<hc:SimplePanel>
+			<ContentPresenter />
+			<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<Style x:Key="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 Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ColorPickerSliderThumbTemplate" TargetType="Thumb">
+		<Border Width="13" Height="13" Background="White" CornerRadius="6.5" />
+	</ControlTemplate>
+	<LinearGradientBrush x:Key="ColorPickerRainbowBrush">
+		<GradientStop Color="#ff0000" />
+		<GradientStop Color="#ff00ff" Offset="0.167" />
+		<GradientStop Color="#0000ff" Offset="0.334" />
+		<GradientStop Color="#00ffff" Offset="0.501" />
+		<GradientStop Color="#00ff00" Offset="0.668" />
+		<GradientStop Color="#ffff00" Offset="0.835" />
+		<GradientStop Color="#ff0000" Offset="1" />
+	</LinearGradientBrush>
+	<DrawingBrush x:Key="ColorPickerOpacityBrush" Viewport="0,0,12,11" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+		<DrawingBrush.Drawing>
+			<DrawingGroup>
+				<GeometryDrawing Brush="#d0cec7">
+					<GeometryDrawing.Geometry>
+						<GeometryGroup>
+							<RectangleGeometry Rect="0,0,6,5" />
+							<RectangleGeometry Rect="6,6,6,5" />
+						</GeometryGroup>
+					</GeometryDrawing.Geometry>
+				</GeometryDrawing>
+				<GeometryDrawing Brush="#e7e7e2">
+					<GeometryDrawing.Geometry>
+						<RectangleGeometry Rect="0,5,12,1" />
+					</GeometryDrawing.Geometry>
+				</GeometryDrawing>
+			</DrawingGroup>
+		</DrawingBrush.Drawing>
+	</DrawingBrush>
+	<Style x:Key="CoverFlowBaseStyle" TargetType="hc:CoverFlow">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CoverFlow">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Viewport3D x:Name="PART_Viewport3D">
+							<Viewport3D.Camera>
+								<PerspectiveCamera x:Name="PART_Camera" Position="0,0,3" UpDirection="0,1,0" LookDirection="0,0,-1" FieldOfView="90" />
+							</Viewport3D.Camera>
+							<Viewport3D.Children>
+								<ModelVisual3D>
+									<ModelVisual3D.Content>
+										<DirectionalLight Color="White" Direction="1,0,-4" />
+									</ModelVisual3D.Content>
+								</ModelVisual3D>
+								<ModelVisual3D>
+									<ModelVisual3D.Content>
+										<DirectionalLight Color="White" Direction="-1,0,-4" />
+									</ModelVisual3D.Content>
+								</ModelVisual3D>
+								<ModelVisual3D x:Name="PART_VisualParent" />
+							</Viewport3D.Children>
+						</Viewport3D>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CoverViewItemBaseStyle" TargetType="hc:CoverViewItem">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CoverViewItem">
+					<Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" Margin="{TemplateBinding Padding}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="GridViewColumnHeaderGripper" TargetType="Thumb">
+		<Setter Property="Canvas.Right" Value="-9" />
+		<Setter Property="Width" Value="18" />
+		<Setter Property="Height" Value="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<Border Background="Transparent" Padding="{TemplateBinding Padding}">
+						<Rectangle Fill="{TemplateBinding Background}" HorizontalAlignment="Center" Width="1" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">
+		<DrawingBrush.Drawing>
+			<DrawingGroup o:Freeze="True">
+				<GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0.9999,-0.000199999999999534L0.9999,15.9998 10.9999,15.9998 10.9999,13.4148 11.9999,14.4138 15.9999,10.4138 15.9999,5.5858 14.0009,7.5858 14.0009,3.0008 10.9999,3.0008 10.9999,-0.000199999999999534z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M10,12.4141L10,15.0001 2,15.0001 2,1.0001 10,1.0001 10,3.0001 10,7.5861 8.414,6.0001 9,6.0001 9,3.0001 3,3.0001 3,6.0001 8,6.0001 8,7.0001 3,7.0001 3,10.0001 8,10.0001 8,10.4141 8.586,11.0001 3,11.0001 3,14.0001 9,14.0001 9,11.4141z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M8.5859,11L2.9999,11 2.9999,14 8.9999,14 8.9999,11.414z M7.9999,7L2.9999,7 2.9999,10 7.9999,10z M7.9999,6L2.9999,6 2.9999,3 8.9999,3 8.9999,6 8.4139,6 7.9999,5.586z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M13,10L13,4 11,4 11,10 9,8 9,10 12,13 15,10 15,8z" />
+			</DrawingGroup>
+		</DrawingBrush.Drawing>
+	</DrawingBrush>
+	<DrawingBrush x:Key="SortByNameDrawingBrush" o:Freeze="True">
+		<DrawingBrush.Drawing>
+			<DrawingGroup o:Freeze="True">
+				<GeometryDrawing o:Freeze="True" Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FFF6F6F6" Geometry="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
+				<GeometryDrawing o:Freeze="True" Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
+			</DrawingGroup>
+		</DrawingBrush.Drawing>
+	</DrawingBrush>
+	<ContextMenu x:Key="TabItemMenu" x:Shared="False">
+		<MenuItem Command="interactivity:ControlCommands.Close" Header="{x:Static langs:Lang.Close}" />
+		<MenuItem Command="interactivity:ControlCommands.CloseAll" Header="{x:Static langs:Lang.CloseAll}" />
+		<MenuItem Command="interactivity:ControlCommands.CloseOther" Header="{x:Static langs:Lang.CloseOther}" />
+	</ContextMenu>
+	<Style x:Key="ToolBarTrayBaseStyle" TargetType="ToolBarTray">
+		<Setter Property="Background" Value="Transparent" />
+	</Style>
+	<PathGeometry x:Key="TreeArrow" Figures="M508.893248 762.931659a65.039498 65.039498 0 0 1-46.420659-19.485839L97.125746 371.004022c-25.143018-25.634319-24.752868-66.816849 0.881451-91.959868 25.648769-25.164693 66.809624-24.745643 91.959867 0.881451l318.933409 325.125238 318.933408-325.125238a65.025048 65.025048 0 0 1 92.841318 91.078417L555.313907 743.44582a65.025048 65.025048 0 0 1-46.420659 19.485839z" />
+	<Style x:Key="RowHeaderGripperStyle" TargetType="Thumb">
+		<Setter Property="Height" Value="8" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Cursor" Value="SizeNS" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ColumnHeaderGripperStyle" TargetType="Thumb">
+		<Setter Property="Width" Value="8" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Cursor" Value="SizeWE" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TextBlockComboBoxStyle" TargetType="ComboBox">
+		<Setter Property="Focusable" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ComboBox">
+					<TextBlock IsHitTestVisible="False" Text="{TemplateBinding Text}" TextTrimming="CharacterEllipsis" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="DataGridTextColumnStyle" TargetType="TextBlock">
+		<Setter Property="TextTrimming" Value="CharacterEllipsis" />
+	</Style>
+	<Style x:Key="CarouselItemBaseStyle" TargetType="hc:CarouselItem">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CarouselItem">
+					<Border BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:Carousel}}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:GrowlWindow">
+		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+		<Setter Property="Width" Value="340" />
+		<Setter Property="MaxWidth" Value="340" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="ShowActivated" Value="False" />
+		<Setter Property="ShowInTaskbar" Value="False" />
+		<Setter Property="Topmost" Value="True" />
+	</Style>
+	<Style x:Key="ListBoxItemCustom" TargetType="ListBoxItem">
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListBoxItem">
+					<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<tools:ComboBoxItemCapsuleStyleSelector x:Key="ComboBoxItemCapsuleStyleSelector" />
+	<hc:HorizontalAlignmentPathTemplateSelector x:Key="HorizontalAlignmentPathTemplateSelector" />
+	<hc:VerticalAlignmentPathTemplateSelector x:Key="VerticalAlignmentPathTemplateSelector" />
+	<SolidColorBrush o:Freeze="True" x:Key="LightPrimaryBrush" Color="{DynamicResource LightPrimaryColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="PrimaryBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource PrimaryColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource DarkPrimaryColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DarkPrimaryBrush" Color="{DynamicResource DarkPrimaryColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="PrimaryTextBrush" Color="{DynamicResource PrimaryTextColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="SecondaryTextBrush" Color="{DynamicResource SecondaryTextColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="ThirdlyTextBrush" Color="{DynamicResource ThirdlyTextColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="ReverseTextBrush" Color="{DynamicResource ReverseTextColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="TextIconBrush" Color="{DynamicResource TextIconColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="BorderBrush" Color="{DynamicResource BorderColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="SecondaryBorderBrush" Color="{DynamicResource SecondaryBorderColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="BackgroundBrush" Color="{DynamicResource BackgroundColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="RegionBrush" Color="{DynamicResource RegionColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="SecondaryRegionBrush" Color="{DynamicResource SecondaryRegionColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="ThirdlyRegionBrush" Color="{DynamicResource ThirdlyRegionColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="TitleBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource TitleColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource SecondaryTitleColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DefaultBrush" Color="{DynamicResource DefaultColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="DarkDefaultBrush" Color="{DynamicResource DarkDefaultColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="LightDangerBrush" Color="{DynamicResource LightDangerColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="DangerBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource DangerColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource DarkDangerColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DarkDangerBrush" Color="{DynamicResource DarkDangerColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="LightWarningBrush" Color="{DynamicResource LightWarningColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="WarningBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource WarningColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource DarkWarningColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DarkWarningBrush" Color="{DynamicResource DarkWarningColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="LightInfoBrush" Color="{DynamicResource LightInfoColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="InfoBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource InfoColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource DarkInfoColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DarkInfoBrush" Color="{DynamicResource DarkInfoColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="LightSuccessBrush" Color="{DynamicResource LightSuccessColor}" />
+	<LinearGradientBrush o:Freeze="True" x:Key="SuccessBrush" EndPoint="1,0" StartPoint="0,0">
+		<GradientStop o:Freeze="True" Color="{DynamicResource SuccessColor}" Offset="0" />
+		<GradientStop o:Freeze="True" Color="{DynamicResource DarkSuccessColor}" Offset="1" />
+	</LinearGradientBrush>
+	<SolidColorBrush o:Freeze="True" x:Key="DarkSuccessBrush" Color="{DynamicResource DarkSuccessColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="AccentBrush" Color="{DynamicResource AccentColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="DarkAccentBrush" Color="{DynamicResource DarkAccentColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="DarkMaskBrush" Color="{DynamicResource DarkMaskColor}" />
+	<SolidColorBrush o:Freeze="True" x:Key="DarkOpacityBrush" Color="{DynamicResource DarkOpacityColor}" />
+	<DropShadowEffect x:Key="EffectShadow1" BlurRadius="5" ShadowDepth="1" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+	<DropShadowEffect x:Key="EffectShadow2" BlurRadius="8" ShadowDepth="1.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+	<DropShadowEffect x:Key="EffectShadow3" BlurRadius="14" ShadowDepth="4.5" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+	<DropShadowEffect x:Key="EffectShadow4" BlurRadius="25" ShadowDepth="8" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+	<DropShadowEffect x:Key="EffectShadow5" BlurRadius="35" ShadowDepth="13" Direction="270" Color="{StaticResource EffectShadowColor}" Opacity=".2" RenderingBias="Performance" o:Freeze="True" />
+	<Style x:Key="SearchPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource SearchGeometry}" />
+	</Style>
+	<Style x:Key="FullScreenReturnPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource FullScreenReturnGeometry}" />
+	</Style>
+	<Style x:Key="FullScreenPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource FullScreenGeometry}" />
+	</Style>
+	<Style x:Key="WindowsPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource WindowsGeometry}" />
+	</Style>
+	<Style x:Key="SavePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource SaveGeometry}" />
+	</Style>
+	<Style x:Key="DownloadPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource DownloadGeometry}" />
+	</Style>
+	<Style x:Key="EnlargePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource EnlargeGeometry}" />
+	</Style>
+	<Style x:Key="ReducePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource ReduceGeometry}" />
+	</Style>
+	<Style x:Key="RotatePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource RotateLeftGeometry}" />
+	</Style>
+	<Style x:Key="CalendarPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource CalendarGeometry}" />
+	</Style>
+	<Style x:Key="DeletePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource DeleteGeometry}" />
+	</Style>
+	<Style x:Key="ClosePathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource CloseGeometry}" />
+	</Style>
+	<Style x:Key="DownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource DownGeometry}" />
+	</Style>
+	<Style x:Key="ClockPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource ClockGeometry}" />
+	</Style>
+	<Style x:Key="LeftPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource LeftGeometry}" />
+	</Style>
+	<Style x:Key="RightPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="RenderTransformOrigin" Value="0.5, 0.5" />
+		<Setter Property="RenderTransform">
+			<Setter.Value>
+				<TransformGroup>
+					<ScaleTransform ScaleY="1" ScaleX="-1" />
+					<SkewTransform AngleY="0" AngleX="0" />
+					<RotateTransform Angle="0" />
+					<TranslateTransform />
+				</TransformGroup>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Data" Value="{StaticResource LeftGeometry}" />
+	</Style>
+	<Style x:Key="UpDownPathStyle" BasedOn="{StaticResource PathBaseStyle}" TargetType="Path">
+		<Setter Property="Data" Value="{StaticResource UpDownGeometry}" />
+	</Style>
+	<Style x:Key="BorderRegion" TargetType="Border">
+		<Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+	</Style>
+	<Style x:Key="BorderTipBaseStyle" TargetType="Border">
+		<Setter Property="CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="BorderThickness" Value="5,0,0,0" />
+	</Style>
+	<Style x:Key="BorderTipPrimary" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+		<Setter Property="Background" Value="{DynamicResource LightPrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="BorderTipDanger" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+		<Setter Property="Background" Value="{DynamicResource LightDangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="BorderTipWarning" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+		<Setter Property="Background" Value="{DynamicResource LightWarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="BorderTipInfo" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+		<Setter Property="Background" Value="{DynamicResource LightInfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="BorderTipSuccess" BasedOn="{StaticResource BorderTipBaseStyle}" TargetType="Border">
+		<Setter Property="Background" Value="{DynamicResource LightSuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="BorderVerticallySplitter" TargetType="Border">
+		<Setter Property="Width" Value="1" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
+	</Style>
+	<Style x:Key="BorderHorizontallySplitter" TargetType="Border">
+		<Setter Property="Height" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Background" Value="{DynamicResource ThirdlyTextBrush}" />
+	</Style>
+	<Style x:Key="BorderClip" TargetType="Border">
+		<Setter Property="Clip">
+			<Setter.Value>
+				<MultiBinding Converter="{StaticResource BorderClipConverter}">
+					<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+					<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+					<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
+				</MultiBinding>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="BorderCircularClip" BasedOn="{StaticResource BorderCircular}" TargetType="Border">
+		<Setter Property="Clip">
+			<Setter.Value>
+				<MultiBinding Converter="{StaticResource BorderCircularClipConverter}">
+					<Binding Path="ActualWidth" RelativeSource="{RelativeSource Self}" />
+					<Binding Path="ActualHeight" RelativeSource="{RelativeSource Self}" />
+					<Binding Path="CornerRadius" RelativeSource="{RelativeSource Self}" />
+				</MultiBinding>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:FlipNumber">
+		<Setter Property="FontSize" Value="70" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="Width" Value="120" />
+		<Setter Property="Height" Value="180" />
+		<Setter Property="Camera">
+			<Setter.Value>
+				<PerspectiveCamera Position="0 0 120" LookDirection="0 0 -1" />
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RectangleFocusVisual" TargetType="Rectangle">
+		<Setter Property="Margin" Value="-2" />
+		<Setter Property="Opacity" Value=".6" />
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Stroke" Value="{DynamicResource SecondaryBorderBrush}" />
+		<Setter Property="StrokeThickness" Value="2" />
+		<Setter Property="StrokeDashArray" Value="1 1" />
+	</Style>
+	<Style x:Key="RectangleFocusVisualCircular" BasedOn="{StaticResource RectangleFocusVisual}" TargetType="Rectangle">
+		<Setter Property="hc:RectangleAttach.Circular" Value="True" />
+	</Style>
+	<Style x:Key="TextBoxBaseBaseStyle" TargetType="TextBoxBase">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="Padding" Value="2,7" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TextBoxBase">
+					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+						<ScrollViewer x:Name="PART_ContentHost" Padding="{TemplateBinding Padding}" Focusable="false" HorizontalScrollBarVisibility="{Binding Path=(ScrollViewer.HorizontalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" VerticalScrollBarVisibility="{Binding Path=(ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="border" Value="0.4" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<Trigger Property="IsFocused" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RichTextBoxBaseStyle" BasedOn="{StaticResource TextBoxBaseBaseStyle}" TargetType="RichTextBox">
+		<Setter Property="MinWidth" Value="10" />
+	</Style>
+	<Style BasedOn="{StaticResource RichTextBoxBaseStyle}" TargetType="RichTextBox" />
+	<Style x:Key="MaskRect4ScreenshotStyle" TargetType="Rectangle">
+		<Setter Property="IsHitTestVisible" Value="False" />
+		<Setter Property="Fill" Value="{DynamicResource DarkOpacityBrush}" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+	</Style>
+	<Style x:Key="Window4ScreenshotStyle" TargetType="hc:ScreenshotWindow">
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="WindowStyle" Value="None" />
+		<Setter Property="WindowState" Value="Maximized" />
+		<Setter Property="Topmost" Value="True" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="hc:WindowAttach.IgnoreAltF4" Value="True" />
+		<Setter Property="hc:WindowAttach.ShowInTaskManager" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ScreenshotWindow">
+					<AdornerDecorator>
+						<hc:SimplePanel>
+							<InkCanvas EditingMode="None" Name="PART_Canvas" Background="Transparent" />
+							<Rectangle Name="PART_MaskAreaLeft" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+							<Rectangle Name="PART_MaskAreaTop" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+							<Rectangle Name="PART_MaskAreaRight" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+							<Rectangle Name="PART_MaskAreaBottom" Style="{StaticResource MaskRect4ScreenshotStyle}" />
+							<Border Name="PART_TargetArea" Style="{StaticResource TargetArea4ScreenshotStyle}">
+								<hc:SimplePanel>
+									<Rectangle hc:TipElement.Placement="LeftTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="Top" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="RightTop" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="Right" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="RightBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="Bottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="LeftBottom" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<Rectangle hc:TipElement.Placement="Left" Style="{StaticResource SnapRect4ScreenshotStyle}" />
+									<TextBlock Text="{TemplateBinding SizeStr}" Background="#CC212121" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Top" Padding="8,2" />
+								</hc:SimplePanel>
+							</Border>
+							<Border x:Name="PART_Magnifier" IsHitTestVisible="False" Visibility="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Top" Width="122" Height="122" BorderThickness="1" BorderBrush="#FF333333" CornerRadius="1">
+								<Border.Effect>
+									<DropShadowEffect BlurRadius="2" Opacity=".2" Direction="-45" RenderingBias="Performance" ShadowDepth="3" />
+								</Border.Effect>
+								<hc:SimplePanel>
+									<Border Margin="0,0,0,32" Background="{TemplateBinding PreviewBrush}" BorderThickness="2" BorderBrush="White">
+										<hc:SimplePanel>
+											<Path Data="M56,0 L60,0 60,40 116,40 116,44 60,44 60,84 56,84 56,44 0,44 0,40 56,40 z" Fill="#CC4CC6FF" />
+										</hc:SimplePanel>
+									</Border>
+									<Border Height="32" VerticalAlignment="Bottom" Background="#CC000000">
+										<StackPanel VerticalAlignment="Center" Margin="5,0,0,0">
+											<TextBlock Foreground="White" Text="{TemplateBinding SizeStr}" />
+										</StackPanel>
+									</Border>
+								</hc:SimplePanel>
+							</Border>
+						</hc:SimplePanel>
+					</AdornerDecorator>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FocusVisual">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle Style="{StaticResource RectangleFocusVisual}" RadiusX="4" RadiusY="4" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FocusVisualRadius0">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle Style="{StaticResource RectangleFocusVisual}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FocusVisualMargin0">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FocusVisualRadius0Margin0">
+		<Setter Property="Control.Template">
+			<Setter.Value>
+				<ControlTemplate>
+					<Rectangle Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="BaseStyle" TargetType="Control">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
+	</Style>
+	<Style x:Key="ButtonBaseBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ButtonBase">
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+	</Style>
+	<Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</StackPanel>
+						</Border>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</hc:DashedBorder>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+				<Setter Property="Margin" Value="0,-1,0,0" />
+			</DataTrigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TextBlockBaseStyle" TargetType="TextBlock">
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+	</Style>
+	<Style x:Key="TextBlockBoldBaseStyle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontWeight" Value="Bold" />
+	</Style>
+	<Style x:Key="HighlightTextBlockBaseStyle" TargetType="hc:HighlightTextBlock">
+		<Setter Property="HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="HighlightTextBrush" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style x:Key="LabelBaseStyle" TargetType="Label">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Label">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="SliderThumb" TargetType="Thumb">
+		<hc:AxleCanvas>
+			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CompareSliderThumbHorizontal" TargetType="Thumb">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="Storyboard1">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
+					<EasingDoubleKeyFrame KeyTime="0" Value="-2" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
+					<EasingDoubleKeyFrame KeyTime="0" Value="2" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="Storyboard2">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathLeft">
+					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PathRight">
+					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<hc:SimplePanel>
+			<Border Width="1" HorizontalAlignment="Center">
+				<Border.Background>
+					<DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,1,8" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+						<DrawingBrush.Drawing>
+							<DrawingGroup>
+								<GeometryDrawing Brush="{DynamicResource BorderBrush}">
+									<GeometryDrawing.Geometry>
+										<GeometryGroup>
+											<RectangleGeometry Rect="0,0,1,4" />
+										</GeometryGroup>
+									</GeometryDrawing.Geometry>
+								</GeometryDrawing>
+							</DrawingGroup>
+						</DrawingBrush.Drawing>
+					</DrawingBrush>
+				</Border.Background>
+			</Border>
+			<Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+				<hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
+					<Path x:Name="PathLeft" Data="{StaticResource LeftGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Left" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+						<Path.RenderTransform>
+							<TransformGroup>
+								<TranslateTransform />
+							</TransformGroup>
+						</Path.RenderTransform>
+					</Path>
+					<Path x:Name="PathRight" Data="{StaticResource RightGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="6,8" HorizontalAlignment="Right" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+						<Path.RenderTransform>
+							<TransformGroup>
+								<TranslateTransform />
+							</TransformGroup>
+						</Path.RenderTransform>
+					</Path>
+				</hc:SimplePanel>
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Stroke" TargetName="PathLeft" Value="White" />
+				<Setter Property="Stroke" TargetName="PathRight" Value="White" />
+			</Trigger>
+			<Trigger Property="IsDragging" Value="true">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CompareSliderHorizontal" TargetType="hc:CompareSlider">
+		<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+			<hc:CompareTrack x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+						<ContentPresenter ContentSource="TargetContent" HorizontalAlignment="Left" Width="{TemplateBinding ActualWidth}" />
+					</RepeatButton>
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+						<ContentPresenter ContentSource="SourceContent" HorizontalAlignment="Right" Width="{TemplateBinding ActualWidth}" />
+					</RepeatButton>
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbHorizontal}" Width="30" Margin="-15,0" />
+				</Track.Thumb>
+			</hc:CompareTrack>
+		</Border>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CompareSliderThumbVertical" TargetType="Thumb">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="Storyboard1">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
+					<EasingDoubleKeyFrame KeyTime="0" Value="-2" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
+					<EasingDoubleKeyFrame KeyTime="0" Value="2" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="Storyboard2">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathUp">
+					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="PathDown">
+					<EasingDoubleKeyFrame KeyTime="0" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<hc:SimplePanel>
+			<Border Height="1" VerticalAlignment="Center">
+				<Border.Background>
+					<DrawingBrush RenderOptions.CachingHint="Cache" Viewport="0,0,8,1" ViewportUnits="Absolute" Stretch="None" TileMode="Tile">
+						<DrawingBrush.Drawing>
+							<DrawingGroup>
+								<GeometryDrawing Brush="{DynamicResource BorderBrush}">
+									<GeometryDrawing.Geometry>
+										<GeometryGroup>
+											<RectangleGeometry Rect="0,0,4,1" />
+										</GeometryGroup>
+									</GeometryDrawing.Geometry>
+								</GeometryDrawing>
+							</DrawingGroup>
+						</DrawingBrush.Drawing>
+					</DrawingBrush>
+				</Border.Background>
+			</Border>
+			<Border x:Name="grip" Width="30" Height="30" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="White">
+				<hc:SimplePanel Width="30" Height="30" Margin="-1,-1,0,0">
+					<Path x:Name="PathUp" Data="{StaticResource UpGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Top" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+						<Path.RenderTransform>
+							<TransformGroup>
+								<TranslateTransform />
+							</TransformGroup>
+						</Path.RenderTransform>
+					</Path>
+					<Path x:Name="PathDown" Data="{StaticResource DownGeometry}" StrokeThickness="1" Stroke="{DynamicResource PrimaryBrush}" Margin="9,6" VerticalAlignment="Bottom" Stretch="Uniform" Width="12" Height="12" RenderTransformOrigin="0.5,0.5">
+						<Path.RenderTransform>
+							<TransformGroup>
+								<TranslateTransform />
+							</TransformGroup>
+						</Path.RenderTransform>
+					</Path>
+				</hc:SimplePanel>
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="grip">
+				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Stroke" TargetName="PathUp" Value="White" />
+				<Setter Property="Stroke" TargetName="PathDown" Value="White" />
+			</Trigger>
+			<Trigger Property="IsDragging" Value="true">
+				<Setter Property="Background" TargetName="grip" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Stroke" TargetName="PathUp" Value="White" />
+				<Setter Property="Stroke" TargetName="PathDown" Value="White" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CompareSliderVertical" TargetType="hc:CompareSlider">
+		<Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+			<hc:CompareTrack x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+						<ContentPresenter ContentSource="TargetContent" VerticalAlignment="Bottom" Height="{TemplateBinding ActualHeight}" />
+					</RepeatButton>
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource CompareSliderRepeatButtonTransparent}">
+						<ContentPresenter ContentSource="SourceContent" VerticalAlignment="Top" Height="{TemplateBinding ActualHeight}" />
+					</RepeatButton>
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource CompareSliderThumbVertical}" Height="30" Margin="0,-15" />
+				</Track.Thumb>
+			</hc:CompareTrack>
+		</Border>
+	</ControlTemplate>
+	<Style x:Key="CompareSliderBaseStyle" TargetType="hc:CompareSlider">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="MinWidth" Value="30" />
+		<Setter Property="MinHeight" Value="30" />
+		<Setter Property="Template" Value="{StaticResource CompareSliderHorizontal}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource CompareSliderVertical}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="PreviewSliderThumb" TargetType="Thumb">
+		<Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="PreviewSliderHorizontal" TargetType="hc:PreviewSlider">
+		<hc:SimplePanel>
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Height="2" VerticalAlignment="center" Margin="9,0" />
+			<Track VerticalAlignment="center" Margin="9,0" x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonHorizontalStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb Margin="-9,0" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" VerticalAlignment="Center" Width="18" />
+				</Track.Thumb>
+			</Track>
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<ControlTemplate x:Key="PreviewSliderVertical" TargetType="hc:PreviewSlider">
+		<hc:SimplePanel>
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Width="2" HorizontalAlignment="center" Margin="0,9" />
+			<Track HorizontalAlignment="center" Margin="0,9" x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource PreviewSliderRepeatButtonVerticalStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb Margin="0,-9" x:Name="PART_Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource PreviewSliderThumb}" HorizontalAlignment="Center" Width="18" />
+				</Track.Thumb>
+			</Track>
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<Style x:Key="PreviewSliderBaseStyle" TargetType="hc:PreviewSlider">
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="IsMoveToPointEnabled" Value="True" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template" Value="{StaticResource PreviewSliderHorizontal}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource PreviewSliderVertical}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="RangeSliderThumb" TargetType="hc:RangeThumb">
+		<Border Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</StackPanel>
+						</Border>
+						<Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="true">
+							<Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="6,0,0,0" />
+		<Setter Property="Width" Value="36" />
+		<Setter Property="Height" Value="22" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardChecked">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="14">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardUnChecked">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="thumb">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="lightBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="innerBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="innerBorder">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Viewbox>
+						<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<Border Height="22" Width="36" x:Name="backBorder" Background="{DynamicResource BorderBrush}" CornerRadius="11" />
+							<Border Grid.Column="0" Height="22" Width="36" Opacity="0" x:Name="lightBorder" Background="{DynamicResource PrimaryBrush}" CornerRadius="11" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+							<Border Grid.Column="0" Height="20" Margin="1" Background="{TemplateBinding Background}" CornerRadius="11" Name="innerBorder" RenderTransformOrigin=".8,0.5">
+								<Border.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform />
+									</TransformGroup>
+								</Border.RenderTransform>
+							</Border>
+							<hc:SimplePanel Grid.Column="0" Margin="1">
+								<Border HorizontalAlignment="Left" CornerRadius="10" Name="thumb" Effect="{StaticResource EffectShadow2}" Background="White" Width="20" Height="20" RenderTransformOrigin="0.5,0.5">
+									<Border.RenderTransform>
+										<TransformGroup>
+											<TranslateTransform />
+										</TransformGroup>
+									</Border.RenderTransform>
+								</Border>
+							</hc:SimplePanel>
+							<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Grid>
+					</Viewbox>
+					<ControlTemplate.Triggers>
+						<Trigger Property="HasContent" Value="true">
+							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="8" />
+		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
+		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+							</ContentControl>
+						</Border>
+						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+			</Trigger>
+			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+				<Setter Property="Margin" Value="0,-1,0,0" />
+			</DataTrigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ScrollBarBaseThumbVertical" TargetType="Thumb">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardMouseEnter">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardMouseLeave">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Width" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Border Width="{TemplateBinding Width}" Background="Transparent">
+						<Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" HorizontalAlignment="Right" Height="{TemplateBinding Height}" SnapsToDevicePixels="True" Width="2" Fill="{TemplateBinding Background}">
+							<Rectangle.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform X="-2" />
+								</TransformGroup>
+							</Rectangle.RenderTransform>
+						</Rectangle>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
+						</Trigger>
+						<Trigger Property="IsDragging" Value="true">
+							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
+						</Trigger>
+						<EventTrigger RoutedEvent="MouseEnter">
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="MouseLeave">
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ScrollBarBaseThumbHorizontal" TargetType="Thumb">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardMouseEnter">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="8" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="4" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardMouseLeave">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Height" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="2" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusX)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Rectangle.RadiusY)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)" Storyboard.TargetName="rectangle">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="-2" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Border Height="{TemplateBinding Height}" Background="Transparent">
+						<Rectangle x:Name="rectangle" RadiusX="1" RadiusY="1" VerticalAlignment="Bottom" Height="2" SnapsToDevicePixels="True" Width="{TemplateBinding Width}" Fill="{TemplateBinding Background}">
+							<Rectangle.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform Y="-2" />
+								</TransformGroup>
+							</Rectangle.RenderTransform>
+						</Rectangle>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource SecondaryTextBrush}" />
+						</Trigger>
+						<Trigger Property="IsDragging" Value="true">
+							<Setter Property="Fill" TargetName="rectangle" Value="{DynamicResource PrimaryTextBrush}" />
+						</Trigger>
+						<EventTrigger RoutedEvent="MouseEnter">
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseEnter}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="MouseLeave">
+							<BeginStoryboard Storyboard="{StaticResource StoryboardMouseLeave}" />
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ScrollBarBaseStyle" TargetType="ScrollBar">
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Width" Value="8" />
+		<Setter Property="MinWidth" Value="8" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ScrollBar">
+					<hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
+						<Border Background="{TemplateBinding Background}" />
+						<Track x:Name="PART_Track" IsDirectionReversed="true" IsEnabled="{TemplateBinding IsMouseOver}">
+							<Track.DecreaseRepeatButton>
+								<RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+							</Track.DecreaseRepeatButton>
+							<Track.IncreaseRepeatButton>
+								<RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+							</Track.IncreaseRepeatButton>
+							<Track.Thumb>
+								<Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbVertical}" />
+							</Track.Thumb>
+						</Track>
+					</hc:SimplePanel>
+				</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="8" />
+				<Setter Property="MinHeight" Value="8" />
+				<Setter Property="BorderThickness" Value="0,1" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="ScrollBar">
+							<hc:SimplePanel x:Name="Bg" SnapsToDevicePixels="true">
+								<Border Background="{TemplateBinding Background}" />
+								<Track x:Name="PART_Track" IsEnabled="{TemplateBinding IsMouseOver}">
+									<Track.DecreaseRepeatButton>
+										<RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+									</Track.DecreaseRepeatButton>
+									<Track.IncreaseRepeatButton>
+										<RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource ScrollBarBaseRepeatButton}" />
+									</Track.IncreaseRepeatButton>
+									<Track.Thumb>
+										<Thumb Background="{TemplateBinding Foreground}" Style="{StaticResource ScrollBarBaseThumbHorizontal}" />
+									</Track.Thumb>
+								</Track>
+							</hc:SimplePanel>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="ScrollViewerNativeBaseControlTemplate" TargetType="ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity=".3" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ScrollViewerNativeAutoHideBaseControlTemplate" TargetType="ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
+		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
+				<Setter Property="Template" Value="{StaticResource ScrollViewerNativeBaseControlTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="ScrollViewerBaseControlTemplate" TargetType="hc:ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".3" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ScrollViewerAutoHideBaseControlTemplate" TargetType="hc:ScrollViewer">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardMouseOver">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.1" Value=".8" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+			<Storyboard x:Key="StoryboardCommon">
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+					<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+				</DoubleAnimationUsingKeyFrames>
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="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.RowSpan="2" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="0" />
+			<ScrollBar x:Name="PART_VerticalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Grid.Column="1" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" Grid.Row="0" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+			<ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardMouseOver}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardCommon}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
+		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:ScrollViewerAttach.AutoHide" Value="False">
+				<Setter Property="Template" Value="{StaticResource ScrollViewerBaseControlTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</StackPanel>
+						</Border>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RepeatButtonDashedBaseStyle" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<hc:DashedBorder BorderDashArray="3,2" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</hc:DashedBorder>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="GroupBoxBaseStyle" TargetType="GroupBox">
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="hc:TitleElement.TitlePlacement" Value="Top" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="4" />
+		<Setter Property="Template" Value="{StaticResource GroupBoxBaseTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource GroupBoxBaseLeftTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="GroupBoxOriginalTopTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+			<StackPanel Orientation="Horizontal" Margin="8,6">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="1,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				<ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+			</StackPanel>
+			<Border Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<ControlTemplate x:Key="GroupBoxOriginalLeftTemplate" TargetType="GroupBox">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<StackPanel Orientation="Horizontal" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0,8,6,8">
+				<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				<ContentPresenter TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+			</StackPanel>
+			<Border Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+				<ContentPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+			</Border>
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="GroupBoxOriginalBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="Template" Value="{StaticResource GroupBoxOriginalTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource GroupBoxOriginalLeftTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="GroupBoxTabBaseStyle" BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox">
+		<Setter Property="Template" Value="{StaticResource GroupBoxTabTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:TitleElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource GroupBoxTabLeftTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ButtonGroupBaseStyle" TargetType="hc:ButtonGroup">
+		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ButtonGroupItemStyleSelector}" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalUniformItemsPanelTemplate}" />
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalUniformItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupHorizontalStackItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource ButtonGroupVerticalStackItemsPanelTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ElementGroupBaseStyle" TargetType="hc:ElementGroup">
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Layout" Value="Uniform" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource PrimaryBrush}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Uniform" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Horizontal" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="Layout" Value="Stack" />
+					<Condition Property="Orientation" Value="Vertical" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
+		<Setter Property="hc:VisualElement.Text">
+			<Setter.Value>
+				<MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0:F0} %">
+					<Binding Path="Value" RelativeSource="{RelativeSource Self}" />
+					<Binding Path="Maximum" RelativeSource="{RelativeSource Self}" />
+				</MultiBinding>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Height" Value="20" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ProgressBar">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+								<EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
+								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
+								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
+							</DoubleAnimationUsingKeyFrames>
+							<PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+								<EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
+								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
+								<EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
+							</PointAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Border x:Name="TemplateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<hc:SimplePanel>
+							<Rectangle x:Name="PART_Track" />
+							<TextBlock Visibility="{Binding Visibility,ElementName=PART_GlowRect}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+							<Border Style="{StaticResource BorderClip}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="PART_Indicator" HorizontalAlignment="Left">
+								<hc:SimplePanel>
+									<Border x:Name="Indicator" Background="{TemplateBinding Foreground}">
+										<Border Width="{Binding ActualWidth,ElementName=TemplateRoot}">
+											<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(hc:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}" />
+										</Border>
+									</Border>
+									<Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100" />
+									<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+										<Rectangle.RenderTransform>
+											<TransformGroup>
+												<ScaleTransform />
+											</TransformGroup>
+										</Rectangle.RenderTransform>
+									</Rectangle>
+								</hc:SimplePanel>
+							</Border>
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Orientation" Value="Vertical">
+							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
+								<Setter.Value>
+									<RotateTransform Angle="-90" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+						<Trigger Property="IsIndeterminate" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+							</Trigger.EnterActions>
+							<Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
+							<Setter Property="Visibility" TargetName="PART_GlowRect" Value="Collapsed" />
+							<Setter Property="Visibility" TargetName="Animation" Value="Visible" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ProgressBar">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="OnLoaded">
+							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" Storyboard.TargetName="Indicator">
+								<LinearDoubleKeyFrame KeyTime="0" Value="0" />
+								<LinearDoubleKeyFrame KeyTime="0:0:.25" Value="21" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+						<Rectangle x:Name="PART_Track" />
+						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+							<Border x:Name="Indicator" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Foreground}" />
+						</Decorator>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Orientation" Value="Vertical">
+							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
+								<Setter.Value>
+									<RotateTransform Angle="-90" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+						<EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="Indicator">
+							<BeginStoryboard Storyboard="{StaticResource OnLoaded}" />
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="CircleProgressBarIndeterminateTemplate" TargetType="hc:CircleProgressBar">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+				<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="TemplateRoot">
+					<LinearDoubleKeyFrame KeyTime="0:0:1.568" Value="360" />
+				</DoubleAnimationUsingKeyFrames>
+				<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)" Storyboard.TargetName="arc">
+					<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.TargetProperty="(shapes:Arc.StartAngle)" Storyboard.TargetName="arc">
+					<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.TargetProperty="(shapes:Arc.EndAngle)" Storyboard.TargetName="arc">
+					<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>
+		<hc:SimplePanel x:Name="TemplateRoot" RenderTransformOrigin="0.5,0.5">
+			<hc:SimplePanel.RenderTransform>
+				<TransformGroup>
+					<RotateTransform />
+				</TransformGroup>
+			</hc:SimplePanel.RenderTransform>
+			<shapes:Arc ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" EndAngle="360" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" StrokeThickness="0" />
+			<shapes:Arc RenderTransformOrigin="0.5,0.5" StartAngle="-5" EndAngle="5" ArcThickness="{TemplateBinding ArcThickness}" Stretch="None" Width="{TemplateBinding ActualWidth}" StrokeThickness="0" Height="{TemplateBinding ActualHeight}" x:Name="arc" Fill="{TemplateBinding Foreground}">
+				<shapes:Arc.RenderTransform>
+					<TransformGroup>
+						<RotateTransform />
+					</TransformGroup>
+				</shapes:Arc.RenderTransform>
+			</shapes:Arc>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsIndeterminate" Value="true">
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+				</Trigger.EnterActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ProgressBarCircleBaseStyle" TargetType="hc:CircleProgressBar">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Height" Value="100" />
+		<Setter Property="Width" Value="100" />
+		<Setter Property="ArcThickness" Value="4" />
+		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
+		<Setter Property="Template" Value="{StaticResource CircleProgressBarTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="IsIndeterminate" Value="True">
+				<Setter Property="Template" Value="{StaticResource CircleProgressBarIndeterminateTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ProgressBarWaveBaseStyle" TargetType="hc:WaveProgressBar">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Width" Value="100" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:F0} %}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:WaveProgressBar">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardOnLoaded" RepeatBehavior="Forever">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)" Storyboard.TargetName="PART_Wave">
+								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="-400" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<StackPanel>
+						<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+							<Viewbox>
+								<Border x:Name="PART_Clip" Style="{StaticResource BorderCircularClip}" CornerRadius="100" Width="200" Height="200">
+									<Path x:Name="PART_Wave" Stroke="{TemplateBinding WaveStroke}" StrokeThickness="{TemplateBinding WaveThickness}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="600" Height="250" Fill="{TemplateBinding WaveFill}" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Margin="0,0,-400,-20">
+										<Path.Data>
+											<PathGeometry>
+												<PathFigure StartPoint="0,1">
+													<PolyBezierSegment Points="0.5,1 0.5,0 1,0" />
+													<PolyBezierSegment Points="1.5,0 1.5,1 2,1" />
+													<PolyBezierSegment Points="2.5,1 2.5,0 3,0" />
+													<PolyLineSegment Points="3,0 3,10, 0,10 0,1" />
+												</PathFigure>
+											</PathGeometry>
+										</Path.Data>
+									</Path>
+								</Border>
+							</Viewbox>
+						</Border>
+						<TextBlock Margin="0,10,0,0" Visibility="{Binding ShowText,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" />
+					</StackPanel>
+					<ControlTemplate.Triggers>
+						<EventTrigger RoutedEvent="FrameworkElement.Loaded" SourceName="PART_Wave">
+							<BeginStoryboard Name="BeginStoryboardWave" Storyboard="{StaticResource StoryboardOnLoaded}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="FrameworkElement.Unloaded" SourceName="PART_Wave">
+							<StopStoryboard BeginStoryboardName="BeginStoryboardWave" />
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CheckBoxBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CheckBox">
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Background" Value="White" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="6,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="CheckBox">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardCheckedTrue">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardCheckedFalse">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(Shape.StrokeDashOffset)" Storyboard.TargetName="path">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="8" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Border Height="16" Width="16" x:Name="checkBoxBorder" Background="{TemplateBinding Background}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+						<hc:SimplePanel Grid.Column="0" Height="16" Width="16" x:Name="markGrid">
+							<Path FlowDirection="LeftToRight" UseLayoutRounding="True" x:Name="path" StrokeDashOffset="8" StrokeDashArray="8,8" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+							<Rectangle x:Name="indeterminateMark" RadiusX="2" RadiusY="2" Fill="{DynamicResource PrimaryBrush}" Margin="2" Opacity="0" />
+						</hc:SimplePanel>
+						<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="HasContent" Value="true">
+							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsChecked" Value="true" />
+								<Condition Property="IsPressed" Value="true" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Opacity" Value=".8" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsChecked" Value="false" />
+								<Condition Property="IsPressed" Value="true" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
+							</Trigger.ExitActions>
+							<Setter Property="Opacity" TargetName="indeterminateMark" Value="0" />
+							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="false">
+							<Setter Property="Stroke" Value="{DynamicResource BorderBrush}" TargetName="path" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="{x:Null}">
+							<Setter Property="Opacity" TargetName="indeterminateMark" Value="1" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RadioButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Margin="-4" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="6,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RadioButton">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardCheckedTrue">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0.5" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardCheckedFalse">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Grid x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+						</Grid.ColumnDefinitions>
+						<Border Height="18" Width="18" x:Name="radioButtonBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="100" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+							<Ellipse x:Name="optionMark" Fill="White" MinWidth="6" MinHeight="6" RenderTransformOrigin="0.5,0.5">
+								<Ellipse.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform />
+									</TransformGroup>
+								</Ellipse.RenderTransform>
+							</Ellipse>
+						</Border>
+						<ContentPresenter x:Name="contentPresenter" Visibility="Collapsed" Grid.Column="1" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="HasContent" Value="true">
+							<Setter Property="Visibility" TargetName="contentPresenter" Value="Visible" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsChecked" Value="true" />
+								<Condition Property="IsPressed" Value="true" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Opacity" Value=".8" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsChecked" Value="false" />
+								<Condition Property="IsPressed" Value="true" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedTrue}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardCheckedFalse}" />
+							</Trigger.ExitActions>
+							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource DarkPrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RadioButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+								<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</StackPanel>
+						</Border>
+						<Border Margin="-1" Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{DynamicResource DarkMaskBrush}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="true">
+							<Setter TargetName="BorderChecked" Property="Visibility" Value="Visible" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:IconElement.Width" Value="16" />
+		<Setter Property="hc:IconElement.Height" Value="16" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RadioButton">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<Border Name="BorderHighlight" BorderThickness="3,0,0,0" BorderBrush="Transparent">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+								<Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+								<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</StackPanel>
+						</Border>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderHighlight" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RadioGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="hc:IconElement.Width" Value="16" />
+		<Setter Property="hc:IconElement.Height" Value="16" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RadioButton">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Height="{Binding Path=(hc:IconElement.Height),RelativeSource={RelativeSource TemplatedParent}}" Width="{Binding Path=(hc:IconElement.Width),RelativeSource={RelativeSource TemplatedParent}}" Fill="{Binding Path=(TextElement.Foreground),ElementName=contentPresenter}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+			</Trigger>
+			<DataTrigger Binding="{Binding Orientation,RelativeSource={RelativeSource  AncestorType=hc:ButtonGroup}}" Value="Vertical">
+				<Setter Property="Margin" Value="0,-1,0,0" />
+			</DataTrigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
+	<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+						</ContentControl>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Padding" Value="6" />
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+						</ContentControl>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ButtonIconCircular.Small" BasedOn="{StaticResource ButtonIconCircular}" TargetType="Button">
+		<Setter Property="Width" Value="20" />
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="1" />
+	</Style>
+	<Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
+		<Setter Property="Background" Value="{x:Null}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Button">
+					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ButtonGroupItemDefault" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button" />
+	<Style x:Key="ButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ButtonGroupItemHorizontalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+	</Style>
+	<Style x:Key="ButtonGroupItemSingle" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+	</Style>
+	<Style x:Key="ButtonGroupItemVerticalFirst" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ButtonGroupItemVerticalLast" BasedOn="{StaticResource ButtonGroupItemBaseStyle}" TargetType="Button">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+	</Style>
+	<Style x:Key="TextBlockDefault" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock" />
+	<Style x:Key="TextBlockDefaultAccent" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource AccentBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultPrimary" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultDanger" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultWarning" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultInfo" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultSuccess" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultSecLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource SecondaryTextBrush}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultThiLight" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+	</Style>
+	<Style x:Key="TextBlockLarge" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockSubTitle" BasedOn="{StaticResource TextBlockBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockLargeBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource HeadFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockSubTitleBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock">
+		<Setter Property="FontSize" Value="{StaticResource SubHeadFontSize}" />
+	</Style>
+	<Style x:Key="TextBlockDefaultBold" BasedOn="{StaticResource TextBlockBoldBaseStyle}" TargetType="TextBlock" />
+	<Style BasedOn="{StaticResource HighlightTextBlockBaseStyle}" TargetType="hc:HighlightTextBlock" />
+	<Style BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+	</Style>
+	<Style x:Key="LabelPrimary" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="LabelSuccess" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="LabelInfo" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="LabelWarning" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="LabelDanger" BasedOn="{StaticResource LabelBaseStyle}" TargetType="Label">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource CompareSliderBaseStyle}" TargetType="hc:CompareSlider" />
+	<Style BasedOn="{StaticResource PreviewSliderBaseStyle}" TargetType="hc:PreviewSlider" />
+	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
+	<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+							<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+						</ContentControl>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
+	<Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Height" Value="30" />
+		<Setter Property="Width" Value="30" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="StoryboardChecked">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="StoryboardUnChecked">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="UnCheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="CheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="0">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="UnCheckedElement">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1">
+									<EasingDoubleKeyFrame.EasingFunction>
+										<PowerEase EasingMode="EaseOut" />
+									</EasingDoubleKeyFrame.EasingFunction>
+								</EasingDoubleKeyFrame>
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Viewbox>
+						<hc:SimplePanel Height="28" Width="28">
+							<Border Name="UnCheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+								<Border.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform ScaleX="1" />
+									</TransformGroup>
+								</Border.RenderTransform>
+								<ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</Border>
+							<Border Name="CheckedElement" Style="{StaticResource BorderCircularClip}" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+								<Border.RenderTransform>
+									<TransformGroup>
+										<ScaleTransform ScaleX="0" />
+									</TransformGroup>
+								</Border.RenderTransform>
+								<ContentPresenter Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+							</Border>
+						</hc:SimplePanel>
+					</Viewbox>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardChecked}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource StoryboardUnChecked}" />
+							</Trigger.ExitActions>
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<hc:SimplePanel>
+							<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+								<Condition Property="IsChecked" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+						</MultiTrigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemDefault" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton" />
+	<Style x:Key="ToggleButtonGroupItemHorizontalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemHorizontalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemSingle" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemVerticalFirst" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ToggleButtonGroupItemVerticalLast" BasedOn="{StaticResource ToggleButtonGroupItemBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+	</Style>
+	<Style x:Key="ToggleButtonLoadingPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+							<hc:SimplePanel>
+								<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+							</hc:SimplePanel>
+							<Viewbox Margin="0,4">
+								<hc:LoadingCircle x:Name="Loading" Width="22" Height="22" Foreground="{TemplateBinding Foreground}" DotDiameter="3" IsRunning="{TemplateBinding IsChecked}" Visibility="Collapsed" />
+							</Viewbox>
+						</StackPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Visibility" Value="Visible" TargetName="Loading" />
+							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+								<Condition Property="IsChecked" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+						</MultiTrigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToggleButtonLoading" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToggleButtonLoadingSuccess" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonLoadingInfo" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonLoadingWarning" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonLoadingDanger" BasedOn="{StaticResource ToggleButtonLoadingPrimary}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
+	<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+						</ContentControl>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<Border Style="{StaticResource BorderCircular}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+							<Path Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Data="{TemplateBinding hc:IconElement.Geometry}" />
+						</ContentControl>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RepeatButtonIconCircular.Small" BasedOn="{StaticResource RepeatButtonIconCircular}" TargetType="RepeatButton">
+		<Setter Property="Width" Value="20" />
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
+		<Setter Property="Background" Value="{x:Null}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RepeatButton">
+					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseHoverBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+							<Setter Property="Background" TargetName="Chrome" Value="{Binding Path=(hc:BackgroundSwitchElement.MouseDownBackground),RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ScrollViewerNativeBaseStyle}" TargetType="ScrollViewer" />
+	<Style BasedOn="{StaticResource ScrollViewerBaseStyle}" TargetType="hc:ScrollViewer" />
+	<Style x:Key="ScrollViewerUpDownRepeatButtonStyle" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="Height" Value="10" />
+		<Setter Property="Padding" Value="0,2" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="ClickMode" Value="Hover" />
+	</Style>
+	<ControlTemplate x:Key="ScrollViewerUpDownControlTemplate" TargetType="ScrollViewer">
+		<Grid x:Name="Grid" Background="{TemplateBinding Background}">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource UpGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Command="{x:Static ScrollBar.LineUpCommand}">
+				<RepeatButton.Visibility>
+					<MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+					</MultiBinding>
+				</RepeatButton.Visibility>
+			</RepeatButton>
+			<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" Margin="{TemplateBinding Padding}" Grid.Row="1" />
+			<RepeatButton Style="{StaticResource ScrollViewerUpDownRepeatButtonStyle}" hc:IconElement.Geometry="{StaticResource DownGeometry}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="2" Command="{x:Static ScrollBar.LineDownCommand}">
+				<RepeatButton.Visibility>
+					<MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+						<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+					</MultiBinding>
+				</RepeatButton.Visibility>
+			</RepeatButton>
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
+		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
+	</Style>
+	<Style x:Key="CalendarButtonStyle" TargetType="CalendarButton">
+		<Setter Property="MinWidth" Value="10" />
+		<Setter Property="MinHeight" Value="10" />
+		<Setter Property="FontSize" Value="12" />
+		<Setter Property="Width" Value="40" />
+		<Setter Property="Height" Value="32" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="CalendarButton">
+					<hc:SimplePanel>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="SelectionStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="Unselected" />
+								<VisualState x:Name="Selected">
+									<Storyboard>
+										<DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
+										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="ActiveStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="Active" />
+								<VisualState x:Name="Inactive">
+									<Storyboard>
+										<ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Rectangle x:Name="SelectedBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
+						<Rectangle x:Name="Background" Fill="{TemplateBinding Background}" Opacity="0" RadiusY="16" RadiusX="16" />
+						<ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+							<TextElement.Foreground>
+								<SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
+							</TextElement.Foreground>
+						</ContentPresenter>
+						<Rectangle x:Name="CalendarButtonFocusVisual" IsHitTestVisible="false" RadiusY="16" RadiusX="16" Stroke="{DynamicResource PrimaryBrush}" Visibility="Collapsed" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsFocused" Value="True">
+							<Setter Property="Visibility" TargetName="CalendarButtonFocusVisual" Value="Visible" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CalendarDayButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="CalendarDayButton">
+		<Setter Property="MinWidth" Value="10" />
+		<Setter Property="MinHeight" Value="10" />
+		<Setter Property="Width" Value="32" />
+		<Setter Property="Height" Value="32" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="CalendarDayButton">
+					<hc:SimplePanel>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0:0:0.1" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Disabled">
+									<Storyboard>
+										<DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="SelectionStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="Unselected" />
+								<VisualState x:Name="Selected">
+									<Storyboard>
+										<DoubleAnimation Duration="0:0:.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="SelectedBackground" />
+										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="ActiveStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="Active" />
+								<VisualState x:Name="Inactive">
+									<Storyboard>
+										<ColorAnimation Duration="0" To="{DynamicResource ThirdlyTextColor}" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+							<VisualStateGroup x:Name="DayStates">
+								<VisualStateGroup.Transitions>
+									<VisualTransition GeneratedDuration="0" />
+								</VisualStateGroup.Transitions>
+								<VisualState x:Name="RegularDay" />
+								<VisualState x:Name="Today">
+									<Storyboard>
+										<DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="TodayBackground" />
+										<ColorAnimation Duration="0" To="White" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)" Storyboard.TargetName="NormalText" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Rectangle RadiusX="16" RadiusY="16" x:Name="TodayBackground" Fill="{DynamicResource DangerBrush}" Opacity="0" />
+						<Rectangle x:Name="SelectedBackground" Fill="{DynamicResource PrimaryBrush}" Opacity="0" RadiusY="16" RadiusX="16" />
+						<ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+							<TextElement.Foreground>
+								<SolidColorBrush Color="{DynamicResource PrimaryTextColor}" />
+							</TextElement.Foreground>
+						</ContentPresenter>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="CalendarItem">
+		<Setter Property="Margin" Value="0" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="CalendarItem">
+					<ControlTemplate.Resources>
+						<DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+							<TextBlock Foreground="{DynamicResource PrimaryTextBrush}" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,6,0,6" Text="{Binding}" VerticalAlignment="Center" />
+						</DataTemplate>
+					</ControlTemplate.Resources>
+					<hc:SimplePanel x:Name="PART_Root">
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Disabled">
+									<Storyboard>
+										<DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_DisabledVisual" />
+									</Storyboard>
+								</VisualState>
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition Height="*" />
+							</Grid.RowDefinitions>
+							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" />
+							<Button x:Name="PART_PreviousButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Left" Grid.Column="0" Height="50" Padding="16" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource LeftGeometry}" />
+							<Button x:Name="PART_HeaderButton" Focusable="False" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="1" FontSize="20" HorizontalAlignment="Center" Grid.Row="0" Style="{StaticResource ButtonCustom}" />
+							<Button x:Name="PART_NextButton" Width="50" Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Right" Height="50" Padding="16" Grid.Column="2" Focusable="False" Grid.Row="0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RightGeometry}" />
+							<Grid Width="240" Height="240" x:Name="PART_MonthView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Visible">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Grid.RowDefinitions>
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+								</Grid.RowDefinitions>
+							</Grid>
+							<Grid Width="240" Height="240" x:Name="PART_YearView" Margin="10,6,10,10" Grid.ColumnSpan="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Visibility="Hidden">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+									<ColumnDefinition />
+								</Grid.ColumnDefinitions>
+								<Grid.RowDefinitions>
+									<RowDefinition />
+									<RowDefinition />
+									<RowDefinition />
+								</Grid.RowDefinitions>
+							</Grid>
+						</Grid>
+						<Rectangle x:Name="PART_DisabledVisual" Visibility="Collapsed" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Year">
+							<Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
+							<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
+						</DataTrigger>
+						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource  AncestorType=Calendar}}" Value="Decade">
+							<Setter Property="Visibility" TargetName="PART_MonthView" Value="Hidden" />
+							<Setter Property="Visibility" TargetName="PART_YearView" Value="Visible" />
+						</DataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CalendarBaseStyle" TargetType="Calendar">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Language" Value="{Binding Lang,Source={x:Static tools:ConfigHelper.Instance}}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Margin" Value="8 0" />
+		<Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyle}" />
+		<Setter Property="CalendarButtonStyle" Value="{StaticResource CalendarButtonStyle}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Calendar">
+					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+						<CalendarItem x:Name="PART_CalendarItem" Margin="{TemplateBinding BorderThickness}" />
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="Calendar" BasedOn="{StaticResource CalendarBaseStyle}" />
+	<Style BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock" />
+	<Style x:Key="ToggleBlockIcon" BasedOn="{StaticResource ToggleBlockBaseStyle}" TargetType="hc:ToggleBlock">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ToggleBlock">
+					<ContentControl Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+						<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+					</ContentControl>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource GroupBoxBaseStyle}" TargetType="GroupBox" />
+	<Style x:Key="GroupBoxOriginal" BasedOn="{StaticResource GroupBoxOriginalBaseStyle}" TargetType="GroupBox" />
+	<Style x:Key="GroupBoxTab" BasedOn="{StaticResource GroupBoxTabBaseStyle}" TargetType="GroupBox" />
+	<Style BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup" />
+	<Style x:Key="ButtonGroupSolid" BasedOn="{StaticResource ButtonGroupBaseStyle}" TargetType="hc:ButtonGroup">
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarSuccess" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarInfo" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarWarning" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarDanger" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarPrimaryStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground">
+			<Setter.Value>
+				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+					<DrawingBrush.Transform>
+						<TransformGroup>
+							<RotateTransform Angle="20" />
+							<TranslateTransform x:Name="MyTransform" X="0" />
+						</TransformGroup>
+					</DrawingBrush.Transform>
+					<DrawingBrush.Drawing>
+						<GeometryDrawing>
+							<GeometryDrawing.Brush>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0" />
+									<GradientStop Color="{DynamicResource DarkPrimaryColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+								</LinearGradientBrush>
+							</GeometryDrawing.Brush>
+							<GeometryDrawing.Geometry>
+								<RectangleGeometry Rect="0,0,20,32" />
+							</GeometryDrawing.Geometry>
+						</GeometryDrawing>
+					</DrawingBrush.Drawing>
+				</DrawingBrush>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarSuccessStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground">
+			<Setter.Value>
+				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+					<DrawingBrush.Transform>
+						<TransformGroup>
+							<RotateTransform Angle="20" />
+							<TranslateTransform x:Name="MyTransform" X="0" />
+						</TransformGroup>
+					</DrawingBrush.Transform>
+					<DrawingBrush.Drawing>
+						<GeometryDrawing>
+							<GeometryDrawing.Brush>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0" />
+									<GradientStop Color="{DynamicResource DarkSuccessColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+								</LinearGradientBrush>
+							</GeometryDrawing.Brush>
+							<GeometryDrawing.Geometry>
+								<RectangleGeometry Rect="0,0,20,32" />
+							</GeometryDrawing.Geometry>
+						</GeometryDrawing>
+					</DrawingBrush.Drawing>
+				</DrawingBrush>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarInfoStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground">
+			<Setter.Value>
+				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+					<DrawingBrush.Transform>
+						<TransformGroup>
+							<RotateTransform Angle="20" />
+							<TranslateTransform x:Name="MyTransform" X="0" />
+						</TransformGroup>
+					</DrawingBrush.Transform>
+					<DrawingBrush.Drawing>
+						<GeometryDrawing>
+							<GeometryDrawing.Brush>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0" />
+									<GradientStop Color="{DynamicResource DarkInfoColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+								</LinearGradientBrush>
+							</GeometryDrawing.Brush>
+							<GeometryDrawing.Geometry>
+								<RectangleGeometry Rect="0,0,20,32" />
+							</GeometryDrawing.Geometry>
+						</GeometryDrawing>
+					</DrawingBrush.Drawing>
+				</DrawingBrush>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarWarningStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground">
+			<Setter.Value>
+				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+					<DrawingBrush.Transform>
+						<TransformGroup>
+							<RotateTransform Angle="20" />
+							<TranslateTransform x:Name="MyTransform" X="0" />
+						</TransformGroup>
+					</DrawingBrush.Transform>
+					<DrawingBrush.Drawing>
+						<GeometryDrawing>
+							<GeometryDrawing.Brush>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0" />
+									<GradientStop Color="{DynamicResource DarkWarningColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+								</LinearGradientBrush>
+							</GeometryDrawing.Brush>
+							<GeometryDrawing.Geometry>
+								<RectangleGeometry Rect="0,0,20,32" />
+							</GeometryDrawing.Geometry>
+						</GeometryDrawing>
+					</DrawingBrush.Drawing>
+				</DrawingBrush>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarDangerStripe" BasedOn="{StaticResource ProgressBarStripeBaseStyle}" TargetType="ProgressBar">
+		<Setter Property="Foreground">
+			<Setter.Value>
+				<DrawingBrush Viewport="0,0,20,32" TileMode="Tile" ViewportUnits="Absolute" Stretch="None">
+					<DrawingBrush.Transform>
+						<TransformGroup>
+							<RotateTransform Angle="20" />
+							<TranslateTransform x:Name="MyTransform" X="0" />
+						</TransformGroup>
+					</DrawingBrush.Transform>
+					<DrawingBrush.Drawing>
+						<GeometryDrawing>
+							<GeometryDrawing.Brush>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0" />
+									<GradientStop Color="{DynamicResource DarkDangerColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="0.5" />
+									<GradientStop Color="{DynamicResource BackgroundColor}" Offset="1" />
+								</LinearGradientBrush>
+							</GeometryDrawing.Brush>
+							<GeometryDrawing.Geometry>
+								<RectangleGeometry Rect="0,0,20,32" />
+							</GeometryDrawing.Geometry>
+						</GeometryDrawing>
+					</DrawingBrush.Drawing>
+				</DrawingBrush>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarSuccessCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarInfoCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarWarningCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarDangerCircle" BasedOn="{StaticResource ProgressBarCircleBaseStyle}" TargetType="hc:CircleProgressBar">
+		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+		<Setter Property="WaveFill" Value="{DynamicResource DarkPrimaryBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarSuccessWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+		<Setter Property="WaveFill" Value="{DynamicResource DarkSuccessBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarInfoWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+		<Setter Property="WaveFill" Value="{DynamicResource DarkInfoBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarWarningWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+		<Setter Property="WaveFill" Value="{DynamicResource DarkWarningBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarDangerWave" BasedOn="{StaticResource ProgressBarWaveBaseStyle}" TargetType="hc:WaveProgressBar">
+		<Setter Property="WaveFill" Value="{DynamicResource DarkDangerBrush}" />
+	</Style>
+	<Style x:Key="ProgressBarFlat" TargetType="ProgressBar">
+		<Setter Property="Height" Value="4" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ProgressBar">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+								<EasingDoubleKeyFrame KeyTime="0" Value="0.25" />
+								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25" />
+								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25" />
+							</DoubleAnimationUsingKeyFrames>
+							<PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+								<EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5" />
+								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
+								<EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5" />
+							</PointAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<hc:SimplePanel x:Name="TemplateRoot" SnapsToDevicePixels="true" ClipToBounds="True">
+						<Rectangle x:Name="PART_Track" Fill="{TemplateBinding Background}" StrokeThickness="0" Stroke="{TemplateBinding BorderBrush}" />
+						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+							<Rectangle x:Name="Indicator" Fill="{TemplateBinding Foreground}" />
+						</Decorator>
+						<Rectangle x:Name="Animation" Visibility="Collapsed" Fill="{TemplateBinding Foreground}" RenderTransformOrigin="0.5,0.5">
+							<Rectangle.RenderTransform>
+								<TransformGroup>
+									<ScaleTransform />
+								</TransformGroup>
+							</Rectangle.RenderTransform>
+						</Rectangle>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsIndeterminate" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource IsIndeterminate}" />
+							</Trigger.EnterActions>
+							<Setter Property="Visibility" TargetName="Indicator" Value="Collapsed" />
+							<Setter Property="Visibility" TargetName="Animation" Value="Visible" />
+						</Trigger>
+						<Trigger Property="Orientation" Value="Vertical">
+							<Setter Property="Height" Value="{x:Static system:Double.NaN}" />
+							<Setter Property="LayoutTransform" TargetName="TemplateRoot">
+								<Setter.Value>
+									<RotateTransform Angle="-90" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
+	<Style BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="RadioGroupItemHorizontalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+	</Style>
+	<Style x:Key="RadioGroupItemSingle" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+	</Style>
+	<Style x:Key="RadioGroupItemVerticalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="RadioGroupItemVerticalLast" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+	</Style>
+	<Style TargetType="ResizeGrip">
+		<Setter Property="MinWidth" Value="11" />
+		<Setter Property="MinHeight" Value="11" />
+		<Setter Property="Width" Value="11" />
+		<Setter Property="Height" Value="11" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ResizeGrip">
+					<hc:SimplePanel Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+						<Path Width="11" Height="11" Data="M 9,0 L 11,0 L 11,11 L 0,11 L 0,9 L 3,9 L 3,6 L 6,6 L 6,3 L 9,3 z" HorizontalAlignment="Right" VerticalAlignment="Bottom">
+							<Path.Fill>
+								<DrawingBrush TileMode="Tile" Viewbox="0,0,3,3" Viewport="0,0,3,3" ViewportUnits="Absolute" ViewboxUnits="Absolute">
+									<DrawingBrush.Drawing>
+										<DrawingGroup>
+											<GeometryDrawing Brush="{StaticResource ResizeGripperForeground}">
+												<GeometryDrawing.Geometry>
+													<RectangleGeometry Rect="0,0,2,2" />
+												</GeometryDrawing.Geometry>
+											</GeometryDrawing>
+										</DrawingGroup>
+									</DrawingBrush.Drawing>
+								</DrawingBrush>
+							</Path.Fill>
+						</Path>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="Window">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+	</Style>
+	<Style x:Key="WindowWin10" TargetType="hc:Window">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="#262e2f" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="NonClientAreaBackground" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="NonClientAreaForeground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="CloseButtonBackground" Value="Transparent" />
+		<Setter Property="CloseButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="CloseButtonHoverBackground" Value="#e81123" />
+		<Setter Property="CloseButtonHoverForeground" Value="White" />
+		<Setter Property="OtherButtonBackground" Value="Transparent" />
+		<Setter Property="OtherButtonForeground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="OtherButtonHoverBackground" Value="{DynamicResource DarkMaskBrush}" />
+		<Setter Property="OtherButtonHoverForeground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Window">
+					<Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<Grid Margin="{TemplateBinding Padding}">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<StackPanel Name="ButtonPanel" WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
+									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Name="ButtonMin" Height="29" Style="{StaticResource ButtonIcon}" Width="45" hc:IconElement.Geometry="{StaticResource WindowMinGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Name="ButtonMax" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowMaxGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+									<Button Background="{TemplateBinding OtherButtonBackground}" Foreground="{TemplateBinding OtherButtonForeground}" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Name="ButtonRestore" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource WindowRestoreGeometry}" BorderThickness="1,0,1,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+									<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Name="ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+								</StackPanel>
+								<Grid Grid.Column="0">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition />
+									</Grid.ColumnDefinitions>
+									<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
+										<interactivity:Interaction.Triggers>
+											<interactivity:EventTrigger EventName="MouseDoubleClick">
+												<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+											</interactivity:EventTrigger>
+										</interactivity:Interaction.Triggers>
+										<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
+									</Button>
+									<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
+										<TextBlock.Visibility>
+											<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+												<MultiBinding.Bindings>
+													<Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
+													<Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
+												</MultiBinding.Bindings>
+											</MultiBinding>
+										</TextBlock.Visibility>
+									</TextBlock>
+									<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
+								</Grid>
+							</Grid>
+							<AdornerDecorator Grid.Row="1">
+								<ContentPresenter ClipToBounds="True" />
+							</AdornerDecorator>
+							<ResizeGrip Width="10" Height="10" x:Name="ResizeGrip" HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" IsTabStop="False" Visibility="Collapsed" WindowChrome.ResizeGripDirection="BottomRight" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsActive" Value="False">
+							<Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
+							<Setter Property="Opacity" Value=".8" TargetName="ButtonPanel" />
+						</Trigger>
+						<Trigger Property="WindowState" Value="Maximized">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+							<Setter Property="Visibility" Value="Visible" TargetName="ButtonRestore" />
+						</Trigger>
+						<Trigger Property="WindowState" Value="Normal">
+							<Setter Property="Visibility" Value="Visible" TargetName="ButtonMax" />
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+						</Trigger>
+						<Trigger Property="ResizeMode" Value="NoResize">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMin" />
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+						</Trigger>
+						<Trigger Property="ResizeMode" Value="CanMinimize">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonMax" />
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ButtonRestore" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+							<Setter Property="Background" TargetName="ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter Property="Foreground" TargetName="ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMax">
+							<Setter Property="Background" TargetName="ButtonMax" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter Property="Foreground" TargetName="ButtonMax" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonRestore">
+							<Setter Property="Background" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter Property="Foreground" TargetName="ButtonRestore" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonMin">
+							<Setter Property="Background" TargetName="ButtonMin" Value="{Binding OtherButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter Property="Foreground" TargetName="ButtonMin" Value="{Binding OtherButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+						<Trigger Property="WindowStyle" Value="None">
+							<Setter Property="ShowNonClientArea" Value="False" />
+						</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="WindowBlur" BasedOn="{StaticResource WindowWin10}" TargetType="hc:BlurWindow">
+		<Setter Property="Background" Value="Transparent" />
+	</Style>
+	<Style x:Key="WindowGlow" BasedOn="{StaticResource WindowWin10}" TargetType="hc:GlowWindow">
+		<Setter Property="ActiveGlowColor" Value="#262e2f" />
+		<Setter Property="InactiveGlowColor" Value="{DynamicResource BorderColor}" />
+		<Setter Property="BorderThickness" Value="0" />
+	</Style>
+	<Style TargetType="hc:ImageBrowser">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="MinWidth" Value="400" />
+		<Setter Property="MinHeight" Value="250" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="Black" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ImageBrowser">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Storyboard1">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
+								<EasingDoubleKeyFrame KeyTime="0:0:.1" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="Storyboard2">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_PanelTop">
+								<EasingDoubleKeyFrame KeyTime="0:0:.4" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<hc:ImageViewer x:Name="PART_ImageViewer" ShowImgMap="True" BorderThickness="0" Background="#dd000000" />
+						<hc:SimplePanel x:Name="PART_PanelTop" Opacity="0" Background="{DynamicResource DarkOpacityBrush}" VerticalAlignment="Top" Grid.Row="0">
+							<StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal">
+								<TextBlock Text="{Binding ImgPath,ElementName=PART_ImageViewer}" Foreground="White" Margin="10,0,0,0" />
+								<TextBlock Text="{Binding ImgSize,ElementName=PART_ImageViewer,Converter={StaticResource Long2FileSizeConverter}}" Foreground="White" Margin="30,0,0,0" />
+							</StackPanel>
+							<Button Command="interactivity:ControlCommands.Close" WindowChrome.IsHitTestVisibleInChrome="True" Background="Red" Padding="14" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonIcon}" HorizontalAlignment="Right" VerticalAlignment="Top" Width="40" Height="40" />
+						</hc:SimplePanel>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger SourceName="PART_ImageViewer" Property="ShowCloseButton" Value="True">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							</Trigger.ExitActions>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsFullScreen" Value="True">
+				<Setter Property="WindowState" Value="Maximized" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TagBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Tag">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Tag">
+					<Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<Border Visibility="{Binding HasHeader,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Width="{Binding ActualHeight,RelativeSource={RelativeSource Self}}" Style="{StaticResource BorderCircularClip}" BorderBrush="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}">
+								<ContentPresenter TextElement.Foreground="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" VerticalAlignment="Center" HorizontalAlignment="Center" />
+							</Border>
+							<ContentPresenter Margin="{TemplateBinding Padding}" Grid.Column="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+							<Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="0,0,6,0" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0,11" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Foreground="{TemplateBinding Foreground}" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+							<Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
+							<Setter Property="Padding" Value="0,6" TargetName="ButtonClose" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource DarkMaskBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TagContainerBaseStyle" TargetType="hc:TagContainer" BasedOn="{StaticResource BaseStyle}">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TagBaseStyle}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="ItemsPanel">
+			<Setter.Value>
+				<ItemsPanelTemplate>
+					<WrapPanel hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}" />
+				</ItemsPanelTemplate>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TagContainer">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<hc:ScrollViewer Focusable="false">
+							<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</hc:ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ComboBoxToggleButton" TargetType="ToggleButton">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Focusable" Value="false" />
+		<Setter Property="ClickMode" Value="Press" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+						<Border Margin="0,0,6,0" BorderThickness="1" BorderBrush="Transparent" HorizontalAlignment="Right" SnapsToDevicePixels="true" Width="{StaticResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+							<Path Width="16" Height="9" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+						</Border>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value=".4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ComboBoxWatermarkToggleButton" TargetType="ToggleButton">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="Focusable" Value="false" />
+		<Setter Property="ClickMode" Value="Press" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="30" />
+						</Grid.ColumnDefinitions>
+						<Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
+						<Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
+						<Border Margin="1" Grid.Column="0" Visibility="{Binding Text,RelativeSource={RelativeSource AncestorType=ComboBox},Converter={StaticResource String2VisibilityReConverter}}">
+							<ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value=".4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ComboBoxTemplate" TargetType="ComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{Binding Background,RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
+			<Border Grid.Column="0" Margin="1,0">
+				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxTopTemplate" TargetType="ComboBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" Margin="1,0">
+				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxLeftTemplate" TargetType="ComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" Margin="1,0">
+				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ComboBoxEditableTextBox" TargetType="TextBox">
+		<Setter Property="OverridesDefaultStyle" Value="true" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="MinWidth" Value="0" />
+		<Setter Property="MinHeight" Value="0" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TextBox">
+					<ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Background="Transparent" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="ComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}" />
+			<Border Grid.Column="0" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxEditableTopTemplate" TargetType="ComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxEditableLeftTemplate" TargetType="ComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ComboBoxItemBaseStyle" TargetType="ComboBoxItem">
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ComboBoxItem">
+					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsSelected" Value="False" />
+								<Condition Property="IsMouseOver" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsSelected" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="Foreground" Value="White" />
+						</MultiTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ComboBoxBaseStyle" TargetType="ComboBox">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ComboBoxItemBaseStyle}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+		<Setter Property="Template" Value="{StaticResource ComboBoxTemplate}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Style.Triggers>
+			<Trigger Property="IsEditable" Value="true">
+				<Setter Property="IsTabStop" Value="false" />
+				<Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ComboBoxExtendBaseStyle" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Template" Value="{StaticResource ComboBoxTopTemplate}" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="False" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxLeftTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxEditableTopTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxEditableLeftTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="ComboBoxPlusTopTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" Margin="1,0">
+				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxPlusLeftTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" Margin="1,0">
+				<ContentPresenter Margin="{TemplateBinding Padding}" x:Name="contentPresenter" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" Content="{TemplateBinding SelectionBoxItem}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxPlusEditableTopTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxPlusEditableTopAutoCompleteTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<Popup Grid.Column="0" Grid.Row="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" x:Name="border" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Grid.Column="1" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+				<Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxPlusEditableLeftTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ComboBoxPlusEditableLeftAutoCompleteTemplate" TargetType="hc:ComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<Popup Grid.Column="1" x:Name="PART_Popup_AutoComplete" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder_AutoComplete" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer Margin="0,4">
+									<StackPanel Name="PART_AutoCompletePanel" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" x:Name="border" Background="Transparent" Margin="-1,1">
+				<TextBox x:Name="PART_EditableTextBox" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxEditableTextBox}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			</Border>
+			<Button Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+				<Setter Property="Height" TargetName="dropDownBorder_AutoComplete" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+				<Setter Property="MaxWidth" TargetName="dropDownBorder_AutoComplete" Value="{x:Static system:Double.MaxValue}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder_AutoComplete" Value="{Binding ActualHeight, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsFocused" Value="false" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsFocused" Value="true" SourceName="PART_EditableTextBox" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="True" SourceName="PART_EditableTextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="border" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ComboBoxPlusBaseStyle" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="hc:ComboBox">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource ComboBoxPlusTopTemplate}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="False" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxPlusLeftTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Top" />
+					<Condition Property="AutoComplete" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableTopAutoCompleteTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftTemplate}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsEditable" Value="True" />
+					<Condition Property="hc:InfoElement.TitlePlacement" Value="Left" />
+					<Condition Property="AutoComplete" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource ComboBoxPlusEditableLeftAutoCompleteTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="MenuItemBaseStyle" TargetType="MenuItem">
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="OverridesDefaultStyle" Value="True" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="MenuItem">
+					<Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+						<Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="26" />
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="30" />
+								<ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
+								<ColumnDefinition Width="20" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+							<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+								<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+							</Border>
+							<ContentPresenter Grid.Column="1" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentSource="Header" Margin="0,3" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							<TextBlock x:Name="InputGestureText" Margin="0,0,10,0" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{TemplateBinding InputGestureText}" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+						</Trigger>
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="Role" Value="TopLevelHeader">
+				<Setter Property="Margin" Value="0" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="MenuItem">
+							<Border MinWidth="44" x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+								<Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition Width="Auto" />
+									</Grid.ColumnDefinitions>
+									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+									<Border Margin="0,0,10,0" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+									</Border>
+									<ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									<Popup Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=templateRoot}" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom">
+										<hc:SimplePanel Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8">
+											<Border CornerRadius="0,0,2,2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+												<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+													<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
+												</ScrollViewer>
+											</Border>
+											<Border hc:MenuTopLineAttach.Popup="{Binding ElementName=PART_Popup}" Height="1" Background="{DynamicResource RegionBrush}" VerticalAlignment="Top" BorderThickness="1,0" BorderBrush="{DynamicResource BorderBrush}" HorizontalAlignment="Left" />
+										</hc:SimplePanel>
+									</Popup>
+								</Grid>
+							</Border>
+							<ControlTemplate.Triggers>
+								<Trigger Property="Icon" Value="{x:Null}">
+									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+								</Trigger>
+								<Trigger Property="IsChecked" Value="True">
+									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+								</Trigger>
+								<Trigger Property="IsHighlighted" Value="True">
+									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
+									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+								</Trigger>
+								<Trigger Property="IsSubmenuOpen" Value="True">
+									<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource BorderBrush}" />
+									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource RegionBrush}" />
+									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+								</Trigger>
+							</ControlTemplate.Triggers>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+			<Trigger Property="Role" Value="TopLevelItem">
+				<Setter Property="Margin" Value="0" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="MenuItem">
+							<Border x:Name="templateRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+								<Grid Margin="{TemplateBinding Padding}">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition />
+									</Grid.ColumnDefinitions>
+									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" HorizontalAlignment="Left" ContentSource="Icon" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+									<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Collapsed" VerticalAlignment="Center" Width="16">
+										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+									</Border>
+									<ContentPresenter x:Name="menuHeaderContainer" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" HorizontalAlignment="Left" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+								</Grid>
+							</Border>
+							<ControlTemplate.Triggers>
+								<Trigger Property="Icon" Value="{x:Null}">
+									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+								</Trigger>
+								<Trigger Property="IsChecked" Value="True">
+									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+									<Setter Property="Visibility" TargetName="Icon" Value="Collapsed" />
+								</Trigger>
+								<Trigger Property="IsHighlighted" Value="True">
+									<Setter Property="Background" TargetName="templateRoot" Value="{DynamicResource SecondaryRegionBrush}" />
+									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+								</Trigger>
+								<Trigger Property="IsSubmenuOpen" Value="True">
+									<Setter Property="Background" TargetName="templateRoot" Value="White" />
+									<Setter Property="TextElement.Foreground" TargetName="menuHeaderContainer" Value="{DynamicResource PrimaryTextBrush}" />
+								</Trigger>
+								<MultiTrigger>
+									<MultiTrigger.Conditions>
+										<Condition Property="IsHighlighted" Value="True" />
+										<Condition Property="IsEnabled" Value="False" />
+									</MultiTrigger.Conditions>
+									<Setter Property="Background" TargetName="templateRoot" Value="#0A000000" />
+									<Setter Property="BorderBrush" TargetName="templateRoot" Value="#21000000" />
+								</MultiTrigger>
+							</ControlTemplate.Triggers>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+			<Trigger Property="Role" Value="SubmenuHeader">
+				<Setter Property="DockPanel.Dock" Value="Top" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="MenuItem">
+							<Border x:Name="Bd" MinWidth="240" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+								<Grid x:Name="Grid" Margin="{TemplateBinding Padding}">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="26" />
+										<ColumnDefinition Width="*" />
+										<ColumnDefinition Width="30" />
+										<ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto" />
+										<ColumnDefinition Width="20" />
+									</Grid.ColumnDefinitions>
+									<ContentPresenter Margin="0,0,10,0" x:Name="Icon" ContentSource="Icon" HorizontalAlignment="Right" Height="16" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16" />
+									<Border Margin="0,0,10,0" IsHitTestVisible="False" Grid.Column="0" x:Name="GlyphPanel" CornerRadius="2" Background="{DynamicResource PrimaryBrush}" ClipToBounds="False" HorizontalAlignment="Right" Height="16" Visibility="Hidden" VerticalAlignment="Center" Width="16">
+										<Path UseLayoutRounding="True" Width="12" Height="12" Data="{StaticResource CheckedGeometry}" StrokeThickness="2" Stretch="Uniform" Stroke="{DynamicResource TextIconBrush}" />
+									</Border>
+									<ContentPresenter TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,3" x:Name="ContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Grid.Column="1" ContentSource="Header" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									<Path x:Name="Path" Grid.Column="4" Width="10" Height="10" HorizontalAlignment="Left" Data="{StaticResource RightGeometry}" Stretch="Uniform" Fill="{TemplateBinding Foreground}" VerticalAlignment="Center" />
+									<Popup Grid.Column="1" x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" VerticalOffset="-13" HorizontalOffset="10">
+										<Border Effect="{StaticResource EffectShadow2}" Margin="8" CornerRadius="2" x:Name="SubMenuBorder" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+											<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+												<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" />
+											</ScrollViewer>
+										</Border>
+									</Popup>
+								</Grid>
+							</Border>
+							<ControlTemplate.Triggers>
+								<Trigger Property="IsChecked" Value="True">
+									<Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible" />
+								</Trigger>
+							</ControlTemplate.Triggers>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+			<Trigger Property="IsHighlighted" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="MenuBaseStyle" TargetType="Menu">
+		<Setter Property="OverridesDefaultStyle" Value="True" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="FontSize" Value="12" />
+		<Setter Property="FontStyle" Value="Normal" />
+		<Setter Property="FontWeight" Value="Normal" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Menu">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="WatermarkTextBoxBaseStyle" TargetType="hc:WatermarkTextBox">
+		<Setter Property="Background" Value="{x:Null}" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="CaretBrush" Value="{Binding Foreground,RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:WatermarkTextBox">
+					<hc:SimplePanel x:Name="WatermarkContent">
+						<TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TextBox">
+					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="border" Value="0.4" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<Trigger Property="IsFocused" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="TextBoxExtendTopTemplate" TargetType="TextBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
+				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TextBoxExtendLeftTemplate" TargetType="TextBox">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="PART_ContentHost" Value="0.4" />
+				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="TextBoxExtendBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Template" Value="{StaticResource TextBoxExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource TextBoxExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+				<Grid SnapsToDevicePixels="true">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+					<ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+				<Grid SnapsToDevicePixels="true">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+					<ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource TextBoxPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="SearchBarBaseStyle" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="hc:SearchBar">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SearchBar">
+					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="30" />
+							</Grid.ColumnDefinitions>
+							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<Trigger Property="IsFocused" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="SearchBarExtendTopTemplate" TargetType="hc:SearchBar">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="SearchBarExtendLeftTemplate" TargetType="hc:SearchBar">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="SearchBarExtendBaseStyle" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template" Value="{StaticResource SearchBarExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource SearchBarExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="SearchBarPlusBaseStyle" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar">
+		<Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource SearchBarPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
+	<Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
+	<Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
+	<Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
+	<Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style x:Key="ComboBoxExtend" BasedOn="{StaticResource ComboBoxExtendBaseStyle}" TargetType="ComboBox" />
+	<Style x:Key="ComboBoxExtend.Small" BasedOn="{StaticResource ComboBoxExtend}" TargetType="ComboBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox" />
+	<Style x:Key="ComboBoxPlus.Small" BasedOn="{StaticResource ComboBoxPlusBaseStyle}" TargetType="hc:ComboBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource WatermarkTextBoxBaseStyle}" TargetType="hc:WatermarkTextBox" />
+	<Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
+	<Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
+	<Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
+	<Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
+	<Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
+	<ControlTemplate x:Key="BadgeTextTemplate" TargetType="hc:Badge">
+		<hc:SimplePanel>
+			<ContentPresenter />
+			<Border x:Name="Border" Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" RenderTransformOrigin="0.5 0.5" Style="{StaticResource BorderCircular}" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+				<Border.RenderTransform>
+					<ScaleTransform />
+				</Border.RenderTransform>
+				<ContentPresenter ContentSource="Text" Margin="{TemplateBinding Padding}" />
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<EventTrigger RoutedEvent="hc:Badge.ValueChanged">
+				<BeginStoryboard>
+					<Storyboard AutoReverse="True">
+						<DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
+						<DoubleAnimation Storyboard.TargetName="Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:.1" From="1" To="1.2" EasingFunction="{StaticResource SineEaseOut}" />
+					</Storyboard>
+				</BeginStoryboard>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="BadgeProcessingTemplate" TargetType="hc:Badge">
+		<hc:SimplePanel>
+			<ContentPresenter />
+			<Ellipse Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Height="10" Width="10" Fill="{TemplateBinding Background}" RenderTransformOrigin="0.5 0.5" Margin="{TemplateBinding BadgeMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+				<Ellipse.OpacityMask>
+					<RadialGradientBrush>
+						<GradientStop Offset="0" Color="Transparent" />
+						<GradientStop Offset="1" Color="Black" />
+					</RadialGradientBrush>
+				</Ellipse.OpacityMask>
+				<Ellipse.RenderTransform>
+					<ScaleTransform />
+				</Ellipse.RenderTransform>
+				<Ellipse.Triggers>
+					<EventTrigger RoutedEvent="Loaded">
+						<BeginStoryboard>
+							<Storyboard RepeatBehavior="Forever" DesiredFrameRate="20">
+								<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
+								<DoubleAnimation Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" BeginTime="0" Duration="0:0:1" From="1" To="2" EasingFunction="{StaticResource SineEaseOut}" />
+								<DoubleAnimation Storyboard.TargetProperty="Opacity" BeginTime="0" Duration="0:0:1" From="1" To="0" EasingFunction="{StaticResource SineEaseOut}" />
+							</Storyboard>
+						</BeginStoryboard>
+					</EventTrigger>
+				</Ellipse.Triggers>
+			</Ellipse>
+			<Border Visibility="{TemplateBinding ShowBadge,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="{TemplateBinding BadgeMargin}" Width="10" Height="10" CornerRadius="5" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<Style x:Key="BadgeBaseStyle" TargetType="hc:Badge">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Template" Value="{StaticResource BadgeTextTemplate}" />
+		<Setter Property="HorizontalContentAlignment" Value="Right" />
+		<Setter Property="VerticalContentAlignment" Value="Top" />
+		<Setter Property="BadgeMargin" Value="0,-10,-10,0" />
+		<Style.Triggers>
+			<Trigger Property="Status" Value="Dot">
+				<Setter Property="Template" Value="{StaticResource BadgeDotTemplate}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+				<Setter Property="BadgeMargin" Value="0,-5,-5,0" />
+			</Trigger>
+			<Trigger Property="Status" Value="Processing">
+				<Setter Property="Template" Value="{StaticResource BadgeProcessingTemplate}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+				<Setter Property="BadgeMargin" Value="0,-5,-5,0" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="CardBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Card">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Card">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Border BorderThickness="0,0,0,1" Visibility="{TemplateBinding Header, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+								<ContentPresenter ContentSource="Header" ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}" ContentStringFormat="{TemplateBinding HeaderStringFormat}" />
+							</Border>
+							<ContentPresenter Grid.Row="1" />
+							<Border Grid.Row="2" BorderThickness="0,1,0,0" Visibility="{TemplateBinding Footer, Converter={StaticResource Object2VisibilityConverter}}" BorderBrush="{TemplateBinding BorderBrush}">
+								<ContentPresenter ContentSource="Footer" ContentTemplate="{TemplateBinding FooterTemplate}" ContentTemplateSelector="{TemplateBinding FooterTemplateSelector}" ContentStringFormat="{TemplateBinding FooterStringFormat}" />
+							</Border>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ChatBubbleStringBaseTemplate" TargetType="hc:ChatBubble">
+		<hc:SimplePanel>
+			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+				<TextBlock TextWrapping="Wrap" Text="{TemplateBinding Content}" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="Role" Value="Receiver">
+				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+				<Setter TargetName="Tail" Property="RenderTransform">
+					<Setter.Value>
+						<TransformGroup>
+							<ScaleTransform ScaleY="1" ScaleX="-1" />
+						</TransformGroup>
+					</Setter.Value>
+				</Setter>
+				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ChatBubbleImageBaseTemplate" TargetType="hc:ChatBubble">
+		<hc:SimplePanel>
+			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+				<hc:SimplePanel>
+					<Image Margin="{TemplateBinding Padding}" VerticalAlignment="Center" Source="{TemplateBinding Content}" />
+					<Border BorderThickness="{TemplateBinding Padding}" BorderBrush="{TemplateBinding Background}" Background="{x:Null}" CornerRadius="15" />
+				</hc:SimplePanel>
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="Role" Value="Receiver">
+				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+				<Setter TargetName="Tail" Property="RenderTransform">
+					<Setter.Value>
+						<TransformGroup>
+							<ScaleTransform ScaleY="1" ScaleX="-1" />
+						</TransformGroup>
+					</Setter.Value>
+				</Setter>
+				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ChatBubbleAudioBaseTemplate" TargetType="hc:ChatBubble">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="12" Name="Definition1" />
+				<ColumnDefinition Name="Definition2" />
+			</Grid.ColumnDefinitions>
+			<Ellipse Name="Dot" VerticalAlignment="Top" Fill="{DynamicResource DangerBrush}" Width="6" Height="6" Visibility="{TemplateBinding IsRead,Converter={StaticResource Boolean2VisibilityReConverter}}" Margin="0,0,6,0" />
+			<Path Name="Tail" Grid.Column="1" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+			<Border Name="Body" Grid.Column="1" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+				<Grid VerticalAlignment="Center" Margin="{TemplateBinding Padding}">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<ContentPresenter Name="Presenter" VerticalAlignment="Center" />
+					<Path Name="Audio" Grid.Column="1" Data="{StaticResource AudioGeometry}" Fill="{TemplateBinding Foreground}" Width="16" Height="16" Margin="6,0,0,0" RenderTransformOrigin="0.5,0.5">
+						<Path.RenderTransform>
+							<TransformGroup>
+								<ScaleTransform ScaleY="1" ScaleX="-1" />
+							</TransformGroup>
+						</Path.RenderTransform>
+					</Path>
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="Role" Value="Receiver">
+				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+				<Setter TargetName="Tail" Property="RenderTransform">
+					<Setter.Value>
+						<TransformGroup>
+							<ScaleTransform ScaleY="1" ScaleX="-1" />
+						</TransformGroup>
+					</Setter.Value>
+				</Setter>
+				<Setter TargetName="Tail" Property="Grid.Column" Value="0" />
+				<Setter TargetName="Dot" Property="Grid.Column" Value="1" />
+				<Setter TargetName="Dot" Property="Margin" Value="6,0,0,0" />
+				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+				<Setter TargetName="Body" Property="Grid.Column" Value="0" />
+				<Setter TargetName="Definition1" Property="Width" Value="Auto" />
+				<Setter TargetName="Definition2" Property="Width" Value="12" />
+				<Setter TargetName="Audio" Property="Grid.Column" Value="0" />
+				<Setter TargetName="Audio" Property="Margin" Value="0,0,6,0" />
+				<Setter TargetName="Audio" Property="RenderTransform">
+					<Setter.Value>
+						<TransformGroup>
+							<ScaleTransform ScaleY="1" ScaleX="1" />
+						</TransformGroup>
+					</Setter.Value>
+				</Setter>
+				<Setter TargetName="Presenter" Property="Grid.Column" Value="1" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ChatBubbleCustomBaseTemplate" TargetType="hc:ChatBubble">
+		<hc:SimplePanel>
+			<Path Name="Tail" Data="{StaticResource BubbleTailGeometry}" Fill="{TemplateBinding Background}" HorizontalAlignment="Right" Stretch="Uniform" VerticalAlignment="Bottom" Width="15" Height="15" RenderTransformOrigin="0.5,0.5" />
+			<Border Name="Body" Background="{TemplateBinding Background}" CornerRadius="15" Margin="0,0,3,0">
+				<ContentPresenter VerticalAlignment="Center" Margin="{TemplateBinding Padding}" />
+			</Border>
+		</hc:SimplePanel>
+		<ControlTemplate.Triggers>
+			<Trigger Property="Role" Value="Receiver">
+				<Setter TargetName="Tail" Property="HorizontalAlignment" Value="Left" />
+				<Setter TargetName="Tail" Property="RenderTransform">
+					<Setter.Value>
+						<TransformGroup>
+							<ScaleTransform ScaleY="1" ScaleX="-1" />
+						</TransformGroup>
+					</Setter.Value>
+				</Setter>
+				<Setter TargetName="Body" Property="Margin" Value="3,0,0,0" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ChatBubbleBaseStyle" TargetType="hc:ChatBubble">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="HorizontalAlignment" Value="Right" />
+		<Setter Property="Background" Value="{DynamicResource DarkPrimaryBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Margin" Value="10" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template" Value="{StaticResource ChatBubbleStringBaseTemplate}" />
+		<Setter Property="IsRead" Value="{Binding IsSelected,RelativeSource={RelativeSource Self}}" />
+		<Setter Property="MaxWidth" Value="280" />
+		<Style.Triggers>
+			<Trigger Property="Role" Value="Receiver">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+				<Setter Property="HorizontalAlignment" Value="Left" />
+			</Trigger>
+			<Trigger Property="Type" Value="Image">
+				<Setter Property="Template" Value="{StaticResource ChatBubbleImageBaseTemplate}" />
+				<Setter Property="MaxHeight" Value="280" />
+			</Trigger>
+			<Trigger Property="Type" Value="Audio">
+				<Setter Property="Template" Value="{StaticResource ChatBubbleAudioBaseTemplate}" />
+			</Trigger>
+			<Trigger Property="Type" Value="Custom">
+				<Setter Property="Template" Value="{StaticResource ChatBubbleCustomBaseTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="Tag4CheckComboBoxStyle" BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag">
+		<Setter Property="Padding" Value="6,3,4,3" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Tag">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+							<Button Focusable="False" Name="ButtonClose" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Close" Margin="10,0,0,0" Width="16" Height="16" Padding="0,4" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource CloseGeometry}" Foreground="{TemplateBinding Foreground}" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="ButtonClose">
+							<Setter Property="hc:IconElement.Geometry" Value="{StaticResource DeleteFillCircleGeometry}" TargetName="ButtonClose" />
+							<Setter Property="Padding" Value="0" TargetName="ButtonClose" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CheckComboBoxToggleButton" BasedOn="{StaticResource ComboBoxToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
+	</Style>
+	<Style x:Key="CheckComboBoxWatermarkToggleButton" BasedOn="{StaticResource ComboBoxWatermarkToggleButton}" TargetType="ToggleButton">
+		<Setter Property="ClickMode" Value="Release" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="30" />
+						</Grid.ColumnDefinitions>
+						<Border Grid.ColumnSpan="2" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true" />
+						<Path Grid.Column="1" x:Name="arrow" Data="{StaticResource DownGeometry}" Stretch="Uniform" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Width="16" VerticalAlignment="Center" />
+						<Border Margin="1" Grid.Column="0" Visibility="{Binding SelectedItem,RelativeSource={RelativeSource AncestorType=hc:CheckComboBox},Converter={StaticResource Object2VisibilityReConverter}}">
+							<ContentPresenter Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Data" TargetName="arrow" Value="{StaticResource UpGeometry}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value=".4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CheckComboBoxItemBaseStyle" TargetType="hc:CheckComboBoxItem">
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CheckComboBoxItem">
+					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{Binding Padding,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,1,0'}" SnapsToDevicePixels="true">
+						<CheckBox Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Stretch" MinHeight="{TemplateBinding MinHeight}" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</CheckBox>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="CheckComboBoxTemplate" TargetType="hc:CheckComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<Popup x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" AllowsTransparency="true" Grid.ColumnSpan="2" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<Grid Margin="0,4" ClipToBounds="False">
+									<Grid.RowDefinitions>
+										<RowDefinition Height="Auto" />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</ScrollViewer>
+								</Grid>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Style="{StaticResource CheckComboBoxToggleButton}" />
+			<Border Grid.Column="0" Margin="-1,1">
+				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="CheckComboBoxBaseStyle" TargetType="hc:CheckComboBox">
+		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle}" />
+		<Setter Property="SelectionMode" Value="Multiple" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource CheckComboBoxItemBaseStyle}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Padding" Value="6,3" />
+		<Setter Property="Template" Value="{StaticResource CheckComboBoxTemplate}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+	</Style>
+	<ControlTemplate x:Key="CheckComboBoxExtendTopTemplate" TargetType="hc:CheckComboBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup x:Name="PART_Popup" Grid.Row="1" Grid.Column="0" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<Grid Margin="0,4" ClipToBounds="False">
+									<Grid.RowDefinitions>
+										<RowDefinition Height="Auto" />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</ScrollViewer>
+								</Grid>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
+				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CheckComboBoxExtendLeftTemplate" TargetType="hc:CheckComboBox">
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<Grid Margin="0,4" ClipToBounds="False">
+									<Grid.RowDefinitions>
+										<RowDefinition Height="Auto" />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</ScrollViewer>
+								</Grid>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" Margin="-1,1">
+				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="CheckComboBoxExtendBaseStyle" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Template" Value="{StaticResource CheckComboBoxExtendTopTemplate}" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource CheckComboBoxExtendLeftTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="CheckComboBoxPlusTopTemplate" TargetType="hc:CheckComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Row="1" Grid.Column="0" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<Grid Margin="0,4" ClipToBounds="False">
+									<Grid.RowDefinitions>
+										<RowDefinition Height="Auto" />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</ScrollViewer>
+								</Grid>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="0" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<ToggleButton Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Column="0" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+			<Border Grid.Row="1" Grid.Column="0" Margin="-1,1">
+				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+			</Border>
+			<Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="CheckComboBoxPlusLeftTemplate" TargetType="hc:CheckComboBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid x:Name="templateRoot" SnapsToDevicePixels="true" MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" MinWidth="30" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Popup Grid.Column="1" x:Name="PART_Popup" PlacementTarget="{Binding ElementName=toggleButton}" AllowsTransparency="true" Grid.ColumnSpan="2" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+				<Decorator Margin="8 0">
+					<Border Effect="{StaticResource EffectShadow2}" BorderThickness="0,1,0,0" Margin="0,0,0,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<Grid Margin="0,4" ClipToBounds="False">
+									<Grid.RowDefinitions>
+										<RowDefinition Height="Auto" />
+										<RowDefinition />
+									</Grid.RowDefinitions>
+									<hc:CheckComboBoxItem x:Name="PART_SelectAll" Style="{TemplateBinding ItemContainerStyle}" IsEnabled="{TemplateBinding ShowSelectAllButton}" Visibility="{Binding ShowSelectAllButton,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" HorizontalContentAlignment="Stretch" Content="{ex:Lang Key={x:Static langs:LangKeys.All}}" />
+									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1">
+										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</ScrollViewer>
+								</Grid>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</Decorator>
+			</Popup>
+			<TextBlock Grid.Column="1" Grid.ColumnSpan="2" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<ToggleButton Grid.Column="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" Content="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" x:Name="toggleButton" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource CheckComboBoxWatermarkToggleButton}" />
+			<Border Grid.Column="1" Margin="-1,1">
+				<hc:UniformSpacingPanel x:Name="PART_Panel" Margin="{TemplateBinding Padding}" Spacing="4" ChildWrapping="Wrap" ItemVerticalAlignment="Center" />
+			</Border>
+			<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,26,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="2" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="HasItems" Value="false">
+				<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+			</Trigger>
+			<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+				<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+				<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=toggleButton}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="toggleButton" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="ButtonClear" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="True">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="toggleButton" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_Panel" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="CheckComboBoxPlusBaseStyle" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource CheckComboBoxPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource CheckComboBoxPlusLeftTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="ColorPickerSliderHorizontal" TargetType="Slider">
+		<hc:SimplePanel>
+			<Border Margin="7,0" Background="{TemplateBinding Background}" MaxHeight="11" CornerRadius="2" />
+			<Border Margin="7,0" Background="{TemplateBinding Foreground}" MaxHeight="11" CornerRadius="2">
+				<Border.OpacityMask>
+					<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+						<GradientStop Color="Transparent" Offset="1" />
+						<GradientStop Color="White" Offset="0" />
+					</LinearGradientBrush>
+				</Border.OpacityMask>
+			</Border>
+			<Track x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb x:Name="Thumb" Focusable="False" Height="13" Width="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Center">
+						<Thumb.Effect>
+							<DropShadowEffect ShadowDepth="0" Opacity=".6" />
+						</Thumb.Effect>
+					</Thumb>
+				</Track.Thumb>
+			</Track>
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ColorPickerSliderVertical" TargetType="Slider">
+		<hc:SimplePanel>
+			<Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Background}" />
+			<Border Margin="0,7" CornerRadius="2" MaxWidth="11" Background="{TemplateBinding Foreground}">
+				<Border.OpacityMask>
+					<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+						<GradientStop Color="Transparent" Offset="1" />
+						<GradientStop Color="White" Offset="0" />
+					</LinearGradientBrush>
+				</Border.OpacityMask>
+			</Border>
+			<Track x:Name="PART_Track">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource ColorPickerSliderRepeatButtonBaseStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb x:Name="Thumb" Focusable="False" Height="13" OverridesDefaultStyle="True" Template="{StaticResource ColorPickerSliderThumbTemplate}" VerticalAlignment="Top" Width="13">
+						<Thumb.Effect>
+							<DropShadowEffect ShadowDepth="0" Opacity=".6" />
+						</Thumb.Effect>
+					</Thumb>
+				</Track.Thumb>
+			</Track>
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<Style x:Key="ColorPickerSlider" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="Foreground" Value="Transparent" />
+		<Setter Property="Template" Value="{StaticResource ColorPickerSliderHorizontal}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource ColorPickerSliderVertical}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ColorPickerBaseStyle" TargetType="hc:ColorPicker">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Width" Value="230" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ColorPicker">
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="122" />
+							<RowDefinition Height="110" />
+							<RowDefinition Height="62" />
+							<RowDefinition Height="62" />
+						</Grid.RowDefinitions>
+						<Border BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}" Grid.RowSpan="4" Background="{TemplateBinding Background}" />
+						<hc:SimplePanel Margin="1" Grid.Row="0">
+							<Border Background="{TemplateBinding BackColor}" />
+							<Border>
+								<Border.Background>
+									<LinearGradientBrush EndPoint="0,0.5" StartPoint="1,0.5">
+										<GradientStop Color="White" Offset="1" />
+										<GradientStop Color="#80ffffff" Offset=".5" />
+										<GradientStop Color="#00ffffff" />
+									</LinearGradientBrush>
+								</Border.Background>
+							</Border>
+							<Border>
+								<Border.Background>
+									<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+										<GradientStop Color="Black" Offset="1" />
+										<GradientStop Color="#80000000" Offset=".5" />
+										<GradientStop Color="#00000000" />
+									</LinearGradientBrush>
+								</Border.Background>
+							</Border>
+						</hc:SimplePanel>
+						<Border Name="PART_BorderColor" Grid.Row="0" CornerRadius="2,2,0,0" ClipToBounds="True">
+							<Canvas Margin="-6">
+								<Border Name="PART_BorderPicker" Background="Transparent" Height="12" CornerRadius="6" Width="12" BorderThickness="1" BorderBrush="White">
+									<Border.Effect>
+										<DropShadowEffect ShadowDepth="0" Opacity=".4" />
+									</Border.Effect>
+								</Border>
+							</Canvas>
+						</Border>
+						<Border Grid.Row="0" Background="Transparent" Name="PART_BorderDrag" />
+						<Grid Margin="16,16,10,0" Grid.Row="1">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition />
+								<ColumnDefinition Width="28" />
+							</Grid.ColumnDefinitions>
+							<ToggleButton Name="PART_ButtonDropper" Width="16" Height="16" Margin="0,0,10,0" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True">
+								<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource PrimaryTextBrush}" />
+								<hc:StatusSwitchElement.CheckedElement>
+									<Path Stretch="Uniform" Data="{StaticResource DropperGeometry}" Fill="{DynamicResource DarkPrimaryBrush}" />
+								</hc:StatusSwitchElement.CheckedElement>
+							</ToggleButton>
+							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{StaticResource ColorPickerOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
+							<Border Grid.Row="0" Grid.Column="1" Width="32" Height="32" CornerRadius="16" Background="{TemplateBinding SelectedBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" />
+							<Slider Name="PART_SliderColor" LargeChange="0.01" SmallChange="0.01" Grid.ColumnSpan="2" Value="6" Maximum="6" Background="{StaticResource ColorPickerRainbowBrush}" Margin="2,1,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Top" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
+							<Slider Name="PART_SliderOpacity" Grid.ColumnSpan="2" IsSnapToTickEnabled="True" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Maximum="255" SmallChange="1" Foreground="{TemplateBinding SelectedBrushWithoutOpacity}" Background="{StaticResource ColorPickerOpacityBrush}" Margin="2,0,0,0" Grid.Row="0" Grid.Column="2" VerticalAlignment="Bottom" Style="{StaticResource ColorPickerSlider}" IsMoveToPointEnabled="True" />
+							<StackPanel Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="0,14,0,0" VerticalAlignment="Top" Visibility="{Binding ShowList[0],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}">
+								<TextBox Padding="0" HorizontalContentAlignment="Center" Width="176" Text="{Binding SelectedBrush,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,Converter={StaticResource Color2HexStringConverter},UpdateSourceTrigger=LostFocus}" FontSize="10" MaxLength="10" Height="24" />
+								<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="HEX" HorizontalAlignment="Center" />
+							</StackPanel>
+							<UniformGrid Name="PART_PanelRgb" Visibility="{Binding ShowList[1],RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Rows="1" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="-2,14,-2,0" VerticalAlignment="Top">
+								<StackPanel Margin="2,0">
+									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="2,0" Tag="R" Value="{Binding ChannelR,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="R" HorizontalAlignment="Center" />
+								</StackPanel>
+								<StackPanel Margin="2,0">
+									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="G" Value="{Binding ChannelG,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="G" HorizontalAlignment="Center" />
+								</StackPanel>
+								<StackPanel Margin="2,0">
+									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Tag="B" Value="{Binding ChannelB,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="B" HorizontalAlignment="Center" />
+								</StackPanel>
+								<StackPanel Margin="2,0">
+									<hc:NumericUpDown HorizontalContentAlignment="Center" Padding="0" Value="{Binding ChannelA,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ShowUpDownButton="False" Maximum="255" Minimum="0" FontSize="10" Height="24" />
+									<TextBlock Foreground="{DynamicResource ThirdlyTextBrush}" Margin="0,2,0,0" FontSize="10" Text="A" HorizontalAlignment="Center" />
+								</StackPanel>
+							</UniformGrid>
+							<Button Command="interactivity:ControlCommands.Switch" Padding="6" FontSize="8" BorderThickness="0" HorizontalAlignment="Right" Height="24" Width="20" Grid.Column="3" Grid.Row="1">
+								<Button.Content>
+									<Path Fill="#323534" Style="{StaticResource UpDownPathStyle}" />
+								</Button.Content>
+							</Button>
+						</Grid>
+						<Border Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
+							<WrapPanel Name="PART_PanelColor" Margin="6" HorizontalAlignment="Center" />
+						</Border>
+						<Border Grid.Row="3" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource BorderBrush}">
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+								<Button Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Width="80" Margin="0,0,16,0" />
+								<Button Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Width="80" Style="{StaticResource ButtonPrimary}" />
+							</StackPanel>
+						</Border>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ContextMenuBaseStyle" TargetType="ContextMenu">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ContextMenu">
+					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{TemplateBinding Background}" CornerRadius="2" MaxHeight="{TemplateBinding MaxHeight}" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+						<ScrollViewer Style="{StaticResource ScrollViewerUpDown}" Margin="0,6">
+							<ItemsPresenter />
+						</ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CoverViewContentBaseStyle" TargetType="hc:CoverViewContent">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Margin" Value="0,0,0,8" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CoverViewContent">
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition Height="16" />
+							<RowDefinition />
+						</Grid.RowDefinitions>
+						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
+							<Border.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform X="5" Y="5" />
+									<RotateTransform Angle="45" />
+								</TransformGroup>
+							</Border.RenderTransform>
+						</Border>
+						<Border x:Name="PART_Content" MinHeight="30" Height="0" Grid.Row="1" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+							<ContentPresenter Margin="{TemplateBinding Padding}" />
+						</Border>
+						<Rectangle SnapsToDevicePixels="True" Visibility="{Binding Visibility,ElementName=PART_Triangle}" Grid.Row="1" VerticalAlignment="Top" HorizontalAlignment="Left" Width="28" Margin="{Binding Margin,ElementName=PART_Triangle}" Height="1" Fill="{TemplateBinding Background}">
+							<Rectangle.RenderTransform>
+								<TransformGroup>
+									<TranslateTransform X="1" />
+								</TransformGroup>
+							</Rectangle.RenderTransform>
+						</Rectangle>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="CoverViewBaseStyle" TargetType="hc:CoverView">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource CoverViewItemBaseStyle}" />
+		<Setter Property="CoverViewContentStyle" Value="{StaticResource CoverViewContentBaseStyle}" />
+		<Setter Property="ItemMargin" Value="8" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CoverView">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<ScrollViewer>
+							<WrapPanel x:Name="PART_Panel" />
+						</ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="DatePickerTextBoxStyle" TargetType="DatePickerTextBox">
+		<Setter Property="Foreground" Value="{Binding Foreground,RelativeSource={RelativeSource AncestorType=DatePicker}}" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DatePickerTextBox">
+					<hc:SimplePanel>
+						<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource AncestorType=DatePicker}}" TextElement.Foreground="{DynamicResource ThirdlyTextBrush}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="DatePickerBaseStyle" TargetType="DatePicker">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="CalendarStyle" Value="{StaticResource CalendarBaseStyle}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="IsTodayHighlighted" Value="True" />
+		<Setter Property="SelectedDateFormat" Value="Short" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DatePicker">
+					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="30" />
+							</Grid.ColumnDefinitions>
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="DatePickerExtendTopTemplate" TargetType="DatePicker">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="DatePickerExtendLeftTemplate" TargetType="DatePicker">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="DatePickerExtendBaseStyle" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template" Value="{StaticResource DatePickerExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource DatePickerExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="DatePickerPlusTopTemplate" TargetType="hc:DatePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="DatePickerPlusLeftTemplate" TargetType="hc:DatePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
+					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="DatePickerPlusBaseStyle" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="hc:DatePicker">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Template" Value="{StaticResource DatePickerPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource DatePickerPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DateTimePickerBaseStyle" TargetType="hc:DateTimePicker">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:DateTimePicker">
+					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="30" />
+							</Grid.ColumnDefinitions>
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="DateTimePickerExtendTopTemplate" TargetType="hc:DateTimePicker">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="DateTimePickerExtendLeftTemplate" TargetType="hc:DateTimePicker">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="DateTimePickerExtendBaseStyle" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template" Value="{StaticResource DateTimePickerExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource DateTimePickerExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="DateTimePickerPlusTopTemplate" TargetType="hc:DateTimePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Grid.Row="1" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="DateTimePickerPlusLeftTemplate" TargetType="hc:DateTimePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="DateTimePickerPlusBaseStyle" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource DateTimePickerPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource DateTimePickerPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DialogBaseStyle" TargetType="hc:Dialog">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Dialog">
+					<Border Background="{DynamicResource DarkOpacityBrush}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="DividerBaseStyle" TargetType="hc:Divider">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Margin" Value="0,24" />
+		<Setter Property="Padding" Value="24,0" />
+		<Setter Property="LineStroke" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Divider">
+					<hc:Row>
+						<hc:Col Layout="12" x:Name="ColStart">
+							<Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+						</hc:Col>
+						<hc:Col Layout="0">
+							<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+						</hc:Col>
+						<hc:Col Layout="12" x:Name="ColEnd">
+							<Line VerticalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" X2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+						</hc:Col>
+					</hc:Row>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Padding" Value="0" />
+						</Trigger>
+						<Trigger Property="HorizontalContentAlignment" Value="Left">
+							<Setter TargetName="ColStart" Property="Layout" Value="0" />
+							<Setter TargetName="ColStart" Property="IsFixed" Value="True" />
+							<Setter TargetName="ColStart" Property="Width" Value="20" />
+							<Setter TargetName="ColEnd" Property="Layout" Value="24" />
+						</Trigger>
+						<Trigger Property="HorizontalContentAlignment" Value="Right">
+							<Setter TargetName="ColEnd" Property="Layout" Value="0" />
+							<Setter TargetName="ColEnd" Property="IsFixed" Value="True" />
+							<Setter TargetName="ColEnd" Property="Width" Value="20" />
+							<Setter TargetName="ColStart" Property="Layout" Value="24" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="Content" Value="{x:Null}">
+				<Setter Property="Padding" Value="0" />
+			</Trigger>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Margin" Value="6,0" />
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="hc:Divider">
+							<Line HorizontalAlignment="Center" StrokeDashArray="{TemplateBinding LineStrokeDashArray}" Stroke="{TemplateBinding LineStroke}" Y2="1" StrokeThickness="{TemplateBinding LineStrokeThickness}" Stretch="Fill" StrokeEndLineCap="Square" StrokeStartLineCap="Square" />
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DrawerBaseStyle" TargetType="hc:Drawer">
+		<Setter Property="Dock" Value="Right" />
+		<Setter Property="MaskBrush" Value="{DynamicResource DarkOpacityBrush}" />
+	</Style>
+	<DrawingBrush x:Key="EmptySimpleLogo" o:Freeze="True">
+		<DrawingBrush.Drawing>
+			<DrawingGroup o:Freeze="True">
+				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M0,844.8C0,942.250667 361.096533,1021.269333 806.536533,1021.269333 1251.976533,1021.269333 1613.038933,942.250666 1613.038933,844.8 1613.038933,747.383467 1251.9424,668.398933 806.536533,668.398933 361.096533,668.398933 0,747.383467 0,844.8z" />
+				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1398.784,580.164267L214.254933,580.164267 214.254933,330.6496 473.873067,35.771733C486.4,13.1072,509.1328,0.477867,531.797333,0.477867L1081.2416,0.477867C1103.940267,0.477867,1126.638933,13.1072,1141.725867,38.2976L1398.818133,330.6496 1398.818133,580.164267z M239.479467,555.008L1373.627733,555.008 1373.627733,338.261333 1121.553067,50.858667C1108.992,33.245867,1096.362667,23.210667,1081.2416,23.210667L531.797333,23.210667C516.676266,23.210667,504.081066,33.28,493.9776,48.401067L239.445333,340.753067 239.445333,554.973867z" />
+				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource SecondaryRegionBrush}" Geometry="F1 M1638,1024z M0,0z M1048.4736,413.832533C1048.4736,373.521066,1073.664,340.753066,1103.940267,340.753067L1386.222933,340.753067 1386.222933,796.945067C1386.222933,849.851734,1353.454933,895.249067,1310.583467,895.249067L302.455467,895.249067C262.109867,895.249067,226.850134,852.3776,226.850133,796.945067L226.850133,340.753067 509.1328,340.753067C539.374933,340.753067 564.565333,373.521067 564.565333,413.832533 564.565333,454.143999 589.755733,486.912 619.997867,486.912L993.041067,486.912C1023.2832,489.437867,1048.4736,454.144,1048.4736,413.832533z" />
+				<GeometryDrawing o:Freeze="True" Brush="{DynamicResource BorderBrush}" Geometry="F1 M1638,1024z M0,0z M1310.583467,907.844267L302.455467,907.844267C254.5664,907.844267,214.2208,857.429334,214.2208,796.910933L214.2208,328.192 509.1328,328.192C546.9184,328.192 577.160533,365.9776 577.160533,413.866667 577.160533,446.634667 597.2992,474.350934 619.997867,474.350933L993.041067,474.350933C1015.7056,474.350933 1035.8784,446.634666 1035.8784,413.866667 1035.8784,365.9776 1066.120533,328.192 1103.940267,328.192L1398.818133,328.192 1398.818133,796.9792C1398.818133,857.463467,1360.9984,907.8784,1310.583467,907.8784z M239.445333,353.348267L239.445333,796.945067C239.445333,844.834134,267.1616,882.619734,302.455467,882.619733L1310.583467,882.619733C1345.877334,882.619733,1373.5936,844.834133,1373.5936,796.945067L1373.5936,353.348267 1103.940267,353.348267C1081.2416,353.348267 1061.0688,381.064534 1061.0688,413.832533 1061.0688,461.7216 1030.826667,499.5072 993.041067,499.5072L619.997867,499.5072C582.212267,499.5072 551.970134,461.7216 551.970133,413.832533 551.970133,381.064533 531.831466,350.8224 509.1328,350.8224L239.445333,350.8224 239.445333,353.348267z" />
+			</DrawingGroup>
+		</DrawingBrush.Drawing>
+	</DrawingBrush>
+	<Rectangle x:Key="LogoRectangle4Empty" x:Shared="False" HorizontalAlignment="Center" Width="64" Height="41" Fill="{StaticResource EmptySimpleLogo}" />
+	<TextBlock x:Key="DescriptionTextBlock4Empty" x:Shared="False" Margin="0,10,0,0" HorizontalAlignment="Center" Foreground="{DynamicResource ThirdlyTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.NoData}}" />
+	<Style x:Key="EmptyBaseStyle" TargetType="hc:Empty">
+		<Setter Property="Logo" Value="{StaticResource LogoRectangle4Empty}" />
+		<Setter Property="Description" Value="{StaticResource DescriptionTextBlock4Empty}" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="Visibility" Value="{Binding Path=(hc:Empty.ShowEmpty),RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Empty">
+					<hc:SimpleStackPanel>
+						<ContentPresenter ContentSource="Logo" />
+						<ContentPresenter ContentSource="Description" />
+						<ContentPresenter HorizontalAlignment="Center" />
+					</hc:SimpleStackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ExpanderLeftTemplate" TargetType="Expander">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<Border x:Name="BorderHeader" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="32" />
+						</Grid.ColumnDefinitions>
+						<Grid.LayoutTransform>
+							<TransformGroup>
+								<RotateTransform Angle="-90" />
+							</TransformGroup>
+						</Grid.LayoutTransform>
+						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+					</Grid>
+				</ToggleButton>
+			</Border>
+			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="0" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsExpanded" Value="true">
+				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,1,1,0'}" />
+				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ExpanderUpTemplate" TargetType="Expander">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<Border x:Name="BorderHeader" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinHeight="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="32" />
+						</Grid.ColumnDefinitions>
+						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource UpGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+					</Grid>
+				</ToggleButton>
+			</Border>
+			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="0" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsExpanded" Value="true">
+				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='0,0,1,1'}" />
+				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource DownGeometry}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ExpanderRightTemplate" TargetType="Expander">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<ToggleButton VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Focusable="False" Padding="0,0,0,10" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{TemplateBinding MinWidth}" Style="{StaticResource ToggleButtonCustom}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="32" />
+						</Grid.ColumnDefinitions>
+						<Grid.LayoutTransform>
+							<TransformGroup>
+								<RotateTransform Angle="-90" />
+							</TransformGroup>
+						</Grid.LayoutTransform>
+						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+					</Grid>
+				</ToggleButton>
+			</Border>
+			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Column="1" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsExpanded" Value="true">
+				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,0,0,1'}" />
+				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ExpanderDownTemplate" TargetType="Expander">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+			<Border x:Name="BorderHeader" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<ToggleButton HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Focusable="False" Padding="10,0,0,0" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="{TemplateBinding Width}" Height="{TemplateBinding MinHeight}" Style="{StaticResource ToggleButtonCustom}">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition />
+							<ColumnDefinition Width="32" />
+						</Grid.ColumnDefinitions>
+						<ContentPresenter ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						<Path Name="PathArrow" IsHitTestVisible="False" Grid.Column="1" Stretch="Uniform" Fill="{TemplateBinding Foreground}" Data="{StaticResource DownGeometry}" Margin="0,0,10,0" Width="12" Height="12" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="Right" />
+					</Grid>
+				</ToggleButton>
+			</Border>
+			<ContentPresenter Name="ExpandSite" Visibility="Collapsed" Grid.Row="1" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsExpanded" Value="true">
+				<Setter Property="CornerRadius" TargetName="BorderHeader" Value="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" />
+				<Setter Property="Visibility" TargetName="ExpandSite" Value="Visible" />
+				<Setter Property="Data" TargetName="PathArrow" Value="{StaticResource UpGeometry}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ExpanderBaseStyle" TargetType="Expander">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="MinWidth" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template" Value="{StaticResource ExpanderDownTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="ExpandDirection" Value="Left">
+				<Setter Property="Template" Value="{StaticResource ExpanderLeftTemplate}" />
+			</Trigger>
+			<Trigger Property="ExpandDirection" Value="Up">
+				<Setter Property="Template" Value="{StaticResource ExpanderUpTemplate}" />
+			</Trigger>
+			<Trigger Property="ExpandDirection" Value="Right">
+				<Setter Property="Template" Value="{StaticResource ExpanderRightTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="FlowDocumentScrollViewerBaseStyle" TargetType="FlowDocumentScrollViewer">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="FlowDocumentScrollViewer">
+					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+						<Grid x:Name="PART_ToolBarHost" Panel.ZIndex="1" DockPanel.Dock="Bottom" Margin="0,6">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+							<Grid Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Center">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Width="180" />
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+							</Grid>
+						</Grid>
+						<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<ScrollViewer x:Name="PART_ContentHost" CanContentScroll="True" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+					</DockPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FlowDocumentPageViewerBaseStyle" TargetType="FlowDocumentPageViewer">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="FlowDocumentPageViewer">
+					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+						<Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<Border x:Name="PART_FindToolBarHost" Grid.Column="0" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+							<StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
+								<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+									<Run Text=" " />
+									<InlineUIContainer>
+										<TextBlock Text="{Binding MasterPageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
+									</InlineUIContainer>
+									<Run Text=" " />
+									<Run Text="/" />
+									<Run Text=" " />
+									<InlineUIContainer>
+										<TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
+									</InlineUIContainer>
+									<Run Text=" " />
+								</TextBlock>
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
+							</StackPanel>
+							<Grid Grid.Column="2" VerticalAlignment="Center" Margin="32,0,0,0">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<RepeatButton Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="0" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="1" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="2" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+							</Grid>
+						</Grid>
+						<Border Panel.ZIndex="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<AdornerDecorator>
+								<DocumentPageView HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" DocumentPaginator="{x:Null}" KeyboardNavigation.IsTabStop="False" DocumentViewerBase.IsMasterPage="True" PageNumber="0" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" />
+							</AdornerDecorator>
+						</Border>
+					</DockPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="FlowDocumentReaderBaseStyle" TargetType="FlowDocumentReader">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="Local" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="FlowDocumentReader">
+					<DockPanel Background="{TemplateBinding Background}" LastChildFill="True">
+						<Grid Panel.ZIndex="1" DockPanel.Dock="Bottom" HorizontalAlignment="Stretch" Margin="0,6">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<StackPanel Orientation="Horizontal">
+								<ToggleButton Width="24" Height="24" Padding="5" x:Name="FindButton" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Command="ApplicationCommands.Find" Margin="0,0,10,0" ToolTip="{x:Static langs:Lang.Find}" />
+								<Border x:Name="PART_FindToolBarHost" HorizontalAlignment="Left" Visibility="Collapsed" VerticalAlignment="Center" />
+							</StackPanel>
+							<StackPanel x:Name="PageCountAndButtons" Grid.Column="1" HorizontalAlignment="Center" Orientation="Horizontal" VerticalAlignment="Center">
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.PreviousPage" IsEnabled="{TemplateBinding CanGoToPreviousPage}" ToolTip="{x:Static langs:Lang.PreviousPage}" />
+								<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+									<Run Text=" " />
+									<InlineUIContainer>
+										<TextBlock Text="{Binding PageNumber, RelativeSource={RelativeSource TemplatedParent}}" />
+									</InlineUIContainer>
+									<Run Text=" " />
+									<Run Text="/" />
+									<Run Text=" " />
+									<InlineUIContainer>
+										<TextBlock Text="{Binding PageCount, RelativeSource={RelativeSource TemplatedParent}}" />
+									</InlineUIContainer>
+									<Run Text=" " />
+								</TextBlock>
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.NextPage" IsEnabled="{TemplateBinding CanGoToNextPage}" ToolTip="{x:Static langs:Lang.NextPage}" />
+							</StackPanel>
+							<Grid Grid.Column="2" Margin="32,0,0,0" VerticalAlignment="Center">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<hc:ButtonGroup Width="90">
+									<RadioButton x:Name="PageViewButton" Padding="0" hc:IconElement.Geometry="{StaticResource PageModeGeometry}" CommandParameter="Page" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsPageViewEnabled}" ToolTip="{x:Static langs:Lang.PageMode}" />
+									<RadioButton x:Name="TwoPageViewButton" hc:IconElement.Geometry="{StaticResource TwoPageModeGeometry}" Padding="0" CommandParameter="TwoPage" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsTwoPageViewEnabled}" ToolTip="{x:Static langs:Lang.TwoPageMode}" />
+									<RadioButton x:Name="ScrollViewButton" hc:IconElement.Geometry="{StaticResource ScrollModeGeometry}" Padding="0" CommandParameter="Scroll" Command="FlowDocumentReader.SwitchViewingModeCommand" GroupName="ViewingMode" IsEnabled="{TemplateBinding IsScrollViewEnabled}" ToolTip="{x:Static langs:Lang.ScrollMode}" />
+								</hc:ButtonGroup>
+								<RepeatButton Margin="32,0,0,0" Height="20" Width="20" Padding="5,8" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource SubGeometry}" Grid.Column="1" Command="NavigationCommands.DecreaseZoom" IsEnabled="{TemplateBinding CanDecreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomOut}" />
+								<Slider hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" Grid.Column="2" HorizontalAlignment="Stretch" LargeChange="{TemplateBinding ZoomIncrement}" Maximum="{TemplateBinding MaxZoom}" Minimum="{TemplateBinding MinZoom}" SmallChange="{TemplateBinding ZoomIncrement}" TickFrequency="{TemplateBinding ZoomIncrement}" Value="{Binding Zoom, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+								<RepeatButton Height="20" Width="20" Padding="4" hc:BorderElement.CornerRadius="10" hc:IconElement.Geometry="{StaticResource AddGeometry}" Grid.Column="3" Command="NavigationCommands.IncreaseZoom" IsEnabled="{TemplateBinding CanIncreaseZoom}" ToolTip="{x:Static langs:Lang.ZoomIn}" />
+							</Grid>
+						</Grid>
+						<Border Panel.ZIndex="0" x:Name="PART_ContentHost" KeyboardNavigation.IsTabStop="False" KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{TemplateBinding Padding}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+					</DockPanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="ViewingMode" Value="Page">
+							<Setter Property="IsChecked" TargetName="PageViewButton" Value="True" />
+						</Trigger>
+						<Trigger Property="ViewingMode" Value="TwoPage">
+							<Setter Property="IsChecked" TargetName="TwoPageViewButton" Value="True" />
+							<Setter Property="BorderThickness" Value="0" />
+						</Trigger>
+						<Trigger Property="ViewingMode" Value="Scroll">
+							<Setter Property="IsChecked" TargetName="ScrollViewButton" Value="True" />
+							<Setter Property="Visibility" TargetName="PageCountAndButtons" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="Document" Value="{x:Null}">
+							<Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
+						</Trigger>
+						<Trigger Property="IsFindEnabled" Value="False">
+							<Setter Property="IsEnabled" TargetName="FindButton" Value="False" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="MenuItem4FrameStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
+		<Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
+		<Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
+		<Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
+		<Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
+	</Style>
+	<ControlTemplate x:Key="FrameWithNavigationUIStyle" TargetType="Frame">
+		<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+			<DockPanel LastChildFill="True">
+				<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter}, ConverterParameter='1,1,0,0'}" DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
+					<hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
+						<Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
+							<Button.ContextMenu>
+								<ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
+							</Button.ContextMenu>
+						</Button>
+						<Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
+							<Button.ContextMenu>
+								<ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4FrameStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
+							</Button.ContextMenu>
+						</Button>
+						<Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
+					</hc:ButtonGroup>
+				</Border>
+				<ContentPresenter SnapsToDevicePixels="True" x:Name="PART_NavWinCP" ClipToBounds="true" />
+			</DockPanel>
+		</Border>
+	</ControlTemplate>
+	<Style x:Key="FrameBaseStyle" TargetType="Frame">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Frame">
+					<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<ContentPresenter SnapsToDevicePixels="True" x:Name="PART_FrameCP" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="NavigationUIVisibility" Value="Visible">
+				<Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="JournalOwnership" Value="OwnsJournal" />
+					<Condition Property="NavigationUIVisibility" Value="Automatic" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource FrameWithNavigationUIStyle}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="GotoTopBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="hc:GotoTop">
+		<Setter Property="Width" Value="50" />
+		<Setter Property="Height" Value="50" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="25" />
+		<Setter Property="hc:IconElement.Geometry" Value="{StaticResource UpGeometry}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Padding" Value="16" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Style="{StaticResource RectangleFocusVisualCircular}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="GravatarBaseStyle" TargetType="hc:Gravatar">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Width" Value="72" />
+		<Setter Property="Height" Value="72" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="6" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Gravatar">
+					<Border ClipToBounds="True" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ImageSelectorBaseStyle" TargetType="hc:ImageSelector">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Stretch" Value="UniformToFill" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="StrokeThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="StrokeDashArray" Value="2,2" />
+		<Setter Property="hc:IconSwitchElement.Geometry" Value="{StaticResource AddGeometry}" />
+		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{StaticResource RemoveGeometry}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ImageSelector">
+					<Button Command="interactivity:ControlCommands.Switch" Style="{StaticResource ButtonCustom}" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<hc:DashedBorder BorderDashArray="{TemplateBinding StrokeDashArray}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" BorderDashThickness="{TemplateBinding StrokeThickness}" Background="{TemplateBinding PreviewBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+								<Border Width="30" Height="30" Background="{TemplateBinding Background}" Style="{StaticResource BorderCircular}">
+									<hc:ToggleBlock IsChecked="{TemplateBinding HasValue}">
+										<hc:ToggleBlock.CheckedContent>
+											<Path Data="{TemplateBinding hc:IconSwitchElement.GeometrySelected}" Width="12" Height="12" Fill="{DynamicResource PrimaryBrush}" />
+										</hc:ToggleBlock.CheckedContent>
+										<hc:ToggleBlock.UnCheckedContent>
+											<Path Data="{TemplateBinding hc:IconSwitchElement.Geometry}" Width="16" Height="16" Fill="{DynamicResource PrimaryBrush}" />
+										</hc:ToggleBlock.UnCheckedContent>
+									</hc:ToggleBlock>
+								</Border>
+							</hc:DashedBorder>
+						</Border>
+					</Button>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ListBoxItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ListBoxItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType=ItemsControl}}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListBoxItem">
+					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="true">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsSelected" Value="true" />
+					<Condition Property="Selector.IsSelectionActive" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+			<Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="ListBoxItem">
+							<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+								<StackPanel Orientation="Horizontal">
+									<ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
+									<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+								</StackPanel>
+							</Border>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ListBoxBaseStyle" TargetType="ListBox">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+		<Setter Property="hc:ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="hc:ScrollViewer.CanContentScroll" Value="true" />
+		<Setter Property="hc:ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListBox">
+					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<hc:ScrollViewer Focusable="false">
+									<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</hc:ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="GridViewColumnHeader">
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Padding" Value="12,6,12,12" />
+		<Setter Property="MinHeight" Value="44" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="GridViewColumnHeader">
+					<hc:SimplePanel SnapsToDevicePixels="true">
+						<Border x:Name="HeaderBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="Transparent">
+							<ContentPresenter x:Name="HeaderContent" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+						</Border>
+						<Canvas>
+							<Thumb x:Name="PART_HeaderGripper" Style="{StaticResource GridViewColumnHeaderGripper}" />
+						</Canvas>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ListViewItemBaseStyle" TargetType="ListViewItem">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="SnapsToDevicePixels" Value="true" />
+		<Setter Property="Margin" Value="0,0,0,4" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="MinHeight" Value="44" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListViewItem">
+					<Border CornerRadius="4" x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<GridViewRowPresenter Content="{TemplateBinding Content}" Columns="{TemplateBinding GridView.ColumnCollection}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsSelected" Value="true" />
+					<Condition Property="Selector.IsSelectionActive" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="LoadingBaseStyle" TargetType="hc:LoadingBase">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="DotDiameter" Value="10" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="LoadingCircleBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingCircle">
+		<Setter Property="Width" Value="40" />
+		<Setter Property="Height" Value="40" />
+		<Setter Property="DotDiameter" Value="5" />
+		<Setter Property="DotInterval" Value="30" />
+		<Setter Property="DotOffSet" Value="60" />
+		<Setter Property="DotDelayTime" Value="90" />
+		<Setter Property="DotSpeed" Value="4" />
+	</Style>
+	<Style x:Key="LoadingLineBaseStyle" BasedOn="{StaticResource LoadingBaseStyle}" TargetType="hc:LoadingLine">
+		<Setter Property="DotDiameter" Value="5" />
+	</Style>
+	<Style x:Key="MagnifierBaseStyle" TargetType="hc:Magnifier">
+		<Setter Property="IsHitTestVisible" Value="False" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Width" Value="180" />
+		<Setter Property="Height" Value="180" />
+		<Setter Property="BorderThickness" Value="8" />
+		<Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Magnifier">
+					<Border Style="{StaticResource BorderCircular}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Ellipse>
+							<Ellipse.Fill>
+								<VisualBrush Visual="{Binding Target,RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute" x:Name="PART_VisualBrush" />
+							</Ellipse.Fill>
+						</Ellipse>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="MenuItem4NavigationWindowStyle" BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem">
+		<Setter Property="Header" Value="{Binding (JournalEntry.Name)}" />
+		<Setter Property="Command" Value="NavigationCommands.NavigateJournal" />
+		<Setter Property="CommandTarget" Value="{Binding TemplatedParent, RelativeSource={RelativeSource AncestorType=ContextMenu}}" />
+		<Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}}" />
+	</Style>
+	<Style x:Key="NavigationWindowBaseStyle" TargetType="NavigationWindow">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="NavigationWindow">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<DockPanel LastChildFill="True">
+							<Border DockPanel.Dock="Top" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource DarkDefaultBrush}">
+								<hc:ButtonGroup x:Name="NavChrome" Width="90" Margin="10,6" HorizontalAlignment="Left">
+									<Button Padding="6" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="NavigationCommands.BrowseBack">
+										<Button.ContextMenu>
+											<ContextMenu x:Name="BackNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.BackStack), RelativeSource={RelativeSource TemplatedParent}}" />
+										</Button.ContextMenu>
+									</Button>
+									<Button Padding="6" hc:IconElement.Geometry="{StaticResource RightGeometry}" Command="NavigationCommands.BrowseForward">
+										<Button.ContextMenu>
+											<ContextMenu x:Name="ForwardNavMenu" ItemContainerStyle="{StaticResource MenuItem4NavigationWindowStyle}" ItemsSource="{Binding Path=(NavigationWindow.ForwardStack), RelativeSource={RelativeSource TemplatedParent}}" />
+										</Button.ContextMenu>
+									</Button>
+									<Button Padding="6" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Command="NavigationCommands.Refresh" />
+								</hc:ButtonGroup>
+							</Border>
+							<hc:SimplePanel>
+								<AdornerDecorator>
+									<ContentPresenter x:Name="PART_NavWinCP" ClipToBounds="true" />
+								</AdornerDecorator>
+								<ResizeGrip x:Name="WindowResizeGrip" HorizontalAlignment="Right" IsTabStop="false" Visibility="Collapsed" VerticalAlignment="Bottom" />
+							</hc:SimplePanel>
+						</DockPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="ShowsNavigationUI" Value="False">
+							<Setter Property="Visibility" TargetName="NavChrome" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="CanGoBack" Value="False">
+							<Setter Property="IsEnabled" TargetName="BackNavMenu" Value="false" />
+						</Trigger>
+						<Trigger Property="CanGoForward" Value="False">
+							<Setter Property="IsEnabled" TargetName="ForwardNavMenu" Value="false" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
+								<Condition Property="WindowState" Value="Normal" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Visibility" TargetName="WindowResizeGrip" Value="Visible" />
+						</MultiTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+		<Setter Property="IsTabStop" Value="False" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:NumericUpDown">
+					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+							<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+							<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="ShowUpDownButton" Value="False">
+							<Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
+						</Trigger>
+						<Trigger Property="IsReadOnly" Value="True">
+							<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+							<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="NumericUpDownExtendTopTemplate" TargetType="hc:NumericUpDown">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsReadOnly" Value="True">
+				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="NumericUpDownExtendLeftTemplate" TargetType="hc:NumericUpDown">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsReadOnly" Value="True">
+				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="NumericUpDownExtendBaseStyle" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Template" Value="{StaticResource NumericUpDownExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource NumericUpDownExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+					<Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsReadOnly" Value="True">
+				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" />
+					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsReadOnly" Value="False" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsReadOnly" Value="True">
+				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
+				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" />
+					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsReadOnly" Value="False" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource NumericUpDownPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="PasswordBoxBaseStyle" TargetType="PasswordBox">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+		<Setter Property="PasswordChar" Value="●" />
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="PasswordBox">
+					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="border" Value="0.4" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<Trigger Property="IsFocused" Value="true">
+							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="PasswordBoxExtendTopTemplate" TargetType="PasswordBox">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<TextBlock x:Name="placeholder" Padding="1" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+				<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+				<Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="PasswordBoxExtendLeftTemplate" TargetType="PasswordBox">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<TextBlock Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" Grid.Column="1" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-1,1" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+				<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value="0.4" TargetName="border" />
+				<Setter Property="Opacity" Value="0.4" TargetName="placeholder" />
+				<Setter Property="Opacity" Value="0.4" TargetName="PART_ContentHost" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="PasswordBoxExtendBaseStyle" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
+		<Setter Property="Template" Value="{StaticResource PasswordBoxExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource PasswordBoxExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="PasswordBoxPlusInternalStyle" TargetType="PasswordBox">
+		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="PasswordBox">
+					<hc:SimplePanel>
+						<TextBlock Margin="2,-1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" x:Name="placeholder" Visibility="Collapsed" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+						<ScrollViewer Padding="{TemplateBinding Padding}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="hc:PasswordBoxAttach.PasswordLength" Value="0">
+							<Setter Property="Visibility" TargetName="placeholder" Value="Visible" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="PasswordBoxPlusTopTemplate" TargetType="hc:PasswordBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<DockPanel Grid.ColumnSpan="3" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Grid.Column="0" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
+			<Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="0" Grid.Row="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
+			<hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			<Button Height="{x:Static system:Double.NaN}" Grid.Row="1" Grid.Column="1" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			<ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="1" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="ShowEyeButton" Value="true">
+				<Setter Property="Margin" Value="0" TargetName="ButtonClear" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="PasswordBoxPlusLeftTemplate" TargetType="hc:PasswordBox">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Grid.ColumnSpan="3" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<Border Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<PasswordBox Margin="-1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityReConverter}}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" Grid.Column="1" x:Name="PART_PasswordBox" PasswordChar="{TemplateBinding PasswordChar}" Style="{StaticResource PasswordBoxPlusInternalStyle}" />
+			<hc:WatermarkTextBox Margin="1,1,0,1" Visibility="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="1" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+			<Button Height="{x:Static system:Double.NaN}" Grid.Column="2" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			<ToggleButton Height="{x:Static system:Double.NaN}" Margin="3,0,7,0" IsChecked="{Binding ShowPassword,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Width="16" Style="{StaticResource ToggleButtonIconTransparent}" Visibility="{TemplateBinding ShowEyeButton,Converter={StaticResource Boolean2VisibilityConverter}}" Padding="0" hc:IconSwitchElement.Geometry="{StaticResource EyeCloseGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource EyeOpenGeometry}" x:Name="ButtonEye" Grid.Column="3" Foreground="{TemplateBinding BorderBrush}" Focusable="False" />
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_PasswordBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+			<Trigger Property="ShowEyeButton" Value="true">
+				<Setter Property="Margin" Value="0" TargetName="ButtonClear" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="PasswordBoxPlusBaseStyle" TargetType="hc:PasswordBox">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
+		<Setter Property="PasswordChar" Value="●" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="AllowDrop" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:PasswordBoxAttach.IsMonitoring" Value="True" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template" Value="{StaticResource PasswordBoxPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource PasswordBoxPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="PinBoxBaseStyle" TargetType="hc:PinBox">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemMargin" Value="4,0" />
+		<Setter Property="ItemWidth" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ItemHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:PinBox">
+					<UniformGrid Name="PART_Panel" Columns="{TemplateBinding Length}" Rows="1" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PoptipBaseStyle" TargetType="hc:Poptip">
+		<Setter Property="IsHitTestVisible" Value="False" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Offset" Value="6" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Poptip">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressBarFlat4ProgressButton" TargetType="ProgressBar">
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ProgressBar">
+					<Border x:Name="PART_Track">
+						<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
+							<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="Indicator" Background="{TemplateBinding Foreground}" />
+						</Decorator>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ProgressButtonBaseStyle" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="ProgressStyle" Value="{StaticResource ProgressBarFlat4ProgressButton}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ProgressButton">
+					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<hc:SimplePanel>
+							<ProgressBar x:Name="ProgressBar" Height="Auto" Value="{TemplateBinding Progress}" Maximum="100" Visibility="Collapsed" Style="{TemplateBinding ProgressStyle}" />
+							<ContentPresenter Name="UnCheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							<ContentPresenter Name="CheckedElement" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Visibility="Collapsed" Content="{Binding Path=(hc:StatusSwitchElement.CheckedElement),RelativeSource={RelativeSource TemplatedParent}}" />
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Visibility" Value="Visible" TargetName="ProgressBar" />
+							<Setter Property="Visibility" Value="Visible" TargetName="CheckedElement" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="hc:StatusSwitchElement.HideUncheckedElement" Value="True" />
+								<Condition Property="IsChecked" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Visibility" Value="Collapsed" TargetName="UnCheckedElement" />
+						</MultiTrigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PropertyItemToolTipBaseStyle" BasedOn="{StaticResource {x:Type ToolTip}}" TargetType="ToolTip">
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToolTip">
+					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<ContentPresenter x:Name="Presenter" Margin="0,0,0,10" />
+							<StackPanel Grid.Row="1" Orientation="Horizontal">
+								<TextBlock FontWeight="Bold" Text="{Binding PropertyTypeName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" />
+								<TextBlock Text="{Binding PropertyName,RelativeSource={RelativeSource AncestorType=hc:PropertyItem}}" Margin="6,0,0,0" />
+							</StackPanel>
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="Content" Value="">
+							<Setter TargetName="Presenter" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PropertyItemBaseStyle" TargetType="hc:PropertyItem">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Margin" Value="0,0,0,6" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:PropertyItem">
+					<GroupBox Style="{StaticResource GroupBoxOriginal}" hc:TitleElement.TitlePlacement="Left">
+						<GroupBox.Header>
+							<TextBlock Padding="0,0,10,0" Width="{Binding Path=(hc:TitleElement.TitleWidth).Value,RelativeSource={RelativeSource TemplatedParent}}" Text="{TemplateBinding DisplayName}" TextTrimming="CharacterEllipsis">
+								<TextBlock.ToolTip>
+									<ToolTip Style="{StaticResource PropertyItemToolTipBaseStyle}" Content="{TemplateBinding Description}" />
+								</TextBlock.ToolTip>
+							</TextBlock>
+						</GroupBox.Header>
+						<ContentPresenter ContentSource="EditorElement" />
+					</GroupBox>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PropertyItemsControlBaseStyle" TargetType="hc:PropertyItemsControl">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource PropertyItemBaseStyle}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:PropertyItemsControl">
+					<hc:ScrollViewer Focusable="false" HorizontalScrollBarVisibility="Disabled">
+						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</hc:ScrollViewer>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsGrouping" Value="False">
+				<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="PropertyGroupItemBaseStyle" TargetType="GroupItem">
+		<Setter Property="Margin" Value="0,0,0,6" />
+		<Setter Property="Padding" Value="10,6,6,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="GroupItem">
+					<Expander Header="{Binding Name}" IsExpanded="True">
+						<Border BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4">
+							<ItemsPresenter Margin="{TemplateBinding Padding}" />
+						</Border>
+					</Expander>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="PropertyGridBaseStyle" TargetType="hc:PropertyGrid">
+		<Setter Property="MaxTitleWidth" Value="200" />
+		<Setter Property="MinTitleWidth" Value="120" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Padding" Value="10" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:PropertyGrid">
+					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid Margin="{TemplateBinding Padding}">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<DockPanel LastChildFill="True" Margin="0,0,0,6">
+								<hc:ButtonGroup Margin="0,0,6,0" Visibility="{Binding ShowSortButton,RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource ButtonGroupSolid}">
+									<RadioButton Command="interactivity:ControlCommands.SortByCategory" IsChecked="True">
+										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByCategoryDrawingBrush}" />
+									</RadioButton>
+									<RadioButton Command="interactivity:ControlCommands.SortByName">
+										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
+									</RadioButton>
+								</hc:ButtonGroup>
+								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
+							</DockPanel>
+							<hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
+								<hc:PropertyItemsControl.GroupStyle>
+									<GroupStyle ContainerStyle="{StaticResource PropertyGroupItemBaseStyle}" />
+								</hc:PropertyItemsControl.GroupStyle>
+							</hc:PropertyItemsControl>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:RateItem">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="OnMouseEnter">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
+								<EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
+								<EasingDoubleKeyFrame KeyTime="0" Value="1.1" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="OnMouseLeave">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="CanvasRoot">
+								<EasingDoubleKeyFrame KeyTime="0" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)" Storyboard.TargetName="CanvasRoot">
+								<EasingDoubleKeyFrame KeyTime="0" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Canvas x:Name="CanvasRoot" RenderTransformOrigin="0.5,0.5">
+						<Canvas.RenderTransform>
+							<TransformGroup>
+								<ScaleTransform />
+							</TransformGroup>
+						</Canvas.RenderTransform>
+						<Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Background}" Stretch="Uniform" />
+						<Border x:Name="PART_Icon" Visibility="Collapsed">
+							<Path Width="{Binding ActualWidth,ElementName=CanvasRoot}" HorizontalAlignment="Left" Height="{Binding ActualHeight,ElementName=CanvasRoot}" Data="{TemplateBinding Icon}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" />
+						</Border>
+					</Canvas>
+					<ControlTemplate.Triggers>
+						<EventTrigger RoutedEvent="UIElement.MouseEnter" SourceName="CanvasRoot">
+							<BeginStoryboard Storyboard="{StaticResource OnMouseEnter}" />
+						</EventTrigger>
+						<EventTrigger RoutedEvent="UIElement.MouseLeave" SourceName="CanvasRoot">
+							<BeginStoryboard Storyboard="{StaticResource OnMouseLeave}" />
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RateBaseStyle" TargetType="hc:Rate">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemMargin" Value="5,0" />
+		<Setter Property="HorizontalAlignment" Value="Left" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="Icon" Value="{StaticResource StarGeometry}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource RateRateItemBaseStyle}" />
+		<Setter Property="Text" Value="{Binding Value,RelativeSource={RelativeSource Self},StringFormat={}{0:0.0}}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Rate">
+					<StackPanel Background="Transparent" Orientation="Horizontal">
+						<UniformGrid Rows="1" Margin="-5,0" x:Name="PART_Panel" />
+						<TextBlock Visibility="{TemplateBinding ShowText,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding Text}" Margin="10,0,0,0" VerticalAlignment="Center" />
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="RunningBlockBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RunningBlock">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="0,10" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:RunningBlock">
+					<hc:RunningBorder CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<hc:SimplePanel ClipToBounds="True">
+							<hc:SimplePanel HorizontalAlignment="Left" x:Name="PART_Panel">
+								<ContentPresenter x:Name="PART_ContentElement" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left">
+									<ContentPresenter.RenderTransform>
+										<TransformGroup>
+											<TranslateTransform />
+										</TransformGroup>
+									</ContentPresenter.RenderTransform>
+								</ContentPresenter>
+							</hc:SimplePanel>
+						</hc:SimplePanel>
+					</hc:RunningBorder>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Padding" Value="10,0" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="SeparatorBaseStyle" TargetType="Separator">
+		<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+	</Style>
+	<Style x:Key="ShieldBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:Shield">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="3" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Color" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Shield">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Border Grid.Column="0" Background="#555" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}">
+							<TextBlock Text="{TemplateBinding Subject}" VerticalAlignment="Center" Margin="4,0" />
+						</Border>
+						<Border Grid.Column="1" Background="{TemplateBinding Color}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}">
+							<ContentPresenter ContentSource="Status" VerticalAlignment="Center" Margin="4,0" TextElement.Foreground="{TemplateBinding Foreground}" ContentStringFormat="{TemplateBinding ContentStringFormat}" />
+						</Border>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SideMenuItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+		<Setter Property="Role" Value="Item" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="MinHeight" Value="40" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenuItem">
+					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
+						<hc:SimplePanel>
+							<Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
+							<ContentControl Margin="4,0,0,0">
+								<DockPanel Margin="{TemplateBinding Padding}">
+									<ContentControl Width="40" Name="PresenterIcon">
+										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+									</ContentControl>
+									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+								</DockPanel>
+							</ContentControl>
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+						</DataTrigger>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SideMenuItemAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemBaseStyle}" TargetType="hc:SideMenuItem">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenuItem">
+					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
+						<hc:SimplePanel>
+							<Rectangle Width="4" Fill="{TemplateBinding BorderBrush}" HorizontalAlignment="Left" />
+							<ContentControl Margin="4,0,0,0">
+								<DockPanel Margin="{TemplateBinding Padding}">
+									<ContentControl Width="40" Name="PresenterIcon">
+										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+									</ContentControl>
+									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+								</DockPanel>
+							</ContentControl>
+						</hc:SimplePanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<DataTrigger Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=hc:SideMenuItem}}" Value="True">
+							<Setter Property="BorderBrush" Value="Transparent" />
+						</DataTrigger>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SideMenuItemHeaderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SideMenuItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenuItem">
+					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition MinHeight="48" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Border Name="BorderBack" Background="{TemplateBinding Background}" />
+							<ContentControl Grid.Row="0" Margin="4,0,0,0">
+								<DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
+									<ContentControl Width="40" Name="PresenterIcon">
+										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+									</ContentControl>
+									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+								</DockPanel>
+							</ContentControl>
+							<StackPanel Grid.Row="1" x:Name="PART_Panel" Visibility="Collapsed" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
+							<Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+						</Trigger>
+						<Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
+							<Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SideMenuItemHeaderAccordionBaseStyle" BasedOn="{StaticResource SideMenuItemHeaderBaseStyle}" TargetType="hc:SideMenuItem">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemAccordionBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenuItem">
+					<Border Name="BorderRoot" Background="{TemplateBinding Background}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition MinHeight="48" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Border Name="BorderBack" Background="{TemplateBinding Background}" />
+							<ContentControl Grid.Row="0" Margin="4,0,0,0">
+								<DockPanel Margin="{TemplateBinding Padding}" Name="PanelHeader" Background="Transparent">
+									<ContentControl Width="40" Name="PresenterIcon">
+										<ContentPresenter ContentSource="Icon" HorizontalAlignment="Center" VerticalAlignment="Center" />
+									</ContentControl>
+									<ContentPresenter Name="PresenterHeader" ContentSource="Header" Margin="6,0,0,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+								</DockPanel>
+							</ContentControl>
+							<ScrollViewer Visibility="{Binding Visibility,ElementName=PART_Panel}" Grid.Row="1" Height="{Binding PanelAreaLength,RelativeSource={RelativeSource AncestorType=hc:SideMenu}}">
+								<StackPanel x:Name="PART_Panel" Visibility="Collapsed" />
+							</ScrollViewer>
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Icon" Value="{x:Null}">
+							<Setter TargetName="PresenterIcon" Property="Visibility" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter TargetName="BorderBack" Property="BorderThickness" Value="4,0,0,0" />
+							<Setter TargetName="BorderBack" Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+							<Setter Property="TextElement.FontWeight" Value="Bold" TargetName="PresenterHeader" />
+						</Trigger>
+						<Trigger SourceName="PanelHeader" Property="IsMouseOver" Value="true">
+							<Setter TargetName="BorderBack" Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SideMenuBaseStyle" TargetType="hc:SideMenu">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenu">
+					<Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<ScrollViewer>
+							<StackPanel x:Name="PART_Panel" />
+						</ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="SplitButtonBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="HorizontalAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SplitButton">
+					<hc:SimplePanel x:Name="templateRoot">
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+									<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+									<ContentPresenter x:Name="ContentPresenterMain" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								</StackPanel>
+								<ToggleButton x:Name="PART_Arrow" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Width="22" Height="Auto" Padding="0,10,8,10" HorizontalContentAlignment="Left" Grid.Column="1" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" hc:IconElement.Geometry="{StaticResource DownGeometry}" />
+							</Grid>
+						</Border>
+						<Popup AllowsTransparency="true" StaysOpen="False" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="Fade" Placement="Bottom">
+							<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{Binding ActualWidth, ElementName=templateRoot}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}">
+								<ScrollViewer Margin="0,4" x:Name="DropDownScrollViewer">
+									<hc:SimplePanel RenderOptions.ClearTypeHint="Enabled">
+										<Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+											<Rectangle x:Name="opaqueRect" Fill="{Binding Background, ElementName=dropDownBorder}" Height="{Binding ActualHeight, ElementName=dropDownBorder}" Width="{Binding ActualWidth, ElementName=dropDownBorder}" />
+										</Canvas>
+										<ContentPresenter ContentSource="DropDownContent" />
+									</hc:SimplePanel>
+								</ScrollViewer>
+							</Border>
+						</Popup>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="HitMode" Value="Click" />
+								<Condition Property="IsChecked" Value="True" SourceName="PART_Arrow" />
+							</MultiTrigger.Conditions>
+							<Setter Property="IsDropDownOpen" Value="True" />
+						</MultiTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="{x:Static StatusBar.SeparatorStyleKey}" BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
+	<Style x:Key="StatusBarBaseStyle" TargetType="StatusBar">
+		<Setter Property="BorderThickness" Value="0,1,0,0" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+	</Style>
+	<Style x:Key="StatusBarItemBaseStyle" TargetType="StatusBarItem">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Style.Triggers>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="StepBarItemBaseStyle" TargetType="hc:StepBarItem">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+		<Style.Triggers>
+			<Trigger Property="Status" Value="Complete">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+			</Trigger>
+			<Trigger Property="Status" Value="UnderWay">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="Status" Value="Waiting">
+				<Setter Property="Foreground" Value="{DynamicResource ThirdlyTextBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="StepBarItemHorizontalTop" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+		<Setter Property="Margin" Value="10,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:StepBarItem">
+					<StackPanel>
+						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Border>
+						<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,4,0,0" />
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="StepBarItemHorizontalBottom" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+		<Setter Property="Margin" Value="10,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:StepBarItem">
+					<StackPanel>
+						<ContentPresenter HorizontalAlignment="Center" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="0,0,0,4" />
+						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Border>
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="StepBarItemVerticalLeft" BasedOn="{StaticResource StepBarItemBaseStyle}" TargetType="hc:StepBarItem">
+		<Setter Property="Margin" Value="0, 10" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:StepBarItem">
+					<StackPanel Orientation="Horizontal">
+						<Border Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center" CornerRadius="12" BorderThickness="2" BorderBrush="{TemplateBinding Foreground}" Height="24" MinWidth="24">
+							<TextBlock Foreground="{TemplateBinding Foreground}" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Index,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Border>
+						<ContentPresenter HorizontalAlignment="Left" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:StepBar}}" TextElement.Foreground="{TemplateBinding Foreground}" Margin="10,4,0,0" />
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="StepBarHorizontalTopControlTemplate" TargetType="hc:StepBar">
+		<hc:SimplePanel>
+			<ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Top" Margin="0,10,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
+			<ItemsPresenter />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<ControlTemplate x:Key="StepBarHorizontalBottomControlTemplate" TargetType="hc:StepBar">
+		<hc:SimplePanel>
+			<ProgressBar HorizontalAlignment="Center" Name="PART_ProgressBarBack" VerticalAlignment="Bottom" Margin="0,0,0,10" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" />
+			<ItemsPresenter VerticalAlignment="Bottom" />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<ControlTemplate x:Key="StepBarVerticalLeftControlTemplate" TargetType="hc:StepBar">
+		<hc:SimplePanel>
+			<ProgressBar Orientation="Vertical" Width="4" HorizontalAlignment="Left" Name="PART_ProgressBarBack" VerticalAlignment="Center" Margin="10,0,0,0" Style="{StaticResource ProgressBarFlat}" Background="{DynamicResource ThirdlyTextBrush}" RenderTransformOrigin="0.5,0.5">
+				<ProgressBar.RenderTransform>
+					<TransformGroup>
+						<RotateTransform Angle="180" />
+					</TransformGroup>
+				</ProgressBar.RenderTransform>
+			</ProgressBar>
+			<ItemsPresenter />
+		</hc:SimplePanel>
+	</ControlTemplate>
+	<Style x:Key="StepBarBaseStyle" TargetType="hc:StepBar">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalTop}" />
+		<Setter Property="Template" Value="{StaticResource StepBarHorizontalTopControlTemplate}" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="Dock" Value="Left">
+				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
+				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+			</Trigger>
+			<Trigger Property="Dock" Value="Bottom">
+				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemHorizontalBottom}" />
+				<Setter Property="Template" Value="{StaticResource StepBarHorizontalBottomControlTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+			</Trigger>
+			<Trigger Property="Dock" Value="Right">
+				<Setter Property="FlowDirection" Value="RightToLeft" />
+				<Setter Property="ItemContainerStyle" Value="{StaticResource StepBarItemVerticalLeft}" />
+				<Setter Property="Template" Value="{StaticResource StepBarVerticalLeftControlTemplate}" />
+				<Setter Property="ItemsPanel" Value="{StaticResource UniformVerticalItemsPanelTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TabItemStyle" TargetType="TabItem">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Margin" Value="0" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TabItem">
+					<hc:SimplePanel x:Name="templateRoot" SnapsToDevicePixels="true">
+						<Border x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Margin="0" />
+						<ContentPresenter x:Name="contentPresenter" TextElement.Foreground="{DynamicResource PrimaryTextBrush}" ContentSource="Header" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="False">
+							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,0" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+						</Trigger>
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Top" />
+							</MultiDataTrigger.Conditions>
+							<Setter Property="Panel.ZIndex" Value="1" />
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,0,3" />
+						</MultiDataTrigger>
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left" />
+							</MultiDataTrigger.Conditions>
+							<Setter Property="Panel.ZIndex" Value="1" />
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,0,3,0" />
+						</MultiDataTrigger>
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Bottom" />
+							</MultiDataTrigger.Conditions>
+							<Setter Property="Panel.ZIndex" Value="1" />
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+							<Setter Property="BorderThickness" TargetName="mainBorder" Value="0,3,0,0" />
+						</MultiDataTrigger>
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding IsSelected, RelativeSource={RelativeSource Self}}" Value="true" />
+								<Condition Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right" />
+							</MultiDataTrigger.Conditions>
+							<Setter Property="Panel.ZIndex" Value="1" />
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+							<Setter Property="BorderThickness" TargetName="mainBorder" Value="3,0,0,0" />
+						</MultiDataTrigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TabControlBaseStyle" TargetType="TabControl">
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Foreground" Value="White" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TabControl">
+					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition x:Name="ColumnDefinition0" />
+							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
+							<RowDefinition x:Name="RowDefinition1" Height="*" />
+						</Grid.RowDefinitions>
+						<TabPanel x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+						<Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="TabStripPlacement" Value="Bottom">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Left">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Right">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TabItemCapsuleBaseStyle" TargetType="TabItem">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TabItem">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentPresenter x:Name="contentPresenter" ContentSource="Header" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" TargetName="BorderRoot" />
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="BorderBrush" Value="{Binding Path=(hc:TitleElement.BorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="Background" Value="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:TitleElement.Foreground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+						</Trigger>
+						<DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Left">
+							<Setter Property="Margin" Value="0,-1,0,0" />
+						</DataTrigger>
+						<DataTrigger Binding="{Binding TabStripPlacement, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="Right">
+							<Setter Property="Margin" Value="0,-1,0,0" />
+						</DataTrigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TabItemPlusBaseStyle" TargetType="hc:TabItem">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderThickness" Value="1,0,1,1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Margin" Value="0" />
+		<Setter Property="Padding" Value="10,0,0,0" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
+		<Setter Property="Menu" Value="{StaticResource TabItemMenu}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TabItem">
+					<Grid x:Name="templateRoot" SnapsToDevicePixels="true" ContextMenu="{TemplateBinding Menu}">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Border Grid.ColumnSpan="3" BorderThickness="{TemplateBinding BorderThickness}" x:Name="mainBorder" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Margin="0">
+							<Border Margin="0,0,0,-1" x:Name="innerBorder" Background="{DynamicResource RegionBrush}" Visibility="Collapsed" />
+						</Border>
+						<Path x:Name="PathMain" Margin="10,0,0,0" Grid.Column="0" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+						<ContentPresenter Grid.Column="1" x:Name="contentPresenter" ContentSource="Header" Focusable="False" HorizontalAlignment="Stretch" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+						<Border Name="BorderMask" Grid.Column="1" HorizontalAlignment="Right" Width="20" Background="{TemplateBinding Background}" Margin="0,0,1,1">
+							<Border.OpacityMask>
+								<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">
+									<GradientStop Color="White" Offset="1" />
+									<GradientStop Offset="0" />
+								</LinearGradientBrush>
+							</Border.OpacityMask>
+						</Border>
+						<Button Grid.Column="2" Focusable="False" Command="interactivity:ControlCommands.Close" Visibility="{TemplateBinding ShowCloseButton,Converter={StaticResource Boolean2VisibilityConverter}}" Background="Transparent" Style="{StaticResource ButtonCustom}" Width="28">
+							<Path Fill="{DynamicResource PrimaryTextBrush}" Width="8" Height="8" Style="{StaticResource ClosePathStyle}" />
+						</Button>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="Panel.ZIndex" Value="1" />
+							<Setter Property="Visibility" TargetName="innerBorder" Value="Visible" />
+							<Setter Property="Background" TargetName="BorderMask" Value="{DynamicResource RegionBrush}" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+						</Trigger>
+						<Trigger Property="ShowCloseButton" Value="True">
+							<Setter Property="Margin" Value="0,0,0,1" TargetName="BorderMask" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="False">
+							<Setter Property="Opacity" Value="0.4" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="TabControlPlusTemplate" TargetType="hc:TabControl">
+		<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+			<Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition x:Name="ColumnDefinition0" />
+					<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="*" />
+				</Grid.RowDefinitions>
+				<Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}">
+					<hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+						<interactivity:Interaction.Behaviors>
+							<interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+								<interactivity:FluidMoveBehavior.EaseX>
+									<CubicEase EasingMode="EaseOut" />
+								</interactivity:FluidMoveBehavior.EaseX>
+							</interactivity:FluidMoveBehavior>
+						</interactivity:Interaction.Behaviors>
+					</hc:TabPanel>
+				</Border>
+				<Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+					<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				</Border>
+				<Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+					<hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+				</Border>
+			</Grid>
+		</Border>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TabControlPlusScrollableTemplate" TargetType="hc:TabControl">
+		<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+			<Grid x:Name="templateRoot" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="*" />
+				</Grid.RowDefinitions>
+				<Border Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,-1,0,0" Grid.Row="0" Grid.Column="0" BorderThickness="0,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Left" Panel.ZIndex="2">
+					<Border.CacheMode>
+						<BitmapCache SnapsToDevicePixels="True" />
+					</Border.CacheMode>
+					<RepeatButton Focusable="False" Style="{StaticResource RepeatButtonIcon}" Padding="8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonLeft" />
+				</Border>
+				<hc:ScrollViewer HorizontalScrollBarVisibility="Hidden" CanMouseWheel="True" hc:ScrollViewerAttach.Orientation="Horizontal" IsInertiaEnabled="True" Grid.Row="0" Grid.Column="1" IsDeferredScrollingEnabled="True" x:Name="PART_OverflowScrollviewer">
+					<Border Background="{TemplateBinding Background}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Name="PART_HeaderBorder">
+						<hc:TabPanel MinHeight="{TemplateBinding TabItemHeight}" TabItemHeight="{TemplateBinding TabItemHeight}" TabItemWidth="{TemplateBinding TabItemWidth}" IsTabFillEnabled="{TemplateBinding IsTabFillEnabled}" Margin="0,0,-1,-1" x:Name="PART_HeaderPanel" HorizontalAlignment="Left" Background="{DynamicResource SecondaryTextBrush}" IsItemsHost="true" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1">
+							<interactivity:Interaction.Behaviors>
+								<interactivity:FluidMoveBehavior AppliesTo="Children" Duration="{Binding FluidMoveDuration,ElementName=PART_HeaderPanel}">
+									<interactivity:FluidMoveBehavior.EaseX>
+										<CubicEase EasingMode="EaseOut" />
+									</interactivity:FluidMoveBehavior.EaseX>
+								</interactivity:FluidMoveBehavior>
+							</interactivity:Interaction.Behaviors>
+						</hc:TabPanel>
+					</Border>
+				</hc:ScrollViewer>
+				<Border Margin="0,-1,0,0" Grid.Row="0" Grid.Column="2" BorderThickness="1,0,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Right">
+					<Border.CacheMode>
+						<BitmapCache SnapsToDevicePixels="True" />
+					</Border.CacheMode>
+					<StackPanel Orientation="Horizontal">
+						<RepeatButton Focusable="False" Visibility="{TemplateBinding ShowScrollButton,Converter={StaticResource Boolean2VisibilityConverter}}" Style="{StaticResource RepeatButtonIcon}" BorderBrush="{DynamicResource BorderBrush}" Padding="8" hc:IconElement.Geometry="{StaticResource RightGeometry}" Foreground="{DynamicResource PrimaryTextBrush}" Background="{DynamicResource SecondaryRegionBrush}" x:Name="PART_ScrollButtonRight" />
+						<Border Visibility="{Binding Visibility,ElementName=PART_OverflowButton}" Width="1" Background="{DynamicResource BorderBrush}" />
+						<hc:ContextMenuToggleButton x:Name="PART_OverflowButton" Visibility="Collapsed" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+					</StackPanel>
+				</Border>
+				<Border x:Name="contentPanel" Background="{DynamicResource SecondaryRegionBrush}" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+					<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				</Border>
+			</Grid>
+		</Border>
+	</ControlTemplate>
+	<Style x:Key="TabControlPlusBaseStyle" TargetType="hc:TabControl">
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemPlusBaseStyle}" />
+		<Setter Property="Template" Value="{StaticResource TabControlPlusTemplate}" />
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsScrollable" Value="True" />
+					<Condition Property="IsTabFillEnabled" Value="False" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" Value="{StaticResource TabControlPlusScrollableTemplate}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TimePickerBaseStyle" TargetType="hc:TimePicker">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TimePicker">
+					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="*" />
+								<ColumnDefinition Width="30" />
+							</Grid.ColumnDefinitions>
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</MultiTrigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="TimePickerExtendTopTemplate" TargetType="hc:TimePicker">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TimePickerExtendLeftTemplate" TargetType="hc:TimePicker">
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="30" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="TimePickerExtendBaseStyle" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
+		<Setter Property="Height" Value="Auto" />
+		<Setter Property="hc:InfoElement.Symbol" Value="●" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="{x:Static system:Double.NaN}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template" Value="{StaticResource TimePickerExtendTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource TimePickerExtendLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="TimePickerPlusTopTemplate" TargetType="hc:TimePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
+			</Grid.RowDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
+			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TimePickerPlusLeftTemplate" TargetType="hc:TimePicker">
+		<ControlTemplate.Resources>
+			<Storyboard x:Key="StoryboardShow">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
+			</Storyboard>
+			<Storyboard x:Key="StoryboardHidden">
+				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
+			</Storyboard>
+		</ControlTemplate.Resources>
+		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+			</DockPanel>
+			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
+			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="25" />
+					</Grid.ColumnDefinitions>
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
+				</Grid>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="false" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="IsOpen" Value="true" SourceName="PART_Popup" />
+				</MultiTrigger.Conditions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
+					<Condition Property="ShowClearButton" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
+			</MultiTrigger>
+			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsOpen" Value="True" SourceName="PART_Popup">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsError" Value="true">
+				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
+				<Trigger.EnterActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
+				</Trigger.EnterActions>
+				<Trigger.ExitActions>
+					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
+				</Trigger.ExitActions>
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="TimePickerPlusBaseStyle" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker">
+		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
+		<Setter Property="Template" Value="{StaticResource TimePickerPlusTopTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource TimePickerPlusLeftTemplate}" />
+				<Setter Property="Width" Value="Auto" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="{x:Static ToolBar.SeparatorStyleKey}" TargetType="Separator">
+		<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Width" Value="1" />
+	</Style>
+	<Style x:Key="{x:Static ToolBar.ButtonStyleKey}" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="{x:Static ToolBar.CheckBoxStyleKey}" BasedOn="{StaticResource CheckBoxBaseStyle}" TargetType="CheckBox" />
+	<Style x:Key="{x:Static ToolBar.RadioButtonStyleKey}" BasedOn="{StaticResource RadioButtonBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="{x:Static ToolBar.ComboBoxStyleKey}" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
+	<Style x:Key="{x:Static ToolBar.TextBoxStyleKey}" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
+	<Style x:Key="{x:Static ToolBar.MenuStyleKey}" BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
+	<Style x:Key="{x:Static ToolBar.ToggleButtonStyleKey}" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToolBarThumbHorizontalStyle" TargetType="Thumb">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
+						<Path Stretch="Uniform" Width="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragVerticalGeometry}" SnapsToDevicePixels="True" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Cursor" Value="SizeAll" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToolBarThumbVerticalStyle" TargetType="Thumb">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="Thumb">
+					<Border SnapsToDevicePixels="True" Padding="{TemplateBinding Padding}" Background="Transparent">
+						<Path Stretch="Uniform" Height="4" Fill="{DynamicResource PrimaryBrush}" Data="{StaticResource DragHorizontalGeometry}" SnapsToDevicePixels="True" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Cursor" Value="SizeAll" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToolBarVerticalOverflowButtonStyle" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="MinHeight" Value="0" />
+		<Setter Property="MinWidth" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
+						<Path x:Name="PathMore" Data="{StaticResource RightGeometry}" Height="8" Margin="4,4,8,4" HorizontalAlignment="Right" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsKeyboardFocused" Value="true">
+							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Visibility" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ToolBarHorizontalOverflowButtonStyle" TargetType="ToggleButton">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="MinHeight" Value="0" />
+		<Setter Property="MinWidth" Value="0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border x:Name="Bd" SnapsToDevicePixels="true" CornerRadius="4" Background="{TemplateBinding Background}">
+						<Path x:Name="PathMore" Data="{StaticResource DownGeometry}" Width="8" Margin="4,4,4,8" VerticalAlignment="Bottom" Fill="{DynamicResource PrimaryTextBrush}" Stretch="Uniform" SnapsToDevicePixels="True" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true">
+							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsKeyboardFocused" Value="true">
+							<Setter Property="Fill" TargetName="PathMore" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Visibility" Value="Collapsed" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="ToolBarVerticalTemplate" TargetType="ToolBar">
+		<Grid x:Name="Grid" SnapsToDevicePixels="true">
+			<Grid.RowDefinitions>
+				<RowDefinition />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<hc:SimplePanel x:Name="OverflowGrid" Grid.Row="1">
+				<ToggleButton Margin="0,4,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarVerticalOverflowButtonStyle}" />
+				<Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Right" StaysOpen="false">
+					<Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
+						<ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
+					</Border>
+				</Popup>
+			</hc:SimplePanel>
+			<Border x:Name="MainPanelBorder" Grid.Row="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+				<DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+					<Thumb x:Name="ToolBarThumb" DockPanel.Dock="Top" Style="{StaticResource ToolBarThumbVerticalStyle}" Height="10" />
+					<ContentPresenter x:Name="ToolBarHeader" DockPanel.Dock="Top" ContentSource="Header" HorizontalAlignment="Center" Margin="0,4,0,4" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+					<ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				</DockPanel>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsOverflowOpen" Value="true">
+				<Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
+			</Trigger>
+			<Trigger Property="Header" Value="{x:Null}">
+				<Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
+			</Trigger>
+			<Trigger Property="ToolBarTray.IsLocked" Value="true">
+				<Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="ToolBarHorizontalTemplate" TargetType="ToolBar">
+		<Grid x:Name="Grid" SnapsToDevicePixels="true">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<hc:SimplePanel x:Name="OverflowGrid" Grid.Column="1">
+				<ToggleButton Margin="4,0,0,0" x:Name="OverflowButton" ClickMode="Press" FocusVisualStyle="{x:Null}" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarHorizontalOverflowButtonStyle}" />
+				<Popup x:Name="OverflowPopup" AllowsTransparency="true" Focusable="false" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom" StaysOpen="false">
+					<Border x:Name="ToolBarSubMenuBorder" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1" Background="{DynamicResource RegionBrush}" RenderOptions.ClearTypeHint="Enabled">
+						<ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" KeyboardNavigation.DirectionalNavigation="Cycle" FocusVisualStyle="{x:Null}" Focusable="true" Margin="6" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle" WrapWidth="200" />
+					</Border>
+				</Popup>
+			</hc:SimplePanel>
+			<Border x:Name="MainPanelBorder" Grid.Column="0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
+				<DockPanel KeyboardNavigation.TabIndex="1" KeyboardNavigation.TabNavigation="Local">
+					<Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbHorizontalStyle}" Width="10" />
+					<ContentPresenter x:Name="ToolBarHeader" ContentSource="Header" HorizontalAlignment="Center" Margin="4,0,4,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+					<ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				</DockPanel>
+			</Border>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsOverflowOpen" Value="true">
+				<Setter Property="IsEnabled" TargetName="ToolBarThumb" Value="false" />
+			</Trigger>
+			<Trigger Property="Header" Value="{x:Null}">
+				<Setter Property="Visibility" TargetName="ToolBarHeader" Value="Collapsed" />
+			</Trigger>
+			<Trigger Property="ToolBarTray.IsLocked" Value="true">
+				<Setter Property="Visibility" TargetName="ToolBarThumb" Value="Collapsed" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="ToolBarBaseStyle" TargetType="ToolBar">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Margin" Value="0,0,4,4" />
+		<Setter Property="Template" Value="{StaticResource ToolBarHorizontalTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource ToolBarVerticalTemplate}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ToolTipBaseStyle" TargetType="ToolTip">
+		<Setter Property="Padding" Value="0,6" />
+		<Setter Property="Background" Value="White" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="FontSize" Value="12" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="2" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToolTip">
+					<Border Effect="{StaticResource EffectShadow2}" Margin="8" Background="{DynamicResource RegionBrush}" Padding="{TemplateBinding Padding}" BorderThickness="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{DynamicResource BorderBrush}">
+						<ContentPresenter Margin="10,0" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TransferItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:TransferItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualMargin0}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="CanDeselect" Value="True" />
+		<Setter Property="SelfManage" Value="True" />
+		<Setter Property="Padding" Value="10, 0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Margin" Value="5,0,5,5" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TransferItem">
+					<Border x:Name="BorderRoot" Background="{DynamicResource RegionBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+						<ContentPresenter x:Name="ContentPresenter" VerticalAlignment="Center" Margin="{TemplateBinding Padding}" ContentTemplate="{Binding ItemTemplate,RelativeSource={RelativeSource AncestorType=hc:TransferGroup}}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter TargetName="BorderRoot" Property="Background" Value="{DynamicResource PrimaryBrush}" />
+							<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsOrigin" Value="True" />
+					<Condition Property="IsTransferred" Value="False" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsOrigin" Value="True" />
+					<Condition Property="IsTransferred" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Collapsed" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsOrigin" Value="False" />
+					<Condition Property="IsTransferred" Value="True" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Visible" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsOrigin" Value="False" />
+					<Condition Property="IsTransferred" Value="False" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Visibility" Value="Collapsed" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="TransferGroupBaseStyle" TargetType="hc:TransferGroup">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TransferGroup">
+					<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ScrollViewer Margin="0,5">
+							<StackPanel x:Name="PART_Panel" />
+						</ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TransferBaseStyle" TargetType="hc:Transfer">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TransferItemBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Transfer">
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition MinWidth="200" />
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition MinWidth="200" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition />
+							<RowDefinition />
+							<RowDefinition />
+							<RowDefinition />
+						</Grid.RowDefinitions>
+						<hc:TransferGroup x:Name="PART_ItemsOrigin" Style="{StaticResource TransferGroupBaseStyle}" Grid.RowSpan="4" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+						<StackPanel Margin="32,0" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1">
+							<Button hc:IconElement.Geometry="{StaticResource LeftGeometry}" Command="interactivity:ControlCommands.Cancel" />
+							<Button hc:IconElement.Geometry="{StaticResource RightGeometry}" Margin="0,10,0,0" Command="interactivity:ControlCommands.Selected" />
+						</StackPanel>
+						<hc:TransferGroup x:Name="PART_ItemsSelected" Style="{StaticResource TransferGroupBaseStyle}" Grid.Row="0" Grid.RowSpan="4" Grid.Column="2" ItemTemplate="{TemplateBinding ItemTemplate}" ItemContainerStyle="{TemplateBinding ItemContainerStyle}" />
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Width" Value="16" />
+		<Setter Property="Height" Value="16" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border Background="Transparent" Height="16" Padding="4" Width="16">
+						<Path x:Name="ExpandPath" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" Data="{StaticResource TreeArrow}" Fill="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeViewItem}}">
+							<Path.RenderTransform>
+								<RotateTransform Angle="-90" />
+							</Path.RenderTransform>
+						</Path>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="RenderTransform" TargetName="ExpandPath">
+								<Setter.Value>
+									<RotateTransform Angle="0" />
+								</Setter.Value>
+							</Setter>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TreeViewItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="TreeViewItem">
+		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0Margin0}" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TreeViewItem">
+					<Grid>
+						<Grid.RowDefinitions>
+							<RowDefinition MinHeight="{TemplateBinding MinHeight}" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+							<DockPanel LastChildFill="True" Margin="{Binding Converter={StaticResource TreeViewItemMarginConverter}, RelativeSource={RelativeSource TemplatedParent}}">
+								<ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ExpandCollapseToggleStyle}" />
+								<ContentPresenter VerticalAlignment="Center" x:Name="PART_Header" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+							</DockPanel>
+						</Border>
+						<ItemsPresenter x:Name="ItemsHost" Grid.Row="1" />
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="true" SourceName="Bd">
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+						</Trigger>
+						<Trigger Property="IsExpanded" Value="false">
+							<Setter Property="Visibility" TargetName="ItemsHost" Value="Collapsed" />
+						</Trigger>
+						<Trigger Property="HasItems" Value="false">
+							<Setter Property="Visibility" TargetName="Expander" Value="Hidden" />
+						</Trigger>
+						<Trigger Property="IsSelected" Value="true">
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsSelected" Value="true" />
+								<Condition Property="IsSelectionActive" Value="false" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource DarkDefaultBrush}" />
+							<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Foreground" Value="{StaticResource {x:Static SystemColors.GrayTextBrushKey}}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TreeViewBaseStyle" TargetType="TreeView" BasedOn="{StaticResource BaseStyle}">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="hc:ScrollViewer.IsInertiaEnabled" Value="False" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="VirtualizingPanel.IsVirtualizing" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TreeView">
+					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+									<ItemsPresenter />
+								</hc:ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Background" TargetName="Bd" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}" />
+						</Trigger>
+						<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+							<Setter Property="CanContentScroll" TargetName="_tv_scrollviewer_" Value="true" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="VirtualizingPanel.IsVirtualizing" Value="true">
+				<Setter Property="ItemsPanel">
+					<Setter.Value>
+						<ItemsPanelTemplate>
+							<VirtualizingStackPanel />
+						</ItemsPanelTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="WatermarkBaseStyle" TargetType="hc:Watermark">
+		<Setter Property="MarkBrush" Value="{DynamicResource DarkMaskBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource DarkMaskBrush}" />
+		<Setter Property="Angle" Value="20" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Watermark">
+					<Border Name="PART_Root">
+						<ContentPresenter />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="AutoCompleteTextBoxInternal" BasedOn="{StaticResource ComboBoxEditableTextBox}" TargetType="TextBox" />
+	<Style x:Key="AutoCompleteTextBoxItemBaseStyle" TargetType="ComboBoxItem">
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="SnapsToDevicePixels" Value="True" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ComboBoxItem">
+					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsSelected" Value="False" />
+								<Condition Property="IsMouseOver" Value="True" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource SecondaryRegionBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="Background" TargetName="Bd" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="Foreground" Value="White" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="AutoCompleteTextBoxBaseStyle" TargetType="hc:AutoCompleteTextBox">
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteTextBoxItemBaseStyle}" />
+		<Setter Property="IsTabStop" Value="false" />
+		<Setter Property="hc:Empty.ShowEmpty" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:AutoCompleteTextBox">
+					<hc:SimplePanel>
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+							<TextBox x:Name="PART_SearchTextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Style="{StaticResource AutoCompleteTextBoxInternal}" />
+						</Border>
+						<Popup x:Name="PART_Popup" AllowsTransparency="true" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+							<Border BorderThickness="0,1,0,0" Effect="{StaticResource EffectShadow2}" Margin="8,0,8,8" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="dropDownBorder" MinWidth="{Binding ActualWidth, ElementName=toggleButton}" MaxHeight="{TemplateBinding MaxDropDownHeight}" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}">
+								<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+									<hc:ToggleBlock.CheckedContent>
+										<ScrollViewer Margin="0,4">
+											<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+										</ScrollViewer>
+									</hc:ToggleBlock.CheckedContent>
+									<hc:ToggleBlock.UnCheckedContent>
+										<hc:Empty />
+									</hc:ToggleBlock.UnCheckedContent>
+								</hc:ToggleBlock>
+							</Border>
+						</Popup>
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="HasItems" Value="false">
+							<Setter Property="Height" TargetName="dropDownBorder" Value="95" />
+						</Trigger>
+						<Trigger Property="hc:DropDownElement.ConsistentWidth" Value="True">
+							<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
+							<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualWidth, ElementName=PART_SearchTextBox}" />
+						</Trigger>
+						<Trigger Property="hc:DropDownElement.AutoWidth" Value="True">
+							<Setter Property="MaxWidth" TargetName="dropDownBorder" Value="{x:Static system:Double.MaxValue}" />
+							<Setter Property="MinWidth" TargetName="dropDownBorder" Value="{Binding ActualHeight, ElementName=PART_SearchTextBox}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="true" SourceName="PART_SearchTextBox">
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</Trigger>
+						<MultiTrigger>
+							<MultiTrigger.Conditions>
+								<Condition Property="IsMouseOver" Value="true" />
+								<Condition Property="IsFocused" Value="false" SourceName="PART_SearchTextBox" />
+							</MultiTrigger.Conditions>
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
+						</MultiTrigger>
+						<Trigger Property="IsFocused" Value="True" SourceName="PART_SearchTextBox">
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+						<Trigger Property="IsEnabled" Value="false">
+							<Setter Property="Opacity" Value="0.4" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="DataGridCellStyle" TargetType="DataGridCell">
+		<Setter Property="FocusVisualStyle">
+			<Setter.Value>
+				<Style>
+					<Setter Property="Control.Template">
+						<Setter.Value>
+							<ControlTemplate>
+								<Rectangle Margin="2" Opacity=".6" SnapsToDevicePixels="true" Stroke="{DynamicResource SecondaryBorderBrush}" StrokeThickness="2" StrokeDashArray="1 1" RadiusX="4" RadiusY="4" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="BorderBrush" Value="Transparent" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="Padding" Value="{StaticResource DefaultControlPadding}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DataGridCell">
+					<Border Background="Transparent">
+						<Border Margin="0,0,4,0" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Padding="{TemplateBinding Padding}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<MultiDataTrigger>
+				<MultiDataTrigger.Conditions>
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="Cell" />
+				</MultiDataTrigger.Conditions>
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+			</MultiDataTrigger>
+			<MultiDataTrigger>
+				<MultiDataTrigger.Conditions>
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="False" />
+					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+				</MultiDataTrigger.Conditions>
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+			</MultiDataTrigger>
+			<MultiDataTrigger>
+				<MultiDataTrigger.Conditions>
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}" Value="True" />
+					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="CellOrRowHeader" />
+				</MultiDataTrigger.Conditions>
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</MultiDataTrigger>
+			<MultiDataTrigger>
+				<MultiDataTrigger.Conditions>
+					<Condition Binding="{Binding IsSelected,RelativeSource={RelativeSource Self}}" Value="true" />
+					<Condition Binding="{Binding SelectionUnit,RelativeSource={RelativeSource FindAncestor,AncestorType=DataGrid}}" Value="FullRow" />
+				</MultiDataTrigger.Conditions>
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</MultiDataTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsSelected" Value="true" />
+					<Condition Property="Selector.IsSelectionActive" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DataGridRowStyle" TargetType="DataGridRow">
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="SnapsToDevicePixels" Value="true" />
+		<Setter Property="Margin" Value="0,0,0,4" />
+		<Setter Property="Padding" Value="0,6" />
+		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+		<Setter Property="ValidationErrorTemplate">
+			<Setter.Value>
+				<ControlTemplate>
+					<TextBlock Foreground="Red" Margin="2,0,0,0" Text="!" VerticalAlignment="Center" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DataGridRow">
+					<SelectiveScrollingGrid>
+						<SelectiveScrollingGrid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+						</SelectiveScrollingGrid.ColumnDefinitions>
+						<SelectiveScrollingGrid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</SelectiveScrollingGrid.RowDefinitions>
+						<Border CornerRadius="4" Grid.ColumnSpan="2" x:Name="DGR_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+						<DataGridCellsPresenter MinHeight="{TemplateBinding MinHeight}" VerticalContentAlignment="Center" Grid.Row="0" Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						<DataGridDetailsPresenter Margin="0,6" Grid.Column="1" Grid.Row="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" Visibility="{TemplateBinding DetailsVisibility}" />
+						<DataGridRowHeader Grid.Row="0" Grid.Column="0" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+					</SelectiveScrollingGrid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsSelected" Value="true" />
+					<Condition Property="Selector.IsSelectionActive" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Background" Value="{DynamicResource DarkDefaultBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DataGridColumnHeaderStyle" TargetType="DataGridColumnHeader">
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Padding" Value="12,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DataGridColumnHeader">
+					<hc:SimplePanel>
+						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
+							<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<ContentPresenter RecognizesAccessKey="True" VerticalAlignment="Center" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								<ToggleButton Grid.Column="1" VerticalAlignment="Center" Height="{x:Static system:Double.NaN}" Padding="4,0" Width="20" IsEnabled="False" Opacity="1" Foreground="{DynamicResource PrimaryBrush}" x:Name="ToggleButtonSortDirection" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DownGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource UpGeometry}" />
+							</Grid>
+						</Border>
+						<Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource ColumnHeaderGripperStyle}" />
+						<Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource ColumnHeaderGripperStyle}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="SortDirection" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="ToggleButtonSortDirection" />
+						</Trigger>
+						<Trigger Property="SortDirection" Value="Ascending">
+							<Setter Property="IsChecked" Value="True" TargetName="ToggleButtonSortDirection" />
+						</Trigger>
+						<Trigger Property="SortDirection" Value="Descending">
+							<Setter Property="IsChecked" Value="False" TargetName="ToggleButtonSortDirection" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="SortDirection" Value="Ascending">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="SortDirection" Value="Descending">
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="DataGridRowHeaderStyle" TargetType="DataGridRowHeader">
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DataGridRowHeader">
+					<hc:SimplePanel HorizontalAlignment="Center">
+						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" Padding="{TemplateBinding Padding}">
+							<StackPanel Orientation="Horizontal">
+								<ContentPresenter RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+							</StackPanel>
+						</Border>
+						<Thumb x:Name="PART_TopHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Top" />
+						<Thumb x:Name="PART_BottomHeaderGripper" Style="{StaticResource RowHeaderGripperStyle}" VerticalAlignment="Bottom" />
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+	</Style>
+	<Style x:Key="BadgePrimary" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="BadgeSuccess" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="BadgeInfo" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="BadgeWarning" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="BadgeDanger" BasedOn="{StaticResource BadgeBaseStyle}" TargetType="hc:Badge">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="CalendarWithClockBaseStyle" TargetType="hc:CalendarWithClock">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Margin" Value="8 0" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:CalendarWithClock">
+					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="2" Height="42" VerticalAlignment="Top" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" />
+							<ContentPresenter Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_CalendarPresenter" Margin="-8,-4,-8,-8" />
+							<ContentPresenter Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" x:Name="PART_ClockPresenter" Margin="-8,-4,-8,-8" />
+							<Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" HorizontalAlignment="Center" Margin="0,0,0,19" Width="180" VerticalAlignment="Bottom" Style="{StaticResource ButtonPrimary}" />
+						</Grid>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:CalendarWithClock" BasedOn="{StaticResource CalendarWithClockBaseStyle}" />
+	<Style BasedOn="{StaticResource CardBaseStyle}" TargetType="hc:Card" />
+	<Style x:Key="CarouselPateButton" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+		<Setter Property="Margin" Value="5,0" />
+		<Setter Property="Width" Value="10" />
+		<Setter Property="Height" Value="10" />
+		<Setter Property="Background" Value="White" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="Padding" Value="0" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<Border CornerRadius="5" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Opacity" Value=".9" />
+						</Trigger>
+						<Trigger Property="IsPressed" Value="True">
+							<Setter Property="Opacity" Value=".6" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:Carousel">
+		<Setter Property="PageButtonStyle" Value="{StaticResource CarouselPateButton}" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource CarouselItemBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Carousel">
+					<ControlTemplate.Triggers>
+						<EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
+							<BeginStoryboard>
+								<Storyboard>
+									<DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:.1" />
+								</Storyboard>
+							</BeginStoryboard>
+						</EventTrigger>
+						<EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
+							<BeginStoryboard>
+								<Storyboard>
+									<DoubleAnimation Storyboard.TargetName="GridTop" Storyboard.TargetProperty="Opacity" To="0" Duration="0:0:.1" />
+								</Storyboard>
+							</BeginStoryboard>
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+					<hc:SimplePanel ClipToBounds="True">
+						<StackPanel x:Name="PART_Panel" Orientation="Horizontal" />
+						<hc:SimplePanel x:Name="GridTop" Opacity="0">
+							<Button Command="interactivity:ControlCommands.Prev" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30,0,0,0" Style="{StaticResource ButtonCustom}">
+								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
+									<Path Margin="16" Fill="White" Style="{StaticResource LeftPathStyle}" />
+								</Border>
+							</Button>
+							<Button Command="interactivity:ControlCommands.Next" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,30,0" Style="{StaticResource ButtonCustom}">
+								<Border Width="50" Height="100" Background="{DynamicResource DarkOpacityBrush}" CornerRadius="4">
+									<Path Margin="16" Fill="White" Style="{StaticResource RightPathStyle}" />
+								</Border>
+							</Button>
+						</hc:SimplePanel>
+						<StackPanel Name="PART_PanelPage" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0,0,0,20" />
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ChatBubbleBaseStyle}" TargetType="hc:ChatBubble" />
+	<Style BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox" />
+	<Style x:Key="Tag4CheckComboBoxStyle.Small" BasedOn="{StaticResource Tag4CheckComboBoxStyle}" TargetType="hc:Tag">
+		<Setter Property="Padding" Value="6,0,4,0" />
+	</Style>
+	<Style x:Key="CheckComboBox.Small" BasedOn="{StaticResource CheckComboBoxBaseStyle}" TargetType="hc:CheckComboBox">
+		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="CheckComboBoxExtend" BasedOn="{StaticResource CheckComboBoxExtendBaseStyle}" TargetType="hc:CheckComboBox" />
+	<Style x:Key="CheckComboBoxExtend.Small" BasedOn="{StaticResource CheckComboBoxExtend}" TargetType="hc:CheckComboBox">
+		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="CheckComboBoxPlus" BasedOn="{StaticResource CheckComboBoxPlusBaseStyle}" TargetType="hc:CheckComboBox" />
+	<Style x:Key="CheckComboBoxPlus.Small" BasedOn="{StaticResource CheckComboBoxPlus}" TargetType="hc:CheckComboBox">
+		<Setter Property="TagStyle" Value="{StaticResource Tag4CheckComboBoxStyle.Small}" />
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+	</Style>
+	<Style x:Key="ClockRadioButtonStyle" TargetType="hc:ClockRadioButton">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Width" Value="28" />
+		<Setter Property="Height" Value="28" />
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ClockRadioButton">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Storyboard1">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.2" Value="1" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="Storyboard2">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="optionMark">
+								<EasingDoubleKeyFrame KeyTime="0" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<hc:SimplePanel x:Name="templateRoot" Background="Transparent" SnapsToDevicePixels="True">
+						<Ellipse x:Name="optionMark" Fill="{TemplateBinding Background}" MinWidth="6" MinHeight="6" Opacity="0" />
+						<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="true">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+							</Trigger.ExitActions>
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ClockBaseStyle" TargetType="hc:Clock">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Margin" Value="8 0" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="ClockRadioButtonStyle" Value="{StaticResource ClockRadioButtonStyle}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Clock">
+					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="50" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition />
+								<ColumnDefinition />
+							</Grid.ColumnDefinitions>
+							<Border Margin="4" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Grid.ColumnSpan="3" Background="{Binding Path=(hc:TitleElement.Background),RelativeSource={RelativeSource TemplatedParent}}" Name="PART_BorderTitle">
+								<TextBlock x:Name="PART_TimeStr" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Foreground="{DynamicResource TextIconBrush}" />
+							</Border>
+							<Canvas Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" Margin="16,16,16,62" VerticalAlignment="Top" Name="PART_Canvas" Width="178" Height="178">
+								<Border Background="{DynamicResource SecondaryRegionBrush}" Width="178" Height="178" CornerRadius="89" />
+								<hc:CirclePanel Diameter="130" x:Name="PART_PanelNum" KeepVertical="True" Margin="24,24,0,0" OffsetAngle="-60" />
+								<Border Focusable="False" Name="PART_BorderClock" Background="{DynamicResource PrimaryBrush}" RenderTransformOrigin="0.5,1" Height="63" Width="2" Canvas.Left="88" Canvas.Top="26" />
+								<Ellipse Fill="White" Width="8" Height="8" StrokeThickness="2" Stroke="{DynamicResource PrimaryBrush}" Canvas.Top="85" Canvas.Left="85" />
+							</Canvas>
+							<hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Am}}" Style="{StaticResource ClockRadioButtonStyle}" />
+							<hc:ClockRadioButton Grid.Row="1" Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{ex:Lang Key={x:Static langs:LangKeys.Pm}}" Style="{StaticResource ClockRadioButtonStyle}" />
+							<Button Grid.Row="1" Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}" />
+						</Grid>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:Clock" BasedOn="{StaticResource ClockBaseStyle}" />
+	<Style x:Key="ClockListBoxItemStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="true">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="true">
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="false">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+			<Trigger Property="hc:EdgeElement.ShowEdgeContent" Value="true">
+				<Setter Property="Template">
+					<Setter.Value>
+						<ControlTemplate TargetType="ListBoxItem">
+							<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+								<StackPanel Orientation="Horizontal">
+									<ContentControl Width="16" Height="16" Content="{Binding Path=(hc:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}" />
+									<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+								</StackPanel>
+							</Border>
+						</ControlTemplate>
+					</Setter.Value>
+				</Setter>
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ClockListBoxStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
+		<Setter Property="MaxHeight" Value="180" />
+		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ClockListBoxItemStyle}" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+	</Style>
+	<Style x:Key="ListClockBaseStyle" TargetType="hc:ListClock">
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="Margin" Value="8 0" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ListClock">
+					<hc:SimplePanel Margin="0,4,0,8" HorizontalAlignment="Center" VerticalAlignment="Center">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Effect="{StaticResource EffectShadow2}" />
+						<Grid Margin="0,4" Width="210">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition />
+								<ColumnDefinition />
+								<ColumnDefinition />
+							</Grid.ColumnDefinitions>
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<ListBox hc:BorderElement.CornerRadius="0" x:Name="PART_HourList" Style="{StaticResource ClockListBoxStyle}" />
+							<ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="1" x:Name="PART_MinuteList" Style="{StaticResource ClockListBoxStyle}" BorderThickness="1,0" />
+							<ListBox hc:BorderElement.CornerRadius="0" Grid.Row="0" Grid.Column="2" x:Name="PART_SecondList" Style="{StaticResource ClockListBoxStyle}" />
+							<Border VerticalAlignment="Bottom" Visibility="{Binding Visibility,ElementName=PART_ButtonConfirm}" Height="1" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" Background="{DynamicResource BorderBrush}" />
+							<Button Margin="0,10" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Background="Transparent" Style="{StaticResource ButtonCustom}" />
+						</Grid>
+					</hc:SimplePanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style TargetType="hc:ListClock" BasedOn="{StaticResource ListClockBaseStyle}" />
+	<Style BasedOn="{StaticResource ColorPickerBaseStyle}" TargetType="hc:ColorPicker" />
+	<Style BasedOn="{StaticResource ContextMenuBaseStyle}" TargetType="ContextMenu" />
+	<Style BasedOn="{StaticResource CoverFlowBaseStyle}" TargetType="hc:CoverFlow" />
+	<Style BasedOn="{StaticResource CoverViewBaseStyle}" TargetType="hc:CoverView" />
+	<Style x:Key="DataGridBaseStyle" TargetType="DataGrid">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="0" />
+		<Setter Property="GridLinesVisibility" Value="None" />
+		<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="EnableRowVirtualization" Value="True" />
+		<Setter Property="CanUserAddRows" Value="False" />
+		<Setter Property="CanUserDeleteRows" Value="False" />
+		<Setter Property="CanUserReorderColumns" Value="False" />
+		<Setter Property="CanUserResizeRows" Value="False" />
+		<Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle}" />
+		<Setter Property="RowHeaderStyle" Value="{StaticResource DataGridRowHeaderStyle}" />
+		<Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle}" />
+		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle}" />
+		<Setter Property="Padding" Value="6" />
+		<Setter Property="RowHeight" Value="44" />
+		<Setter Property="ColumnHeaderHeight" Value="44" />
+		<Setter Property="hc:DataGridAttach.TextColumnStyle" Value="{StaticResource DataGridTextColumnStyle}" />
+		<Setter Property="hc:DataGridAttach.EditingTextColumnStyle" Value="{StaticResource TextBoxBaseStyle}" />
+		<Setter Property="hc:DataGridAttach.ComboBoxColumnStyle" Value="{StaticResource TextBlockComboBoxStyle}" />
+		<Setter Property="hc:DataGridAttach.EditingComboBoxColumnStyle" Value="{StaticResource ComboBoxBaseStyle}" />
+		<Setter Property="hc:DataGridAttach.CheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
+		<Setter Property="hc:DataGridAttach.EditingCheckBoxColumnStyle" Value="{StaticResource CheckBoxBaseStyle}" />
+		<Setter Property="hc:DataGridAttach.ApplyDefaultStyle" Value="True" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="DataGrid">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="Storyboard1">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value=".8" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+						<Storyboard x:Key="Storyboard2">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_VerticalScrollBar">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="PART_HorizontalScrollBar">
+								<EasingDoubleKeyFrame KeyTime="0:0:.2" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="false">
+							<ScrollViewer.Template>
+								<ControlTemplate TargetType="ScrollViewer">
+									<Grid>
+										<Grid.ColumnDefinitions>
+											<ColumnDefinition Width="Auto" />
+											<ColumnDefinition Width="*" />
+											<ColumnDefinition Width="Auto" />
+										</Grid.ColumnDefinitions>
+										<Grid.RowDefinitions>
+											<RowDefinition Height="Auto" />
+											<RowDefinition Height="*" />
+										</Grid.RowDefinitions>
+										<Button Command="{x:Static DataGrid.SelectAllCommand}" MaxHeight="30" Height="auto" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid},Converter={StaticResource DoubleMinConverter}}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource AllGeometry}" Foreground="{DynamicResource PrimaryBrush}">
+											<Button.Visibility>
+												<MultiBinding Converter="{StaticResource DataGridSelectAllButtonVisibilityConverter}">
+													<Binding Path="HeadersVisibility" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+													<Binding Path="(hc:DataGridAttach.ShowSelectAllButton)" RelativeSource="{RelativeSource AncestorType=DataGrid}" />
+												</MultiBinding>
+											</Button.Visibility>
+										</Button>
+										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.ColumnSpan="2" Grid.Row="0" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType=DataGrid}}" />
+										<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource AncestorType=DataGrid},Mode=OneWay}" Grid.ColumnSpan="3" Grid.Column="0" Grid.Row="1" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+											<hc:ToggleBlock.CheckedContent>
+												<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" CanContentScroll="{TemplateBinding CanContentScroll}" />
+											</hc:ToggleBlock.CheckedContent>
+											<hc:ToggleBlock.UnCheckedContent>
+												<hc:Empty />
+											</hc:ToggleBlock.UnCheckedContent>
+										</hc:ToggleBlock>
+										<ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_VerticalScrollBar" Grid.Column="2" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" Grid.Row="1" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportHeight}" />
+										<ScrollBar Style="{StaticResource ScrollBarBaseStyle}" Opacity="0" x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" VerticalAlignment="Bottom" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}" />
+									</Grid>
+									<ControlTemplate.Triggers>
+										<EventTrigger RoutedEvent="MouseEnter">
+											<BeginStoryboard Storyboard="{StaticResource Storyboard1}" />
+										</EventTrigger>
+										<EventTrigger RoutedEvent="MouseLeave">
+											<BeginStoryboard Storyboard="{StaticResource Storyboard2}" />
+										</EventTrigger>
+									</ControlTemplate.Triggers>
+								</ControlTemplate>
+							</ScrollViewer.Template>
+							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</ScrollViewer>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid" />
+	<Style x:Key="DataGridCellStyle.Small" BasedOn="{StaticResource DataGridCellStyle}" TargetType="DataGridCell">
+		<Setter Property="Padding" Value="6,2" />
+	</Style>
+	<Style x:Key="DataGridRowStyle.Small" BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
+		<Setter Property="Margin" Value="0,0,0,2" />
+	</Style>
+	<Style x:Key="DataGridColumnHeaderStyle.Small" BasedOn="{StaticResource DataGridColumnHeaderStyle}" TargetType="DataGridColumnHeader">
+		<Setter Property="Padding" Value="8,0" />
+	</Style>
+	<Style x:Key="DataGrid.Small" BasedOn="{StaticResource DataGridBaseStyle}" TargetType="DataGrid">
+		<Setter Property="CellStyle" Value="{StaticResource DataGridCellStyle.Small}" />
+		<Setter Property="RowStyle" Value="{StaticResource DataGridRowStyle.Small}" />
+		<Setter Property="ColumnHeaderStyle" Value="{StaticResource DataGridColumnHeaderStyle.Small}" />
+		<Setter Property="RowHeight" Value="24" />
+		<Setter Property="ColumnHeaderHeight" Value="20" />
+	</Style>
+	<Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
+	<Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
+	<Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
+	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
+	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
+	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
+	<Style BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup" />
+	<Style x:Key="ElementGroupSolid" BasedOn="{StaticResource ElementGroupBaseStyle}" TargetType="hc:ElementGroup">
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource EmptyBaseStyle}" TargetType="hc:Empty" />
+	<Style BasedOn="{StaticResource ExpanderBaseStyle}" TargetType="Expander" />
+	<Style BasedOn="{StaticResource FlowDocumentScrollViewerBaseStyle}" TargetType="FlowDocumentScrollViewer" />
+	<Style BasedOn="{StaticResource FlowDocumentPageViewerBaseStyle}" TargetType="FlowDocumentPageViewer" />
+	<Style BasedOn="{StaticResource FlowDocumentReaderBaseStyle}" TargetType="FlowDocumentReader" />
+	<Style BasedOn="{StaticResource FrameBaseStyle}" TargetType="Frame" />
+	<Style BasedOn="{StaticResource GotoTopBaseStyle}" TargetType="hc:GotoTop" />
+	<Style BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar" />
+	<Style x:Key="GravatarCircle" BasedOn="{StaticResource GravatarBaseStyle}" TargetType="hc:Gravatar">
+		<Setter Property="Padding" Value="16" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Gravatar">
+					<Border Style="{StaticResource BorderCircularClip}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ContentPresenter Margin="{TemplateBinding Padding}" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="GravatarCircleImg" BasedOn="{StaticResource GravatarCircle}" TargetType="hc:Gravatar">
+		<Setter Property="Padding" Value="0" />
+	</Style>
+	<Style TargetType="hc:Growl">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="MinHeight" Value="60" />
+		<Setter Property="Width" Value="320" />
+		<Setter Property="Margin" Value="10,10,10,0" />
+		<Setter Property="MaxWidth" Value="320" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="8" />
+		<Setter Property="Background" Value="{DynamicResource ThirdlyRegionBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Growl">
+					<Grid Name="PART_GridMain" RenderTransformOrigin="0.5,0.5">
+						<Grid.RenderTransform>
+							<TransformGroup>
+								<TranslateTransform X="{TemplateBinding MaxWidth}" />
+							</TransformGroup>
+						</Grid.RenderTransform>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="50" />
+							<ColumnDefinition />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+						<Border Grid.ColumnSpan="3" Grid.RowSpan="2" Effect="{StaticResource EffectShadow2}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Path FlowDirection="LeftToRight" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="0,15,0,0" Width="30" Height="30" Data="{TemplateBinding Icon}" Stretch="Uniform" Fill="{TemplateBinding IconBrush}" />
+						<StackPanel VerticalAlignment="Center" Grid.Row="0" Grid.Column="1" Margin="0,10,10,10">
+							<TextBlock Text="{TemplateBinding Message}" Style="{StaticResource TextBlockDefault}" HorizontalAlignment="Left" TextWrapping="Wrap" />
+							<TextBlock Visibility="{Binding ShowDateTime,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" Text="{Binding Time,RelativeSource={RelativeSource AncestorType=hc:Growl},StringFormat=yyyy/MM/dd HH:mm:ss}" Style="{StaticResource TextBlockDefault}" Foreground="{DynamicResource SecondaryTextBrush}" HorizontalAlignment="Left" Margin="0,4,0,0" />
+						</StackPanel>
+						<Button Grid.Row="0" Visibility="Collapsed" Margin="11,0" Name="PART_ButtonClose" Command="interactivity:ControlCommands.Close" Grid.Column="2" Background="Transparent" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center" HorizontalAlignment="Center" Width="18" Height="18">
+							<Path FlowDirection="LeftToRight" Data="{StaticResource ErrorGeometry}" Stretch="Uniform" Fill="{DynamicResource SecondaryTextBrush}" />
+						</Button>
+						<UniformGrid Columns="2" Name="PART_PanelMore" IsEnabled="False" Visibility="Collapsed" Grid.Row="1" Grid.ColumnSpan="3" Height="28" Grid.Column="0">
+							<Button Command="interactivity:ControlCommands.Cancel" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
+								<TextBlock Text="{Binding CancelStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource DangerBrush}" />
+							</Button>
+							<Button Command="interactivity:ControlCommands.Confirm" Style="{StaticResource ButtonCustom}" HorizontalAlignment="Stretch" Background="Transparent">
+								<TextBlock Text="{Binding ConfirmStr,RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Center" Foreground="{DynamicResource PrimaryBrush}" />
+							</Button>
+						</UniformGrid>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ImageSelectorBaseStyle}" TargetType="hc:ImageSelector" />
+	<Style TargetType="hc:ImageViewer">
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="Background" Value="Transparent" />
+		<Setter Property="MinWidth" Value="400" />
+		<Setter Property="MinHeight" Value="250" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:ImageViewer">
+					<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<hc:SimplePanel x:Name="PART_PanelMain" ClipToBounds="True" Grid.RowSpan="2">
+								<Border HorizontalAlignment="Left" VerticalAlignment="Top" Height="{TemplateBinding ImageHeight}" Width="{TemplateBinding ImageWidth}" Margin="{TemplateBinding ImageMargin}">
+									<Image Name="PART_ImageMain" RenderOptions.BitmapScalingMode="NearestNeighbor" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding ImageSource}" />
+								</Border>
+							</hc:SimplePanel>
+							<Border Grid.Row="0" Grid.RowSpan="2" Width="252" Height="162" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="{DynamicResource DarkOpacityBrush}" BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1">
+								<Border.Visibility>
+									<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+										<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowSmallImgInternal" />
+										<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ShowImgMap" />
+									</MultiBinding>
+								</Border.Visibility>
+								<Canvas ClipToBounds="True" Name="PART_CanvasSmallImg" MaxWidth="250" MaxHeight="160">
+									<Border UseLayoutRounding="True" Name="PART_BorderMove" Background="Transparent" Width="50" Height="70" BorderThickness="1" BorderBrush="Black">
+										<Border BorderThickness="1" BorderBrush="White" />
+									</Border>
+								</Canvas>
+							</Border>
+							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
+								<StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
+									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
+									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
+									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
+									<TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
+									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
+										<Border BorderThickness="1" BorderBrush="White" Padding="2">
+											<TextBlock Text="1:1" />
+										</Border>
+									</Button>
+									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
+									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
+									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
+								</StackPanel>
+							</Border>
+						</Grid>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox" />
+	<Style x:Key="ListBoxItemBaseStyle.Small" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
+		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="ListBox.Small" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemBaseStyle.Small}" />
+	</Style>
+	<Style x:Key="ListBoxCustom" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemCustom}" />
+		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+	</Style>
+	<Style x:Key="WrapPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapHorizontalItemsPanelTemplate}" />
+	</Style>
+	<Style x:Key="WrapPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+		<Setter Property="ItemsPanel" Value="{StaticResource WrapVerticalItemsPanelTemplate}" />
+	</Style>
+	<Style x:Key="StackPanelHorizontalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+		<Setter Property="ItemsPanel" Value="{StaticResource StackHorizontalItemsPanelTemplate}" />
+	</Style>
+	<Style x:Key="StackPanelVerticalListBox" BasedOn="{StaticResource ListBoxCustom}" TargetType="ListBox">
+		<Setter Property="ItemsPanel" Value="{StaticResource StackVerticalItemsPanelTemplate}" />
+	</Style>
+	<Style x:Key="ListViewBaseStyle" TargetType="ListView">
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Padding" Value="6" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
+		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ListView">
+					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
+							<hc:ToggleBlock.CheckedContent>
+								<ScrollViewer>
+									<Grid Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+										<Grid.RowDefinitions>
+											<RowDefinition Height="Auto" />
+											<RowDefinition Height="*" />
+										</Grid.RowDefinitions>
+										<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+										<ItemsPresenter Grid.Row="1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</Grid>
+								</ScrollViewer>
+							</hc:ToggleBlock.CheckedContent>
+							<hc:ToggleBlock.UnCheckedContent>
+								<hc:Empty />
+							</hc:ToggleBlock.UnCheckedContent>
+						</hc:ToggleBlock>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="IsGrouping" Value="true" />
+					<Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
+				</MultiTrigger.Conditions>
+				<Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+			</MultiTrigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource ListViewBaseStyle}" TargetType="ListView" />
+	<Style BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine" />
+	<Style x:Key="LoadingLineLight" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style x:Key="LoadingLineLarge" BasedOn="{StaticResource LoadingLineBaseStyle}" TargetType="hc:LoadingLine">
+		<Setter Property="DotDiameter" Value="10" />
+	</Style>
+	<Style x:Key="LoadingLineLargeLight" BasedOn="{StaticResource LoadingLineLarge}" TargetType="hc:LoadingLine">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle" />
+	<Style x:Key="LoadingCircleLight" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style x:Key="LoadingCircleLarge" BasedOn="{StaticResource LoadingCircleBaseStyle}" TargetType="hc:LoadingCircle">
+		<Setter Property="Width" Value="100" />
+		<Setter Property="Height" Value="100" />
+		<Setter Property="DotDiameter" Value="10" />
+		<Setter Property="DotInterval" Value="20" />
+		<Setter Property="DotOffSet" Value="40" />
+		<Setter Property="DotDelayTime" Value="120" />
+	</Style>
+	<Style x:Key="LoadingCircleLargeLight" BasedOn="{StaticResource LoadingCircleLarge}" TargetType="hc:LoadingCircle">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource MagnifierBaseStyle}" TargetType="hc:Magnifier" />
+	<Style x:Key="MessageBoxButtonStyle" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
+		<Setter Property="MinWidth" Value="88" />
+		<Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+		<Setter Property="Margin" Value="5,0" />
+	</Style>
+	<Style x:Key="MessageBoxPrimaryButtonStyle" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
+		<Setter Property="MinWidth" Value="88" />
+		<Setter Property="Visibility" Value="{Binding IsEnabled,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2VisibilityConverter}}" />
+		<Setter Property="Margin" Value="5,0" />
+	</Style>
+	<Style TargetType="hc:MessageBox" BasedOn="{StaticResource WindowWin10}">
+		<Setter Property="MinHeight" Value="172" />
+		<Setter Property="ShowInTaskbar" Value="False" />
+		<Setter Property="MinWidth" Value="335" />
+		<Setter Property="MaxWidth" Value="476" />
+		<Setter Property="MaxHeight" Value="680" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="SizeToContent" Value="WidthAndHeight" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:MessageBox">
+					<Border SnapsToDevicePixels="True" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+						<Grid Margin="{TemplateBinding Padding}">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<Grid Background="{TemplateBinding NonClientAreaBackground}" Name="PART_NonClientArea" TextElement.Foreground="{TemplateBinding NonClientAreaForeground}">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<StackPanel WindowChrome.IsHitTestVisibleInChrome="True" UseLayoutRounding="True" VerticalAlignment="Top" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal">
+									<Button Background="{TemplateBinding CloseButtonBackground}" Foreground="{TemplateBinding CloseButtonForeground}" IsTabStop="False" Name="PART_ButtonClose" Height="29" Style="{StaticResource ButtonIcon}" Width="46" hc:IconElement.Geometry="{StaticResource CloseGeometry}" BorderThickness="1,0,0,0" hc:IconElement.Width="10" hc:IconElement.Height="10" />
+								</StackPanel>
+								<Grid Grid.Column="0">
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition />
+									</Grid.ColumnDefinitions>
+									<Button Name="ButtonIcon" Visibility="{TemplateBinding Icon,Converter={StaticResource Object2VisibilityConverter}}" Command="{x:Static SystemCommands.ShowSystemMenuCommand}" Background="Transparent" Margin="10,0,0,0" WindowChrome.IsHitTestVisibleInChrome="True" Style="{StaticResource ButtonCustom}" VerticalAlignment="Center">
+										<interactivity:Interaction.Triggers>
+											<interactivity:EventTrigger EventName="MouseDoubleClick">
+												<interactivity:InvokeCommandAction Command="{x:Static SystemCommands.CloseWindowCommand}" />
+											</interactivity:EventTrigger>
+										</interactivity:Interaction.Triggers>
+										<Image IsHitTestVisible="False" Source="{TemplateBinding Icon}" VerticalAlignment="Center" Width="16" Height="16" />
+									</Button>
+									<TextBlock Grid.Column="1" Text="{TemplateBinding Title}" Padding="10,0,0,0" VerticalAlignment="Center">
+										<TextBlock.Visibility>
+											<MultiBinding Converter="{StaticResource BooleanArr2VisibilityConverter}">
+												<MultiBinding.Bindings>
+													<Binding Path="ShowTitle" RelativeSource="{RelativeSource TemplatedParent}" />
+													<Binding Path="Title" RelativeSource="{RelativeSource TemplatedParent}" Converter="{StaticResource Object2BooleanConverter}" />
+												</MultiBinding.Bindings>
+											</MultiBinding>
+										</TextBlock.Visibility>
+									</TextBlock>
+									<ContentPresenter WindowChrome.IsHitTestVisibleInChrome="True" Grid.Column="2" x:Name="ContentPresenterMain" Content="{TemplateBinding NonClientAreaContent}" />
+								</Grid>
+							</Grid>
+							<AdornerDecorator Grid.Row="1">
+								<Grid>
+									<Grid.ColumnDefinitions>
+										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition />
+									</Grid.ColumnDefinitions>
+									<Grid.RowDefinitions>
+										<RowDefinition />
+										<RowDefinition Height="Auto" />
+									</Grid.RowDefinitions>
+									<Path Data="{TemplateBinding Image}" Fill="{TemplateBinding ImageBrush}" HorizontalAlignment="Center" Visibility="{TemplateBinding ShowImage,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Top" Margin="20,32,0,0" Width="30" Height="30" Stretch="Uniform" />
+									<ScrollViewer Grid.Row="0" Grid.Column="1" VerticalAlignment="Top">
+										<Border MinHeight="30" Margin="10,32,10,10" HorizontalAlignment="Left">
+											<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Message}" TextWrapping="Wrap" />
+										</Border>
+									</ScrollViewer>
+									<StackPanel Name="PART_Panel" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Margin="0,10,0,16" Orientation="Horizontal" HorizontalAlignment="Center" />
+								</Grid>
+							</AdornerDecorator>
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsActive" Value="False">
+							<Setter Property="Opacity" Value=".8" TargetName="ContentPresenterMain" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True" SourceName="PART_ButtonClose">
+							<Setter Property="Background" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverBackground,RelativeSource={RelativeSource TemplatedParent}}" />
+							<Setter Property="Foreground" TargetName="PART_ButtonClose" Value="{Binding CloseButtonHoverForeground,RelativeSource={RelativeSource TemplatedParent}}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
+	<Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
+		<Setter Property="GroupName" Value="1" />
+		<Setter Property="MinWidth" Value="30" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="RadioButton">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<StackPanel Orientation="Horizontal" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}">
+							<Path x:Name="PathMain" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconElement.Geometry}" />
+							<ContentPresenter x:Name="contentPresenter" RecognizesAccessKey="True" VerticalAlignment="Center" Margin="6,0,0,0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</StackPanel>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="IsChecked" Value="true">
+							<Setter Property="BorderBrush" Value="{Binding Path=(hc:VisualElement.HighlightBorderBrush),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="Background" Value="{Binding Path=(hc:VisualElement.HighlightBackground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="BorderRoot" />
+							<Setter Property="TextElement.Foreground" Value="{Binding Path=(hc:VisualElement.HighlightForeground),RelativeSource={RelativeSource TemplatedParent}}" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="Content" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="contentPresenter" />
+						</Trigger>
+						<Trigger Property="hc:IconElement.Geometry" Value="{x:Null}">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="PathMain" />
+							<Setter Property="Margin" Value="0" TargetName="contentPresenter" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsChecked" Value="True">
+				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style TargetType="hc:Pagination">
+		<Setter Property="hc:VisualElement.HighlightBorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightBackground" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:VisualElement.HighlightForeground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:Pagination">
+					<StackPanel Orientation="Horizontal" VerticalAlignment="Top">
+						<Button x:Name="PART_ButtonLeft" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource LeftGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='1,0,0,1'}" Command="interactivity:ControlCommands.Prev" />
+						<StackPanel ZIndex="999" HorizontalAlignment="Center" Orientation="Horizontal">
+							<interactivity:Interaction.Triggers>
+								<interactivity:RoutedEventTrigger RoutedEvent="RadioButton.Checked">
+									<interactivity:EventToCommand Command="interactivity:ControlCommands.Selected" PassEventArgsToCommand="True" />
+								</interactivity:RoutedEventTrigger>
+							</interactivity:Interaction.Triggers>
+							<RadioButton Name="PART_ButtonFirst" Content="1" IsChecked="True" Style="{StaticResource PaginationButtonStyle}" />
+							<Border Name="PART_MoreLeft" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
+								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
+							</Border>
+							<StackPanel Name="PART_PanelMain" Orientation="Horizontal" />
+							<Border Name="PART_MoreRight" Cursor="No" Margin="-1,0,0,0" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{DynamicResource SecondaryRegionBrush}" Padding="10,0">
+								<hc:SimpleText FontWeight="Bold" Foreground="{DynamicResource SecondaryTextBrush}" Text="..." VerticalAlignment="Center" />
+							</Border>
+							<RadioButton Name="PART_ButtonLast" Content="10" Style="{StaticResource PaginationButtonStyle}" />
+						</StackPanel>
+						<Button x:Name="PART_ButtonRight" MinWidth="30" Padding="10,8" hc:IconElement.Geometry="{StaticResource RightGeometry}" hc:BorderElement.CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource CornerRadiusSplitConverter},ConverterParameter='0,1,1,0'}" Margin="-1,0,0,0" Command="interactivity:ControlCommands.Next" />
+						<hc:NumericUpDown x:Name="PART_Jump" IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="6,0,0,0" Maximum="{Binding MaxPageCount,RelativeSource={RelativeSource TemplatedParent}}" Minimum="1" />
+						<Button IsEnabled="{TemplateBinding IsJumpEnabled}" Visibility="{TemplateBinding IsJumpEnabled,Converter={StaticResource Boolean2VisibilityConverter}}" Content="{ex:Lang {x:Static langs:LangKeys.Jump}}" Margin="6,0,0,0" Command="interactivity:ControlCommands.Jump" />
+					</StackPanel>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox" />
+	<Style x:Key="PasswordBox.Small" BasedOn="{StaticResource PasswordBoxBaseStyle}" TargetType="PasswordBox">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style x:Key="PasswordBoxExtend" BasedOn="{StaticResource PasswordBoxExtendBaseStyle}" TargetType="PasswordBox" />
+	<Style x:Key="PasswordBoxExtend.Small" BasedOn="{StaticResource PasswordBoxExtend}" TargetType="PasswordBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox" />
+	<Style x:Key="PasswordBoxPlus.Small" BasedOn="{StaticResource PasswordBoxPlusBaseStyle}" TargetType="hc:PasswordBox">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
+	<Style BasedOn="{StaticResource PinBoxBaseStyle}" TargetType="hc:PinBox" />
+	<Style BasedOn="{StaticResource PoptipBaseStyle}" TargetType="hc:Poptip" />
+	<Style TargetType="hc:PopupWindow">
+		<Setter Property="WindowStyle" Value="None" />
+		<Setter Property="MinHeight" Value="220" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="BorderThickness" Value="20" />
+		<Setter Property="ShowInTaskbar" Value="False" />
+		<Setter Property="MinWidth" Value="300" />
+		<Setter Property="ResizeMode" Value="NoResize" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="SizeToContent" Value="WidthAndHeight" />
+		<Setter Property="Effect">
+			<Setter.Value>
+				<DropShadowEffect Opacity=".6" ShadowDepth="0" BlurRadius="15" />
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:PopupWindow">
+					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid>
+							<Grid.RowDefinitions>
+								<RowDefinition Height="Auto" />
+								<RowDefinition />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<Grid Name="TitleGrid" Height="30" Background="{DynamicResource TitleBrush}">
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition />
+									<ColumnDefinition Width="Auto" />
+								</Grid.ColumnDefinitions>
+								<TextBlock Name="PART_TitleBlock" Background="Transparent" Padding="{StaticResource DefaultControlPadding}" Foreground="White" Text="{TemplateBinding Title}" VerticalAlignment="Center" TextWrapping="Wrap" TextTrimming="WordEllipsis" />
+								<Button Margin="0,0,1,0" Background="Transparent" Name="CloseButton" Foreground="White" Grid.Column="1" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="Red" Command="interactivity:ControlCommands.Close" IsCancel="True" Height="28" Style="{StaticResource ButtonCustom}" Width="44" Padding="9">
+									<Path Fill="{Binding ElementName=CloseButton,Path=Foreground}" Style="{StaticResource ClosePathStyle}" />
+								</Button>
+							</Grid>
+							<Border BorderBrush="{DynamicResource TitleBrush}" Name="PART_MainBorder" Grid.Row="1">
+								<StackPanel>
+									<TextBlock Text="{TemplateBinding ContentStr}" MinHeight="110" Name="MyTextBlock" TextAlignment="Center" Padding="32" Foreground="{DynamicResource PrimaryTextBrush}" MaxWidth="300" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" Background="{TemplateBinding Background}" />
+									<StackPanel Margin="0,0,0,32" Orientation="Horizontal" Background="{DynamicResource RegionBrush}" HorizontalAlignment="Center">
+										<Button IsCancel="True" MinWidth="80" Command="interactivity:ControlCommands.Cancel" Content="{ex:Lang Key={x:Static langs:LangKeys.Cancel}}" Visibility="{TemplateBinding ShowCancel,Converter={StaticResource Boolean2VisibilityConverter}}" Margin="0,0,16,0" />
+										<Button IsDefault="True" MinWidth="80" Command="interactivity:ControlCommands.Confirm" Content="{ex:Lang Key={x:Static langs:LangKeys.Confirm}}" Style="{StaticResource ButtonPrimary}" />
+									</StackPanel>
+								</StackPanel>
+							</Border>
+						</Grid>
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="ShowBorder" Value="True">
+							<Setter Property="BorderThickness" Value="1,0,1,1" TargetName="PART_MainBorder" />
+						</Trigger>
+						<Trigger Property="ShowTitle" Value="False">
+							<Setter Property="Visibility" Value="Collapsed" TargetName="TitleGrid" />
+							<Setter Property="Background" Value="Transparent" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ProgressButtonPrimary" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ProgressButtonSuccess" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ProgressButtonInfo" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ProgressButtonWarning" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ProgressButtonDanger" BasedOn="{StaticResource ProgressButtonBaseStyle}" TargetType="hc:ProgressButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource PropertyGridBaseStyle}" TargetType="hc:PropertyGrid" />
+	<Style x:Key="ComboBoxItemCapsuleBaseStyle" BasedOn="{x:Null}" TargetType="ComboBoxItem">
+		<Setter Property="MinWidth" Value="40" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="VerticalAlignment" Value="Center" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="10,0" />
+		<Setter Property="Margin" Value="-1,0,0,0" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ComboBoxItem">
+					<Border x:Name="BorderRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<ContentPresenter x:Name="contentPresenter" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" TextElement.Foreground="{TemplateBinding Foreground}" Focusable="False" HorizontalAlignment="Center" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsSelected" Value="True">
+				<Setter Property="Panel.ZIndex" Value="{x:Static system:Int32.MaxValue}" />
+			</Trigger>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
+			</Trigger>
+			<Trigger Property="IsSelected" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="TextElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="ComboBoxItemCapsuleDefault" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem" />
+	<Style x:Key="ComboBoxItemCapsuleHorizontalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ComboBoxItemCapsuleHorizontalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+	</Style>
+	<Style x:Key="ComboBoxItemCapsuleSingle" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+	</Style>
+	<Style x:Key="ComboBoxItemCapsuleVerticalFirst" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="ComboBoxItemCapsuleVerticalLast" BasedOn="{StaticResource ComboBoxItemCapsuleBaseStyle}" TargetType="ComboBoxItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+	</Style>
+	<Style x:Key="ComboBoxCapsule" BasedOn="{x:Null}" TargetType="ComboBox">
+		<Setter Property="ItemContainerStyleSelector" Value="{StaticResource ComboBoxItemCapsuleStyleSelector}" />
+		<Setter Property="VerticalAlignment" Value="Top" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="ItemsPanel" Value="{StaticResource UniformHorizontalItemsPanelTemplate}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ComboBox">
+					<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource RateBaseStyle}" TargetType="hc:Rate" />
+	<Style BasedOn="{StaticResource RunningBlockBaseStyle}" TargetType="hc:RunningBlock" />
+	<Style BasedOn="{StaticResource SeparatorBaseStyle}" TargetType="Separator" />
+	<Style BasedOn="{StaticResource ShieldBaseStyle}" TargetType="hc:Shield" />
+	<Style BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu" />
+	<Style x:Key="SideMenuAccordion" BasedOn="{StaticResource SideMenuBaseStyle}" TargetType="hc:SideMenu">
+		<Setter Property="ExpandMode" Value="Accordion" />
+		<Setter Property="PanelAreaLength" Value="200" />
+		<Setter Property="ItemContainerStyle" Value="{StaticResource SideMenuItemHeaderAccordionBaseStyle}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:SideMenu">
+					<Border Name="BorderRoot" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+						<StackPanel x:Name="PART_Panel" />
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Background" Value="{DynamicResource BorderBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style x:Key="SplitButtonPrimary" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="SplitButtonSuccess" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="SplitButtonInfo" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="SplitButtonWarning" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="SplitButtonDanger" BasedOn="{StaticResource SplitButtonBaseStyle}" TargetType="hc:SplitButton">
+		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style BasedOn="{StaticResource StatusBarBaseStyle}" TargetType="StatusBar" />
+	<Style BasedOn="{StaticResource StatusBarItemBaseStyle}" TargetType="StatusBarItem" />
+	<Style BasedOn="{StaticResource StepBarBaseStyle}" TargetType="hc:StepBar" />
+	<Style BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl" />
+	<Style BasedOn="{StaticResource TabControlPlusBaseStyle}" TargetType="hc:TabControl" />
+	<Style x:Key="TabItemInLine" BasedOn="{StaticResource TabItemStyle}" TargetType="TabItem">
+		<Setter Property="MinWidth" Value="0" />
+	</Style>
+	<Style x:Key="TabControlInLine" BasedOn="{StaticResource TabControlBaseStyle}" TargetType="TabControl">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TabItemInLine}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TabControl">
+					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition x:Name="ColumnDefinition0" />
+							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
+							<RowDefinition x:Name="RowDefinition1" Height="*" />
+						</Grid.RowDefinitions>
+						<UniformGrid Rows="1" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+						<Border x:Name="contentPanel" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,1,0,0'}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="TabStripPlacement" Value="Bottom">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,0,1'}" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Left">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='1,0,0,0'}" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
+							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Right">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="BorderThickness" Value="{Binding BorderThickness,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource ThicknessSplitConverter},ConverterParameter='0,0,1,0'}" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
+							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TabItemCapsuleDefault" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem" />
+	<Style x:Key="TabItemCapsuleHorizontalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="TabItemCapsuleHorizontalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,4,4,0" />
+	</Style>
+	<Style x:Key="TabItemCapsuleSingle" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+	</Style>
+	<Style x:Key="TabItemCapsuleVerticalFirst" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="4,4,0,0" />
+		<Setter Property="Margin" Value="0" />
+	</Style>
+	<Style x:Key="TabItemCapsuleVerticalLast" BasedOn="{StaticResource TabItemCapsuleBaseStyle}" TargetType="TabItem">
+		<Setter Property="hc:BorderElement.CornerRadius" Value="0,0,4,4" />
+	</Style>
+	<Style x:Key="TabControlCapsule" TargetType="TabControl">
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="ItemContainerStyleSelector">
+			<Setter.Value>
+				<tools:TabItemCapsuleStyleSelector />
+			</Setter.Value>
+		</Setter>
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="TabControl">
+					<Grid x:Name="templateRoot" Background="{TemplateBinding Background}" ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition x:Name="ColumnDefinition0" />
+							<ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
+						</Grid.ColumnDefinitions>
+						<Grid.RowDefinitions>
+							<RowDefinition x:Name="RowDefinition0" Height="Auto" />
+							<RowDefinition x:Name="RowDefinition1" Height="*" />
+						</Grid.RowDefinitions>
+						<UniformGrid Rows="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="headerPanel" Background="Transparent" Grid.Column="0" IsItemsHost="true" Margin="0" Grid.Row="0" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1" />
+						<Border x:Name="contentPanel" Margin="0,6,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{DynamicResource BorderBrush}" Background="{TemplateBinding Background}" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" Grid.Row="1" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
+							<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" Margin="0" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+						</Border>
+					</Grid>
+					<ControlTemplate.Triggers>
+						<Trigger Property="TabStripPlacement" Value="Bottom">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="Auto" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="1" />
+							<Setter TargetName="contentPanel" Property="Margin" Value="0,0,0,6" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Left">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
+							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="Margin" Value="6,0,0,0" />
+						</Trigger>
+						<Trigger Property="TabStripPlacement" Value="Right">
+							<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
+							<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
+							<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
+							<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
+							<Setter TargetName="headerPanel" Property="Grid.Column" Value="1" />
+							<Setter TargetName="headerPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="headerPanel" Property="Rows" Value="0" />
+							<Setter TargetName="headerPanel" Property="Columns" Value="1" />
+							<Setter TargetName="contentPanel" Property="Grid.Column" Value="0" />
+							<Setter TargetName="contentPanel" Property="Grid.Row" Value="0" />
+							<Setter TargetName="contentPanel" Property="Margin" Value="0,0,6,0" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style x:Key="TabControlCapsuleSolid" BasedOn="{StaticResource TabControlCapsule}" TargetType="TabControl">
+		<Setter Property="hc:TitleElement.BorderBrush" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:TitleElement.Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="hc:TitleElement.Foreground" Value="{DynamicResource TextIconBrush}" />
+	</Style>
+	<Style TargetType="hc:TimeBar">
+		<Setter Property="HotspotsBrush" Value="{DynamicResource AccentBrush}" />
+		<Setter Property="Focusable" Value="False" />
+		<Setter Property="UseLayoutRounding" Value="True" />
+		<Setter Property="BorderThickness" Value="0,1,0,0" />
+		<Setter Property="Foreground" Value="White" />
+		<Setter Property="Background" Value="{DynamicResource TitleBrush}" />
+		<Setter Property="Height" Value="60" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="hc:TimeBar">
+					<ControlTemplate.Triggers>
+						<EventTrigger RoutedEvent="FrameworkElement.MouseEnter">
+							<BeginStoryboard>
+								<Storyboard>
+									<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
+										<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+									</ObjectAnimationUsingKeyFrames>
+								</Storyboard>
+							</BeginStoryboard>
+						</EventTrigger>
+						<EventTrigger RoutedEvent="FrameworkElement.MouseLeave">
+							<BeginStoryboard>
+								<Storyboard>
+									<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="PART_TextBlockMove">
+										<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+									</ObjectAnimationUsingKeyFrames>
+								</Storyboard>
+							</BeginStoryboard>
+						</EventTrigger>
+					</ControlTemplate.Triggers>
+					<Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+						<hc:SimplePanel ClipToBounds="True">
+							<Border BorderThickness="0,0,0,4" BorderBrush="White" VerticalAlignment="Top" Height="52">
+								<TextBlock FontSize="16" Name="PART_TextBlockSelected" VerticalAlignment="Top" Margin="0,14,0,0" HorizontalAlignment="Center" />
+							</Border>
+							<TextBlock Visibility="{TemplateBinding ShowSpeStr,Converter={StaticResource Boolean2VisibilityConverter}}" Text="{TemplateBinding SpeStr}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,14,10,0" />
+							<TextBlock Visibility="Collapsed" Name="PART_TextBlockMove" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,2,0,0" />
+							<Canvas Name="PART_CanvasSpe" VerticalAlignment="Bottom" Height="28" />
+							<hc:SimplePanel x:Name="PART_Hotspots" Margin="0,48,0,0" VerticalAlignment="Top" Visibility="{Binding Hotspots,RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Object2VisibilityConverter}}" />
+							<Border Width="1" Background="{DynamicResource DangerBrush}" />
+							<Border Name="PART_BorderTop" Background="Transparent" Cursor="Hand" />
+						</hc:SimplePanel>
+					</Border>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
+	<Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
+	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
+	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
+	<Style BasedOn="{StaticResource TransferBaseStyle}" TargetType="hc:Transfer" />
+	<Style BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem" />
+	<Style BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView" />
+	<Style x:Key="TreeViewItemBaseStyle.Small" BasedOn="{StaticResource TreeViewItemBaseStyle}" TargetType="TreeViewItem">
+		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="MinHeight" Value="24" />
+	</Style>
+	<Style x:Key="TreeView.Small" BasedOn="{StaticResource TreeViewBaseStyle}" TargetType="TreeView">
+		<Setter Property="ItemContainerStyle" Value="{StaticResource TreeViewItemBaseStyle.Small}" />
+	</Style>
+	<Style BasedOn="{StaticResource WatermarkBaseStyle}" TargetType="hc:Watermark" />
+	<Style BasedOn="{StaticResource AutoCompleteTextBoxBaseStyle}" TargetType="hc:AutoCompleteTextBox" />
+	<ControlTemplate x:Key="TipSliderThumbHorizontalTop" TargetType="Thumb">
+		<hc:AxleCanvas>
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipSliderThumbHorizontalBottom" TargetType="Thumb">
+		<hc:AxleCanvas>
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipSliderThumbVerticalLeft" TargetType="Thumb">
+		<hc:AxleCanvas Orientation="Vertical">
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipSliderThumbVerticalRight" TargetType="Thumb">
+		<hc:AxleCanvas Orientation="Vertical">
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{Binding Value,RelativeSource={RelativeSource AncestorType=Slider}}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=Slider}}" />
+			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="SliderHorizontal" TargetType="Slider">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+			<TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Row="1" Height="2" VerticalAlignment="center" Margin="9,0">
+				<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
+					<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Height="2" />
+				</Canvas>
+			</Border>
+			<Track Margin="9,0" x:Name="PART_Track" Grid.Row="1">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="Thumb" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" VerticalAlignment="Center" />
+				</Track.Thumb>
+			</Track>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Top" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalTop}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Bottom" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbHorizontalBottom}" />
+			</MultiTrigger>
+			<Trigger Property="TickPlacement" Value="TopLeft">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="BottomRight">
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="Both">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="IsSelectionRangeEnabled" Value="true">
+				<Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="SliderVertical" TargetType="Slider">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<TickBar x:Name="TopTick" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
+			<TickBar x:Name="BottomTick" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Grid.Column="1" HorizontalAlignment="center" Margin="0,9" Width="2">
+				<Canvas x:Name="Canvas_SelectionRange" Visibility="Hidden">
+					<Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource AccentBrush}" Width="2" />
+				</Canvas>
+			</Border>
+			<Track Margin="0,9" x:Name="PART_Track" Grid.Column="1">
+				<Track.DecreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+				</Track.DecreaseRepeatButton>
+				<Track.IncreaseRepeatButton>
+					<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+				</Track.IncreaseRepeatButton>
+				<Track.Thumb>
+					<Thumb Margin="0,-9" x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumb}" HorizontalAlignment="Center" Width="18" />
+				</Track.Thumb>
+			</Track>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Left" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalLeft}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Right" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="Thumb" Value="{StaticResource TipSliderThumbVerticalRight}" />
+			</MultiTrigger>
+			<Trigger Property="TickPlacement" Value="TopLeft">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="BottomRight">
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="Both">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="IsSelectionRangeEnabled" Value="true">
+				<Setter Property="Visibility" TargetName="Canvas_SelectionRange" Value="Visible" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="SliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="Slider">
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
+		<Setter Property="Template" Value="{StaticResource SliderHorizontal}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource SliderVertical}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<ControlTemplate x:Key="TipRangeSliderThumbHorizontalTop" TargetType="hc:RangeThumb">
+		<hc:AxleCanvas>
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Bottom="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipRangeSliderThumbHorizontalBottom" TargetType="hc:RangeThumb">
+		<hc:AxleCanvas>
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Top="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+			<Border Canvas.Bottom="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipRangeSliderThumbVerticalLeft" TargetType="hc:RangeThumb">
+		<hc:AxleCanvas Orientation="Vertical">
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Right="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="TipRangeSliderThumbVerticalRight" TargetType="hc:RangeThumb">
+		<hc:AxleCanvas Orientation="Vertical">
+			<Label Name="LabelValue" IsHitTestVisible="False" Opacity="0" Canvas.Left="28" Style="{StaticResource LabelPrimary}" Content="{TemplateBinding Content}" ContentStringFormat="{Binding Path=(hc:TipElement.StringFormat),RelativeSource={RelativeSource AncestorType=hc:RangeSlider}}" />
+			<Border Canvas.Right="0" Effect="{StaticResource EffectShadow1}" Name="BorderDot" BorderThickness="0" BorderBrush="{DynamicResource PrimaryBrush}" Width="18" Height="18" Background="White" CornerRadius="9" />
+		</hc:AxleCanvas>
+		<ControlTemplate.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Effect" Value="{StaticResource EffectShadow2}" TargetName="BorderDot" />
+				<Setter Property="Opacity" Value="1" TargetName="LabelValue" />
+			</Trigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonDown">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="2" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+			<EventTrigger RoutedEvent="PreviewMouseLeftButtonUp">
+				<EventTrigger.Actions>
+					<BeginStoryboard>
+						<Storyboard>
+							<ThicknessAnimation To="0" Duration="0:0:.1" Storyboard.TargetName="BorderDot" Storyboard.TargetProperty="BorderThickness" />
+						</Storyboard>
+					</BeginStoryboard>
+				</EventTrigger.Actions>
+			</EventTrigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="RangeSliderHorizontal" TargetType="hc:RangeSlider">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<TickBar x:Name="TopTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+			<TickBar x:Name="BottomTick" Width="{Binding ActualWidth,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="9,0" Grid.Row="1" Height="2" VerticalAlignment="center" />
+			<hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="9,0" x:Name="PART_Track" Grid.Row="1">
+				<hc:RangeTrack.DecreaseRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+				</hc:RangeTrack.DecreaseRepeatButton>
+				<hc:RangeTrack.CenterRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+				</hc:RangeTrack.CenterRepeatButton>
+				<hc:RangeTrack.IncreaseRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonHorizontalStyle}" />
+				</hc:RangeTrack.IncreaseRepeatButton>
+				<hc:RangeTrack.ThumbStart>
+					<hc:RangeThumb Content="{TemplateBinding ValueStart}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbStart" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
+				</hc:RangeTrack.ThumbStart>
+				<hc:RangeTrack.ThumbEnd>
+					<hc:RangeThumb Content="{TemplateBinding ValueEnd}" ClipToBounds="False" Width="18" Margin="-9,0" Height="18" x:Name="ThumbEnd" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" VerticalAlignment="Center" />
+				</hc:RangeTrack.ThumbEnd>
+			</hc:RangeTrack>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Top" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
+				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalTop}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Bottom" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
+				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbHorizontalBottom}" />
+			</MultiTrigger>
+			<Trigger Property="TickPlacement" Value="TopLeft">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="BottomRight">
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="Both">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<ControlTemplate x:Key="RangeSliderVertical" TargetType="hc:RangeSlider">
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<TickBar x:Name="TopTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="0" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4" />
+			<TickBar x:Name="BottomTick" Height="{Binding ActualHeight,ElementName=TrackBackground}" Ticks="{TemplateBinding Ticks}" TickFrequency="{TemplateBinding TickFrequency}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Grid.Column="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4" />
+			<Border x:Name="TrackBackground" Background="{TemplateBinding Background}" Margin="0,9" Grid.Column="1" HorizontalAlignment="center" Width="2" />
+			<hc:RangeTrack IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Orientation="{TemplateBinding Orientation}" ValueStart="{TemplateBinding ValueStart}" ValueEnd="{TemplateBinding ValueEnd}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Margin="0,9" x:Name="PART_Track" Grid.Column="1">
+				<hc:RangeTrack.DecreaseRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+				</hc:RangeTrack.DecreaseRepeatButton>
+				<hc:RangeTrack.CenterRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.CenterLarge}" Background="{DynamicResource PrimaryBrush}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+				</hc:RangeTrack.CenterRepeatButton>
+				<hc:RangeTrack.IncreaseRepeatButton>
+					<RepeatButton Interval="{TemplateBinding Interval}" Delay="{TemplateBinding Delay}" Command="{x:Static hc:RangeSlider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonVerticalStyle}" />
+				</hc:RangeTrack.IncreaseRepeatButton>
+				<hc:RangeTrack.ThumbStart>
+					<hc:RangeThumb Content="{TemplateBinding ValueStart}" Margin="0,-9" x:Name="ThumbStart" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
+				</hc:RangeTrack.ThumbStart>
+				<hc:RangeTrack.ThumbEnd>
+					<hc:RangeThumb Content="{TemplateBinding ValueEnd}" Margin="0,-9" x:Name="ThumbEnd" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource RangeSliderThumb}" HorizontalAlignment="Center" Width="18" />
+				</hc:RangeTrack.ThumbEnd>
+			</hc:RangeTrack>
+		</Grid>
+		<ControlTemplate.Triggers>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Left" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
+				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalLeft}" />
+			</MultiTrigger>
+			<MultiTrigger>
+				<MultiTrigger.Conditions>
+					<Condition Property="hc:TipElement.Placement" Value="Right" />
+					<Condition Property="hc:TipElement.Visibility" Value="Visible" />
+				</MultiTrigger.Conditions>
+				<Setter Property="Template" TargetName="ThumbStart" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
+				<Setter Property="Template" TargetName="ThumbEnd" Value="{StaticResource TipRangeSliderThumbVerticalRight}" />
+			</MultiTrigger>
+			<Trigger Property="TickPlacement" Value="TopLeft">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="BottomRight">
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+			<Trigger Property="TickPlacement" Value="Both">
+				<Setter Property="Visibility" TargetName="TopTick" Value="Visible" />
+				<Setter Property="Visibility" TargetName="BottomTick" Value="Visible" />
+			</Trigger>
+		</ControlTemplate.Triggers>
+	</ControlTemplate>
+	<Style x:Key="RangeSliderBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="hc:RangeSlider">
+		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+		<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource DarkPrimaryBrush}" />
+		<Setter Property="Template" Value="{StaticResource RangeSliderHorizontal}" />
+		<Style.Triggers>
+			<Trigger Property="Orientation" Value="Vertical">
+				<Setter Property="Template" Value="{StaticResource RangeSliderVertical}" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value=".4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource RangeSliderBaseStyle}" TargetType="hc:RangeSlider" />
+	<Style BasedOn="{StaticResource SliderBaseStyle}" TargetType="Slider" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index 51cb5463..25be788e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -364,7 +364,6 @@ namespace HandyControl.Tools.Interop
         [StructLayout(LayoutKind.Sequential)]
         internal struct WINDOWPLACEMENT
         {
-
             public int length;
             public int flags;
             public SW showCmd;

From de8824842a668c67a0b03d0e727f660251121375 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 24 Feb 2022 00:03:34 +0800
Subject: [PATCH 09/32] feat(style): add DatePicker small style

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 35 ++++++++++++++-----
 .../Controls/DatePickerDemoCtl.xaml           | 29 ++++++++++-----
 .../Styles/NativeDatePickerDemoCtl.xaml       | 29 ++++++++++-----
 .../Styles/Base/DatePickerBaseStyle.xaml      | 19 +++++-----
 .../Themes/Styles/DatePicker.xaml             | 19 ++++++++++
 .../HandyControl_Shared/Themes/Theme.xaml     | 35 ++++++++++++++-----
 6 files changed, 123 insertions(+), 43 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 5eee86f4..b8dbdc4f 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -7927,6 +7927,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
@@ -7939,7 +7940,7 @@
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="30" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -7989,7 +7990,7 @@
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="30" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8027,7 +8028,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8037,7 +8038,7 @@
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="30" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8108,8 +8109,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8171,7 +8172,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8183,8 +8184,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -12496,8 +12497,24 @@
 		<Setter Property="ColumnHeaderHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
+	<Style x:Key="DatePicker.Small" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
+	<Style x:Key="DatePickerExtend.Small" BasedOn="{StaticResource DatePickerExtend}" TargetType="DatePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
+	<Style x:Key="DatePickerPlus.Small" BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
 	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
 	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
index 040ab4ad..8d946d1a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
@@ -7,16 +7,29 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32">
-            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}"/>
-            <hc:DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
+        <ScrollViewer>
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}"/>
+                    <hc:DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
 
-            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-            <hc:DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-            <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-            <hc:DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerPlus.Small}"/>
+                    <hc:DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerPlus.Small}"/>
 
-        </StackPanel>
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource DatePickerPlus.Small}"/>
+                    <hc:DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource DatePickerPlus.Small}"/>
+
+                    <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Style="{StaticResource DatePickerPlus.Small}"/>
+                    <hc:DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource DatePickerPlus.Small}"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
index e33dce5b..6b036c08 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
@@ -7,16 +7,29 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32">
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}"/>
-            <DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
+        <ScrollViewer>
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}"/>
+                    <DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}"/>
 
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-            <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-            <DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DatePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePicker.Small}"/>
+                    <DatePicker Margin="0,16,0,0" IsEnabled="False" SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePicker.Small}"/>
 
-        </StackPanel>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Style="{StaticResource DatePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DatePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+
+                    <DatePicker SelectedDate="{x:Static system:DateTime.Now}" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DatePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DatePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml
index 4d93d623..09d0028f 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DatePickerBaseStyle.xaml
@@ -32,6 +32,7 @@
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
@@ -44,7 +45,7 @@
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="30"/>
                             </Grid.ColumnDefinitions>
-                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                             <DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                             <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                         </Grid>
@@ -95,7 +96,7 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -134,7 +135,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -144,7 +145,7 @@
                         <ColumnDefinition Width="*"/>
                         <ColumnDefinition Width="30"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -217,8 +218,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -281,7 +282,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -293,8 +294,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False"/>
                     <DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DatePicker.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DatePicker.xaml
index aa4f381b..6ba057c7 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DatePicker.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DatePicker.xaml
@@ -4,8 +4,27 @@
 
     <Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker"/>
 
+    <Style x:Key="DatePicker.Small" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
     <Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker"/>
 
+    <Style x:Key="DatePickerExtend.Small" BasedOn="{StaticResource DatePickerExtend}" TargetType="DatePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
     <Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker"/>
 
+    <Style x:Key="DatePickerPlus.Small" BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index c72999a7..e7878bdc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8045,6 +8045,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
@@ -8057,7 +8058,7 @@
 								<ColumnDefinition Width="*" />
 								<ColumnDefinition Width="30" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<DatePickerTextBox Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -8107,7 +8108,7 @@
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="30" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8145,7 +8146,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8155,7 +8156,7 @@
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="30" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8226,8 +8227,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8289,7 +8290,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8301,8 +8302,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" />
 					<DatePickerTextBox x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource DatePickerTextBoxStyle}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -12638,8 +12639,24 @@
 		<Setter Property="ColumnHeaderHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker" />
+	<Style x:Key="DatePicker.Small" BasedOn="{StaticResource DatePickerBaseStyle}" TargetType="DatePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DatePickerExtend" BasedOn="{StaticResource DatePickerExtendBaseStyle}" TargetType="DatePicker" />
+	<Style x:Key="DatePickerExtend.Small" BasedOn="{StaticResource DatePickerExtend}" TargetType="DatePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker" />
+	<Style x:Key="DatePickerPlus.Small" BasedOn="{StaticResource DatePickerPlusBaseStyle}" TargetType="hc:DatePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
 	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
 	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />

From 301f17e294deea7ace52d39753a755bf12def41e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 24 Feb 2022 22:31:05 +0800
Subject: [PATCH 10/32] Create build.Lang.es.nuspec

---
 build/build.Lang.es.nuspec | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 build/build.Lang.es.nuspec

diff --git a/build/build.Lang.es.nuspec b/build/build.Lang.es.nuspec
new file mode 100644
index 00000000..5c1bd8c8
--- /dev/null
+++ b/build/build.Lang.es.nuspec
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>HandyControl.Lang.es</id>
+    <version>3.3.0</version>
+    <title>HandyOrg</title>
+    <authors>HandyOrg</authors>
+    <owners>HandyOrg</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="file">LICENSE</license>
+    <icon>icon.png</icon>
+    <projectUrl>https://github.com/HandyOrg/HandyControl</projectUrl>
+    <description>Contains some simple and commonly used WPF controls</description>
+    <releaseNotes>Changes are detailed at https://github.com/HandyOrg/HandyControl/releases</releaseNotes>
+    <copyright>Copyright © HandyOrg 2018-2021</copyright>
+    <tags>WPF C# Control</tags>
+    <repository type="git" url="https://github.com/HandyOrg/HandyControl" commit="083639031635a4b9618842b2be589324d8676055" />
+    <dependencies>
+      <group targetFramework=".NETFramework4.0" />
+      <group targetFramework=".NETFramework4.5" />
+      <group targetFramework=".NETFramework4.5.1" />
+      <group targetFramework=".NETFramework4.5.2" />
+      <group targetFramework=".NETFramework4.6" />
+      <group targetFramework=".NETFramework4.6.1" />
+      <group targetFramework=".NETFramework4.6.2" />
+      <group targetFramework=".NETFramework4.7" />
+      <group targetFramework=".NETFramework4.7.1" />
+      <group targetFramework=".NETFramework4.7.2" />
+      <group targetFramework=".NETFramework4.8" />
+      <group targetFramework=".NETCoreApp3.0" />
+      <group targetFramework=".NETCoreApp3.1" />
+      <group targetFramework="net5.0" />
+      <group targetFramework="net6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="lib\net40\es\HandyControl.resources.dll" target="lib\net40\es\HandyControl.resources.dll" />
+    <file src="lib\net45\es\HandyControl.resources.dll" target="lib\net45\es\HandyControl.resources.dll" />
+    <file src="lib\net451\es\HandyControl.resources.dll" target="lib\net451\es\HandyControl.resources.dll" />
+    <file src="lib\net452\es\HandyControl.resources.dll" target="lib\net452\es\HandyControl.resources.dll" />
+    <file src="lib\net46\es\HandyControl.resources.dll" target="lib\net46\es\HandyControl.resources.dll" />
+    <file src="lib\net461\es\HandyControl.resources.dll" target="lib\net461\es\HandyControl.resources.dll" />
+    <file src="lib\net462\es\HandyControl.resources.dll" target="lib\net462\es\HandyControl.resources.dll" />
+    <file src="lib\net47\es\HandyControl.resources.dll" target="lib\net47\es\HandyControl.resources.dll" />
+    <file src="lib\net471\es\HandyControl.resources.dll" target="lib\net471\es\HandyControl.resources.dll" />
+    <file src="lib\net472\es\HandyControl.resources.dll" target="lib\net472\es\HandyControl.resources.dll" />
+    <file src="lib\net48\es\HandyControl.resources.dll" target="lib\net48\es\HandyControl.resources.dll" />
+    <file src="lib\net5.0\es\HandyControl.resources.dll" target="lib\net5.0\es\HandyControl.resources.dll" />
+    <file src="lib\net6.0\es\HandyControl.resources.dll" target="lib\net6.0\es\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.0\es\HandyControl.resources.dll" target="lib\netcoreapp3.0\es\HandyControl.resources.dll" />
+    <file src="lib\netcoreapp3.1\es\HandyControl.resources.dll" target="lib\netcoreapp3.1\es\HandyControl.resources.dll" />
+    <file src="icon.png" target="icon.png" />
+    <file src="LICENSE" target="LICENSE" />
+  </files>
+</package>
\ No newline at end of file

From 7b54f36b3a450d5b9aab7dc6166233d48ca1444f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 24 Feb 2022 23:45:17 +0800
Subject: [PATCH 11/32] chore(style): add DateTimePicker small style

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 41 +++++++++----
 .../Controls/DateTimePickerDemoCtl.xaml       | 58 +++++++++++++------
 .../Styles/Base/DateTimePickerBaseStyle.xaml  | 25 ++++----
 .../Themes/Styles/DateTimePicker.xaml         | 19 ++++++
 .../HandyControl_Shared/Themes/Theme.xaml     | 41 +++++++++----
 5 files changed, 130 insertions(+), 54 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index b8dbdc4f..0cdc6c5f 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -8248,6 +8248,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
@@ -8262,9 +8263,9 @@
 						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="25" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -8312,9 +8313,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8352,7 +8353,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8360,9 +8361,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8433,8 +8434,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8496,7 +8497,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8508,8 +8509,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -12516,8 +12517,24 @@
 		<Setter Property="Padding" Value="6,0" />
 	</Style>
 	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePicker.Small" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerExtend.Small" BasedOn="{StaticResource DateTimePickerExtend}" TargetType="hc:DateTimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerPlus.Small" BasedOn="{StaticResource DateTimePickerPlus}" TargetType="hc:DateTimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
 	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
 	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
index 661f1e1d..971f319c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
@@ -6,27 +6,49 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <StackPanel>
-                <hc:DateTimePicker ShowClearButton="True"/>
-                <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False"/>
+        <ScrollViewer>
+            <hc:UniformSpacingPanel  Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:DateTimePicker ShowClearButton="True"/>
+                    <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False"/>
 
-                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-                <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-                <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            </StackPanel>
-            <StackPanel Margin="32,0,0,0">
-                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}"/>
-                <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePickerPlus}"/>
+                    <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}"/>
+                    <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePickerPlus}"/>
 
-                <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-                <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-                <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            </StackPanel>
-        </StackPanel>
+                    <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePicker.Small}"/>
+                    <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePicker.Small}"/>
+
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+
+                    <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus.Small}"/>
+                    <hc:DateTimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource DateTimePickerPlus.Small}"/>
+
+                    <hc:DateTimePicker ShowClearButton="True" Style="{StaticResource DateTimePickerPlus.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource DateTimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+
+                    <hc:DateTimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource DateTimePickerPlus.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml
index e58bacc1..81e51d02 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/DateTimePickerBaseStyle.xaml
@@ -8,6 +8,7 @@
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
@@ -22,9 +23,9 @@
                         <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="30"/>
+                                <ColumnDefinition Width="25"/>
                             </Grid.ColumnDefinitions>
-                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                             <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                             <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                         </Grid>
@@ -73,9 +74,9 @@
                 <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -114,7 +115,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -122,9 +123,9 @@
                 <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -197,8 +198,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -261,7 +262,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -273,8 +274,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/DateTimePicker.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/DateTimePicker.xaml
index 35391c24..4f46907b 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/DateTimePicker.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/DateTimePicker.xaml
@@ -4,8 +4,27 @@
 
     <Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker"/>
 
+    <Style x:Key="DateTimePicker.Small" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
     <Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker"/>
 
+    <Style x:Key="DateTimePickerExtend.Small" BasedOn="{StaticResource DateTimePickerExtend}" TargetType="hc:DateTimePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
     <Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker"/>
 
+    <Style x:Key="DateTimePickerPlus.Small" BasedOn="{StaticResource DateTimePickerPlus}" TargetType="hc:DateTimePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index e7878bdc..7d59d654 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -8366,6 +8366,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
@@ -8380,9 +8381,9 @@
 						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="25" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -8430,9 +8431,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8470,7 +8471,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8478,9 +8479,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8551,8 +8552,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -8614,7 +8615,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -8626,8 +8627,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -12658,8 +12659,24 @@
 		<Setter Property="Padding" Value="6,0" />
 	</Style>
 	<Style BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePicker.Small" BasedOn="{StaticResource DateTimePickerBaseStyle}" TargetType="hc:DateTimePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DateTimePickerExtend" BasedOn="{StaticResource DateTimePickerExtendBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerExtend.Small" BasedOn="{StaticResource DateTimePickerExtend}" TargetType="hc:DateTimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="DateTimePickerPlus" BasedOn="{StaticResource DateTimePickerPlusBaseStyle}" TargetType="hc:DateTimePicker" />
+	<Style x:Key="DateTimePickerPlus.Small" BasedOn="{StaticResource DateTimePickerPlus}" TargetType="hc:DateTimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource DialogBaseStyle}" TargetType="hc:Dialog" />
 	<Style BasedOn="{StaticResource DividerBaseStyle}" TargetType="hc:Divider" />
 	<Style BasedOn="{StaticResource DrawerBaseStyle}" TargetType="hc:Drawer" />

From 810d81ef6a94b7db57773a45440efe517c1029b4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 26 Feb 2022 13:58:51 +0800
Subject: [PATCH 12/32] chore(style): add TimePicker small style

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 41 +++++++----
 .../Controls/TimePickerDemoCtl.xaml           | 70 +++++++++++++------
 .../Styles/Base/TimePickerBaseStyle.xaml      | 25 +++----
 .../Themes/Styles/TimePicker.xaml             | 19 +++++
 .../HandyControl_Shared/Themes/Theme.xaml     | 41 +++++++----
 5 files changed, 138 insertions(+), 58 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 0cdc6c5f..3bc2bd10 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -11008,6 +11008,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
@@ -11022,9 +11023,9 @@
 						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="25" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -11072,9 +11073,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11112,7 +11113,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -11120,9 +11121,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11193,8 +11194,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11256,7 +11257,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -11268,8 +11269,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -13385,8 +13386,24 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePicker.Small" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerExtend.Small" BasedOn="{StaticResource TimePickerExtend}" TargetType="hc:TimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerPlus.Small" BasedOn="{StaticResource TimePickerPlus}" TargetType="hc:TimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
 	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
 	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
index c9cf2352..6e054d8e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
@@ -6,31 +6,57 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <StackPanel>
-                <hc:TimePicker ShowClearButton="True"/>
-                <hc:TimePicker Margin="0,16,0,0" IsEnabled="False"/>
+        <ScrollViewer>
+            <hc:UniformSpacingPanel  Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:TimePicker ShowClearButton="True"/>
+                    <hc:TimePicker Margin="0,16,0,0" IsEnabled="False"/>
 
-                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-                <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-                <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            </StackPanel>
-            <StackPanel Margin="32,0,0,0">
-                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
-                    <hc:TimePicker.Clock>
-                        <hc:ListClock/>
-                    </hc:TimePicker.Clock>
-                </hc:TimePicker>
-                <hc:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
+                    <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel Margin="32,0,0,0">
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
+                        <hc:TimePicker.Clock>
+                            <hc:ListClock/>
+                        </hc:TimePicker.Clock>
+                    </hc:TimePicker>
+                    <hc:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
 
-                <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
-                <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
-                <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            </StackPanel>
-        </StackPanel>
+                    <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerPlus}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePicker.Small}"/>
+                    <hc:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePicker.Small}"/>
+
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+
+                    <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerExtend.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel Margin="32,0,0,0">
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus.Small}">
+                        <hc:TimePicker.Clock>
+                            <hc:ListClock/>
+                        </hc:TimePicker.Clock>
+                    </hc:TimePicker>
+                    <hc:TimePicker ShowClearButton="True" Margin="0,16,0,0" Style="{StaticResource TimePickerPlus.Small}"/>
+
+                    <hc:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+
+                    <hc:TimePicker ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" Style="{StaticResource TimePickerPlus.Small}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0"/>
+                    <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml
index 64ab4620..e38b6716 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TimePickerBaseStyle.xaml
@@ -8,6 +8,7 @@
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
@@ -22,9 +23,9 @@
                         <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="30"/>
+                                <ColumnDefinition Width="25"/>
                             </Grid.ColumnDefinitions>
-                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                            <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                             <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                             <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                         </Grid>
@@ -73,9 +74,9 @@
                 <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -114,7 +115,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -122,9 +123,9 @@
                 <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="30"/>
+                        <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -197,8 +198,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
@@ -261,7 +262,7 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
@@ -273,8 +274,8 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="25"/>
                     </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
+                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
+                    <Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button"  Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                     <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
                     <Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False"/>
                 </Grid>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TimePicker.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TimePicker.xaml
index 801d2ac9..204d49a3 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TimePicker.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TimePicker.xaml
@@ -4,8 +4,27 @@
 
     <Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker"/>
 
+    <Style x:Key="TimePicker.Small" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+    
     <Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker"/>
 
+    <Style x:Key="TimePickerExtend.Small" BasedOn="{StaticResource TimePickerExtend}" TargetType="hc:TimePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+    
     <Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker"/>
 
+    <Style x:Key="TimePickerPlus.Small" BasedOn="{StaticResource TimePickerPlus}" TargetType="hc:TimePicker">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
+        <Setter Property="Padding" Value="6,0"/>
+    </Style>
+    
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 7d59d654..908c02ed 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -11126,6 +11126,7 @@
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
@@ -11140,9 +11141,9 @@
 						<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Width="*" />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="25" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+							<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 							<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 						</Grid>
@@ -11190,9 +11191,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11230,7 +11231,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -11238,9 +11239,9 @@
 				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="30" />
+						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Margin="3,0,0,0" HorizontalAlignment="Left" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11311,8 +11312,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -11374,7 +11375,7 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
@@ -11386,8 +11387,8 @@
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="25" />
 					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
+					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
+					<Button Height="{x:Static system:Double.NaN}" Margin="3,0,0,0" HorizontalAlignment="Left" Style="{StaticResource ButtonIcon}" Width="16" Padding="0" hc:IconElement.Geometry="{StaticResource ClockGeometry}" x:Name="PART_Button" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
 					<Popup Grid.Column="0" x:Name="PART_Popup" PopupAnimation="{StaticResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" AllowsTransparency="True" Placement="Bottom" PlacementTarget="{Binding ElementName=templateRoot}" StaysOpen="False" />
 				</Grid>
@@ -13536,8 +13537,24 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePicker.Small" BasedOn="{StaticResource TimePickerBaseStyle}" TargetType="hc:TimePicker">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="TimePickerExtend" BasedOn="{StaticResource TimePickerExtendBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerExtend.Small" BasedOn="{StaticResource TimePickerExtend}" TargetType="hc:TimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style x:Key="TimePickerPlus" BasedOn="{StaticResource TimePickerPlusBaseStyle}" TargetType="hc:TimePicker" />
+	<Style x:Key="TimePickerPlus.Small" BasedOn="{StaticResource TimePickerPlus}" TargetType="hc:TimePicker">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
+		<Setter Property="Padding" Value="6,0" />
+	</Style>
 	<Style BasedOn="{StaticResource ToolBarTrayBaseStyle}" TargetType="ToolBarTray" />
 	<Style BasedOn="{StaticResource ToolBarBaseStyle}" TargetType="ToolBar" />
 	<Style BasedOn="{StaticResource ToolTipBaseStyle}" TargetType="ToolTip" />

From 7f19117c31b193d4e0b05869870db69b0f26cc75 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 3 Mar 2022 23:28:08 +0800
Subject: [PATCH 13/32] enhance: improved ImageViewer

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 20 +++---
 .../Controls/Image/ImageViewer.cs             | 70 +++++++++----------
 .../Themes/Styles/ImageViewer.xaml            | 20 +++---
 .../HandyControl_Shared/Themes/Theme.xaml     | 20 +++---
 4 files changed, 62 insertions(+), 68 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 3bc2bd10..28949e9a 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -12620,8 +12620,6 @@
 	<Style TargetType="hc:ImageViewer">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="MinWidth" Value="400" />
-		<Setter Property="MinHeight" Value="250" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="Template">
@@ -12651,23 +12649,23 @@
 									</Border>
 								</Canvas>
 							</Border>
-							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
+							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Visibility="{TemplateBinding ShowToolBar, Converter={StaticResource Boolean2VisibilityConverter}}" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
 								<StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
-									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
 									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
 									<TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
-									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
+									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="{DynamicResource TextIconBrush}">
 										<Border BorderThickness="1" BorderBrush="White" Padding="2">
 											<TextBlock Text="1:1" />
 										</Border>
 									</Button>
 									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
-									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
+									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton, Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
 								</StackPanel>
 							</Border>
 						</Grid>
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
index ed9f59dc..48a99f79 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -229,6 +229,9 @@ namespace HandyControl.Controls
             ctl.Init();
         }
 
+        public static readonly DependencyProperty ShowToolBarProperty = DependencyProperty.Register(
+            "ShowToolBar", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.TrueBox));
+
         public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
             "IsFullScreen", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
 
@@ -292,6 +295,12 @@ namespace HandyControl.Controls
             set => SetValue(ImageSourceProperty, value);
         }
 
+        public bool ShowToolBar
+        {
+            get => (bool) GetValue(ShowToolBarProperty);
+            set => SetValue(ShowToolBarProperty, ValueBoxes.BooleanBox(value));
+        }
+
         internal object ImageContent
         {
             get => GetValue(ImageContentProperty);
@@ -406,7 +415,6 @@ namespace HandyControl.Controls
                 _canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
                 _canvasSmallImg.MouseLeftButtonUp -= CanvasSmallImg_OnMouseLeftButtonUp;
                 _canvasSmallImg.MouseMove -= CanvasSmallImg_OnMouseMove;
-                _canvasSmallImg.MouseLeave -= CanvasSmallImg_OnMouseLeave;
             }
 
             base.OnApplyTemplate();
@@ -430,7 +438,6 @@ namespace HandyControl.Controls
                 _canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
                 _canvasSmallImg.MouseLeftButtonUp += CanvasSmallImg_OnMouseLeftButtonUp;
                 _canvasSmallImg.MouseMove += CanvasSmallImg_OnMouseMove;
-                _canvasSmallImg.MouseLeave += CanvasSmallImg_OnMouseLeave;
             }
 
             _borderSmallIsLoaded = false;
@@ -595,24 +602,11 @@ namespace HandyControl.Controls
             }
         }
 
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-            MoveImg();
-        }
+        protected override void OnMouseMove(MouseEventArgs e) => MoveImg();
 
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-            _imgIsMouseLeftButtonDown = false;
-            ShowBorderBottom = false;
-        }
+        protected override void OnMouseLeave(MouseEventArgs e) => ShowBorderBottom = false;
 
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
-        {
-            base.OnMouseWheel(e);
-            ScaleImg(e.Delta > 0);
-        }
+        protected override void OnMouseWheel(MouseWheelEventArgs e) => ScaleImg(e.Delta > 0);
 
         protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
         {
@@ -658,11 +652,7 @@ namespace HandyControl.Controls
             _imgIsMouseLeftButtonDown = true;
         }
 
-        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnPreviewMouseLeftButtonUp(e);
-            _imgIsMouseLeftButtonDown = false;
-        }
+        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e) => _imgIsMouseLeftButtonDown = false;
 
         /// <summary>
         ///     右下角小图片显示切换
@@ -837,6 +827,11 @@ namespace HandyControl.Controls
             ShowCloseButton = _imgCurrentPoint.Y < 200;
             ShowBorderBottom = _imgCurrentPoint.Y > ActualHeight - 200;
 
+            if (Mouse.LeftButton == MouseButtonState.Released)
+            {
+                return;
+            }
+
             if (_imgIsMouseLeftButtonDown)
             {
                 var subX = _imgCurrentPoint.X - _imgMouseDownPoint.X;
@@ -874,18 +869,25 @@ namespace HandyControl.Controls
         /// </summary>
         private void MoveSmallImg()
         {
-            if (_imgSmallIsMouseLeftButtonDown)
+            if (!_imgSmallIsMouseLeftButtonDown)
             {
-                _imgSmallCurrentPoint = Mouse.GetPosition(_canvasSmallImg);
-
-                var subX = _imgSmallCurrentPoint.X - _imgSmallMouseDownPoint.X;
-                var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
-
-                var marginX = _imgSmallMouseDownMargin.Left + subX;
-                var marginY = _imgSmallMouseDownMargin.Top + subY;
-
-                MoveSmallImg(marginX, marginY);
+                return;
             }
+
+            if (Mouse.LeftButton == MouseButtonState.Released)
+            {
+                return;
+            }
+
+            _imgSmallCurrentPoint = Mouse.GetPosition(_canvasSmallImg);
+
+            var subX = _imgSmallCurrentPoint.X - _imgSmallMouseDownPoint.X;
+            var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
+
+            var marginX = _imgSmallMouseDownMargin.Left + subX;
+            var marginY = _imgSmallMouseDownMargin.Top + subY;
+
+            MoveSmallImg(marginX, marginY);
         }
 
         private void MoveSmallImg(double marginX, double marginY)
@@ -921,7 +923,5 @@ namespace HandyControl.Controls
         private void CanvasSmallImg_OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => _imgSmallIsMouseLeftButtonDown = false;
 
         private void CanvasSmallImg_OnMouseMove(object sender, MouseEventArgs e) => MoveSmallImg();
-
-        private void CanvasSmallImg_OnMouseLeave(object sender, MouseEventArgs e) => _imgSmallIsMouseLeftButtonDown = false;
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
index 26c85bde..9e3199f8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ImageViewer.xaml
@@ -6,8 +6,6 @@
     <Style TargetType="hc:ImageViewer">
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="MinWidth" Value="400"/>
-        <Setter Property="MinHeight" Value="250"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="Template">
@@ -37,25 +35,25 @@
                                     </Border>
                                 </Canvas>
                             </Border>
-                            <Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
+                            <Border UseLayoutRounding="True" Name="PART_BorderBottom" Visibility="{TemplateBinding ShowToolBar, Converter={StaticResource Boolean2VisibilityConverter}}"  Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
                                 <StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
-                                    <Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3"/>
-                                    <Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.Save" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.Open" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3"/>
 
                                     <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}"/>
 
-                                    <Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3"/>
                                     <TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}"/>
-                                    <Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3"/>
-                                    <Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
+                                    <Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="{DynamicResource TextIconBrush}">
                                         <Border BorderThickness="1" BorderBrush="White" Padding="2">
                                             <TextBlock Text="1:1"/>
                                         </Border>
                                     </Button>
                                     <Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}"/>
-                                    <Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3"/>
-                                    <Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3"/>
-                                    <ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0"  Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3"/>
+                                    <Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0"  Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3"/>
+                                    <ToggleButton Visibility="{TemplateBinding ShowFullScreenButton, Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3"/>
 
                                 </StackPanel>
                             </Border>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 908c02ed..37874226 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -12762,8 +12762,6 @@
 	<Style TargetType="hc:ImageViewer">
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="MinWidth" Value="400" />
-		<Setter Property="MinHeight" Value="250" />
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="Template">
@@ -12793,23 +12791,23 @@
 									</Border>
 								</Canvas>
 							</Border>
-							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
+							<Border UseLayoutRounding="True" Name="PART_BorderBottom" Visibility="{TemplateBinding ShowToolBar, Converter={StaticResource Boolean2VisibilityConverter}}" Opacity="0" CornerRadius="4,4,0,0" Grid.Row="1" HorizontalAlignment="Center" Background="{DynamicResource DarkOpacityBrush}">
 								<StackPanel Margin="30,10" VerticalAlignment="Center" Orientation="Horizontal">
-									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Save" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SaveGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Open" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource WindowsGeometry}" Padding="3" />
 									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Reduce" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource ReduceGeometry}" Padding="3" />
 									<TextBlock Margin="6,0" Text="{TemplateBinding ScaleStr}" Style="{StaticResource TextBlockSubTitle}" Foreground="{DynamicResource TextIconBrush}" />
-									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="White">
+									<Button Command="interactivity:ControlCommands.Enlarge" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource EnlargeGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.Restore" Background="Transparent" Margin="6,0" Style="{StaticResource ButtonCustom}" Foreground="{DynamicResource TextIconBrush}">
 										<Border BorderThickness="1" BorderBrush="White" Padding="2">
 											<TextBlock Text="1:1" />
 										</Border>
 									</Button>
 									<Border Margin="10,2" Background="White" Style="{StaticResource BorderVerticallySplitter}" />
-									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
-									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
-									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton,Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.RotateLeft" CommandParameter="" Margin="6,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}" Padding="3" />
+									<Button Command="interactivity:ControlCommands.RotateRight" Margin="6,0,0,0" Foreground="{DynamicResource TextIconBrush}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}" Padding="3" />
+									<ToggleButton Visibility="{TemplateBinding ShowFullScreenButton, Converter={StaticResource Boolean2VisibilityConverter}}" Foreground="{DynamicResource TextIconBrush}" IsChecked="{Binding IsFullScreen,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" Margin="12,0,6,0" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource FullScreenGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource FullScreenReturnGeometry}" Padding="3" />
 								</StackPanel>
 							</Border>
 						</Grid>

From 508dfc0cf8e50f276b67da943ed4c6895cfb4a8c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 10 Mar 2022 13:53:57 +0800
Subject: [PATCH 14/32] enhance: optimized Poptip

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |   1 -
 .../Controls/Other/Poptip.cs                  | 112 ++++++++++--------
 .../Themes/Styles/Base/PoptipBaseStyle.xaml   |   1 -
 .../HandyControl_Shared/Themes/Theme.xaml     |   1 -
 4 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 28949e9a..6402103d 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -9985,7 +9985,6 @@
 		<Setter Property="HorizontalAlignment" Value="Left" />
 		<Setter Property="VerticalAlignment" Value="Top" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Offset" Value="6" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
index d5f3e033..425b536f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
@@ -18,7 +18,8 @@ namespace HandyControl.Controls
             _popup = new Popup
             {
                 AllowsTransparency = true,
-                Child = this
+                Child = this,
+                Placement = PlacementMode.Relative
             };
 
             _popup.SetBinding(DataContextProperty, new Binding(DataContextProperty.Name) { Source = this });
@@ -91,19 +92,42 @@ namespace HandyControl.Controls
             set => SetValue(ContentTemplateSelectorProperty, value);
         }
 
-        public static readonly DependencyProperty OffsetProperty = DependencyProperty.RegisterAttached(
-            "Offset", typeof(double), typeof(Poptip), new PropertyMetadata(6.0));
+        public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
+            "VerticalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
 
-        public static void SetOffset(DependencyObject element, double value)
-            => element.SetValue(OffsetProperty, value);
-
-        public static double GetOffset(DependencyObject element)
-            => (double) element.GetValue(OffsetProperty);
-
-        public double Offset
+        public static void SetVerticalOffset(DependencyObject element, double value)
         {
-            get => (double) GetValue(OffsetProperty);
-            set => SetValue(OffsetProperty, value);
+            element.SetValue(VerticalOffsetProperty, value);
+        }
+
+        public static double GetVerticalOffset(DependencyObject element)
+        {
+            return (double) element.GetValue(VerticalOffsetProperty);
+        }
+
+        public double VerticalOffset
+        {
+            get => (double) GetValue(VerticalOffsetProperty);
+            set => SetValue(VerticalOffsetProperty, value);
+        }
+
+        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
+            "HorizontalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
+
+        public static void SetHorizontalOffset(DependencyObject element, double value)
+        {
+            element.SetValue(HorizontalOffsetProperty, value);
+        }
+
+        public static double GetHorizontalOffset(DependencyObject element)
+        {
+            return (double) element.GetValue(HorizontalOffsetProperty);
+        }
+
+        public double HorizontalOffset
+        {
+            get => (double) GetValue(HorizontalOffsetProperty);
+            set => SetValue(HorizontalOffsetProperty, value);
         }
 
         public static readonly DependencyProperty PlacementTypeProperty = DependencyProperty.RegisterAttached(
@@ -193,75 +217,60 @@ namespace HandyControl.Controls
 
             var poptip = (Poptip) GetInstance(Target);
             var popupPlacement = poptip.PlacementType;
-            var popupOffset = poptip.Offset;
-
-            PlacementMode placementMode;
+            var popupOffsetX = poptip.HorizontalOffset;
+            var popupOffsetY = poptip.VerticalOffset;
 
             switch (popupPlacement)
             {
                 case PlacementType.LeftTop:
-                    offsetX = -popupOffset;
-                    placementMode = PlacementMode.Left;
                     break;
                 case PlacementType.Left:
-                    offsetX = -popupOffset;
-                    offsetY = (targetHeight - height) / 2;
-                    placementMode = PlacementMode.Left;
+                    offsetY = -(height - targetHeight) * 0.5;
                     break;
                 case PlacementType.LeftBottom:
-                    offsetX = -popupOffset;
-                    offsetY = targetHeight - height;
-                    placementMode = PlacementMode.Left;
+                    offsetY = -(height - targetHeight);
                     break;
                 case PlacementType.TopLeft:
-                    offsetY = -popupOffset;
-                    placementMode = PlacementMode.Top;
+                    offsetX = width;
+                    offsetY = -height;
                     break;
                 case PlacementType.Top:
-                    offsetX = (targetWidth - width) / 2;
-                    offsetY = -popupOffset;
-                    placementMode = PlacementMode.Top;
+                    offsetX = (width + targetWidth) * 0.5;
+                    offsetY = -height;
                     break;
                 case PlacementType.TopRight:
-                    offsetX = targetWidth - width;
-                    offsetY = -popupOffset;
-                    placementMode = PlacementMode.Top;
+                    offsetX = targetWidth;
+                    offsetY = -height;
                     break;
                 case PlacementType.RightTop:
-                    offsetX = popupOffset;
-                    placementMode = PlacementMode.Right;
+                    offsetX = width + targetWidth;
                     break;
                 case PlacementType.Right:
-                    offsetX = popupOffset;
-                    offsetY = (targetHeight - height) / 2;
-                    placementMode = PlacementMode.Right;
+                    offsetX = width + targetWidth;
+                    offsetY = -(height - targetHeight) * 0.5;
                     break;
                 case PlacementType.RightBottom:
-                    offsetX = popupOffset;
-                    offsetY = targetHeight - height;
-                    placementMode = PlacementMode.Right;
+                    offsetX = width + targetWidth;
+                    offsetY = -(height - targetHeight);
                     break;
                 case PlacementType.BottomLeft:
-                    offsetY = popupOffset;
-                    placementMode = PlacementMode.Bottom;
+                    offsetX = width;
+                    offsetY = targetHeight;
                     break;
                 case PlacementType.Bottom:
-                    offsetX = (targetWidth - width) / 2;
-                    offsetY = popupOffset;
-                    placementMode = PlacementMode.Bottom;
+                    offsetX = (width + targetWidth) * 0.5;
+                    offsetY = targetHeight;
                     break;
                 case PlacementType.BottomRight:
-                    offsetX = targetWidth - width;
-                    offsetY = popupOffset;
-                    placementMode = PlacementMode.Bottom;
+                    offsetX = targetWidth;
+                    offsetY = targetHeight;
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
 
-            _popup.HorizontalOffset = offsetX;
-            _popup.VerticalOffset = offsetY;
-            _popup.Placement = placementMode;
+            _popup.HorizontalOffset = offsetX + popupOffsetX;
+            _popup.VerticalOffset = offsetY + popupOffsetY;
         }
 
         private void SwitchPoptip(bool isShow)
@@ -273,7 +282,8 @@ namespace HandyControl.Controls
                     SetCurrentValue(ContentProperty, GetContent(Target));
                     SetCurrentValue(PlacementTypeProperty, GetPlacement(Target));
                     SetCurrentValue(HitModeProperty, GetHitMode(Target));
-                    SetCurrentValue(OffsetProperty, GetOffset(Target));
+                    SetCurrentValue(HorizontalOffsetProperty, GetHorizontalOffset(Target));
+                    SetCurrentValue(VerticalOffsetProperty, GetVerticalOffset(Target));
                     SetCurrentValue(IsOpenProperty, GetIsOpen(Target));
                 }
 
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
index 2280a99c..27b26086 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PoptipBaseStyle.xaml
@@ -7,7 +7,6 @@
         <Setter Property="HorizontalAlignment" Value="Left"/>
         <Setter Property="VerticalAlignment" Value="Top"/>
         <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Offset" Value="6"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 37874226..fe27287d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -10103,7 +10103,6 @@
 		<Setter Property="HorizontalAlignment" Value="Left" />
 		<Setter Property="VerticalAlignment" Value="Top" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Offset" Value="6" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />

From 12a01ac78e18ce5e157a91959daea96f8e4f3798 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 10 Mar 2022 21:23:34 +0800
Subject: [PATCH 15/32] enhance: optimized CoverView

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml   |  6 ++----
 .../Controls/Attach/DataGridAttach.cs              |  2 +-
 .../Controls/Attach/ScrollViewerAttach.cs          |  2 +-
 .../Controls/Cover/CoverView/CoverView.cs          | 14 ++++++++++----
 .../Controls/Cover/CoverView/CoverViewContent.cs   |  2 +-
 .../Themes/Styles/Base/CoverViewBaseStyle.xaml     |  8 +++-----
 src/Shared/HandyControl_Shared/Themes/Theme.xaml   |  6 ++----
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 6402103d..0df7730f 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -7860,7 +7860,7 @@
 							<RowDefinition Height="16" />
 							<RowDefinition />
 						</Grid.RowDefinitions>
-						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
+						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
 							<Border.RenderTransform>
 								<TransformGroup>
 									<TranslateTransform X="5" Y="5" />
@@ -7892,9 +7892,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:CoverView">
 					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<ScrollViewer>
-							<WrapPanel x:Name="PART_Panel" />
-						</ScrollViewer>
+						<WrapPanel x:Name="PART_Panel" />
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
index 64eb1888..301cc8e1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
@@ -341,7 +341,7 @@ namespace HandyControl.Controls
             "ShowSelectAllButton", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.TrueBox));
 
         public static void SetShowSelectAllButton(DependencyObject element, bool value)
-            => element.SetValue(ShowSelectAllButtonProperty, value);
+            => element.SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetShowSelectAllButton(DependencyObject element)
             => (bool) element.GetValue(ShowSelectAllButtonProperty);
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
index f78e4545..67306295 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
@@ -11,7 +11,7 @@ namespace HandyControl.Controls
             "AutoHide", typeof(bool), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
 
         public static void SetAutoHide(DependencyObject element, bool value)
-            => element.SetValue(AutoHideProperty, value);
+            => element.SetValue(AutoHideProperty, ValueBoxes.BooleanBox(value));
 
         public static bool GetAutoHide(DependencyObject element)
             => (bool) element.GetValue(AutoHideProperty);
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
index ada57091..6f255395 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
@@ -35,7 +35,7 @@ namespace HandyControl.Controls
             {
                 if (_selectedItem == null)
                 {
-                    item.IsSelected = true;
+                    item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
                     _selectedItem = item;
                     if (_viewContent != null)
                     {
@@ -49,8 +49,8 @@ namespace HandyControl.Controls
 
                 if (!Equals(_selectedItem, item))
                 {
-                    _selectedItem.IsSelected = false;
-                    item.IsSelected = true;
+                    _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
+                    item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
                     _selectedItem = item;
                     if (_viewContent != null)
                     {
@@ -67,7 +67,7 @@ namespace HandyControl.Controls
                     _viewContent.ContentTemplate = null;
                     UpdateCoverViewContent(false);
                 }
-                _selectedItem.IsSelected = false;
+                _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
                 _selectedItem = null;
             }
         }
@@ -218,6 +218,12 @@ namespace HandyControl.Controls
             {
                 ItemsHost.Children.Remove(_viewContent);
             }
+
+            if (_selectedItem == null)
+            {
+                return;
+            }
+
             var total = _entryDic.Count + 1;
             var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
             if (total <= Groups)
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
index 689d9b00..626d682f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
@@ -9,7 +9,7 @@ namespace HandyControl.Controls
 {
     [TemplatePart(Name = ElementTriangle, Type = typeof(FrameworkElement))]
     [TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
-    internal class CoverViewContent : ContentControl
+    public class CoverViewContent : ContentControl
     {
         private const string ElementTriangle = "PART_Triangle";
 
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
index 5458edbf..442852af 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/CoverViewBaseStyle.xaml
@@ -29,7 +29,7 @@
                             <RowDefinition Height="16"/>
                             <RowDefinition/>
                         </Grid.RowDefinitions>
-                        <Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
+                        <Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
                             <Border.RenderTransform>
                                 <TransformGroup>
                                     <TranslateTransform X="5" Y="5"/>
@@ -62,13 +62,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="hc:CoverView">
                     <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                        <ScrollViewer>
-                            <WrapPanel x:Name="PART_Panel"/>
-                        </ScrollViewer>
+                        <WrapPanel x:Name="PART_Panel"/>
                     </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index fe27287d..df5d3916 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -7978,7 +7978,7 @@
 							<RowDefinition Height="16" />
 							<RowDefinition />
 						</Grid.RowDefinitions>
-						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
+						<Border x:Name="PART_Triangle" Visibility="Visible" Grid.Row="0" Width="30" Height="30" BorderThickness="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Top" Grid.RowSpan="2">
 							<Border.RenderTransform>
 								<TransformGroup>
 									<TranslateTransform X="5" Y="5" />
@@ -8010,9 +8010,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:CoverView">
 					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-						<ScrollViewer>
-							<WrapPanel x:Name="PART_Panel" />
-						</ScrollViewer>
+						<WrapPanel x:Name="PART_Panel" />
 					</Border>
 				</ControlTemplate>
 			</Setter.Value>

From a1c5b6d6f57df837e27a508ef3fbc8ce7601fd5a Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 11 Mar 2022 21:00:30 +0800
Subject: [PATCH 16/32] enhance: optimized ListBox style

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml                | 2 +-
 .../HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml  | 2 +-
 .../UserControl/Styles/ListBoxDemoCtl.xaml                      | 2 +-
 .../Themes/Styles/Base/ListBoxBaseStyle.xaml                    | 2 +-
 src/Shared/HandyControl_Shared/Themes/Theme.xaml                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 0df7730f..a6dee6a2 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -9216,7 +9216,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ListBox">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
 								<hc:ScrollViewer Focusable="false">
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
index ff888595..924112f4 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
@@ -42,7 +42,6 @@
 
     <Style x:Key="ListBoxItemTransparent" BasedOn="{StaticResource ListBoxItemBaseStyle}" TargetType="ListBoxItem">
         <Setter Property="Visibility" Value="{Binding IsVisible,Converter={StaticResource Boolean2VisibilityConverter}}"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="Background" Value="Transparent"/>
     </Style>
 
@@ -79,6 +78,7 @@
     </Style>
 
     <Style x:Key="ListBoxTransparent" BasedOn="{StaticResource ListBoxBaseStyle}" TargetType="ListBox">
+        <Setter Property="hc:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemTransparent}"/>
     </Style>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
index 0360ded7..a00d0410 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml
@@ -12,7 +12,7 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <ListBox Margin="16" Width="200" ItemsSource="{Binding DataList}" Style="{StaticResource ListBox.Small}">
+            <ListBox Margin="16" Width="200" ItemsSource="{Binding DataList}" Style="{StaticResource ListBox.Small}" hc:BorderElement.CornerRadius="4">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <TextBlock Text="{Binding Name}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
index 139c6332..0b4ebdc4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -73,7 +73,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ListBox">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                    <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                             <hc:ToggleBlock.CheckedContent>
                                 <hc:ScrollViewer Focusable="false">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index df5d3916..9a9373d6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -9334,7 +9334,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ListBox">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
 								<hc:ScrollViewer Focusable="false">

From 0e14b7b5042e8efdf9ec3166aa62640910a308c4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Fri, 11 Mar 2022 21:43:56 +0800
Subject: [PATCH 17/32] enhance: optimized TreeView style

---
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml            | 4 ++--
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml         | 9 +++++----
 .../UserControl/Styles/TreeViewDemoCtl.xaml              | 2 +-
 .../Themes/Styles/Base/ListBoxBaseStyle.xaml             | 4 ++--
 .../Themes/Styles/Base/ToggleBlockBaseStyle.xaml         | 3 ++-
 .../Themes/Styles/Base/TreeViewBaseStyle.xaml            | 4 ++--
 src/Shared/HandyControl_Shared/Themes/Theme.xaml         | 9 +++++----
 7 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 101d1183..34cd38b2 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -99,10 +99,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                    <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                             <hc:ToggleBlock.CheckedContent>
-                                <hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                <hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                     <ItemsPresenter/>
                                 </hc:ScrollViewer>
                             </hc:ToggleBlock.CheckedContent>
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index a6dee6a2..843af5ed 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -462,6 +462,7 @@
 	<Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:ToggleBlock">
@@ -9219,8 +9220,8 @@
 					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer Focusable="false">
-									<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								<hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+									<ItemsPresenter />
 								</hc:ScrollViewer>
 							</hc:ToggleBlock.CheckedContent>
 							<hc:ToggleBlock.UnCheckedContent>
@@ -11733,10 +11734,10 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+								<hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
 									<ItemsPresenter />
 								</hc:ScrollViewer>
 							</hc:ToggleBlock.CheckedContent>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
index 949b299b..dcc8dfc9 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml
@@ -12,7 +12,7 @@
                     </HierarchicalDataTemplate>
                 </TreeView.ItemTemplate>
             </TreeView>
-            <TreeView Width="200" Margin="16" ItemsSource="{Binding DataList}" Style="{StaticResource TreeView.Small}">
+            <TreeView Width="200" Margin="16" ItemsSource="{Binding DataList}" Style="{StaticResource TreeView.Small}" hc:BorderElement.CornerRadius="4">
                 <TreeView.ItemTemplate>
                     <HierarchicalDataTemplate ItemsSource="{Binding DataList}">
                         <TextBlock Text="{Binding Name}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
index 0b4ebdc4..d29dc02c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ListBoxBaseStyle.xaml
@@ -76,8 +76,8 @@
                     <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                             <hc:ToggleBlock.CheckedContent>
-                                <hc:ScrollViewer Focusable="false">
-                                    <ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                <hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                    <ItemsPresenter/>
                                 </hc:ScrollViewer>
                             </hc:ToggleBlock.CheckedContent>
                             <hc:ToggleBlock.UnCheckedContent>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleBlockBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleBlockBaseStyle.xaml
index 4b12c87f..2510351d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleBlockBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleBlockBaseStyle.xaml
@@ -5,6 +5,7 @@
     <Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
+        <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:ToggleBlock">
@@ -37,4 +38,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
\ No newline at end of file
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
index 14487c3f..ab105bff 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TreeViewBaseStyle.xaml
@@ -100,10 +100,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
-                    <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                    <Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
                         <hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
                             <hc:ToggleBlock.CheckedContent>
-                                <hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                                <hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
                                     <ItemsPresenter/>
                                 </hc:ScrollViewer>
                             </hc:ToggleBlock.CheckedContent>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 9a9373d6..b3a2dfb2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -462,6 +462,7 @@
 	<Style x:Key="ToggleBlockBaseStyle" TargetType="hc:ToggleBlock">
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:ToggleBlock">
@@ -9337,8 +9338,8 @@
 					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer Focusable="false">
-									<ItemsPresenter Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+								<hc:ScrollViewer IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+									<ItemsPresenter />
 								</hc:ScrollViewer>
 							</hc:ToggleBlock.CheckedContent>
 							<hc:ToggleBlock.UnCheckedContent>
@@ -11852,10 +11853,10 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+					<Border x:Name="Bd" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
 						<hc:ToggleBlock IsChecked="{Binding HasItems,RelativeSource={RelativeSource TemplatedParent},Mode=OneWay}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch">
 							<hc:ToggleBlock.CheckedContent>
-								<hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" Template="{StaticResource ScrollViewerBaseControlTemplate}" Background="{TemplateBinding Background}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+								<hc:ScrollViewer x:Name="_tv_scrollviewer_" IsInertiaEnabled="{Binding Path=(hc:ScrollViewer.IsInertiaEnabled),RelativeSource={RelativeSource TemplatedParent}}" CanContentScroll="false" Focusable="false" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
 									<ItemsPresenter />
 								</hc:ScrollViewer>
 							</hc:ToggleBlock.CheckedContent>

From 1154eabd8d43721f70d3e537e91c8adbbc562c91 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 12 Mar 2022 12:34:09 +0800
Subject: [PATCH 18/32] chore(style): add ToggleButton small style

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 241 ++++++++++----
 .../UserControl/Styles/ButtonDemoCtl.xaml     | 116 +++----
 .../Styles/RepeatButtonDemoCtl.xaml           | 116 +++----
 .../Styles/ToggleButtonDemoCtl.xaml           | 307 +++++++++++-------
 .../Themes/Styles/Base/ButtonBaseStyle.xaml   |   2 +-
 .../Styles/Base/RepeatButtonBaseStyle.xaml    |   1 +
 .../Styles/Base/ToggleButtonBaseStyle.xaml    |  87 ++---
 .../Themes/Styles/Button.xaml                 |  33 +-
 .../Themes/Styles/RepeatButton.xaml           |  50 ++-
 .../Themes/Styles/ToggleButton.xaml           |  99 +++++-
 .../HandyControl_Shared/Themes/Theme.xaml     | 241 ++++++++++----
 11 files changed, 866 insertions(+), 427 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 843af5ed..7ef4398b 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1192,6 +1192,7 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 	</Style>
 	<Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
@@ -1231,7 +1232,6 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1670,6 +1670,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1711,6 +1712,48 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="8" />
+		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
+		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+							</ContentControl>
+						</Border>
+						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="FocusVisualStyle">
 			<Setter.Value>
@@ -1836,48 +1879,6 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
-		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-							</ContentControl>
-						</Border>
-						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
 	<Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
@@ -2314,6 +2315,7 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
@@ -3092,7 +3094,6 @@
 	</Style>
 	<Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3105,42 +3106,53 @@
 	<Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
 	<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
 	<Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
 	</Style>
 	<Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
 	</Style>
 	<Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
 	</Style>
 	<Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
 	</Style>
 	<Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="Transparent" />
@@ -3161,12 +3173,12 @@
 	</Style>
 	<Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
 		<Setter Property="Padding" Value="6" />
 		<Setter Property="FocusVisualStyle">
@@ -3198,6 +3210,7 @@
 		<Setter Property="Width" Value="20" />
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
@@ -3211,6 +3224,7 @@
 	<Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
@@ -3219,6 +3233,7 @@
 	<Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
@@ -3227,6 +3242,7 @@
 	<Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
@@ -3235,6 +3251,7 @@
 	<Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
@@ -3243,6 +3260,7 @@
 	<Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
@@ -3251,6 +3269,7 @@
 	<Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{x:Null}" />
@@ -3368,7 +3387,6 @@
 	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3378,26 +3396,60 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonDefault.Small" BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
 	<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonPrimary.Small" BasedOn="{StaticResource ToggleButtonPrimary}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonSuccess.Small" BasedOn="{StaticResource ToggleButtonSuccess}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonInfo.Small" BasedOn="{StaticResource ToggleButtonInfo}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonWarning.Small" BasedOn="{StaticResource ToggleButtonWarning}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonDanger.Small" BasedOn="{StaticResource ToggleButtonDanger}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3407,20 +3459,55 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonIcon.Small" BasedOn="{StaticResource ToggleButtonIcon}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconPrimary.Small" BasedOn="{StaticResource ToggleButtonIconPrimary}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconSuccess.Small" BasedOn="{StaticResource ToggleButtonIconSuccess}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconInfo.Small" BasedOn="{StaticResource ToggleButtonIconInfo}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconWarning.Small" BasedOn="{StaticResource ToggleButtonIconWarning}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconDanger.Small" BasedOn="{StaticResource ToggleButtonIconDanger}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="Transparent" />
@@ -3443,7 +3530,15 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<Style x:Key="ToggleButtonIconTransparent.Small" BasedOn="{StaticResource ToggleButtonIconTransparent}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
+	<Style x:Key="ToggleButtonSwitch.Small" BasedOn="{StaticResource ToggleButtonSwitch}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="16" />
+	</Style>
 	<Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
@@ -3560,6 +3655,10 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<Style x:Key="ToggleButtonFlip.Small" BasedOn="{StaticResource ToggleButtonFlip}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Width" Value="20" />
+	</Style>
 	<Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
@@ -3689,7 +3788,6 @@
 	</Style>
 	<Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3702,42 +3800,53 @@
 	<Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
 	<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="Transparent" />
@@ -3758,13 +3867,14 @@
 	</Style>
 	<Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Padding" Value="6" />
 		<Setter Property="FocusVisualStyle">
 			<Setter.Value>
 				<Style>
@@ -3794,6 +3904,7 @@
 		<Setter Property="Width" Value="20" />
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
@@ -3807,6 +3918,7 @@
 	<Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
@@ -3815,6 +3927,7 @@
 	<Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
@@ -3823,6 +3936,7 @@
 	<Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
@@ -3831,6 +3945,7 @@
 	<Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
@@ -3839,6 +3954,7 @@
 	<Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
@@ -3847,6 +3963,7 @@
 	<Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{x:Null}" />
@@ -3857,7 +3974,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RepeatButton">
-					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
 						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 					<ControlTemplate.Triggers>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
index 324581b0..8946d91d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml
@@ -63,68 +63,68 @@
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDashed}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDashed}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDashed}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDashed}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource ButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="15,7" Margin="5" Style="{StaticResource ButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <Button Width="50" Padding="15,7" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Margin="5" Style="{StaticResource ButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,8" Margin="5" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <Button Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Padding="7" Margin="5" Style="{StaticResource ButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <Button Padding="7" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel Margin="16,0,0,0">
-                            <Button Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                            <Button Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                            <Button hc:BorderElement.CornerRadius="4" Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="{DynamicResource DangerBrush}" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                            <Button hc:BorderElement.CornerRadius="4" Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource ButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
                         </StackPanel>
                     </WrapPanel>
                 </hc:UniformSpacingPanel>
@@ -183,64 +183,64 @@
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDefault.Small}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDefault.Small}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDefault.Small}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDefault.Small}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource ButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" Style="{StaticResource ButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Margin="5" Style="{StaticResource ButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" Style="{StaticResource ButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDashed.Small}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource ButtonDashed.Small}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDashed.Small}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ButtonDashed.Small}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource ButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="15,2" Margin="5" Style="{StaticResource ButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <Button Width="50" Padding="15,2" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Margin="5" Style="{StaticResource ButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <Button Width="50" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" Style="{StaticResource ButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <Button Width="50" Padding="16,3" Margin="5" Style="{StaticResource ButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <Button Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <Button Padding="2" Margin="5" Style="{StaticResource ButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <Button Padding="2" IsEnabled="False" Margin="5" Style="{StaticResource ButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button Margin="5" Style="{StaticResource ButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <Button IsEnabled="False" Margin="5" Style="{StaticResource ButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                 </hc:UniformSpacingPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
index 931a5624..4e574843 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml
@@ -63,68 +63,68 @@
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDashed}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDashed}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDashed}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDashed}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="15,7" Margin="5" Style="{StaticResource RepeatButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <RepeatButton Width="50" Padding="15,7" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,8" Margin="5" Style="{StaticResource RepeatButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,8" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Padding="7" Margin="5" Style="{StaticResource RepeatButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <RepeatButton Padding="7" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIconCircular}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel Margin="16,0,0,0">
-                            <RepeatButton Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
-                            <RepeatButton Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                            <RepeatButton hc:BorderElement.CornerRadius="4" Margin="5" Height="28" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="{DynamicResource DangerBrush}" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
+                            <RepeatButton hc:BorderElement.CornerRadius="4" Margin="5" Height="28" IsEnabled="False" Padding="10,0" Background="#24292e" Foreground="White" Content="{ex:Lang Key={x:Static langs:LangKeys.ButtonCustom}}" Style="{StaticResource RepeatButtonCustom}" hc:BackgroundSwitchElement.MouseHoverBackground="Red" hc:BackgroundSwitchElement.MouseDownBackground="PaleVioletRed"/>
                         </StackPanel>
                     </WrapPanel>
                 </hc:UniformSpacingPanel>
@@ -183,64 +183,64 @@
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDefault.Small}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDefault.Small}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDefault.Small}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDefault.Small}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource RepeatButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" Style="{StaticResource RepeatButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" Style="{StaticResource RepeatButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDashed.Small}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource DeleteGeometry}" Style="{StaticResource RepeatButtonDashed.Small}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDashed.Small}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RepeatButtonDashed.Small}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
-                            <RepeatButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="15,2" Margin="5" Style="{StaticResource RepeatButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
-                            <RepeatButton Width="50" Padding="15,2" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource DownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Margin="5" Style="{StaticResource RepeatButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
-                            <RepeatButton Width="50" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" Style="{StaticResource RepeatButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource DeleteGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonDashedDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
-                            <RepeatButton Width="50" Padding="16,3" Margin="5" Style="{StaticResource RepeatButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <RepeatButton Width="50" Padding="16,3" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIcon.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                         <StackPanel>
-                            <RepeatButton Padding="2" Margin="5" Style="{StaticResource RepeatButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
-                            <RepeatButton Padding="2" IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton Margin="5" Style="{StaticResource RepeatButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
+                            <RepeatButton IsEnabled="False" Margin="5" Style="{StaticResource RepeatButtonIconCircular.Small}" hc:IconElement.Geometry="{StaticResource UpDownGeometry}"/>
                         </StackPanel>
                     </WrapPanel>
                 </hc:UniformSpacingPanel>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index b4478399..fb22c6e4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -7,129 +7,202 @@
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
         <hc:ScrollViewer IsInertiaEnabled="True">
-            <StackPanel Margin="32">
-                <WrapPanel ItemWidth="160" ItemHeight="130">
-                    <StackPanel>
-                        <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5"/>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonPrimary}"/>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"/>
-                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonPrimary"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource ToggleButtonSuccess}"/>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"/>
-                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonSuccess"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo}"/>
-                        <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo}"/>
-                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonInfo"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning}"/>
-                        <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning}"/>
-                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonWarning"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger}"/>
-                        <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger}"/>
-                        <TextBlock TextAlignment="Center" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonDanger"/>
-                    </StackPanel>
-                </WrapPanel>
-                <WrapPanel ItemWidth="160" ItemHeight="130">
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIcon"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconPrimary"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconSuccess"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconInfo"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconWarning"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconDanger"/>
-                    </StackPanel>
-                </WrapPanel>
-                <WrapPanel ItemWidth="160" ItemHeight="130">
-                    <StackPanel>
-                        <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource DeleteGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource DownGeometry}"/>
-                        <TextBlock TextAlignment="Center" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonIconTransparent"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
-                            <hc:StatusSwitchElement.CheckedElement>
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" Spacing="32" Margin="32">
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource ToggleButtonPrimary}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource ToggleButtonSuccess}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconPrimary}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconSuccess}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconInfo}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconWarning}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconDanger}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconTransparent}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                                        <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
                                 <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
-                            </hc:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                                <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
-                            </Border>
-                        </ToggleButton>
-                        <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
-                            <hc:StatusSwitchElement.CheckedElement>
+                            </ToggleButton>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Style="{StaticResource ToggleButtonCustom}" hc:StatusSwitchElement.HideUncheckedElement="True" Margin="5">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
+                                        <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
                                 <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource PrimaryBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
+                                    <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
                                 </Border>
-                            </hc:StatusSwitchElement.CheckedElement>
-                            <Border Width="80" Height="30" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
-                                <Ellipse Width="20" Height="20" Fill="{DynamicResource BorderBrush}" StrokeThickness="1" Stroke="{DynamicResource BorderBrush}"/>
-                            </Border>
-                        </ToggleButton>
-                        <TextBlock TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Style="{StaticResource TextBlockDefault}" Text="ToggleButtonCustom"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton IsChecked="True" Margin="5,9" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonSwitch}"/>
-                        <ToggleButton IsEnabled="False" IsChecked="True" HorizontalAlignment="Center" Margin="5,9" Style="{StaticResource ToggleButtonSwitch}"/>
-                        <TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonSwitch"/>
-                    </StackPanel>
-                    <StackPanel>
-                        <ToggleButton BorderThickness="0" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip}">
-                            <hc:StatusSwitchElement.CheckedElement>
-                                <Border Background="{DynamicResource PrimaryBrush}">
-                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                            </ToggleButton>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Margin="5,9" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonSwitch}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" HorizontalAlignment="Center" Margin="5,9" Style="{StaticResource ToggleButtonSwitch}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton BorderThickness="0" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip}">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Background="{DynamicResource PrimaryBrush}">
+                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
+                                <Border Background="{DynamicResource DangerBrush}">
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
                                 </Border>
-                            </hc:StatusSwitchElement.CheckedElement>
-                            <Border Background="{DynamicResource DangerBrush}">
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
-                            </Border>
-                        </ToggleButton>
-                        <ToggleButton BorderThickness="0" IsEnabled="False" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip}">
-                            <hc:StatusSwitchElement.CheckedElement>
-                                <Border Background="{DynamicResource PrimaryBrush}">
-                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                            </ToggleButton>
+                            <ToggleButton BorderThickness="0" IsEnabled="False" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip}">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Background="{DynamicResource PrimaryBrush}">
+                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
+                                <Border Background="{DynamicResource DangerBrush}">
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
                                 </Border>
-                            </hc:StatusSwitchElement.CheckedElement>
-                            <Border Background="{DynamicResource DangerBrush}">
-                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
-                            </Border>
-                        </ToggleButton>
-                        <TextBlock Style="{StaticResource TextBlockDefault}" Text="ToggleButtonFlip"/>
-                    </StackPanel>
-                </WrapPanel>
-            </StackPanel>
+                            </ToggleButton>
+                        </StackPanel>
+                    </WrapPanel>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource ToggleButtonDefault.Small}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource ToggleButtonDefault.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource ToggleButtonPrimary.Small}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource ToggleButtonPrimary.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource ToggleButtonSuccess.Small}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource ToggleButtonSuccess.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo.Small}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource ToggleButtonInfo.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning.Small}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource ToggleButtonWarning.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger.Small}"/>
+                            <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger.Small}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIcon.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconPrimary.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconPrimary.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconSuccess.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconSuccess.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconInfo.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconInfo.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconWarning.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconWarning.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconDanger.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconDanger.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIconTransparent.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonIconTransparent.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton IsChecked="True" Margin="5,8" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonSwitch.Small}"/>
+                            <ToggleButton IsEnabled="False" IsChecked="True" HorizontalAlignment="Center" Margin="5,4" Style="{StaticResource ToggleButtonSwitch.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton BorderThickness="0" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip.Small}">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Background="{DynamicResource PrimaryBrush}">
+                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
+                                <Border Background="{DynamicResource DangerBrush}">
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                </Border>
+                            </ToggleButton>
+                            <ToggleButton BorderThickness="0" IsEnabled="False" IsChecked="True" Margin="5" HorizontalAlignment="Center" Style="{StaticResource ToggleButtonFlip.Small}">
+                                <hc:StatusSwitchElement.CheckedElement>
+                                    <Border Background="{DynamicResource PrimaryBrush}">
+                                        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.Off}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                    </Border>
+                                </hc:StatusSwitchElement.CheckedElement>
+                                <Border Background="{DynamicResource DangerBrush}">
+                                    <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{ex:Lang Key={x:Static langs:LangKeys.On}}" Foreground="{DynamicResource TextIconBrush}"/>
+                                </Border>
+                            </ToggleButton>
+                        </StackPanel>
+                    </WrapPanel>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
         </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
index f3f85aef..c4c463cc 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ButtonBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:hc="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
@@ -43,7 +44,6 @@
     </Style>
 
     <Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="Template">
             <Setter.Value>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RepeatButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RepeatButtonBaseStyle.xaml
index 866182b4..e2b5afb6 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RepeatButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RepeatButtonBaseStyle.xaml
@@ -3,6 +3,7 @@
                     xmlns:hc="clr-namespace:HandyControl.Controls">
 
     <Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
index 399f4141..4ccfa31a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ToggleButtonBaseStyle.xaml
@@ -4,6 +4,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -46,6 +47,49 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
+        <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Padding" Value="8"/>
+        <Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}"/>
+        <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}"/>
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <hc:SimplePanel>
+                        <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
+                        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+                            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                                <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}"/>
+                            </ContentControl>
+                        </Border>
+                        <Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}"/>
+                    </hc:SimplePanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Opacity" Value=".9"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Opacity" Value=".6"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="0.4"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
     <Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="FocusVisualStyle">
             <Setter.Value>
@@ -172,49 +216,6 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-        <Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
-        <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
-        <Setter Property="Padding" Value="8"/>
-        <Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}"/>
-        <Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <hc:SimplePanel>
-                        <Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"/>
-                        <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-                            <ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                                <Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}"/>
-                            </ContentControl>
-                        </Border>
-                        <Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}"/>
-                    </hc:SimplePanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="Opacity" Value=".9"/>
-            </Trigger>
-            <Trigger Property="IsPressed" Value="True">
-                <Setter Property="Opacity" Value=".6"/>
-            </Trigger>
-            <Trigger Property="IsEnabled" Value="False">
-                <Setter Property="Opacity" Value="0.4"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
     <Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
index 29c87320..e6e1f70f 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Button.xaml
@@ -6,7 +6,6 @@
 
     <Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1" />
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -20,53 +19,64 @@
     <Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button"/>
 
     <Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
     </Style>
 
     <Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}"/>
     </Style>
 
     <Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}"/>
     </Style>
 
     <Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}"/>
     </Style>
 
     <Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
     </Style>
 
     <Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
@@ -93,13 +103,13 @@
 
     <Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
         <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="0"/>
         <Setter Property="Padding" Value="6"/>
         <Setter Property="FocusVisualStyle">
@@ -132,6 +142,7 @@
         <Setter Property="Width" Value="20"/>
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
@@ -151,6 +162,7 @@
     <Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
@@ -161,6 +173,7 @@
     <Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
@@ -171,6 +184,7 @@
     <Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
@@ -181,6 +195,7 @@
     <Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
@@ -191,6 +206,7 @@
     <Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
@@ -201,6 +217,7 @@
     <Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
index 025483a8..b5f43ee5 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/RepeatButton.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:hc="clr-namespace:HandyControl.Controls">
 
@@ -6,7 +6,6 @@
 
     <Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -20,53 +19,64 @@
     <Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton"/>
-    
+
     <Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
     </Style>
 
     <Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
-    
+
     <Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}"/>
     </Style>
 
     <Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
-    
+
     <Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}"/>
     </Style>
 
     <Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
-    
+
     <Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}"/>
     </Style>
 
     <Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
-    
+
     <Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
     </Style>
 
     <Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
@@ -93,14 +103,15 @@
 
     <Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
-        <Setter Property="Padding" Value="6,2"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Width" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="0"/>
+        <Setter Property="Padding" Value="6"/>
         <Setter Property="FocusVisualStyle">
             <Setter.Value>
                 <Style>
@@ -131,11 +142,12 @@
         <Setter Property="Width" Value="20"/>
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
 
-    <!--region ButtonDashed-->
+    <!--region RepeatButtonDashed-->
 
     <Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
@@ -150,6 +162,7 @@
     <Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
@@ -160,6 +173,7 @@
     <Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
@@ -170,6 +184,7 @@
     <Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
@@ -180,6 +195,7 @@
     <Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
@@ -190,6 +206,7 @@
     <Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
@@ -200,6 +217,7 @@
     <Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
         <Setter Property="Height" Value="20"/>
         <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--endregion-->
@@ -213,7 +231,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RepeatButton">
-                    <Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                    <Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
                         <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
                     </Border>
                     <ControlTemplate.Triggers>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
index d5e3e627..4319e86f 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ToggleButton.xaml
@@ -6,7 +6,6 @@
     <Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -17,33 +16,73 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ToggleButtonDefault.Small" BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
+    </Style>
+
     <Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton"/>
 
     <Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonPrimary.Small" BasedOn="{StaticResource ToggleButtonPrimary}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonSuccess.Small" BasedOn="{StaticResource ToggleButtonSuccess}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonInfo.Small" BasedOn="{StaticResource ToggleButtonInfo}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonWarning.Small" BasedOn="{StaticResource ToggleButtonWarning}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonDanger.Small" BasedOn="{StaticResource ToggleButtonDanger}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <!--图标-->
     <Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -54,24 +93,65 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ToggleButtonIcon.Small" BasedOn="{StaticResource ToggleButtonIcon}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
+    </Style>
+
     <Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonIconPrimary.Small" BasedOn="{StaticResource ToggleButtonIconPrimary}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonIconSuccess.Small" BasedOn="{StaticResource ToggleButtonIconSuccess}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonIconInfo.Small" BasedOn="{StaticResource ToggleButtonIconInfo}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonIconWarning.Small" BasedOn="{StaticResource ToggleButtonIconWarning}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+    </Style>
+
+    <Style x:Key="ToggleButtonIconDanger.Small" BasedOn="{StaticResource ToggleButtonIconDanger}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
@@ -96,9 +176,19 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ToggleButtonIconTransparent.Small" BasedOn="{StaticResource ToggleButtonIconTransparent}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
+    </Style>
+
     <!--开关-->
     <Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton"/>
 
+    <Style x:Key="ToggleButtonSwitch.Small" BasedOn="{StaticResource ToggleButtonSwitch}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="16"/>
+    </Style>
+
     <!--翻转-->
     <Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
@@ -217,6 +307,11 @@
         </Setter>
     </Style>
 
+    <Style x:Key="ToggleButtonFlip.Small" BasedOn="{StaticResource ToggleButtonFlip}" TargetType="ToggleButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Width" Value="20"/>
+    </Style>
+
     <!--自定义-->
     <Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
         <Setter Property="Background" Value="Transparent"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index b3a2dfb2..d1fa08d8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1192,6 +1192,7 @@
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 	</Style>
 	<Style x:Key="ButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="Button">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
@@ -1231,7 +1232,6 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="ButtonDashedBaseStyle" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1670,6 +1670,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ToggleButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="ToggleButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
 			<Setter.Value>
@@ -1711,6 +1712,48 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
+		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
+		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="8" />
+		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
+		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="ToggleButton">
+					<hc:SimplePanel>
+						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
+						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
+							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
+							</ContentControl>
+						</Border>
+						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
+					</hc:SimplePanel>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsChecked" Value="True">
+							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+		<Style.Triggers>
+			<Trigger Property="IsMouseOver" Value="True">
+				<Setter Property="Opacity" Value=".9" />
+			</Trigger>
+			<Trigger Property="IsPressed" Value="True">
+				<Setter Property="Opacity" Value=".6" />
+			</Trigger>
+			<Trigger Property="IsEnabled" Value="False">
+				<Setter Property="Opacity" Value="0.4" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="ToggleButtonSwitchBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="FocusVisualStyle">
 			<Setter.Value>
@@ -1836,48 +1879,6 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="ToggleButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
-		<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}" />
-		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="hc:IconSwitchElement.Geometry" Value="{x:Null}" />
-		<Setter Property="hc:IconSwitchElement.GeometrySelected" Value="{x:Null}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<hc:SimplePanel>
-						<Border Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" />
-						<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}">
-							<ContentControl HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-								<Path x:Name="PathIcon" Width="{TemplateBinding hc:IconElement.Width}" Height="{TemplateBinding hc:IconElement.Height}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="True" Stretch="Uniform" Data="{TemplateBinding hc:IconSwitchElement.Geometry}" />
-							</ContentControl>
-						</Border>
-						<Border Visibility="Collapsed" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" x:Name="BorderChecked" BorderThickness="4" BorderBrush="{TemplateBinding BorderBrush}" />
-					</hc:SimplePanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PathIcon" Property="Data" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(hc:IconSwitchElement.GeometrySelected)}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value=".9" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Opacity" Value=".6" />
-			</Trigger>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="0.4" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
 	<Style x:Key="ToggleButtonGroupItemBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
@@ -2314,6 +2315,7 @@
 		</Style.Triggers>
 	</Style>
 	<Style x:Key="RepeatButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RepeatButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="Template">
@@ -3092,7 +3094,6 @@
 	</Style>
 	<Style x:Key="ButtonDefault" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3105,42 +3106,53 @@
 	<Style x:Key="ButtonDefault.Small" BasedOn="{StaticResource ButtonDefault}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style BasedOn="{StaticResource ButtonDefault}" TargetType="Button" />
 	<Style x:Key="ButtonPrimary" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
 	<Style x:Key="ButtonPrimary.Small" BasedOn="{StaticResource ButtonPrimary}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonSuccess" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
 	</Style>
 	<Style x:Key="ButtonSuccess.Small" BasedOn="{StaticResource ButtonSuccess}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonInfo" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
 	</Style>
 	<Style x:Key="ButtonInfo.Small" BasedOn="{StaticResource ButtonInfo}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonWarning" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
 	</Style>
 	<Style x:Key="ButtonWarning.Small" BasedOn="{StaticResource ButtonWarning}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDanger" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
 	</Style>
 	<Style x:Key="ButtonDanger.Small" BasedOn="{StaticResource ButtonDanger}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonIcon" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="Transparent" />
@@ -3161,12 +3173,12 @@
 	</Style>
 	<Style x:Key="ButtonIcon.Small" BasedOn="{StaticResource ButtonIcon}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonIconCircular" BasedOn="{StaticResource ButtonBaseStyle}" TargetType="Button">
 		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
 		<Setter Property="Padding" Value="6" />
 		<Setter Property="FocusVisualStyle">
@@ -3198,6 +3210,7 @@
 		<Setter Property="Width" Value="20" />
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashed" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
@@ -3211,6 +3224,7 @@
 	<Style x:Key="ButtonDashed.Small" BasedOn="{StaticResource ButtonDashed}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedPrimary" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
@@ -3219,6 +3233,7 @@
 	<Style x:Key="ButtonDashedPrimary.Small" BasedOn="{StaticResource ButtonDashedPrimary}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedSuccess" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
@@ -3227,6 +3242,7 @@
 	<Style x:Key="ButtonDashedSuccess.Small" BasedOn="{StaticResource ButtonDashedSuccess}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedInfo" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
@@ -3235,6 +3251,7 @@
 	<Style x:Key="ButtonDashedInfo.Small" BasedOn="{StaticResource ButtonDashedInfo}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedWarning" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
@@ -3243,6 +3260,7 @@
 	<Style x:Key="ButtonDashedWarning.Small" BasedOn="{StaticResource ButtonDashedWarning}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonDashedDanger" BasedOn="{StaticResource ButtonDashedBaseStyle}" TargetType="Button">
 		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
@@ -3251,6 +3269,7 @@
 	<Style x:Key="ButtonDashedDanger.Small" BasedOn="{StaticResource ButtonDashedDanger}" TargetType="Button">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="Button">
 		<Setter Property="Background" Value="{x:Null}" />
@@ -3368,7 +3387,6 @@
 	<Style x:Key="ToggleButtonDefault" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3378,26 +3396,60 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonDefault.Small" BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style BasedOn="{StaticResource ToggleButtonDefault}" TargetType="ToggleButton" />
 	<Style x:Key="ToggleButtonPrimary" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonPrimary.Small" BasedOn="{StaticResource ToggleButtonPrimary}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonSuccess" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonSuccess.Small" BasedOn="{StaticResource ToggleButtonSuccess}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonInfo" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonInfo.Small" BasedOn="{StaticResource ToggleButtonInfo}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonWarning" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonWarning.Small" BasedOn="{StaticResource ToggleButtonWarning}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonDanger" BasedOn="{StaticResource ToggleButtonBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonDanger.Small" BasedOn="{StaticResource ToggleButtonDanger}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIcon" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3407,20 +3459,55 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="ToggleButtonIcon.Small" BasedOn="{StaticResource ToggleButtonIcon}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="ToggleButtonIconPrimary" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconPrimary.Small" BasedOn="{StaticResource ToggleButtonIconPrimary}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconSuccess" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconSuccess.Small" BasedOn="{StaticResource ToggleButtonIconSuccess}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconInfo" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconInfo.Small" BasedOn="{StaticResource ToggleButtonIconInfo}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconWarning" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconWarning.Small" BasedOn="{StaticResource ToggleButtonIconWarning}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconDanger" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="ToggleButtonIconDanger.Small" BasedOn="{StaticResource ToggleButtonIconDanger}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="ToggleButtonIconTransparent" BasedOn="{StaticResource ToggleButtonIconBaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="Transparent" />
@@ -3443,7 +3530,15 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<Style x:Key="ToggleButtonIconTransparent.Small" BasedOn="{StaticResource ToggleButtonIconTransparent}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="ToggleButtonSwitch" BasedOn="{StaticResource ToggleButtonSwitchBaseStyle}" TargetType="ToggleButton" />
+	<Style x:Key="ToggleButtonSwitch.Small" BasedOn="{StaticResource ToggleButtonSwitch}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="16" />
+	</Style>
 	<Style x:Key="ToggleButtonFlip" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
@@ -3560,6 +3655,10 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<Style x:Key="ToggleButtonFlip.Small" BasedOn="{StaticResource ToggleButtonFlip}" TargetType="ToggleButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Width" Value="20" />
+	</Style>
 	<Style x:Key="ToggleButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="ToggleButton">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="HorizontalAlignment" Value="Center" />
@@ -3689,7 +3788,6 @@
 	</Style>
 	<Style x:Key="RepeatButtonDefault" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -3702,42 +3800,53 @@
 	<Style x:Key="RepeatButtonDefault.Small" BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style BasedOn="{StaticResource RepeatButtonDefault}" TargetType="RepeatButton" />
 	<Style x:Key="RepeatButtonPrimary" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonPrimary.Small" BasedOn="{StaticResource RepeatButtonPrimary}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonSuccess" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonSuccess.Small" BasedOn="{StaticResource RepeatButtonSuccess}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonInfo" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonInfo.Small" BasedOn="{StaticResource RepeatButtonInfo}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonWarning" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonWarning.Small" BasedOn="{StaticResource RepeatButtonWarning}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDanger" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
 	</Style>
 	<Style x:Key="RepeatButtonDanger.Small" BasedOn="{StaticResource RepeatButtonDanger}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonIcon" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="Transparent" />
@@ -3758,13 +3867,14 @@
 	</Style>
 	<Style x:Key="RepeatButtonIcon.Small" BasedOn="{StaticResource RepeatButtonIcon}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
-		<Setter Property="Padding" Value="6,2" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonIconCircular" BasedOn="{StaticResource RepeatButtonBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Width" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
+		<Setter Property="Padding" Value="6" />
 		<Setter Property="FocusVisualStyle">
 			<Setter.Value>
 				<Style>
@@ -3794,6 +3904,7 @@
 		<Setter Property="Width" Value="20" />
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashed" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
@@ -3807,6 +3918,7 @@
 	<Style x:Key="RepeatButtonDashed.Small" BasedOn="{StaticResource RepeatButtonDashed}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedPrimary" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryBrush}" />
@@ -3815,6 +3927,7 @@
 	<Style x:Key="RepeatButtonDashedPrimary.Small" BasedOn="{StaticResource RepeatButtonDashedPrimary}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedSuccess" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource SuccessBrush}" />
@@ -3823,6 +3936,7 @@
 	<Style x:Key="RepeatButtonDashedSuccess.Small" BasedOn="{StaticResource RepeatButtonDashedSuccess}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedInfo" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource InfoBrush}" />
@@ -3831,6 +3945,7 @@
 	<Style x:Key="RepeatButtonDashedInfo.Small" BasedOn="{StaticResource RepeatButtonDashedInfo}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedWarning" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource WarningBrush}" />
@@ -3839,6 +3954,7 @@
 	<Style x:Key="RepeatButtonDashedWarning.Small" BasedOn="{StaticResource RepeatButtonDashedWarning}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonDashedDanger" BasedOn="{StaticResource RepeatButtonDashedBaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Foreground" Value="{DynamicResource DangerBrush}" />
@@ -3847,6 +3963,7 @@
 	<Style x:Key="RepeatButtonDashedDanger.Small" BasedOn="{StaticResource RepeatButtonDashedDanger}" TargetType="RepeatButton">
 		<Setter Property="Height" Value="20" />
 		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RepeatButtonCustom" BasedOn="{StaticResource BaseStyle}" TargetType="RepeatButton">
 		<Setter Property="Background" Value="{x:Null}" />
@@ -3857,7 +3974,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RepeatButton">
-					<Border x:Name="Chrome" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+					<Border x:Name="Chrome" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
 						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 					<ControlTemplate.Triggers>

From 99d2fafb720ce826223330d5083e3f5aad2907d6 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 18:54:34 +0800
Subject: [PATCH 19/32] refactor: massive refactor input elements, step 1/3

---
 .../HandyControl_Net_40/Themes/Theme.xaml     | 648 ++++++++----------
 .../HandyControlDemo_Code.csproj              |   6 -
 .../HandyControlDemo_Shared.projitems         |   4 +-
 .../Service/Data/DataService.cs               |  12 -
 .../ValidationRule/NumericUpDownDemoRule.cs   |  19 +
 .../Controls/CheckComboBoxDemoCtl.xaml        |   2 +-
 .../UserControl/Controls/ComboBoxDemoCtl.xaml |   2 +-
 .../Controls/NumericUpDownDemoCtl.xaml        |  52 +-
 .../Controls/NumericUpDownDemoCtl.xaml.cs     |  11 +-
 .../Controls/SearchBarDemoCtl.xaml            |  50 +-
 .../UserControl/Controls/TextBoxDemoCtl.xaml  |  35 +-
 .../UserControl/Main/LeftMainContent.xaml     |   2 +-
 .../UserControl/Styles/GroupBoxDemoCtl.xaml   |   2 +-
 .../Styles/NativeComboBoxDemoCtl.xaml         |   2 +-
 .../UserControl/Styles/ToolBarDemoCtl.xaml    |   2 +-
 .../ViewModel/Common/ComboBoxDemoViewModel.cs |   9 -
 .../Common/InputElementDemoViewModel.cs       |  92 +++
 .../Controls/SearchBarDemoViewModel.cs        |  16 -
 .../ViewModel/ViewModelLocator.cs             |   9 +-
 .../Controls/Attach/InfoElement.cs            |   9 +
 .../Controls/Input/NumericUpDown.cs           | 185 +----
 .../Controls/Input/SearchBar.cs               |   1 -
 .../Controls/Input/TextBox.cs                 | 128 +---
 .../HandyControl_Shared.projitems             |   2 +
 .../Themes/Styles/Base/BaseStyle.xaml         |  34 +
 .../Styles/Base/NumericUpDownBaseStyle.xaml   | 240 +++----
 .../Styles/Base/PropertyGridBaseStyle.xaml    |   2 +-
 .../Styles/Base/SearchBarBaseStyle.xaml       | 175 ++---
 .../Themes/Styles/Base/TextBoxBaseStyle.xaml  | 152 ++--
 .../Themes/Styles/NumericUpDown.xaml          |  21 +
 .../Themes/Styles/SearchBar.xaml              |  21 +
 .../Themes/Styles/TextBox.xaml                |  12 +-
 .../HandyControl_Shared/Themes/Theme.xaml     | 648 ++++++++----------
 .../Tools/ValidationRule/NoBlankTextRule.cs   |  24 +
 .../Tools/ValidationRule/RegexRule.cs         |  44 ++
 35 files changed, 1213 insertions(+), 1460 deletions(-)
 create mode 100644 src/Shared/HandyControlDemo_Shared/Tools/ValidationRule/NumericUpDownDemoRule.cs
 delete mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs
 create mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Common/InputElementDemoViewModel.cs
 delete mode 100644 src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/ValidationRule/NoBlankTextRule.cs
 create mode 100644 src/Shared/HandyControl_Shared/Tools/ValidationRule/RegexRule.cs

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 7ef4398b..8fbfb137 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -1175,6 +1175,37 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<ControlTemplate x:Key="InputElementErrorTemplate">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<AdornedElementPlaceholder x:Name="adornedElementPlaceholder" />
+			<hc:TransitioningContentControl TransitionMode="Top2Bottom" Grid.Row="1" ClipToBounds="True">
+				<TextBlock Foreground="{DynamicResource DangerBrush}" Margin="2,2,0,0" Text="{Binding Path=AdornedElement.(Validation.Errors)[0].ErrorContent, ElementName=adornedElementPlaceholder}" />
+			</hc:TransitioningContentControl>
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="InputElementBaseStyle" TargetType="Control">
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,0" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Validation.ErrorTemplate" Value="{StaticResource InputElementErrorTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="Validation.HasError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="BaseStyle" TargetType="Control">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
@@ -6452,47 +6483,36 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:WatermarkTextBox">
-					<hc:SimplePanel x:Name="WatermarkContent">
+					<hc:SimplePanel>
 						<TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 					</hc:SimplePanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+	<Style x:Key="TextBoxBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="TextBox">
 		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
 		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TextBox">
-					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</Border>
+					<hc:SimplePanel x:Name="root">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="border" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 						</Trigger>
 						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -6507,11 +6527,11 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
 			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			<TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
@@ -6520,10 +6540,10 @@
 				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -6538,8 +6558,8 @@
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
 			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			<TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
@@ -6548,10 +6568,10 @@
 				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -6569,125 +6589,88 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
 			<DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
 			<DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
 		<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
@@ -6700,19 +6683,20 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:SearchBar">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+					<hc:SimplePanel x:Name="root">
+						<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
 						</Grid>
-					</Border>
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6733,23 +6717,23 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6765,25 +6749,25 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6807,14 +6791,6 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
@@ -6822,109 +6798,81 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
+				<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+				<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
+				<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+				<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -6940,8 +6888,26 @@
 	<Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
 	<Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
 	<Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBar.Small" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+	</Style>
 	<Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarExtend.Small" BasedOn="{StaticResource SearchBarExtend}" TargetType="hc:SearchBar">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarPlus.Small" BasedOn="{StaticResource SearchBarPlus}" TargetType="hc:SearchBar">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
 	<Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
 		<Setter Property="MinHeight" Value="20" />
@@ -6965,21 +6931,23 @@
 	<Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
 	<Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
 		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
 	</Style>
 	<Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
 	<Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
 		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
 		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
 	<Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
 		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
 		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
 	<Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
@@ -9506,54 +9474,41 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+	<Style x:Key="NumericUpDownBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="hc:NumericUpDown">
 		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
 		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
 		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:NumericUpDown">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+					<hc:SimplePanel x:Name="root">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-							<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-							<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+							<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+							<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
 						</Grid>
-					</Border>
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 						</Trigger>
 						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="ShowUpDownButton" Value="False">
-							<Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
-						</Trigger>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-							<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -9566,31 +9521,35 @@
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 			<Trigger Property="IsReadOnly" Value="True">
 				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
@@ -9604,35 +9563,35 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -9650,139 +9609,102 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
 			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
 					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 					<Condition Property="IsReadOnly" Value="False" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
 					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 					<Condition Property="IsReadOnly" Value="False" />
 				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
 		<Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
@@ -10278,7 +10200,7 @@
 										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
 									</RadioButton>
 								</hc:ButtonGroup>
-								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
+								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
 							</DockPanel>
 							<hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
 								<hc:PropertyItemsControl.GroupStyle>
@@ -12977,8 +12899,26 @@
 	</Style>
 	<Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
 	<Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDown.Small" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+	</Style>
 	<Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownExtend.Small" BasedOn="{StaticResource NumericUpDownExtend}" TargetType="hc:NumericUpDown">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownPlus.Small" BasedOn="{StaticResource NumericUpDownPlus}" TargetType="hc:NumericUpDown">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
 		<Setter Property="GroupName" Value="1" />
 		<Setter Property="MinWidth" Value="30" />
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index 237b3fcf..d987392a 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -854,9 +854,6 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Basic\InteractiveDialogViewModel.cs">
       <Link>ViewModel\InteractiveDialogViewModel.cs</Link>
     </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Common\ComboBoxDemoViewModel.cs">
-      <Link>ViewModel\ComboBoxDemoViewModel.cs</Link>
-    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Controls\AutoCompleteTextBoxDemoViewModel.cs">
       <Link>ViewModel\AutoCompleteTextBoxDemoViewModel.cs</Link>
     </Resource>
@@ -887,9 +884,6 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Controls\PaginationDemoViewModel.cs">
       <Link>ViewModel\PaginationDemoViewModel.cs</Link>
     </Resource>
-    <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Controls\SearchBarDemoViewModel.cs">
-      <Link>ViewModel\SearchBarDemoViewModel.cs</Link>
-    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Controls\SideMenuDemoViewModel.cs">
       <Link>ViewModel\SideMenuDemoViewModel.cs</Link>
     </Resource>
diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
index d672b443..770a728b 100644
--- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
+++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems
@@ -41,6 +41,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\VersionHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\Win32Helper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\HighlightingProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\ValidationRule\NumericUpDownDemoRule.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)UserControl\Basic\Avatar.xaml.cs">
       <DependentUpon>Avatar.xaml</DependentUpon>
     </Compile>
@@ -410,7 +411,6 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\ChatBoxViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Basic\InteractiveDialogViewModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Common\ComboBoxDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\AutoCompleteTextBoxDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\BadgeDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\CardDemoViewModel.cs" />
@@ -421,13 +421,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\NotificationDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\NotifyIconDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\PaginationDemoViewModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SearchBarDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SideMenuDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SplitButtonDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\SpriteDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\StepBarDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\TabControlDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\TagDemoViewModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Common\InputElementDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Controls\WindowDemoViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\DemoViewModelBase`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModel\Main\ItemsDisplayViewModel.cs" />
diff --git a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
index dd79df82..aa09bcc5 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
@@ -101,18 +101,6 @@ namespace HandyControlDemo.Service
             return list;
         }
 
-        internal List<string> GetComboBoxDemoDataList()
-        {
-            var converter = new StringRepeatConverter();
-            var list = new List<string>();
-            for (var i = 1; i <= 9; i++)
-            {
-                list.Add($"{converter.Convert(Lang.Text, null, i, CultureInfo.CurrentCulture)}{i}");
-            }
-
-            return list;
-        }
-
         internal List<AvatarModel> GetContributorDataList()
         {
             var client = new WebClient();
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/ValidationRule/NumericUpDownDemoRule.cs b/src/Shared/HandyControlDemo_Shared/Tools/ValidationRule/NumericUpDownDemoRule.cs
new file mode 100644
index 00000000..91235fe2
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/Tools/ValidationRule/NumericUpDownDemoRule.cs
@@ -0,0 +1,19 @@
+using System.Globalization;
+using System.Windows.Controls;
+
+namespace HandyControlDemo.Tools;
+
+public class NumericUpDownDemoRule : ValidationRule
+{
+    public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+    {
+        if (value is not double doubleValue)
+        {
+            return new ValidationResult(false, HandyControl.Properties.Langs.Lang.FormatError);
+        }
+
+        return doubleValue % 2 > double.Epsilon
+            ? new ValidationResult(false, Properties.Langs.Lang.Error)
+            : ValidationResult.ValidResult;
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
index 6eb0f4a6..cee0bb0c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.CheckComboBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
+             DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              xmlns:hc="https://handyorg.github.io/handycontrol"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
index 8a972e79..ab9fa393 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="HandyControlDemo.UserControl.ComboBoxDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
+             DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}"
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
index e09deb85..c7c9cfae 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -4,9 +4,11 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             Background="{DynamicResource RegionBrush}">
+             xmlns:tools="clr-namespace:HandyControlDemo.Tools"
+             Background="{DynamicResource RegionBrush}"
+             DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
+        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
             <StackPanel>
                 <hc:NumericUpDown Maximum="100"/>
                 <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
@@ -17,16 +19,52 @@
                 <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
                 <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
-            <StackPanel Margin="32,0,0,0">
-                <hc:NumericUpDown Name="NumericUpDownCustomVerify" ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}"/>
+            <StackPanel>
+                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}">
+                    <hc:NumericUpDown.Value>
+                        <Binding Path="DoubleValue1" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <tools:NumericUpDownDemoRule/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:NumericUpDown.Value>
+                </hc:NumericUpDown>
                 <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus}"/>
                 <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus}"/>
 
-                <hc:NumericUpDown ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
+                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
                 <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus}"/>
                 <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" Margin="0,32,0,0"/>
-                <hc:NumericUpDown DecimalPlaces="2" ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
-        </StackPanel>
+            <StackPanel>
+                <hc:NumericUpDown Maximum="100" Style="{StaticResource NumericUpDown.Small}"/>
+                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDown.Small}"/>
+                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDown.Small}"/>
+
+                <hc:NumericUpDown hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend.Small}"/>
+                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend.Small}"/>
+                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" Margin="0,32,0,0"/>
+                <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            </StackPanel>
+            <StackPanel>
+                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus.Small}">
+                    <hc:NumericUpDown.Value>
+                        <Binding Path="DoubleValue2" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <tools:NumericUpDownDemoRule/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:NumericUpDown.Value>
+                </hc:NumericUpDown>
+                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
+
+                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" Margin="0,32,0,0"/>
+                <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            </StackPanel>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
index 3fb6ea48..8e966a21 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
@@ -1,19 +1,10 @@
-using HandyControl.Data;
-
-
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl
 {
     public partial class NumericUpDownDemoCtl
     {
         public NumericUpDownDemoCtl()
         {
             InitializeComponent();
-
-            NumericUpDownCustomVerify.VerifyFunc = str => double.TryParse(str, out var v)
-                ? v % 2 < 1e-06
-                    ? OperationResult.Failed(Properties.Langs.Lang.Error)
-                    : OperationResult.Success()
-                : OperationResult.Failed(Properties.Langs.Lang.Error);
         }
     }
 }
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
index e1038cfe..9307a54c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
@@ -4,10 +4,10 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             DataContext="{Binding SearchBarDemo,Source={StaticResource Locator}}"
+             DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
+        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
             <StackPanel>
                 <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
                 <hc:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
@@ -17,15 +17,49 @@
                 <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" Margin="0,32,0,0"/>
                 <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
-            <StackPanel Margin="32,0,0,0">
-                <hc:SearchBar Name="SearchBarCustomVerify" ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
+            <StackPanel>
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
                 <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus}"/>
 
-                <hc:SearchBar ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
-                <hc:SearchBar TextType="Mail" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
+                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}">
+                    <hc:SearchBar.Text>
+                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <hc:RegexRule Type="Mail"/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:SearchBar.Text>
+                </hc:SearchBar>
                 <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" Margin="0,32,0,0"/>
-                <hc:SearchBar ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
             </StackPanel>
-        </StackPanel>
+            <StackPanel>
+                <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}" Style="{StaticResource SearchBar.Small}"/>
+                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBar.Small}"/>
+
+                <hc:SearchBar hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend.Small}"/>
+                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend.Small}"/>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" Margin="0,32,0,0"/>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            </StackPanel>
+            <StackPanel>
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus.Small}"/>
+                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus.Small}"/>
+
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus.Small}"/>
+                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus.Small}">
+                    <hc:SearchBar.Text>
+                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <hc:RegexRule Type="Mail"/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:SearchBar.Text>
+                </hc:SearchBar>
+                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" Margin="0,32,0,0"/>
+                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+            </StackPanel>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
index f9cef692..7bac1879 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
@@ -4,26 +4,43 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             xmlns:hc="https://handyorg.github.io/handycontrol">
+             xmlns:hc="https://handyorg.github.io/handycontrol"
+             DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}">
     <hc:TransitioningContentControl>
         <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
             <StackPanel>
-                <hc:TextBox ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
                 <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False"/>
 
-                <hc:TextBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <hc:TextBox TextType="Mail" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0">
+                    <hc:TextBox.Text>
+                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <hc:RegexRule Type="Mail"/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:TextBox.Text>
+                </hc:TextBox>
                 <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <hc:TextBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
             </StackPanel>
             <StackPanel>
-                <hc:TextBox ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
                 <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TextBoxPlus.Small}"/>
 
-                <hc:TextBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
-                <hc:TextBox TextType="Mail" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
+                <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}">
+                    <hc:TextBox.Text>
+                        <Binding Path="Email2" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <hc:RegexRule Type="Mail"/>
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:TextBox.Text>
+                </hc:TextBox>
                 <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
-                <hc:TextBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}"/>
+                <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}"/>
             </StackPanel>
         </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
index 52fe0e9a..8f038e1d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml
@@ -45,7 +45,7 @@
                             <ColumnDefinition/>
                             <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
-                        <hc:SearchBar ShowClearButton="True" IsRealTime="True" SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterKey}}" Margin="0,4,4,4" Tag="{Binding ElementName=ListBoxDemo}"/>
+                        <hc:SearchBar hc:InfoElement.ShowClearButton="True" IsRealTime="True" SearchStarted="SearchBar_OnSearchStarted" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterKey}}" Margin="0,4,4,4" Tag="{Binding ElementName=ListBoxDemo}"/>
                         <ToggleButton Tag="{Binding ElementName=ListBoxDemo}" Name="ButtonStyleAscending" Click="ButtonAscending_OnClick" Grid.Row="0" Grid.Column="1" Style="{StaticResource DemoInfoSortButtonStyle}"/>
                         <ListBox Name="ListBoxDemo" ScrollViewer.CanContentScroll="False" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" VirtualizingStackPanel.IsVirtualizing="True" SelectedIndex="{Binding SelectedIndex}" ItemsSource="{Binding DemoItemList}" BorderThickness="0" SelectionMode="Single" Style="{StaticResource ListBoxTransparent}">
                             <ListBox.ItemTemplate>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
index f7a47ec9..c3683aff 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
@@ -42,7 +42,7 @@
                     <TextBox/>
                 </GroupBox>
                 <GroupBox Grid.Row="2" VerticalAlignment="Bottom" Grid.Column="1" Width="300" hc:TitleElement.TitleWidth="100" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left" hc:TitleElement.TitlePlacement="Left">
-                    <ComboBox DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
+                    <ComboBox DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
                 </GroupBox>
             </Grid>
         </ScrollViewer>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
index 02141d91..c8c55ec4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
+             DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
         <ScrollViewer>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
index d8188e5e..f146887e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             DataContext="{Binding ComboBoxDemo,Source={StaticResource Locator}}"
+             DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
         <StackPanel Margin="32">
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs
deleted file mode 100644
index 4ae4e1f2..00000000
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Common/ComboBoxDemoViewModel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using HandyControlDemo.Service;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class ComboBoxDemoViewModel : DemoViewModelBase<string>
-    {
-        public ComboBoxDemoViewModel(DataService dataService) => DataList = dataService.GetComboBoxDemoDataList();
-    }
-}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Common/InputElementDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Common/InputElementDemoViewModel.cs
new file mode 100644
index 00000000..88e587bb
--- /dev/null
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Common/InputElementDemoViewModel.cs
@@ -0,0 +1,92 @@
+using System.Collections.Generic;
+using System.Globalization;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using HandyControl.Controls;
+using HandyControlDemo.Properties.Langs;
+using HandyControlDemo.Tools.Converter;
+
+namespace HandyControlDemo.ViewModel;
+
+public class InputElementDemoViewModel : ViewModelBase
+{
+    private string _email1;
+    private string _email2;
+    private double _doubleValue1;
+    private double _doubleValue2;
+    private IList<string> _dataList;
+
+    public string Email1
+    {
+        get => _email1;
+#if NET40
+        set => Set(nameof(Email1), ref _email1, value);
+#else
+        set => Set(ref _email1, value);
+#endif
+    }
+
+    public string Email2
+    {
+        get => _email2;
+#if NET40
+        set => Set(nameof(Email2), ref _email2, value);
+#else
+        set => Set(ref _email2, value);
+#endif
+    }
+
+    public double DoubleValue1
+    {
+        get => _doubleValue1;
+#if NET40
+        set => Set(nameof(DoubleValue1), ref _doubleValue1, value);
+#else
+        set => Set(ref _doubleValue1, value);
+#endif
+    }
+
+    public double DoubleValue2
+    {
+        get => _doubleValue2;
+#if NET40
+        set => Set(nameof(DoubleValue2), ref _doubleValue2, value);
+#else
+        set => Set(ref _doubleValue2, value);
+#endif
+    }
+
+    public IList<string> DataList
+    {
+        get => _dataList;
+#if NET40
+        set => Set(nameof(DataList), ref _dataList, value);
+#else
+        set => Set(ref _dataList, value);
+#endif
+    }
+
+    public RelayCommand<string> SearchCmd => new(Search);
+
+    public InputElementDemoViewModel()
+    {
+        DataList = GetComboBoxDemoDataList();
+    }
+
+    private void Search(string key)
+    {
+        Growl.Info(key);
+    }
+
+    private List<string> GetComboBoxDemoDataList()
+    {
+        var converter = new StringRepeatConverter();
+        var list = new List<string>();
+        for (var i = 1; i <= 9; i++)
+        {
+            list.Add($"{converter.Convert(Lang.Text, null, i, CultureInfo.CurrentCulture)}{i}");
+        }
+
+        return list;
+    }
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs
deleted file mode 100644
index 71b85433..00000000
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SearchBarDemoViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
-using HandyControl.Controls;
-
-namespace HandyControlDemo.ViewModel
-{
-    public class SearchBarDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<string> SearchCmd => new(Search);
-
-        private void Search(string key)
-        {
-            Growl.Info(key);
-        }
-    }
-}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
index 80f876a3..7d686d69 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
@@ -17,7 +17,6 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
             SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
             SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
-            SimpleIoc.Default.Register<ComboBoxDemoViewModel>();
             SimpleIoc.Default.Register<WindowDemoViewModel>();
             SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetBlogDataList), "Blogs");
             SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetProjectDataList), "Projects");
@@ -27,7 +26,6 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<ChatBoxViewModel>();
             SimpleIoc.Default.Register<CoverViewModel>();
             SimpleIoc.Default.Register<DialogDemoViewModel>();
-            SimpleIoc.Default.Register<SearchBarDemoViewModel>();
             SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
             SimpleIoc.Default.Register<InteractiveDialogViewModel>();
             SimpleIoc.Default.Register<BadgeDemoViewModel>();
@@ -40,6 +38,7 @@ namespace HandyControlDemo.ViewModel
             SimpleIoc.Default.Register<SplitButtonDemoViewModel>();
             SimpleIoc.Default.Register<TagDemoViewModel>();
             SimpleIoc.Default.Register<AutoCompleteTextBoxDemoViewModel>();
+            SimpleIoc.Default.Register<InputElementDemoViewModel>();
         }
 
         public static ViewModelLocator Instance = new Lazy<ViewModelLocator>(() =>
@@ -55,8 +54,6 @@ namespace HandyControlDemo.ViewModel
 
         public ImageBrowserDemoViewModel ImageBrowserDemo => SimpleIoc.Default.GetInstance<ImageBrowserDemoViewModel>();
 
-        public ComboBoxDemoViewModel ComboBoxDemo => SimpleIoc.Default.GetInstance<ComboBoxDemoViewModel>();
-
         public WindowDemoViewModel WindowDemo => SimpleIoc.Default.GetInstance<WindowDemoViewModel>();
 
         public ItemsDisplayViewModel ContributorsView => new(SimpleIoc.Default.GetInstance<DataService>().GetContributorDataList);
@@ -77,8 +74,6 @@ namespace HandyControlDemo.ViewModel
 
         public DialogDemoViewModel DialogDemo => SimpleIoc.Default.GetInstance<DialogDemoViewModel>();
 
-        public SearchBarDemoViewModel SearchBarDemo => SimpleIoc.Default.GetInstance<SearchBarDemoViewModel>();
-
         public NotifyIconDemoViewModel NotifyIconDemo => SimpleIoc.Default.GetInstance<NotifyIconDemoViewModel>();
 
         public InteractiveDialogViewModel InteractiveDialog => SimpleIoc.Default.GetInstance<InteractiveDialogViewModel>();
@@ -103,6 +98,8 @@ namespace HandyControlDemo.ViewModel
 
         public AutoCompleteTextBoxDemoViewModel AutoCompleteTextBoxDemo => new(SimpleIoc.Default.GetInstance<DataService>());
 
+        public InputElementDemoViewModel InputElementDemo => new();
+
         #endregion
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
index 3573f75b..9678149a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
@@ -80,5 +80,14 @@ namespace HandyControl.Controls
 
         public static string GetRegexPattern(DependencyObject element)
             => (string) element.GetValue(RegexPatternProperty);
+
+        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.RegisterAttached(
+            "ShowClearButton", typeof(bool), typeof(InfoElement), new PropertyMetadata(ValueBoxes.FalseBox));
+
+        public static void SetShowClearButton(DependencyObject element, bool value)
+            => element.SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+
+        public static bool GetShowClearButton(DependencyObject element)
+            => (bool) element.GetValue(ShowClearButtonProperty);
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index a1d20927..a48c60ff 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -15,40 +15,25 @@ namespace HandyControl.Controls
     ///     数值选择控件
     /// </summary>
     [TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
-    [TemplatePart(Name = ElementErrorTip, Type = typeof(UIElement))]
-    public class NumericUpDown : Control, IDataInput
+    public class NumericUpDown : Control
     {
-        #region Constants
-
         private const string ElementTextBox = "PART_TextBox";
 
-        private const string ElementErrorTip = "PART_ErrorTip";
-
-        #endregion Constants
-
-        #region Data
-
         private TextBox _textBox;
 
-        private UIElement _errorTip;
-
-        private bool _updateText;
-
-        #endregion Data
-
         public NumericUpDown()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) =>
             {
                 if (IsReadOnly) return;
 
-                Value += Increment;
+                SetCurrentValue(ValueProperty, Value + Increment);
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) =>
             {
                 if (IsReadOnly) return;
 
-                Value -= Increment;
+                SetCurrentValue(ValueProperty, Value - Increment);
             }));
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
             {
@@ -56,35 +41,13 @@ namespace HandyControl.Controls
 
                 SetCurrentValue(ValueProperty, ValueBoxes.Double0Box);
             }));
-
-            Loaded += (s, e) => OnApplyTemplate();
-        }
-
-        protected override void OnGotFocus(RoutedEventArgs e)
-        {
-            base.OnGotFocus(e);
-
-            if (_textBox != null)
-            {
-                _textBox?.Focus();
-                _textBox.Select(_textBox.Text.Length, 0);
-            }
         }
 
         public override void OnApplyTemplate()
         {
-            if (_textBox != null)
-            {
-                TextCompositionManager.RemovePreviewTextInputHandler(_textBox, PreviewTextInputHandler);
-                _textBox.TextChanged -= TextBox_TextChanged;
-                _textBox.PreviewKeyDown -= TextBox_PreviewKeyDown;
-                _textBox.LostFocus -= TextBox_LostFocus;
-            }
-
             base.OnApplyTemplate();
 
             _textBox = GetTemplateChild(ElementTextBox) as TextBox;
-            _errorTip = GetTemplateChild(ElementErrorTip) as UIElement;
 
             if (_textBox != null)
             {
@@ -95,55 +58,11 @@ namespace HandyControl.Controls
                 _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
                 _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                TextCompositionManager.AddPreviewTextInputHandler(_textBox, PreviewTextInputHandler);
-                _textBox.TextChanged += TextBox_TextChanged;
                 _textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
-                _textBox.LostFocus += TextBox_LostFocus;
                 _textBox.Text = CurrentText;
             }
         }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => UpdateData();
-
-        private void UpdateData()
-        {
-            if (!VerifyData())
-            {
-                _updateText = true;
-                return;
-            }
-
-            _updateText = false;
-
-            if (string.IsNullOrWhiteSpace(_textBox.Text))
-            {
-                Value = 0;
-
-                SetCurrentValue(ErrorStrProperty, string.Empty);
-                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-            }
-            else if (double.TryParse(_textBox.Text, out var value))
-            {
-                Value = value;
-
-                if (Validation.GetHasError(this))
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                }
-            }
-
-            _updateText = true;
-        }
-
-        private void PreviewTextInputHandler(object sender, TextCompositionEventArgs e) => UpdateData();
-
-        private void TextBox_LostFocus(object sender, RoutedEventArgs e)
-        {
-            if (IsError && _errorTip != null) return;
-            _textBox.Text = CurrentText;
-        }
-
         private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (IsReadOnly) return;
@@ -215,7 +134,7 @@ namespace HandyControl.Controls
 
         private void SetText()
         {
-            if (_updateText && _textBox != null)
+            if (_textBox != null)
             {
                 _textBox.Text = CurrentText;
                 _textBox.Select(_textBox.Text.Length, 0);
@@ -366,57 +285,6 @@ namespace HandyControl.Controls
             set => SetValue(ShowUpDownButtonProperty, ValueBoxes.BooleanBox(value));
         }
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
-
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
-
-        public static readonly DependencyPropertyKey TextTypePropertyKey =
-            DependencyProperty.RegisterReadOnly("TextType", typeof(TextType), typeof(NumericUpDown),
-                new PropertyMetadata(default(TextType)));
-
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public static readonly DependencyProperty TextTypeProperty = TextTypePropertyKey.DependencyProperty;
-
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
         /// <summary>
         ///     标识 IsReadOnly 依赖属性。
         /// </summary>
@@ -471,50 +339,5 @@ namespace HandyControl.Controls
             get => (Brush) GetValue(CaretBrushProperty);
             set => SetValue(CaretBrushProperty, value);
         }
-
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-        public virtual bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            if (VerifyFunc != null)
-            {
-                result = VerifyFunc.Invoke(_textBox.Text);
-            }
-            else
-            {
-                if (!string.IsNullOrEmpty(_textBox.Text))
-                {
-                    if (double.TryParse(_textBox.Text, out var value))
-                    {
-                        if (value < Minimum || value > Maximum)
-                        {
-                            result = OperationResult.Failed(Properties.Langs.Lang.OutOfRange);
-                        }
-                        else
-                        {
-                            result = OperationResult.Success();
-                        }
-                    }
-                    else
-                    {
-                        result = OperationResult.Failed(Properties.Langs.Lang.FormatError);
-                    }
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
-            }
-
-            SetCurrentValue(ErrorStrProperty, result.Message);
-            SetCurrentValue(IsErrorProperty, ValueBoxes.BooleanBox(!result.Data));
-            return result.Data;
-        }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
index 16d7a68a..daa3e7ac 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
@@ -42,7 +42,6 @@ namespace HandyControl.Controls
             {
                 OnSearchStarted();
             }
-            VerifyData();
         }
 
         private void OnSearchStarted()
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
index ba7a2e9a..961c6b37 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
@@ -1,138 +1,16 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using HandyControl.Data;
+using System.Windows.Input;
 using HandyControl.Interactivity;
-using HandyControl.Tools;
 
 namespace HandyControl.Controls
 {
-    public class TextBox : System.Windows.Controls.TextBox, IDataInput
+    public class TextBox : System.Windows.Controls.TextBox
     {
         public TextBox()
         {
             CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
             {
-                SetCurrentValue(TextProperty, "");
+                SetCurrentValue(TextProperty, string.Empty);
             }));
         }
-
-        protected override void OnTextChanged(TextChangedEventArgs e)
-        {
-            base.OnTextChanged(e);
-            VerifyData();
-        }
-
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(TextBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(TextBox), new PropertyMetadata(default(string)));
-
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
-
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(TextBox), new PropertyMetadata(default(TextType)));
-
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(TextBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public virtual bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            if (VerifyFunc != null)
-            {
-                result = VerifyFunc.Invoke(Text);
-            }
-            else
-            {
-                if (!string.IsNullOrEmpty(Text))
-                {
-                    if (TextType != TextType.Common)
-                    {
-                        var regexPattern = InfoElement.GetRegexPattern(this);
-                        result = string.IsNullOrEmpty(regexPattern)
-                            ? Text.IsKindOf(TextType)
-                                ? OperationResult.Success()
-                                : OperationResult.Failed(Properties.Langs.Lang.FormatError)
-                            : Text.IsKindOf(regexPattern)
-                                ? OperationResult.Success()
-                                : OperationResult.Failed(Properties.Langs.Lang.FormatError);
-                    }
-                    else
-                    {
-                        result = OperationResult.Success();
-                    }
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
-            }
-
-            var isError = !result.Data;
-            if (isError)
-            {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
-            }
-            else
-            {
-                isError = Validation.GetHasError(this);
-                if (isError)
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
-            }
-
-            return !isError;
-        }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index cc810bd4..ecd496ef 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -415,6 +415,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\ButtonGroupItemStyleSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\ComboBoxItemCapsuleStyleSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\StyleSelector\TabItemCapsuleStyleSelector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\ValidationRule\NoBlankTextRule.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\ValidationRule\RegexRule.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)Themes\Basic\Behaviors.xaml">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
index 358fbee4..9e425e10 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/BaseStyle.xaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:hc="clr-namespace:HandyControl.Controls"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="FocusVisual">
@@ -41,6 +42,39 @@
         </Setter>
     </Style>
 
+    <ControlTemplate x:Key="InputElementErrorTemplate">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <AdornedElementPlaceholder x:Name="adornedElementPlaceholder"/>
+            <hc:TransitioningContentControl TransitionMode="Top2Bottom" Grid.Row="1" ClipToBounds="True">
+                <TextBlock Foreground="{DynamicResource DangerBrush}" Margin="2,2,0,0" Text="{Binding Path=AdornedElement.(Validation.Errors)[0].ErrorContent, ElementName=adornedElementPlaceholder}"/>
+            </hc:TransitioningContentControl>
+        </Grid>
+    </ControlTemplate>
+
+    <Style x:Key="InputElementBaseStyle" TargetType="Control">
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,0"/>
+        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
+        <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="HorizontalContentAlignment" Value="Left"/>
+        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+        <Setter Property="Validation.ErrorTemplate" Value="{StaticResource InputElementErrorTemplate}"/>
+        <Style.Triggers>
+            <Trigger Property="Validation.HasError" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
     <Style x:Key="BaseStyle" TargetType="Control">
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="FontSize" Value="{StaticResource TextFontSize}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
index 036616d5..8f76a90a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/NumericUpDownBaseStyle.xaml
@@ -4,54 +4,41 @@
                     xmlns:interactivity="clr-namespace:HandyControl.Interactivity"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+    <Style x:Key="NumericUpDownBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="hc:NumericUpDown">
         <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="Once"/>
         <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
-        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:NumericUpDown">
-                    <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                    <hc:SimplePanel x:Name="root">
+                        <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition/>
                                 <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                            <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                            <Button x:Name="DownButton"  Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+                            <hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                            <Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}"/>
+                            <Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}"/>
                         </Grid>
-                    </Border>
+                    </hc:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" Value="0.4"/>
+                            <Setter Property="Opacity" TargetName="root" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-                            <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-                        </Trigger>
-                        <Trigger Property="ShowUpDownButton" Value="False">
-                            <Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1"/>
-                        </Trigger>
-                        <Trigger Property="IsReadOnly" Value="True">
-                            <Setter Property="IsEnabled" TargetName="UpButton" Value="False"/>
-                            <Setter Property="IsEnabled" TargetName="DownButton" Value="False"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -65,31 +52,35 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}"/>
             </Grid.RowDefinitions>
-            <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                    <Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                    <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                </Grid>
-            </Border>
+            <Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+            <Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                <Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}"/>
+                <Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
             <Trigger Property="IsReadOnly" Value="True">
                 <Setter Property="IsEnabled" TargetName="UpButton" Value="False"/>
@@ -104,35 +95,35 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                    <Button x:Name="UpButton"  Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                    <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                </Grid>
-            </Border>
+            <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+            <Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                <Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}"/>
+                <Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="IsEnabled" TargetName="UpButton" Value="False"/>
-                <Setter Property="IsEnabled" TargetName="DownButton" Value="False"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -152,141 +143,104 @@
     </Style>
 
     <ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}"/>
             </Grid.RowDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
             <DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="25"/>
-                    </Grid.ColumnDefinitions>
-                    <hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear"  Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                    <Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                </Grid>
-            </Border>
+            <Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+            <Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                <Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+                <Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}"/>
+                <Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
-            <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="IsEnabled" TargetName="UpButton" Value="False"/>
-                <Setter Property="IsEnabled" TargetName="DownButton" Value="False"/>
-            </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="true"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                     <Condition Property="IsReadOnly" Value="False"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
-            <DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="25"/>
-                    </Grid.ColumnDefinitions>
-                    <hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button x:Name="UpButton"  Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                    <Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14"/>
-                </Grid>
-            </Border>
+            <Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+            <Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}"/>
+                <Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+                <Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}"/>
+                <Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
-            <Trigger Property="IsReadOnly" Value="True">
-                <Setter Property="IsEnabled" TargetName="UpButton" Value="False"/>
-                <Setter Property="IsEnabled" TargetName="DownButton" Value="False"/>
-            </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
                     <Condition Property="IsMouseOver" Value="true"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                     <Condition Property="IsReadOnly" Value="False"/>
                 </MultiTrigger.Conditions>
-                <Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear"/>
+                <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
-        <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}"/>
         <Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}"/>
         <Style.Triggers>
             <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
index bb56a295..b84a979d 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/PropertyGridBaseStyle.xaml
@@ -140,7 +140,7 @@
                                         <Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}"/>
                                     </RadioButton>
                                 </hc:ButtonGroup>
-                                <hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
+                                <hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
                             </DockPanel>
                             <hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
                                 <hc:PropertyItemsControl.GroupStyle>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml
index 438bd3f1..b44233b2 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/SearchBarBaseStyle.xaml
@@ -8,19 +8,20 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:SearchBar">
-                    <Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+                    <hc:SimplePanel x:Name="root">
+                        <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition/>
-                                <ColumnDefinition Width="30"/>
+                                <ColumnDefinition Width="Auto"/>
                             </Grid.ColumnDefinitions>
-                            <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
                             <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                            <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0"/>
                         </Grid>
-                    </Border>
+                    </hc:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                            <Setter Property="Opacity" TargetName="root" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
                             <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
@@ -42,23 +43,23 @@
             </Grid.RowDefinitions>
             <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="30"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                    <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                </Grid>
-            </Border>
+            <Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+            <Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
@@ -75,25 +76,25 @@
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="30"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                    <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                </Grid>
-            </Border>
+            <Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+            <Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
@@ -119,14 +120,6 @@
     </Style>
 
     <ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -134,110 +127,82 @@
             </Grid.RowDefinitions>
             <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}"/>
-            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="25"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                    <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                </Grid>
-            </Border>
+            <Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+            <Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0"/>
+                <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="root"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+            <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
-            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="25"/>
-                    </Grid.ColumnDefinitions>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0"/>
-                    <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                    <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                </Grid>
-            </Border>
+            <Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}"/>
+            <Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" >
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0"/>
+                <TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="root"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
index 3a772bee..cac7e07a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TextBoxBaseStyle.xaml
@@ -15,48 +15,37 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:WatermarkTextBox">
-                    <hc:SimplePanel x:Name="WatermarkContent">
+                    <hc:SimplePanel>
                         <TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}"/>
-                        <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                        <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
                     </hc:SimplePanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-        <Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}"/>
-        <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+    <Style x:Key="TextBoxBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="TextBox">
         <Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
         <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
-        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="Padding" Value="{StaticResource DefaultInputPadding}"/>
-        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TextBox">
-                    <Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                        <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                    </Border>
+                    <hc:SimplePanel x:Name="root">
+                        <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+                        <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                    </hc:SimplePanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                            <Setter Property="Opacity" TargetName="root" Value="0.4"/>
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
                         </Trigger>
                         <Trigger Property="IsFocused" Value="true">
-                            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
+                            <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -72,11 +61,11 @@
             </Grid.RowDefinitions>
             <DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
             <Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
-            <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
@@ -85,10 +74,10 @@
                 <Setter Property="Opacity" TargetName="Placeholder" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -104,8 +93,8 @@
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
             <Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
-            <TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-            <ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+            <TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+            <ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
@@ -114,10 +103,10 @@
                 <Setter Property="Opacity" TargetName="Placeholder" Value="0.4"/>
             </Trigger>
             <Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}"/>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
@@ -137,127 +126,90 @@
     </Style>
 
     <ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}"/>
             </Grid.RowDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1"/>
             <DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid SnapsToDevicePixels="true">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-                    <ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                </Grid>
-            </Border>
+            <Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+            <Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="root"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
-        <ControlTemplate.Resources>
-            <Storyboard x:Key="StoryboardShow">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2"/>
-            </Storyboard>
-            <Storyboard x:Key="StoryboardHidden">
-                <ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0"/>
-            </Storyboard>
-        </ControlTemplate.Resources>
         <Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1"/>
             <DockPanel LastChildFill="True"  Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
                 <ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}"/>
                 <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}"/>
             </DockPanel>
-            <Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                <Grid SnapsToDevicePixels="true">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
-                    <ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                    <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}"/>
-                </Grid>
-            </Border>
+            <Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True"/>
+            <Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}"/>
+                <ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                <Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}"/>
+            </Grid>
         </Grid>
         <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" TargetName="templateRoot" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="border" Value="0.4"/>
+                <Setter Property="Opacity" TargetName="root" Value="0.4"/>
             </Trigger>
-            <Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+            <Trigger Property="IsMouseOver" Value="true" SourceName="root">
                 <Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}"/>
             </Trigger>
             <MultiTrigger>
                 <MultiTrigger.Conditions>
-                    <Condition Property="IsMouseOver" Value="true" SourceName="templateRoot"/>
-                    <Condition Property="ShowClearButton" Value="True"/>
+                    <Condition Property="IsMouseOver" Value="true" SourceName="root"/>
+                    <Condition Property="hc:InfoElement.ShowClearButton" Value="True"/>
                 </MultiTrigger.Conditions>
                 <Setter Property="Visibility" Value="Visible" TargetName="ButtonClear"/>
             </MultiTrigger>
             <Trigger Property="IsFocused" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}"/>
-            </Trigger>
-            <Trigger Property="IsError" Value="true">
-                <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}"/>
-                <Trigger.EnterActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardShow}"/>
-                </Trigger.EnterActions>
-                <Trigger.ExitActions>
-                    <BeginStoryboard Storyboard="{StaticResource StoryboardHidden}"/>
-                </Trigger.ExitActions>
+                <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
     <Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
-        <Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}"/>
         <Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}"/>
         <Style.Triggers>
             <Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/NumericUpDown.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/NumericUpDown.xaml
index 06f9b8fa..6f97ba2c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/NumericUpDown.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/NumericUpDown.xaml
@@ -4,8 +4,29 @@
 
     <Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown"/>
 
+    <Style x:Key="NumericUpDown.Small" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+    </Style>
+
     <Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown"/>
 
+    <Style x:Key="NumericUpDownExtend.Small" BasedOn="{StaticResource NumericUpDownExtend}" TargetType="hc:NumericUpDown">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
+    </Style>
+
     <Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown"/>
 
+    <Style x:Key="NumericUpDownPlus.Small" BasedOn="{StaticResource NumericUpDownPlus}" TargetType="hc:NumericUpDown">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/SearchBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/SearchBar.xaml
index 9edf609f..e4b97bc9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/SearchBar.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/SearchBar.xaml
@@ -4,8 +4,29 @@
 
     <Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar"/>
 
+    <Style x:Key="SearchBar.Small" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
+        <Setter Property="MinHeight" Value="20"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+    </Style>
+
     <Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar"/>
 
+    <Style x:Key="SearchBarExtend.Small" BasedOn="{StaticResource SearchBarExtend}" TargetType="hc:SearchBar">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
+    </Style>
+
     <Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar"/>
 
+    <Style x:Key="SearchBarPlus.Small" BasedOn="{StaticResource SearchBarPlus}" TargetType="hc:SearchBar">
+        <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
+        <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
+    </Style>
+
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/TextBox.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/TextBox.xaml
index d0cb5f86..3d4b22d0 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/TextBox.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/TextBox.xaml
@@ -8,7 +8,7 @@
 
     <Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
         <Setter Property="MinHeight" Value="20"/>
-        <Setter Property="Padding" Value="6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
     </Style>
 
     <Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox"/>
@@ -16,8 +16,9 @@
     <Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
         <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
         <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
-        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
-        <Setter Property="Padding" Value="6,0"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
     </Style>
 
     <Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox"/>
@@ -25,8 +26,9 @@
     <Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
         <Setter Property="hc:InfoElement.MinContentHeight" Value="20"/>
         <Setter Property="hc:InfoElement.ContentHeight" Value="20"/>
-        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3"/>
-        <Setter Property="Padding" Value="6,0"/>
+        <Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0"/>
+        <Setter Property="Padding" Value="6,2,6,1"/>
+        <Setter Property="MinHeight" Value="20"/>
     </Style>
 
 </ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index d1fa08d8..5c904d64 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -1175,6 +1175,37 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	<ControlTemplate x:Key="InputElementErrorTemplate">
+		<Grid>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+			<AdornedElementPlaceholder x:Name="adornedElementPlaceholder" />
+			<hc:TransitioningContentControl TransitionMode="Top2Bottom" Grid.Row="1" ClipToBounds="True">
+				<TextBlock Foreground="{DynamicResource DangerBrush}" Margin="2,2,0,0" Text="{Binding Path=AdornedElement.(Validation.Errors)[0].ErrorContent, ElementName=adornedElementPlaceholder}" />
+			</hc:TransitioningContentControl>
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="InputElementBaseStyle" TargetType="Control">
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,0" />
+		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
+		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="HorizontalContentAlignment" Value="Left" />
+		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
+		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
+		<Setter Property="Validation.ErrorTemplate" Value="{StaticResource InputElementErrorTemplate}" />
+		<Style.Triggers>
+			<Trigger Property="Validation.HasError" Value="true">
+				<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
 	<Style x:Key="BaseStyle" TargetType="Control">
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="FontSize" Value="{StaticResource TextFontSize}" />
@@ -6535,47 +6566,36 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:WatermarkTextBox">
-					<hc:SimplePanel x:Name="WatermarkContent">
+					<hc:SimplePanel>
 						<TextBlock Text="{TemplateBinding Watermark}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="{TemplateBinding Padding}" x:Name="PART_Watermark" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 					</hc:SimplePanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="TextBoxBaseStyle" TargetType="TextBox">
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+	<Style x:Key="TextBoxBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="TextBox">
 		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,8,6,8" />
 		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
 		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TextBox">
-					<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-2,0,-1,0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					</Border>
+					<hc:SimplePanel x:Name="root">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+						<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="border" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 						</Trigger>
 						<Trigger Property="IsFocused" Value="true">
-							<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -6590,11 +6610,11 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
 			<Border x:Name="border" Grid.Row="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			<TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Row="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Grid.Row="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
@@ -6603,10 +6623,10 @@
 				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -6621,8 +6641,8 @@
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
 			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
-			<TextBlock x:Name="Placeholder" Padding="1" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-			<ScrollViewer Padding="{TemplateBinding Padding}" Margin="-1,1" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			<TextBlock x:Name="Placeholder" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Grid.Column="1" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+			<ScrollViewer Margin="-2,0" Padding="{TemplateBinding Padding}" Grid.Column="1" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
@@ -6631,10 +6651,10 @@
 				<Setter Property="Opacity" TargetName="Placeholder" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true" SourceName="PART_ContentHost">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource SecondaryBorderBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -6652,125 +6672,88 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="TextBoxPlusTopTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
 			<DockPanel LastChildFill="True" Grid.Row="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Margin="-2,0,-1,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="TextBoxPlusLeftTemplate" TargetType="hc:TextBox">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
 			<DockPanel LastChildFill="True" Grid.Column="0" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-				<Grid SnapsToDevicePixels="true">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
-					<ScrollViewer Grid.Column="0" Margin="-2,0,-1,0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Margin="0,0,7,0" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root" ClipToBounds="True">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="TextBoxPlusBaseStyle" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="hc:TextBox">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
 		<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
@@ -6783,19 +6766,20 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:SearchBar">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+					<hc:SimplePanel x:Name="root">
+						<Border x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition />
-								<ColumnDefinition Width="30" />
+								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
 							<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+							<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
 						</Grid>
-					</Border>
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6816,23 +6800,23 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6848,25 +6832,25 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="30" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<TextBlock VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" HorizontalAlignment="Stretch" Style="{StaticResource TextBlockDefaultThiLight}" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" />
+				<ScrollViewer Margin="-2,0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
 			<Trigger Property="IsMouseOver" Value="true">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
@@ -6890,14 +6874,6 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="SearchBarPlusTopTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
@@ -6905,109 +6881,81 @@
 			</Grid.RowDefinitions>
 			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<TextBlock Grid.Row="1" FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" />
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
+				<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+				<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="SearchBarPlusLeftTemplate" TargetType="hc:SearchBar">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="TextBlockError" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="TextBlockError" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Visibility="Collapsed" Name="ButtonClear" Width="16" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" Style="{StaticResource ButtonIcon}" Padding="2,6,7,6" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" Focusable="False" Grid.Row="0" />
-					<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
-					<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Search" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,1'}" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource SearchGeometry}" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" Focusable="False" Grid.Row="0" />
+				<TextBlock HorizontalAlignment="Stretch" Text="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" Grid.Row="0" Grid.Column="0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Style="{StaticResource TextBlockDefaultThiLight}" Margin="{TemplateBinding Padding}" Visibility="{TemplateBinding Text,Converter={StaticResource String2VisibilityReConverter}}" />
+				<ScrollViewer Margin="-2,0" Grid.Row="0" Grid.Column="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
-					<Condition Property="IsMouseOver" Value="true" SourceName="templateRoot" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="IsMouseOver" Value="true" SourceName="root" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -7023,8 +6971,26 @@
 	<Style BasedOn="{StaticResource TagBaseStyle}" TargetType="hc:Tag" />
 	<Style BasedOn="{StaticResource TagContainerBaseStyle}" TargetType="hc:TagContainer" />
 	<Style BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBar.Small" BasedOn="{StaticResource SearchBarBaseStyle}" TargetType="hc:SearchBar">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+	</Style>
 	<Style x:Key="SearchBarExtend" BasedOn="{StaticResource SearchBarExtendBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarExtend.Small" BasedOn="{StaticResource SearchBarExtend}" TargetType="hc:SearchBar">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="SearchBarPlus" BasedOn="{StaticResource SearchBarPlusBaseStyle}" TargetType="hc:SearchBar" />
+	<Style x:Key="SearchBarPlus.Small" BasedOn="{StaticResource SearchBarPlus}" TargetType="hc:SearchBar">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox" />
 	<Style x:Key="ComboBox.Small" BasedOn="{StaticResource ComboBoxBaseStyle}" TargetType="ComboBox">
 		<Setter Property="MinHeight" Value="20" />
@@ -7048,21 +7014,23 @@
 	<Style BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox" />
 	<Style x:Key="TextBox.Small" BasedOn="{StaticResource TextBoxBaseStyle}" TargetType="TextBox">
 		<Setter Property="MinHeight" Value="20" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
 	</Style>
 	<Style x:Key="TextBoxExtend" BasedOn="{StaticResource TextBoxExtendBaseStyle}" TargetType="TextBox" />
 	<Style x:Key="TextBoxExtend.Small" BasedOn="{StaticResource TextBoxExtend}" TargetType="TextBox">
 		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
 		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox" />
 	<Style x:Key="TextBoxPlus.Small" BasedOn="{StaticResource TextBoxPlusBaseStyle}" TargetType="hc:TextBox">
 		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
 		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
-		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,3" />
-		<Setter Property="Padding" Value="6,0" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
 	</Style>
 	<Style BasedOn="{StaticResource MenuItemBaseStyle}" TargetType="MenuItem" />
 	<Style BasedOn="{StaticResource MenuBaseStyle}" TargetType="Menu" />
@@ -9624,54 +9592,41 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="NumericUpDownBaseStyle" TargetType="hc:NumericUpDown">
-		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+	<Style x:Key="NumericUpDownBaseStyle" BasedOn="{StaticResource InputElementBaseStyle}" TargetType="hc:NumericUpDown">
 		<Setter Property="CaretBrush" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
 		<Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
 		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
 		<Setter Property="AllowDrop" Value="true" />
-		<Setter Property="Padding" Value="{StaticResource DefaultInputPadding}" />
-		<Setter Property="MinHeight" Value="{StaticResource DefaultControlHeight}" />
 		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
 		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:NumericUpDown">
-					<Border x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
+					<hc:SimplePanel x:Name="root">
+						<Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<hc:WatermarkTextBox Focusable="True" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-							<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-							<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
+							<Grid.RowDefinitions>
+								<RowDefinition />
+								<RowDefinition />
+							</Grid.RowDefinitions>
+							<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+							<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+							<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
 						</Grid>
-					</Border>
+					</hc:SimplePanel>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.4" />
+							<Setter Property="Opacity" TargetName="root" Value="0.4" />
 						</Trigger>
 						<Trigger Property="IsMouseOver" Value="true">
 							<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 						</Trigger>
 						<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-							<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-						</Trigger>
-						<Trigger Property="ShowUpDownButton" Value="False">
-							<Setter Property="Margin" TargetName="PART_TextBox" Value="2,0,2,1" />
-						</Trigger>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-							<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+							<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
@@ -9684,31 +9639,35 @@
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 			<Trigger Property="IsReadOnly" Value="True">
 				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
@@ -9722,35 +9681,35 @@
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox Margin="-2,0" CaretBrush="{TemplateBinding CaretBrush}" Focusable="True" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="5,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="5,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="1" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border x:Name="border" Grid.Column="1" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="1" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
@@ -9768,139 +9727,102 @@
 		</Style.Triggers>
 	</Style>
 	<ControlTemplate x:Key="NumericUpDownPlusTopTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid>
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Double2GridLengthConverter}}" />
 			</Grid.RowDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Row="1" />
 			<DockPanel Grid.ColumnSpan="2" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{TemplateBinding Padding}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
-				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Margin="1,0,1,0" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
+				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Row="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid>
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" x:Name="PART_TextBox" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Row="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Row="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
 					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 					<Condition Property="IsReadOnly" Value="False" />
 				</MultiTrigger.Conditions>
 				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<ControlTemplate x:Key="NumericUpDownPlusLeftTemplate" TargetType="hc:NumericUpDown">
-		<ControlTemplate.Resources>
-			<Storyboard x:Key="StoryboardShow">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,-18" Duration="0:0:.2" />
-			</Storyboard>
-			<Storyboard x:Key="StoryboardHidden">
-				<ThicknessAnimation Storyboard.TargetName="PART_ErrorTip" Storyboard.TargetProperty="Margin" To="9,0,0,4" Duration="0:0:0" />
-			</Storyboard>
-		</ControlTemplate.Resources>
 		<Grid MinHeight="{Binding Path=(hc:InfoElement.MinContentHeight),RelativeSource={RelativeSource TemplatedParent}}" Height="{Binding Path=(hc:InfoElement.ContentHeight),RelativeSource={RelativeSource TemplatedParent}}">
 			<Grid.ColumnDefinitions>
 				<ColumnDefinition Width="{Binding Path=(hc:InfoElement.TitleWidth),RelativeSource={RelativeSource TemplatedParent}}" />
 				<ColumnDefinition />
 			</Grid.ColumnDefinitions>
-			<TextBlock FontSize="12" Text="{TemplateBinding ErrorStr}" Name="PART_ErrorTip" VerticalAlignment="Bottom" Margin="9,0,0,4" Foreground="{DynamicResource DangerBrush}" Grid.Column="1" />
-			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="0,7,6,7">
+			<DockPanel Grid.Column="0" LastChildFill="True" Visibility="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource String2VisibilityConverter}}" HorizontalAlignment="{Binding Path=(hc:TitleElement.HorizontalAlignment),RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="{Binding Path=(hc:TitleElement.VerticalAlignment),RelativeSource={RelativeSource TemplatedParent}}" Margin="{Binding Path=(hc:TitleElement.MarginOnTheLeft),RelativeSource={RelativeSource TemplatedParent}}">
 				<ContentPresenter DockPanel.Dock="Right" TextElement.Foreground="{DynamicResource DangerBrush}" Margin="4,0,0,0" Content="{Binding Path=(hc:InfoElement.Symbol),RelativeSource={RelativeSource TemplatedParent}}" Visibility="{Binding Path=(hc:InfoElement.Necessary),RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource Boolean2VisibilityConverter}}" />
 				<TextBlock hc:TextBlockAttach.AutoTooltip="True" TextWrapping="NoWrap" TextTrimming="CharacterEllipsis" Text="{Binding Path=(hc:InfoElement.Title),RelativeSource={RelativeSource TemplatedParent}}" />
 			</DockPanel>
-			<Border Grid.Column="1" x:Name="templateRoot" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
-				<Grid x:Name="PART_Root" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="25" />
-					</Grid.ColumnDefinitions>
-					<hc:WatermarkTextBox x:Name="PART_TextBox" CaretBrush="{TemplateBinding CaretBrush}" Padding="{TemplateBinding Padding}" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" Grid.Column="0" Focusable="{TemplateBinding Focusable}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Grid.Row="0" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
-					<Button Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" Name="PART_ButtonClear" Width="16" Visibility="Collapsed" Grid.Column="1" Style="{StaticResource ButtonIcon}" Padding="0,6" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{Binding BorderBrush,ElementName=templateRoot}" />
-					<Button x:Name="UpButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" Padding="0,7,5,1" Margin="0,0,0,14" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-					<Button x:Name="DownButton" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" Padding="0,1,5,7" Margin="0,14,0,0" Focusable="False" Grid.Column="2" Foreground="{Binding BorderBrush,ElementName=templateRoot}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" Width="30" VerticalAlignment="Center" Height="14" />
-				</Grid>
-			</Border>
+			<Border Grid.Column="1" x:Name="border" CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" />
+			<Grid Grid.Column="1" SnapsToDevicePixels="true" x:Name="root">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+				<hc:WatermarkTextBox Grid.RowSpan="2" Focusable="True" Watermark="{Binding Path=(hc:InfoElement.Placeholder),RelativeSource={RelativeSource TemplatedParent}}" CaretBrush="{TemplateBinding CaretBrush}" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" x:Name="PART_TextBox" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsReadOnly="{TemplateBinding IsReadOnly}" />
+				<Button Grid.RowSpan="2" Height="{x:Static system:Double.NaN}" Command="interactivity:ControlCommands.Clear" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,0,1'}" Visibility="Collapsed" Name="ButtonClear" Grid.Column="1" Style="{StaticResource ButtonIcon}" hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}" Foreground="{TemplateBinding BorderBrush}" />
+				<Button x:Name="UpButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="0" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Prev" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,1,1,0'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource UpGeometry}" Style="{StaticResource ButtonIcon}" />
+				<Button x:Name="DownButton" IsEnabled="{TemplateBinding IsReadOnly, Converter={StaticResource Boolean2BooleanReConverter}}" Height="{x:Static system:Double.NaN}" Grid.Row="1" Visibility="{TemplateBinding ShowUpDownButton,Converter={StaticResource Boolean2VisibilityConverter}}" Command="interactivity:ControlCommands.Next" hc:IconElement.Height="6" hc:IconElement.Width="14" Padding="{Binding Padding, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ThicknessSplitConverter}, ConverterParameter='0,0,1,1'}" Focusable="False" Grid.Column="2" Foreground="{TemplateBinding BorderBrush}" hc:IconElement.Geometry="{StaticResource DownGeometry}" Style="{StaticResource ButtonIcon}" />
+			</Grid>
 		</Grid>
 		<ControlTemplate.Triggers>
 			<Trigger Property="IsEnabled" Value="false">
-				<Setter Property="Opacity" TargetName="templateRoot" Value="0.4" />
+				<Setter Property="Opacity" TargetName="border" Value="0.4" />
+				<Setter Property="Opacity" TargetName="root" Value="0.4" />
 			</Trigger>
-			<Trigger Property="IsMouseOver" Value="true" SourceName="templateRoot">
+			<Trigger Property="IsMouseOver" Value="true" SourceName="root">
 				<Setter Property="BorderBrush" Value="{DynamicResource SecondaryBorderBrush}" />
 			</Trigger>
-			<Trigger Property="IsReadOnly" Value="True">
-				<Setter Property="IsEnabled" TargetName="UpButton" Value="False" />
-				<Setter Property="IsEnabled" TargetName="DownButton" Value="False" />
-			</Trigger>
 			<MultiTrigger>
 				<MultiTrigger.Conditions>
 					<Condition Property="IsMouseOver" Value="true" />
-					<Condition Property="ShowClearButton" Value="True" />
+					<Condition Property="hc:InfoElement.ShowClearButton" Value="True" />
 					<Condition Property="IsReadOnly" Value="False" />
 				</MultiTrigger.Conditions>
-				<Setter Property="Visibility" Value="Visible" TargetName="PART_ButtonClear" />
+				<Setter Property="Visibility" Value="Visible" TargetName="ButtonClear" />
 			</MultiTrigger>
 			<Trigger Property="IsFocused" Value="true" SourceName="PART_TextBox">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource PrimaryBrush}" />
-			</Trigger>
-			<Trigger Property="IsError" Value="true">
-				<Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DangerBrush}" />
-				<Trigger.EnterActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardShow}" />
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard Storyboard="{StaticResource StoryboardHidden}" />
-				</Trigger.ExitActions>
+				<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="NumericUpDownPlusBaseStyle" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown">
-		<Setter Property="IsError" Value="{Binding Path=(Validation.HasError),RelativeSource={RelativeSource Self}}" />
 		<Setter Property="Template" Value="{StaticResource NumericUpDownPlusTopTemplate}" />
 		<Style.Triggers>
 			<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">
@@ -10396,7 +10318,7 @@
 										<Rectangle Width="16" Height="16" Fill="{StaticResource SortByNameDrawingBrush}" />
 									</RadioButton>
 								</hc:ButtonGroup>
-								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
+								<hc:SearchBar x:Name="PART_SearchBar" IsRealTime="True" hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}" />
 							</DockPanel>
 							<hc:PropertyItemsControl Grid.Row="1" x:Name="PART_ItemsControl" Style="{StaticResource PropertyItemsControlBaseStyle}">
 								<hc:PropertyItemsControl.GroupStyle>
@@ -13128,8 +13050,26 @@
 	</Style>
 	<Style BasedOn="{StaticResource NavigationWindowBaseStyle}" TargetType="NavigationWindow" />
 	<Style BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDown.Small" BasedOn="{StaticResource NumericUpDownBaseStyle}" TargetType="hc:NumericUpDown">
+		<Setter Property="MinHeight" Value="20" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+	</Style>
 	<Style x:Key="NumericUpDownExtend" BasedOn="{StaticResource NumericUpDownExtendBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownExtend.Small" BasedOn="{StaticResource NumericUpDownExtend}" TargetType="hc:NumericUpDown">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="NumericUpDownPlus" BasedOn="{StaticResource NumericUpDownPlusBaseStyle}" TargetType="hc:NumericUpDown" />
+	<Style x:Key="NumericUpDownPlus.Small" BasedOn="{StaticResource NumericUpDownPlus}" TargetType="hc:NumericUpDown">
+		<Setter Property="hc:InfoElement.MinContentHeight" Value="20" />
+		<Setter Property="hc:InfoElement.ContentHeight" Value="20" />
+		<Setter Property="hc:TitleElement.MarginOnTheLeft" Value="0,3,6,0" />
+		<Setter Property="Padding" Value="6,2,6,1" />
+		<Setter Property="MinHeight" Value="20" />
+	</Style>
 	<Style x:Key="PaginationButtonStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
 		<Setter Property="GroupName" Value="1" />
 		<Setter Property="MinWidth" Value="30" />
diff --git a/src/Shared/HandyControl_Shared/Tools/ValidationRule/NoBlankTextRule.cs b/src/Shared/HandyControl_Shared/Tools/ValidationRule/NoBlankTextRule.cs
new file mode 100644
index 00000000..8f6aa029
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/ValidationRule/NoBlankTextRule.cs
@@ -0,0 +1,24 @@
+using System.Globalization;
+using System.Windows.Controls;
+
+namespace HandyControl.Tools;
+
+public class NoBlankTextRule : ValidationRule
+{
+    public string ErrorContent { get; set; } = Properties.Langs.Lang.IsNecessary;
+
+    public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+    {
+        if (value is not string text)
+        {
+            return new ValidationResult(false, Properties.Langs.Lang.FormatError);
+        }
+
+        if (string.IsNullOrEmpty(text))
+        {
+            return new ValidationResult(false, ErrorContent);
+        }
+
+        return ValidationResult.ValidResult;
+    }
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/ValidationRule/RegexRule.cs b/src/Shared/HandyControl_Shared/Tools/ValidationRule/RegexRule.cs
new file mode 100644
index 00000000..c3a425ed
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/ValidationRule/RegexRule.cs
@@ -0,0 +1,44 @@
+using System.Globalization;
+using System.Windows.Controls;
+using HandyControl.Data;
+
+namespace HandyControl.Tools;
+
+public class RegexRule : ValidationRule
+{
+    public TextType Type { get; set; }
+
+    public string Pattern { get; set; }
+
+    public string ErrorContent { get; set; } = Properties.Langs.Lang.FormatError;
+
+    public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+    {
+        if (value is not string text)
+        {
+            return CreateErrorValidationResult();
+        }
+
+        if (!string.IsNullOrEmpty(Pattern))
+        {
+            if (!text.IsKindOf(Pattern))
+            {
+                return CreateErrorValidationResult();
+            }
+        }
+        else if (Type != TextType.Common)
+        {
+            if (!text.IsKindOf(Type))
+            {
+                return CreateErrorValidationResult();
+            }
+        }
+
+        return ValidationResult.ValidResult;
+    }
+
+    private ValidationResult CreateErrorValidationResult()
+    {
+        return new ValidationResult(false, ErrorContent);
+    }
+}

From bbf1b7d4c6e1754ed24a1f2a9b7d26247a805326 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 20:28:58 +0800
Subject: [PATCH 20/32] chore: use file-scoped namespace

---
 .../HandyControlDemo_Shared/App.xaml.cs       |  163 +-
 .../HandyControlDemo_Shared/Data/AppConfig.cs |   15 +-
 .../Data/Enum/DemoType.cs                     |   21 +-
 .../Data/GlobalData.cs                        |   45 +-
 .../Data/MessageToken.cs                      |   61 +-
 .../Data/Model/AvatarModel.cs                 |   15 +-
 .../Data/Model/CardModel.cs                   |   15 +-
 .../Data/Model/ChatInfoModel.cs               |   19 +-
 .../Data/Model/CoverViewDemoModel.cs          |   15 +-
 .../Data/Model/DemoDataModel.cs               |   23 +-
 .../Data/Model/DemoInfoModel.cs               |   43 +-
 .../Data/Model/DemoItemModel.cs               |   51 +-
 .../Data/Model/GeometryItemModel.cs           |   15 +-
 .../Data/Model/PropertyGridDemoModel.cs       |   41 +-
 .../Data/Model/StepBarDemoModel.cs            |   15 +-
 .../Data/Model/TabControlDemoModel.cs         |   15 +-
 .../MainWindow.xaml.cs                        |   61 +-
 .../Properties/Langs/LangProvider.cs          | 5087 ++++++++---------
 .../Resources/DemoTheme.cs                    |   23 +-
 .../Service/Data/DataService.cs               |  815 ++-
 .../Tools/Converter/HatchBrushConverter.cs    |   45 +-
 .../Tools/Converter/String2BrushConverter.cs  |   25 +-
 .../Tools/Converter/StringRepeatConverter.cs  |   59 +-
 .../Tools/Extension/LangExtension.cs          |   13 +-
 .../Tools/Helper/AssemblyHelper.cs            |   53 +-
 .../Tools/Helper/VersionHelper.cs             |   23 +-
 .../Tools/Helper/Win32Helper.cs               |   19 +-
 .../Tools/HighlightingProvider.cs             |  125 +-
 .../UserControl/Basic/Avatar.xaml.cs          |   67 +-
 .../UserControl/Basic/ChatBox.xaml.cs         |   31 +-
 .../UserControl/Basic/GeometryItem.xaml.cs    |   25 +-
 .../UserControl/Basic/IFull.cs                |   11 +-
 .../Basic/InteractiveDialog.xaml.cs           |   13 +-
 .../UserControl/Basic/TextDialog.xaml.cs      |   13 +-
 .../Basic/TextDialogWithTimer.xaml.cs         |   31 +-
 .../Controls/AnimationPathDemoCtl.xaml.cs     |   13 +-
 .../AutoCompleteTextBoxDemoCtl.xaml.cs        |   13 +-
 .../UserControl/Controls/BadgeDemoCtl.xaml.cs |   13 +-
 .../Controls/ButtonGroupDemoCtl.xaml.cs       |   67 +-
 .../Controls/CalendarWithClockDemoCtl.xaml.cs |   13 +-
 .../UserControl/Controls/CardDemoCtl.xaml.cs  |   13 +-
 .../Controls/CarouselDemoCtl.xaml.cs          |   13 +-
 .../Controls/ChatBubbleDemoCtl.xaml.cs        |   13 +-
 .../Controls/CheckComboBoxDemoCtl.xaml.cs     |   13 +-
 .../Controls/CirclePanelDemoCtl.xaml.cs       |   13 +-
 .../UserControl/Controls/ClockDemoCtl.xaml.cs |   13 +-
 .../Controls/ColorPickerDemoCtl.xaml.cs       |   13 +-
 .../Controls/ComboBoxDemoCtl.xaml.cs          |   13 +-
 .../Controls/CompareSliderDemoCtl.xaml.cs     |   13 +-
 .../Controls/CoverFlowDemoCtl.xaml.cs         |   41 +-
 .../Controls/CoverViewDemoCtl.xaml.cs         |   13 +-
 .../Controls/DatePickerDemoCtl.xaml.cs        |   13 +-
 .../Controls/DateTimePickerDemoCtl.xaml.cs    |   13 +-
 .../Controls/DialogDemoCtl.xaml.cs            |   13 +-
 .../Controls/DividerDemoCtl.xaml.cs           |   13 +-
 .../Controls/DrawerDemoCtl.xaml.cs            |   13 +-
 .../Controls/ElementGroupDemoCtl.xaml.cs      |   13 +-
 .../Controls/FlexPanelDemoCtl.xaml.cs         |   13 +-
 .../Controls/FlipClockDemoCtl.xaml.cs         |   13 +-
 .../Controls/FloatingBlockDemoCtl.xaml.cs     |   13 +-
 .../Controls/GifImageDemoCtl.xaml.cs          |   25 +-
 .../Controls/GotoTopDemoCtl.xaml.cs           |   13 +-
 .../Controls/GravatarDemoCtl.xaml.cs          |   13 +-
 .../UserControl/Controls/GridDemoCtl.xaml.cs  |   13 +-
 .../UserControl/Controls/GrowlDemoCtl.xaml.cs |   13 +-
 .../Controls/HoneycombPanelDemoCtl.xaml.cs    |   13 +-
 .../Controls/ImageBlockDemoCtl.xaml.cs        |   13 +-
 .../Controls/ImageBrowserDemoCtl.xaml.cs      |   13 +-
 .../Controls/ImageSelectorDemoCtl.xaml.cs     |   13 +-
 .../Controls/LoadingDemoCtl.xaml.cs           |   13 +-
 .../Controls/MagnifierDemoCtl.xaml.cs         |   13 +-
 .../Controls/NotificationDemoCtl.xaml.cs      |   13 +-
 .../Controls/NotifyIconDemoCtl.xaml.cs        |   25 +-
 .../Controls/NumericUpDownDemoCtl.xaml.cs     |   13 +-
 .../Controls/OutlineTextDemoCtl.xaml.cs       |   13 +-
 .../Controls/PaginationDemoCtl.xaml.cs        |   13 +-
 .../Controls/PasswordBoxDemoCtl.xaml.cs       |   13 +-
 .../Controls/PinBoxDemoCtl.xaml.cs            |   27 +-
 .../Controls/PoptipDemoCtl.xaml.cs            |   13 +-
 .../Controls/PreviewSliderDemoCtl.xaml.cs     |   13 +-
 .../Controls/ProgressBarDemoCtl.xaml.cs       |   13 +-
 .../Controls/ProgressButtonDemoCtl.xaml.cs    |  105 +-
 .../Controls/PropertyGridDemoCtl.xaml.cs      |   47 +-
 .../Controls/RangeSliderDemoCtl.xaml.cs       |   13 +-
 .../UserControl/Controls/RateDemoCtl.xaml.cs  |   13 +-
 .../Controls/RelativePanelDemoCtl.xaml.cs     |   13 +-
 .../Controls/RunningBlockDemoCtl.xaml.cs      |   13 +-
 .../Controls/ScreenshotDemoCtl.xaml.cs        |   45 +-
 .../Controls/ScrollViewerDemoCtl.xaml.cs      |   13 +-
 .../Controls/SearchBarDemoCtl.xaml.cs         |   13 +-
 .../Controls/ShieldDemoCtl.xaml.cs            |   13 +-
 .../Controls/SideMenuDemoCtl.xaml.cs          |   13 +-
 .../Controls/SplitButtonDemoCtl.xaml.cs       |   25 +-
 .../Controls/SpriteDemoCtl.xaml.cs            |   13 +-
 .../Controls/StepBarDemoCtl.xaml.cs           |   13 +-
 .../Controls/TabControlDemoCtl.xaml.cs        |   13 +-
 .../UserControl/Controls/TagDemoCtl.xaml.cs   |   13 +-
 .../Controls/TextBoxDemoCtl.xaml.cs           |   13 +-
 .../Controls/TimeBarDemoCtl.xaml.cs           |   27 +-
 .../Controls/TimePickerDemoCtl.xaml.cs        |   13 +-
 .../Controls/TransferDemoCtl.xaml.cs          |   13 +-
 ...TransitioningContentControlDemoCtl.xaml.cs |   13 +-
 .../UniformSpacingPanelDemoCtl.xaml.cs        |   13 +-
 .../Controls/WaterfallPanelDemoCtl.xaml.cs    |   13 +-
 .../Controls/WindowDemoCtl.xaml.cs            |  109 +-
 .../UserControl/Main/AppNotification.xaml.cs  |   13 +-
 .../UserControl/Main/AppSprite.xaml.cs        |   13 +-
 .../UserControl/Main/BlogsView.xaml.cs        |   13 +-
 .../UserControl/Main/ContributorsView.xaml.cs |   13 +-
 .../UserControl/Main/LeftMainContent.xaml.cs  |  159 +-
 .../UserControl/Main/MainContent.xaml.cs      |  315 +-
 .../Main/MainWindowContent.xaml.cs            |   13 +-
 .../UserControl/Main/NonClientAreaContent.cs  |   91 +-
 .../UserControl/Main/PracticalDemo.cs         |   13 +-
 .../UserControl/Main/ProjectsView.xaml.cs     |   13 +-
 .../Main/UnderConstruction.xaml.cs            |   13 +-
 .../UserControl/Main/WebsitesView.xaml.cs     |   13 +-
 .../UserControl/Practical/Login.xaml.cs       |   13 +-
 .../UserControl/Styles/BorderDemoCtl.xaml.cs  |   13 +-
 .../UserControl/Styles/BrushDemoCtl.xaml.cs   |   13 +-
 .../UserControl/Styles/ButtonDemoCtl.xaml.cs  |   13 +-
 .../Styles/CalendarDemoCtl.xaml.cs            |   13 +-
 .../Styles/CheckBoxDemoCtl.xaml.cs            |   13 +-
 .../Styles/DataGridDemoCtl.xaml.cs            |   13 +-
 .../Styles/ExpanderDemoCtl.xaml.cs            |   13 +-
 .../Styles/FlowDocumentDemoCtl.xaml.cs        |   13 +-
 .../UserControl/Styles/FrameDemoCtl.xaml.cs   |   79 +-
 .../Styles/GeometryDemoCtl.xaml.cs            |   47 +-
 .../Styles/GroupBoxDemoCtl.xaml.cs            |   13 +-
 .../UserControl/Styles/LabelDemoCtl.xaml.cs   |   13 +-
 .../UserControl/Styles/ListBoxDemoCtl.xaml.cs |   13 +-
 .../Styles/ListViewDemoCtl.xaml.cs            |   13 +-
 .../UserControl/Styles/MenuDemoCtl.xaml.cs    |   13 +-
 .../Styles/NativeComboBoxDemoCtl.xaml.cs      |   13 +-
 .../Styles/NativeDatePickerDemoCtl.xaml.cs    |   13 +-
 .../Styles/NativePasswordBoxDemoCtl.xaml.cs   |   13 +-
 .../Styles/NativeProgressBarDemoCtl.xaml.cs   |   13 +-
 .../Styles/NativeScrollViewerDemoCtl.xaml.cs  |   13 +-
 .../Styles/NativeTabControlDemoCtl.xaml.cs    |   13 +-
 .../Styles/NativeTextBoxDemoCtl.xaml.cs       |   13 +-
 .../Styles/NativeWindowDemoCtl.xaml.cs        |   13 +-
 .../Styles/RadioButtonDemoCtl.xaml.cs         |   13 +-
 .../Styles/RepeatButtonDemoCtl.xaml.cs        |   13 +-
 .../Styles/RichTextBoxDemoCtl.xaml.cs         |   13 +-
 .../UserControl/Styles/SliderDemoCtl.xaml.cs  |   13 +-
 .../Styles/TextBlockDemoCtl.xaml.cs           |   13 +-
 .../Styles/ToggleButtonDemoCtl.xaml.cs        |   13 +-
 .../UserControl/Styles/ToolBarDemoCtl.xaml.cs |   13 +-
 .../Styles/TreeViewDemoCtl.xaml.cs            |   13 +-
 .../UserControl/Tools/EffectsDemoCtl.xaml.cs  |   13 +-
 .../Tools/GeometryAnimationDemoCtl.xaml.cs    |   13 +-
 .../Tools/HatchBrushGeneratorDemoCtl.xaml.cs  |   13 +-
 .../ViewModel/Basic/ChatBoxViewModel.cs       |  251 +-
 .../Basic/InteractiveDialogViewModel.cs       |   39 +-
 .../AutoCompleteTextBoxDemoViewModel.cs       |   81 +-
 .../ViewModel/Controls/BadgeDemoViewModel.cs  |   25 +-
 .../ViewModel/Controls/CardDemoViewModel.cs   |   39 +-
 .../ViewModel/Controls/CoverViewModel.cs      |   11 +-
 .../ViewModel/Controls/DialogDemoViewModel.cs |   77 +-
 .../ViewModel/Controls/GrowlDemoViewModel.cs  |  133 +-
 .../Controls/ImageBrowserDemoViewModel.cs     |   13 +-
 .../Controls/NotificationDemoViewModel.cs     |   35 +-
 .../Controls/NotifyIconDemoViewModel.cs       |  147 +-
 .../Controls/PaginationDemoViewModel.cs       |   79 +-
 .../Controls/SideMenuDemoViewModel.cs         |   17 +-
 .../Controls/SplitButtonDemoViewModel.cs      |   11 +-
 .../ViewModel/Controls/SpriteDemoViewModel.cs |   11 +-
 .../Controls/StepBarDemoViewModel.cs          |   65 +-
 .../Controls/TabControlDemoViewModel.cs       |   35 +-
 .../ViewModel/Controls/TagDemoViewModel.cs    |   53 +-
 .../ViewModel/Controls/WindowDemoViewModel.cs |   23 +-
 .../ViewModel/DemoViewModelBase`1.cs          |   33 +-
 .../ViewModel/Main/ItemsDisplayViewModel.cs   |   25 +-
 .../ViewModel/Main/MainViewModel.cs           |  275 +-
 .../ViewModel/Main/NonClientAreaViewModel.cs  |   39 +-
 .../ViewModel/ViewModelLocator.cs             |  189 +-
 .../Window/AboutWindow.xaml.cs                |   55 +-
 .../Window/BlurWindow.xaml.cs                 |   13 +-
 .../Window/CommonWindow.xaml.cs               |   13 +-
 .../Window/CustomNonClientAreaWindow.xaml.cs  |   13 +-
 .../Window/DialogDemoWindow.xaml.cs           |   37 +-
 .../Window/GlowWindow.xaml.cs                 |   13 +-
 .../Window/GrowlDemoWindow.xaml.cs            |   13 +-
 .../Window/NativeCommonWindow.xaml.cs         |   13 +-
 .../Window/NavigationWindow.xaml.cs           |   79 +-
 .../NoNonClientAreaDragableWindow.xaml.cs     |   19 +-
 .../Window/TouchDragMoveWindow.xaml.cs        |   49 +-
 .../ManualObservableCollection`1.cs           |  135 +-
 .../Collections/Pool/IPool`1.cs               |   15 +-
 .../Collections/Pool/SimplePool`1.cs          |   91 +-
 .../Collections/Pool/SynchronizedPool`1.cs    |   43 +-
 .../Collections/Queue/Deque`1.cs              |  625 +-
 .../Attach/BackgroundSwitchElement.cs         |   25 +-
 .../Controls/Attach/BorderElement.cs          |   71 +-
 .../Controls/Attach/DataGridAttach.cs         |  561 +-
 .../Controls/Attach/DropDownElement.cs        |   37 +-
 .../Controls/Attach/EdgeElement.cs            |   55 +-
 .../Controls/Attach/GridAttach.cs             |  155 +-
 .../Controls/Attach/IconElement.cs            |   45 +-
 .../Controls/Attach/IconSwitchElement.cs      |   29 +-
 .../Controls/Attach/ImageAttach.cs            |   55 +-
 .../Controls/Attach/InfoElement.cs            |  131 +-
 .../Controls/Attach/MenuTopLineAttach.cs      |  187 +-
 .../Controls/Attach/PanelElement.cs           |   65 +-
 .../Controls/Attach/PasswordBoxAttach.cs      |   73 +-
 .../Controls/Attach/RectangleAttach.cs        |   63 +-
 .../Controls/Attach/ScrollViewerAttach.cs     |   85 +-
 .../Controls/Attach/StatusSwitchElement.cs    |   37 +-
 .../Controls/Attach/TextBlockAttach.cs        |  101 +-
 .../Controls/Attach/TipElement.cs             |   37 +-
 .../Controls/Attach/TitleElement.cs           |  113 +-
 .../Controls/Attach/VisualElement.cs          |   69 +-
 .../Controls/Attach/WindowAttach.cs           |  267 +-
 .../Controls/Base/AdornerElement.cs           |  155 +-
 .../Controls/Base/HeaderedSelectableItem.cs   |   39 +-
 .../Base/HeaderedSimpleItemsControl.cs        |   23 +-
 .../Controls/Base/IGravatarGenerator.cs       |   11 +-
 .../Controls/Base/ISelectable.cs              |   15 +-
 .../Controls/Base/ISingleOpen.cs              |   11 +-
 .../Controls/Base/RegularItemsControl.cs      |   69 +-
 .../Controls/Base/SelectableItem.cs           |  185 +-
 .../Controls/Base/SimpleItemsControl.cs       |  277 +-
 .../Controls/Block/FloatingBlock.cs           |  337 +-
 .../Block/RunningBlock/RunningBlock.cs        |  357 +-
 .../Block/RunningBlock/RunningBorder.cs       |  107 +-
 .../Controls/Block/ToggleBlock.cs             |   97 +-
 .../Controls/Button/ButtonGroup.cs            |   55 +-
 .../Controls/Button/ContextMenuButton.cs      |   31 +-
 .../Button/ContextMenuToggleButton.cs         |   41 +-
 .../Controls/Button/ProgressButton.cs         |   39 +-
 .../Controls/Button/SplitButton.cs            |  135 +-
 .../Controls/Carousel/Carousel.cs             |  787 ++-
 .../Controls/Carousel/CarouselItem.cs         |   11 +-
 .../Controls/ColorPicker/ColorDropper.cs      |  171 +-
 .../Controls/ColorPicker/ColorPicker.cs       | 1401 +++--
 .../Controls/Cover/CoverFlow/CoverFlow.cs     |  503 +-
 .../Controls/Cover/CoverFlow/CoverFlowItem.cs |  257 +-
 .../Controls/Cover/CoverView/CoverView.cs     |  739 ++-
 .../Cover/CoverView/CoverViewContent.cs       |  219 +-
 .../Controls/Cover/CoverView/CoverViewItem.cs |   11 +-
 .../Controls/Dialog/Dialog.cs                 |  263 +-
 .../Controls/Dialog/DialogContainer.cs        |   11 +-
 .../Controls/Drawer/Drawer.cs                 |  817 ++-
 .../Controls/Drawer/DrawerContainer.cs        |   11 +-
 .../Controls/Growl/Growl.cs                   | 1741 +++---
 .../Controls/Growl/GrowlWindow.cs             |   57 +-
 .../Controls/Image/GifImage.cs                |  947 ++-
 .../Controls/Image/ImageBlock.cs              |  431 +-
 .../Controls/Image/ImageViewer.cs             | 1699 +++---
 .../AutoCompleteTextBox.cs                    |  265 +-
 .../AutoCompleteTextBoxItem.cs                |   11 +-
 .../Input/CheckComboBox/CheckComboBox.cs      |  501 +-
 .../Input/CheckComboBox/CheckComboBoxItem.cs  |   11 +-
 .../Controls/Input/ComboBox.cs                |  623 +-
 .../Controls/Input/DatePicker.cs              |  225 +-
 .../Controls/Input/DateTimePicker.cs          | 1227 ++--
 .../Controls/Input/IDataInput.cs              |   61 +-
 .../Controls/Input/ImageSelector.cs           |  229 +-
 .../Controls/Input/NumericUpDown.cs           |  539 +-
 .../Controls/Input/PasswordBox.cs             |  599 +-
 .../Controls/Input/PinBox.cs                  |  601 +-
 .../Controls/Input/SearchBar.cs               |  237 +-
 .../Controls/Input/TextBox.cs                 |   17 +-
 .../Controls/Input/TimePicker.cs              | 1199 ++--
 .../Controls/Input/WatermarkTextBox.cs        |   47 +-
 .../Controls/Loading/LoadingBase.cs           |  243 +-
 .../Controls/Loading/LoadingCircle.cs         |  335 +-
 .../Controls/Loading/LoadingLine.cs           |  177 +-
 .../Controls/Other/AnimationPath.cs           |  311 +-
 .../Controls/Other/Badge.cs                   |  183 +-
 .../Controls/Other/BlendEffectBox.cs          |  179 +-
 .../Controls/Other/Card.cs                    |  159 +-
 .../Controls/Other/ChatBubble.cs              |   77 +-
 .../Controls/Other/DashedBorder.cs            | 1139 ++--
 .../Controls/Other/Divider.cs                 |  147 +-
 .../Controls/Other/Empty.cs                   |   57 +-
 .../Controls/Other/GotoTop.cs                 |  159 +-
 .../Controls/Other/Gravatar.cs                |   97 +-
 .../Controls/Other/Magnifier.cs               |  275 +-
 .../Controls/Other/Notification.cs            |  259 +-
 .../Controls/Other/NotifyIcon.cs              | 1331 +++--
 .../Controls/Other/Pagination.cs              |  775 ++-
 .../Controls/Other/Poptip.cs                  |  617 +-
 .../Controls/Other/ScrollViewer.cs            |  353 +-
 .../Controls/Other/Shield.cs                  |   59 +-
 .../Controls/Other/Sprite.cs                  |   47 +-
 .../Other/TransitioningContentControl.cs      |  177 +-
 .../Controls/Other/Watermark.cs               |  309 +-
 .../Controls/Panel/AxleCanvas.cs              |   91 +-
 .../Controls/Panel/CirclePanel.cs             |  161 +-
 .../Controls/Panel/ElementGroup.cs            |  267 +-
 .../Controls/Panel/FlexPanel.cs               | 1215 ++--
 .../Controls/Panel/Grid/Col.cs                |  159 +-
 .../Controls/Panel/Grid/Row.cs                |  175 +-
 .../Controls/Panel/HoneycombPanel.cs          |  279 +-
 .../Controls/Panel/RelativePanel.cs           | 1187 ++--
 .../Controls/Panel/SimplePanel.cs             |   59 +-
 .../Controls/Panel/SimpleStackPanel.cs        |  187 +-
 .../Controls/Panel/UniformSpacingPanel.cs     |  647 ++-
 .../Controls/Panel/WaterfallPanel.cs          |  239 +-
 .../Controls/ProgressBar/CircleProgressBar.cs |  185 +-
 .../Controls/ProgressBar/WaveProgressBar.cs   |  203 +-
 .../Editors/DatePropertyEditor.cs             |   21 +-
 .../Editors/DateTimePropertyEditor.cs         |   21 +-
 .../Editors/EnumPropertyEditor.cs             |   23 +-
 .../HorizontalAlignmentPropertyEditor.cs      |   91 +-
 .../Editors/ImagePropertyEditor.cs            |  105 +-
 .../Editors/NumberPropertyEditor.cs           |   49 +-
 .../Editors/PlainTextPropertyEditor.cs        |   21 +-
 .../Editors/PropertyEditorBase.cs             |   37 +-
 .../Editors/ReadOnlyTextPropertyEditor.cs     |   21 +-
 .../Editors/SwitchPropertyEditor.cs           |   25 +-
 .../Editors/TimePropertyEditor.cs             |   21 +-
 .../VerticalAlignmentPropertyEditor.cs        |   91 +-
 .../Controls/PropertyGrid/PropertyGrid.cs     |  345 +-
 .../Controls/PropertyGrid/PropertyItem.cs     |  237 +-
 .../PropertyGrid/PropertyItemsControl.cs      |   17 +-
 .../Controls/PropertyGrid/PropertyResolver.cs |  225 +-
 .../HandyControl_Shared/Controls/Rate/Rate.cs |  519 +-
 .../Controls/Rate/RateItem.cs                 |  411 +-
 .../Controls/Screenshot/Screenshot.cs         |   15 +-
 .../Controls/Screenshot/ScreenshotWindow.cs   | 1261 ++--
 .../Controls/SideMenu/SideMenu.cs             |  423 +-
 .../Controls/SideMenu/SideMenuItem.cs         |  383 +-
 .../Slider/CompareSlider/CompareSlider.cs     |   39 +-
 .../Slider/CompareSlider/CompareTrack.cs      |  199 +-
 .../Controls/Slider/PreviewSlider.cs          |  321 +-
 .../Slider/RangeSlider/RangeSlider.cs         | 1159 ++--
 .../Controls/Slider/RangeSlider/RangeThumb.cs |   75 +-
 .../Controls/Slider/RangeSlider/RangeTrack.cs |  877 ++-
 .../Slider/RangeSlider/TwoWayRangeBase.cs     |  325 +-
 .../Controls/StepBar/StepBar.cs               |  307 +-
 .../Controls/StepBar/StepBarItem.cs           |   65 +-
 .../Controls/TabControl/TabControl.cs         |  777 ++-
 .../Controls/TabControl/TabItem.cs            |  879 ++-
 .../Controls/TabControl/TabPanel.cs           |  313 +-
 .../HandyControl_Shared/Controls/Tag/Tag.cs   |  255 +-
 .../Controls/Tag/TagContainer.cs              |   69 +-
 .../Controls/Text/HighlightTextBlock.cs       |  335 +-
 .../Controls/Text/OutlineText.cs              |  507 +-
 .../Controls/Text/SimpleText.cs               |  347 +-
 .../Controls/Time/CalendarWithClock.cs        |  491 +-
 .../Controls/Time/Clock/Clock.cs              |  585 +-
 .../Controls/Time/Clock/ClockBase.cs          |  195 +-
 .../Controls/Time/Clock/ClockRadioButton.cs   |   11 +-
 .../Controls/Time/Clock/ListClock.cs          |  251 +-
 .../Controls/Time/FlipClock/FlipClock.cs      |  157 +-
 .../Controls/Time/FlipClock/FlipNumber.cs     |  477 +-
 .../Controls/Time/TimeBar/SpeTextBlock.cs     |   87 +-
 .../Controls/Time/TimeBar/TimeBar.cs          | 1095 ++--
 .../Controls/Transfer/Transfer.cs             |  513 +-
 .../Controls/Transfer/TransferGroup.cs        |  109 +-
 .../Controls/Transfer/TransferItem.cs         |   39 +-
 .../Controls/Window/BlurWindow.cs             |  137 +-
 .../Controls/Window/GlowWindow.cs             |  777 ++-
 .../Controls/Window/ImageBrowser.cs           |  201 +-
 .../Controls/Window/MessageBox.cs             | 1203 ++--
 .../Controls/Window/PopupWindow.cs            |  427 +-
 .../Data/Args/CancelRoutedEventArgs.cs        |   17 +-
 .../Data/Args/FunctionEventArgs`1.cs          |   25 +-
 .../Data/Args/KeyboardHookEventArgs.cs        |   23 +-
 .../Data/Args/MouseHookEventArgs.cs           |   15 +-
 .../Data/DisposableObject.cs                  |  115 +-
 .../Data/Enum/BadgeStatus.cs                  |   15 +-
 .../Data/Enum/ChatMessageType.cs              |   17 +-
 .../Data/Enum/ChatRoleType.cs                 |   13 +-
 .../Data/Enum/ColLayoutStatus.cs              |   23 +-
 .../Data/Enum/DrawerShowMode.cs               |   15 +-
 .../Data/Enum/EnumDataProvider.cs             |  109 +-
 .../Data/Enum/ExpandMode.cs                   |   41 +-
 .../Data/Enum/HatchStyle.cs                   |  115 +-
 .../HandyControl_Shared/Data/Enum/HitMode.cs  |   17 +-
 .../Data/Enum/ImageCodecFlags.cs              |   29 +-
 .../HandyControl_Shared/Data/Enum/InfoType.cs |   21 +-
 .../HandyControl_Shared/Data/Enum/IpType.cs   |   51 +-
 .../Data/Enum/LinearLayout.cs                 |   15 +-
 .../Data/Enum/MouseHookMessageType.cs         |   21 +-
 .../Data/Enum/NotifyIconInfoType.cs           |   41 +-
 .../Data/Enum/PlacementType.cs                |  105 +-
 .../Data/Enum/ResultType.cs                   |   35 +-
 .../Data/Enum/ShowAnimation.cs                |   17 +-
 .../Data/Enum/SideMenuItemRole.cs             |   13 +-
 .../HandyControl_Shared/Data/Enum/SkinType.cs |   15 +-
 .../Data/Enum/StepStatus.cs                   |   35 +-
 .../Data/Enum/StrokePosition.cs               |   15 +-
 .../HandyControl_Shared/Data/Enum/TextType.cs |   49 +-
 .../Data/Enum/TitlePlacementType.cs           |   19 +-
 .../Data/Enum/TransitionMode.cs               |   29 +-
 .../Data/Enum/VisualWrapping.cs               |   13 +-
 .../HandyControl_Shared/Data/EnumItem.cs      |   15 +-
 .../Data/Flex/FlexContentAlignment.cs         |   21 +-
 .../Data/Flex/FlexContentJustify.cs           |   19 +-
 .../Data/Flex/FlexDirection.cs                |   17 +-
 .../Data/Flex/FlexItemAlignment.cs            |   21 +-
 .../Data/Flex/FlexItemsAlignment.cs           |   19 +-
 .../HandyControl_Shared/Data/Flex/FlexWrap.cs |   15 +-
 .../HandyControl_Shared/Data/Gif/GPStream.cs  |  505 +-
 .../Data/Gif/GifFrameDimension.cs             |   47 +-
 .../Data/Gif/GifImageInfo.cs                  |  161 +-
 .../Data/Gif/GifPropertyItem.cs               |   17 +-
 .../Data/Gif/GifPropertyItemInternal.cs       |  203 +-
 .../Data/GlowWindow/ChangeScope.cs            |   31 +-
 .../Data/GlowWindow/GlowBitmap.cs             |  177 +-
 .../Data/GlowWindow/GlowBitmapPart.cs         |   41 +-
 .../Data/GlowWindow/GlowDrawingContext.cs     |   89 +-
 .../Data/GlowWindow/GlowEdge.cs               | 1085 ++--
 .../Data/HandyControlConfig.cs                |   15 +-
 .../HandyControl_Shared/Data/HwndWrapper.cs   |  185 +-
 .../Data/Info/GrowlInfo.cs                    |   41 +-
 .../Data/Info/ImageCodecInfo.cs               |  283 +-
 .../Data/Info/MessageBoxInfo.cs               |   29 +-
 .../Data/Info/SystemVersionInfo.cs            |  141 +-
 .../Data/Operation/OperationResult.cs         |   43 +-
 .../Data/Operation/OperationResult`1.cs       |   35 +-
 .../HandyControl_Shared/Data/PanelUvSize.cs   |  115 +-
 .../Data/Range/ColorRange.cs                  |  109 +-
 .../Data/Range/DateTimeRange.cs               |   39 +-
 .../Data/Range/DoubleRange.cs                 |   15 +-
 .../Data/Range/IValueRange.cs                 |   15 +-
 .../HandyControl_Shared/Data/ResourceToken.cs |  379 +-
 .../HandyControl_Shared/Data/ValueBoxes.cs    |   57 +-
 .../Drawing/BezierCurveFlattener.cs           |  653 ++-
 .../Expression/Drawing/CommonExtensions.cs    |  151 +-
 .../Drawing/ExceptionStringTable.cs           |   49 +-
 .../Expression/Drawing/GeometryHelper.cs      |  423 +-
 .../Expression/Drawing/MarchLocation.cs       |   85 +-
 .../Expression/Drawing/MarchStopReason.cs     |   15 +-
 .../Expression/Drawing/MathHelper.cs          |  123 +-
 .../Expression/Drawing/PathFigureHelper.cs    |  203 +-
 .../Expression/Drawing/PathGeometryHelper.cs  |   33 +-
 .../Expression/Drawing/PathSegmentData.cs     |   23 +-
 .../Expression/Drawing/PathSegmentHelper.cs   | 1375 +++--
 .../Expression/Drawing/PolylineData.cs        |  273 +-
 .../Expression/Drawing/PolylineHelper.cs      |  181 +-
 .../Expression/Drawing/RandomEngine.cs        |   71 +-
 .../Expression/Drawing/SimpleSegment.cs       |  119 +-
 .../Expression/Media/ArcGeometrySource.cs     |  917 ++-
 .../Media/DrawingPropertyChangedEventArgs.cs  |   15 +-
 .../Media/DrawingPropertyMetadata.cs          |  123 +-
 .../Media/DrawingPropertyMetadataOptions.cs   |   17 +-
 .../Expression/Media/GeometryEffect.cs        |  265 +-
 .../Media/GeometryEffectConverter.cs          |   93 +-
 .../Expression/Media/GeometrySource`1.cs      |  123 +-
 .../Media/IArcGeometrySourceParameters.cs     |   17 +-
 .../Expression/Media/IGeometrySource.cs       |   19 +-
 .../Media/IGeometrySourceExtensions.cs        |   43 +-
 .../Media/IGeometrySourceParameters.cs        |   15 +-
 .../Expression/Media/IShape.cs                |   25 +-
 .../Media/InvalidateGeometryReasons.cs        |   21 +-
 .../Expression/Media/SketchGeometryEffect.cs  |  241 +-
 .../Expression/Media/UnitType.cs              |   13 +-
 .../Expression/Shapes/Arc.cs                  |  105 +-
 .../Expression/Shapes/PrimitiveShape.cs       |  137 +-
 .../Interactivity/AdornerContainer.cs         |   65 +-
 .../Interactivity/AttachableCollection`1.cs   |  273 +-
 .../Interactivity/Behavior/Behavior.cs        |  151 +-
 .../Behavior/BehaviorCollection.cs            |   73 +-
 .../Interactivity/Behavior/Behavior`1.cs      |   17 +-
 .../Behavior/FluidMoveBehavior.cs             |  813 ++-
 .../Behavior/FluidMoveBehaviorBase.cs         |  337 +-
 .../Behavior/MouseDragElementBehavior.cs      |  663 ++-
 .../Behavior/MouseDragElementBehaviorEx.cs    |  702 ++-
 .../Commands/CloseWindowCommand.cs            |   27 +-
 .../Interactivity/Commands/ControlCommands.cs |  291 +-
 .../Interactivity/Commands/OpenLinkCommand.cs |   43 +-
 .../Commands/PushMainWindow2TopCommand.cs     |   25 +-
 .../Commands/ShutdownAppCommand.cs            |   15 +-
 .../Commands/StartScreenshotCommand.cs        |   15 +-
 .../Interactivity/DefaultTriggerAttribute.cs  |   83 +-
 .../Interactivity/EventToCommand.cs           |  315 +-
 .../Interactivity/EventTrigger.cs             |   47 +-
 .../Interactivity/EventTriggerBase.cs         |  541 +-
 .../Interactivity/EventTriggerBase`1.cs       |   35 +-
 .../Interactivity/ExceptionStringTable.cs     |   75 +-
 .../ExtendedVisualStateManager.cs             | 2071 ++++---
 .../Interactivity/FluidMoveScope.cs           |   13 +-
 .../Interactivity/IAttachedObject.cs          |   17 +-
 .../Interactivity/IEventArgsConverter.cs      |   11 +-
 .../Interactivity/Interaction.cs              |  137 +-
 .../Interactivity/InvokeCommandAction.cs      |  117 +-
 .../Interactivity/NameResolvedEventArgs.cs    |   23 +-
 .../Interactivity/NameResolver.cs             |  231 +-
 .../Interactivity/PreviewInvokeEventArgs.cs   |   11 +-
 .../Interactivity/RoutedEventTrigger.cs       |   45 +-
 .../Interactivity/TagType.cs                  |   13 +-
 .../Interactivity/TransitionEffect.cs         |   97 +-
 .../Interactivity/TriggerAction.cs            |  209 +-
 .../Interactivity/TriggerActionCollection.cs  |   79 +-
 .../Interactivity/TriggerAction`1.cs          |   19 +-
 .../Interactivity/TriggerBase.cs              |  193 +-
 .../Interactivity/TriggerCollection.cs        |   73 +-
 .../Interactivity/TypeConstraintAttribute.cs  |   21 +-
 .../Animation/DiscreteGeometryKeyFrame.cs     |   35 +-
 .../Media/Animation/EasingGeometryKeyFrame.cs |  105 +-
 .../Media/Animation/GeometryAnimation.cs      |  323 +-
 .../Media/Animation/GeometryAnimationBase.cs  |   77 +-
 .../GeometryAnimationUsingKeyFrames.cs        |  859 ++-
 .../Animation/GeometryKeyFrameCollection.cs   |  567 +-
 .../Media/Animation/LinearGeometryKeyFrame.cs |   65 +-
 .../Media/Animation/ResolvedKeyFrameEntry.cs  |   59 +-
 .../Media/Animation/SplineGeometryKeyFrame.cs |   95 +-
 .../Media/Effects/BrightnessEffect.cs         |   55 +-
 .../Media/Effects/ColorComplementEffect.cs    |   35 +-
 .../Media/Effects/ColorMatrixEffect.cs        |  475 +-
 .../Media/Effects/ContrastEffect.cs           |   55 +-
 .../Media/Effects/EffectBase.cs               |   21 +-
 .../Media/Effects/GrayScaleEffect.cs          |   55 +-
 .../Properties/Langs/LangProvider.cs          |  951 ++-
 .../Themes/SharedResourceDictionary.cs        |   51 +-
 .../HandyControl_Shared/Themes/Theme.cs       |  401 +-
 .../Converter/Boolean2BooleanReConverter.cs   |   37 +-
 .../Tools/Converter/Boolean2StrConverter.cs   |   33 +-
 .../Boolean2VisibilityReConverter.cs          |   25 +-
 .../Converter/BooleanArr2BooleanConverter.cs  |   47 +-
 .../BooleanArr2VisibilityConverter.cs         |   47 +-
 .../Converter/BorderCircularClipConverter.cs  |   37 +-
 .../Converter/BorderCircularConverter.cs      |   39 +-
 .../Tools/Converter/BorderClipConverter.cs    |   69 +-
 .../Tools/Converter/ColLayoutConverter.cs     |  243 +-
 .../Converter/Color2ChannelAConverter.cs      |   47 +-
 .../Tools/Converter/Color2HexStrConverter.cs  |   49 +-
 .../Converter/CornerRadiusSplitConverter.cs   |   41 +-
 ...aGridSelectAllButtonVisibilityConverter.cs |   65 +-
 .../Converter/Double2GridLengthConverter.cs   |   31 +-
 .../Tools/Converter/DoubleMinConverter.cs     |   39 +-
 .../Tools/Converter/Int2StrConverter.cs       |   49 +-
 .../Tools/Converter/Long2FileSizeConverter.cs |   87 +-
 .../Converter/Number2PercentageConverter.cs   |   41 +-
 .../Converter/Object2BooleanConverter.cs      |   19 +-
 .../Tools/Converter/Object2StringConverter.cs |   19 +-
 .../Converter/Object2VisibilityConverter.cs   |   25 +-
 .../Converter/Object2VisibilityReConverter.cs |   25 +-
 .../Converter/RectangleCircularConverter.cs   |   39 +-
 .../Converter/String2VisibilityConverter.cs   |   25 +-
 .../Converter/String2VisibilityReConverter.cs |   25 +-
 .../Converter/ThicknessSplitConverter.cs      |   41 +-
 .../Converter/TreeViewItemMarginConverter.cs  |   33 +-
 .../Tools/Extension/ColLayout.cs              |  229 +-
 .../Tools/Extension/ColorExtension.cs         |   49 +-
 .../Extension/DependencyObjectExtension.cs    |   21 +-
 .../Tools/Extension/DialogExtension.cs        |  115 +-
 .../Tools/Extension/EnumerableExtension.cs    |   41 +-
 .../Extension/FrameworkElementExtension.cs    |   89 +-
 .../Tools/Extension/GeometryExtension.cs      |   79 +-
 .../Tools/Extension/LangExtension.cs          |  283 +-
 .../Tools/Extension/StringExtension.cs        |   49 +-
 .../Tools/Extension/UIElementExtension.cs     |   53 +-
 .../Tools/Extension/ValueExtension.cs         |   31 +-
 .../Tools/Generator/ComparerGenerator.cs      |   37 +-
 .../Tools/Generator/DateTimeRangeComparer.cs  |   17 +-
 .../Generator/GithubGravatarGenerator.cs      |  189 +-
 .../Tools/Generator/HatchBrushGenerator.cs    |  201 +-
 .../Tools/GifImageAnimator.cs                 |  441 +-
 .../Tools/GlobalShortcut.cs                   |  221 +-
 .../Tools/Helper/AnimationHelper.cs           |  149 +-
 .../Tools/Helper/ArithmeticHelper.cs          |  223 +-
 .../Tools/Helper/BindingHelper.cs             |   43 +-
 .../Tools/Helper/ColorHelper.cs               |   27 +-
 .../Tools/Helper/ConfigHelper.cs              |  105 +-
 .../Tools/Helper/DesignerHelper.cs            |   25 +-
 .../Tools/Helper/DpiHelper.cs                 |  183 +-
 .../Tools/Helper/FullScreenHelper.cs          |  497 +-
 .../Tools/Helper/IconHelper.cs                |  475 +-
 .../Tools/Helper/InputClickHelper.cs          |  261 +-
 .../Tools/Helper/ResourceHelper.cs            |  123 +-
 .../Tools/Helper/ScreenHelper.cs              |  141 +-
 .../Tools/Helper/SecurityHelper.cs            |   25 +-
 .../Tools/Helper/SingleOpenHelper.cs          |   57 +-
 .../Tools/Helper/SystemHelper.cs              |   41 +-
 .../Tools/Helper/TextHelper.cs                |   25 +-
 .../Tools/Helper/TokenizerHelper.cs           |  367 +-
 .../Tools/Helper/TouchDragMoveWindowHelper.cs |  123 +-
 .../Tools/Helper/ValidateHelper.cs            |  203 +-
 .../Tools/Helper/VisualHelper.cs              |  131 +-
 .../Tools/Helper/WindowHelper.cs              |  307 +-
 .../Tools/Hook/ClipboardHook.cs               |   85 +-
 .../Tools/Hook/KeyboardHook.cs                |  181 +-
 .../Tools/Hook/MouseHook.cs                   |  107 +-
 .../Tools/Hook/SystemMenuHook.cs              |   83 +-
 .../Tools/Interop/Handle/BitmapHandle.cs      |   71 +-
 .../Tools/Interop/Handle/CommonHandles.cs     |   19 +-
 .../Tools/Interop/Handle/HandleCollector.cs   |  207 +-
 .../Tools/Interop/Handle/IconHandle.cs        |   51 +-
 .../Interop/Handle/SafeFileMappingHandle.cs   |   67 +-
 .../Tools/Interop/Handle/WpfSafeHandle.cs     |   35 +-
 .../Tools/Interop/InteropMethods.cs           | 1413 +++--
 .../Tools/Interop/InteropValues.cs            | 2359 ++++----
 .../Tools/RegexJudgment.cs                    |  175 +-
 .../Tools/RegexPatterns.cs                    |  251 +-
 .../ButtonGroupItemStyleSelector.cs           |  209 +-
 .../ComboBoxItemCapsuleStyleSelector.cs       |   41 +-
 .../TabItemCapsuleStyleSelector.cs            |   51 +-
 .../Microsoft.Windows.Shell/JumpItem.cs       |   17 +-
 .../JumpItemRejectionReason.cs                |   17 +-
 .../JumpItemsRejectedEventArgs.cs             |   51 +-
 .../JumpItemsRemovedEventArgs.cs              |   35 +-
 .../Microsoft.Windows.Shell/JumpList.cs       | 1367 +++--
 .../Microsoft.Windows.Shell/JumpPath.cs       |   11 +-
 .../Microsoft.Windows.Shell/JumpTask.cs       |   23 +-
 .../Microsoft.Windows.Shell/Standard/AC.cs    |   13 +-
 .../Standard/APPDOCLISTTYPE.cs                |   13 +-
 .../Standard/Assert.cs                        |  449 +-
 .../Microsoft.Windows.Shell/Standard/BI.cs    |   11 +-
 .../Standard/BITMAPINFO.cs                    |   15 +-
 .../Standard/BITMAPINFOHEADER.cs              |   33 +-
 .../Standard/BLENDFUNCTION.cs                 |   17 +-
 .../Standard/CHANGEFILTERSTRUCT.cs            |   15 +-
 .../Microsoft.Windows.Shell/Standard/CLSID.cs |   37 +-
 .../Standard/CREATESTRUCT.cs                  |   39 +-
 .../Microsoft.Windows.Shell/Standard/CS.cs    |   37 +-
 .../Standard/CombineRgnResult.cs              |   17 +-
 .../Microsoft.Windows.Shell/Standard/DOGIF.cs |   19 +-
 .../Standard/DWMFLIP3D.cs                     |   15 +-
 .../Standard/DWMNCRP.cs                       |   15 +-
 .../Microsoft.Windows.Shell/Standard/DWMWA.cs |   33 +-
 .../Standard/DWM_SIT.cs                       |   13 +-
 .../Standard/DWM_TIMING_INFO.cs               |   91 +-
 .../Standard/DeviceCap.cs                     |   17 +-
 .../Standard/DoubleUtilities.cs               |   97 +-
 .../Standard/DpiHelper.cs                     |  119 +-
 .../Standard/ErrorModes.cs                    |   21 +-
 .../Microsoft.Windows.Shell/Standard/FO.cs    |   17 +-
 .../Microsoft.Windows.Shell/Standard/FOF.cs   |   41 +-
 .../Standard/Facility.cs                      |   31 +-
 .../Microsoft.Windows.Shell/Standard/GCLP.cs  |   11 +-
 .../Microsoft.Windows.Shell/Standard/GPS.cs   |   29 +-
 .../Microsoft.Windows.Shell/Standard/GWL.cs   |   23 +-
 .../Microsoft.Windows.Shell/Standard/HCF.cs   |   25 +-
 .../Standard/HIGHCONTRAST.cs                  |   15 +-
 .../Standard/HRESULT.cs                       |  433 +-
 .../Microsoft.Windows.Shell/Standard/HT.cs    |   67 +-
 .../Standard/IApplicationDestinations.cs      |   21 +-
 .../Standard/IApplicationDocumentLists.cs     |   23 +-
 .../Standard/ICustomDestinationList.cs        |   41 +-
 .../Standard/IEnumIDList.cs                   |   27 +-
 .../Standard/IEnumObjects.cs                  |   23 +-
 .../Microsoft.Windows.Shell/Standard/IID.cs   |   57 +-
 .../Microsoft.Windows.Shell/Standard/INPUT.cs |   15 +-
 .../Standard/INPUT_TYPE.cs                    |   11 +-
 .../Standard/IObjectArray.cs                  |   23 +-
 .../Standard/IObjectCollection.cs             |   29 +-
 .../Standard/IObjectWithAppUserModelId.cs     |   23 +-
 .../Standard/IObjectWithProgId.cs             |   23 +-
 .../Standard/IPropertyStore.cs                |   25 +-
 .../Standard/IShellFolder.cs                  |   45 +-
 .../Standard/IShellItem.cs                    |   29 +-
 .../Standard/IShellItem2.cs                   |   67 +-
 .../Standard/IShellItemArray.cs               |   37 +-
 .../Standard/IShellLinkW.cs                   |   51 +-
 .../Standard/ITaskbarList.cs                  |   25 +-
 .../Standard/ITaskbarList2.cs                 |   27 +-
 .../Standard/ITaskbarList3.cs                 |   75 +-
 .../Standard/ITaskbarList4.cs                 |   77 +-
 .../Microsoft.Windows.Shell/Standard/KDC.cs   |   13 +-
 .../Standard/LOGFONT.cs                       |   41 +-
 .../Standard/MARGINS.cs                       |   17 +-
 .../Microsoft.Windows.Shell/Standard/MF.cs    |   21 +-
 .../Standard/MINMAXINFO.cs                    |   19 +-
 .../Standard/MONITORINFO.cs                   |   19 +-
 .../Standard/MOUSEEVENTF.cs                   |   13 +-
 .../Standard/MOUSEINPUT.cs                    |   21 +-
 .../Standard/MSGFLT.cs                        |   15 +-
 .../Standard/MSGFLTINFO.cs                    |   17 +-
 .../Standard/ManagedIStream.cs                |  281 +-
 .../Standard/MessageHandler.cs                |    7 +-
 .../Standard/MessageWindow.cs                 |  211 +-
 .../Microsoft.Windows.Shell/Standard/NIF.cs   |   31 +-
 .../Microsoft.Windows.Shell/Standard/NIIF.cs  |   27 +-
 .../Microsoft.Windows.Shell/Standard/NIM.cs   |   19 +-
 .../Standard/NONCLIENTMETRICS.cs              |  109 +-
 .../Standard/NOTIFYICONDATA.cs                |   49 +-
 .../Standard/NativeMethods.cs                 | 1697 +++---
 .../Standard/OLECMDEXECOPT.cs                 |   17 +-
 .../Standard/OLECMDF.cs                       |   21 +-
 .../Standard/OLECMDID.cs                      |  123 +-
 .../Microsoft.Windows.Shell/Standard/PKEY.cs  |   49 +-
 .../Microsoft.Windows.Shell/Standard/POINT.cs |   15 +-
 .../Standard/PROPVARIANT.cs                   |  169 +-
 .../Standard/READYSTATE.cs                    |   19 +-
 .../Microsoft.Windows.Shell/Standard/RECT.cs  |  241 +-
 .../Standard/RGBQUAD.cs                       |   17 +-
 .../Microsoft.Windows.Shell/Standard/RGN.cs   |   19 +-
 .../Standard/RefPOINT.cs                      |   19 +-
 .../Standard/RefRECT.cs                       |  199 +-
 .../Microsoft.Windows.Shell/Standard/SC.cs    |   55 +-
 .../Microsoft.Windows.Shell/Standard/SFGAO.cs |   79 +-
 .../Microsoft.Windows.Shell/Standard/SHARD.cs |   23 +-
 .../Standard/SHARDAPPIDINFO.cs                |   23 +-
 .../Standard/SHARDAPPIDINFOIDLIST.cs          |   21 +-
 .../Standard/SHARDAPPIDINFOLINK.cs            |   21 +-
 .../Standard/SHCONTF.cs                       |   33 +-
 .../Standard/SHFILEOPSTRUCT.cs                |   33 +-
 .../Microsoft.Windows.Shell/Standard/SHGDN.cs |   21 +-
 .../Standard/SIATTRIBFLAGS.cs                 |   15 +-
 .../Standard/SICHINT.cs                       |   17 +-
 .../Microsoft.Windows.Shell/Standard/SIGDN.cs |   27 +-
 .../Microsoft.Windows.Shell/Standard/SIZE.cs  |   15 +-
 .../Microsoft.Windows.Shell/Standard/SLGP.cs  |   17 +-
 .../Microsoft.Windows.Shell/Standard/SM.cs    |  177 +-
 .../Microsoft.Windows.Shell/Standard/SPI.cs   |  439 +-
 .../Microsoft.Windows.Shell/Standard/SPIF.cs  |   19 +-
 .../Standard/STATE_SYSTEM.cs                  |   75 +-
 .../Microsoft.Windows.Shell/Standard/STPF.cs  |   21 +-
 .../Standard/STR_GPS.cs                       |   21 +-
 .../Microsoft.Windows.Shell/Standard/SW.cs    |   37 +-
 .../Microsoft.Windows.Shell/Standard/SWP.cs   |   41 +-
 .../Standard/SafeConnectionPointCookie.cs     |  121 +-
 .../Standard/SafeDC.cs                        |  289 +-
 .../Standard/SafeFindHandle.cs                |   25 +-
 .../Standard/SafeGdiplusStartupToken.cs       |   59 +-
 .../Standard/SafeHBITMAP.cs                   |   25 +-
 .../Standard/StartupInput.cs                  |   19 +-
 .../Standard/StartupOutput.cs                 |   15 +-
 .../Standard/Status.cs                        |   53 +-
 .../Standard/StockObject.cs                   |   33 +-
 .../Microsoft.Windows.Shell/Standard/TBPF.cs  |   19 +-
 .../Microsoft.Windows.Shell/Standard/THB.cs   |   19 +-
 .../Microsoft.Windows.Shell/Standard/THBF.cs  |   23 +-
 .../Standard/THUMBBUTTON.cs                   |   27 +-
 .../Standard/TITLEBARINFO.cs                  |   25 +-
 .../Standard/TITLEBARINFOEX.cs                |   37 +-
 .../Microsoft.Windows.Shell/Standard/ULW.cs   |   15 +-
 .../Standard/UNSIGNED_RATIO.cs                |   15 +-
 .../Standard/Utility.cs                       | 1489 +++--
 .../Standard/Verify.cs                        |  467 +-
 .../Standard/WIN32_FIND_DATAW.cs              |   39 +-
 .../Standard/WINDOWPLACEMENT.cs               |   23 +-
 .../Standard/WINDOWPOS.cs                     |   23 +-
 .../Standard/WINDOWTHEMEATTRIBUTETYPE.cs      |   11 +-
 .../Microsoft.Windows.Shell/Standard/WM.cs    |  271 +-
 .../Standard/WNDCLASSEX.cs                    |   39 +-
 .../Microsoft.Windows.Shell/Standard/WS.cs    |   65 +-
 .../Microsoft.Windows.Shell/Standard/WS_EX.cs |   65 +-
 .../Standard/WTA_OPTIONS.cs                   |   25 +-
 .../Microsoft.Windows.Shell/Standard/WTNCA.cs |   21 +-
 .../Microsoft.Windows.Shell/Standard/WVR.cs   |   25 +-
 .../Standard/Win32Error.cs                    |  239 +-
 .../Standard/Win32Value.cs                    |   23 +-
 .../Standard/WndProc.cs                       |    7 +-
 .../Standard/WndProcHook.cs                   |    7 +-
 .../Microsoft.Windows.Shell/SystemCommands.cs |  121 +-
 .../SystemParameters2.cs                      | 1059 ++--
 .../TaskbarItemInfo.cs                        | 1061 ++--
 .../TaskbarItemProgressState.cs               |   19 +-
 .../ThumbButtonInfo.cs                        |  459 +-
 .../ThumbButtonInfoCollection.cs              |   45 +-
 .../Microsoft.Windows.Shell/WindowChrome.cs   |  411 +-
 .../WindowChromeWorker.cs                     | 1437 +++--
 748 files changed, 57929 insertions(+), 58678 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 0dd38bb4..07cb8e23 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -15,17 +15,17 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Properties.Langs;
 using HandyControlDemo.Tools;
 
-namespace HandyControlDemo
+namespace HandyControlDemo;
+
+public partial class App
 {
-    public partial class App
-    {
 #pragma warning disable IDE0052
-        [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-        private static Mutex AppMutex;
+    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
+    private static Mutex AppMutex;
 #pragma warning restore IDE0052
 
-        public App()
-        {
+    public App()
+    {
 #if !NET40
             var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
             if (!Directory.Exists(cachePath))
@@ -35,106 +35,105 @@ namespace HandyControlDemo
             ProfileOptimization.SetProfileRoot(cachePath);
             ProfileOptimization.StartProfile("Profile");
 #endif
-        }
+    }
 
-        protected override void OnStartup(StartupEventArgs e)
+    protected override void OnStartup(StartupEventArgs e)
+    {
+        AppMutex = new Mutex(true, "HandyControlDemo", out var createdNew);
+
+        if (!createdNew)
         {
-            AppMutex = new Mutex(true, "HandyControlDemo", out var createdNew);
+            var current = Process.GetCurrentProcess();
 
-            if (!createdNew)
+            foreach (var process in Process.GetProcessesByName(current.ProcessName))
             {
-                var current = Process.GetCurrentProcess();
-
-                foreach (var process in Process.GetProcessesByName(current.ProcessName))
+                if (process.Id != current.Id)
                 {
-                    if (process.Id != current.Id)
-                    {
-                        Win32Helper.SetForegroundWindow(process.MainWindowHandle);
-                        break;
-                    }
+                    Win32Helper.SetForegroundWindow(process.MainWindowHandle);
+                    break;
                 }
-                Shutdown();
             }
-            else
+            Shutdown();
+        }
+        else
+        {
+            var splashScreen = new SplashScreen("Resources/Img/Cover.png");
+            splashScreen.Show(true);
+
+            base.OnStartup(e);
+
+            UpdateRegistry();
+
+            ShutdownMode = ShutdownMode.OnMainWindowClose;
+            GlobalData.Init();
+            ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
+            LangProvider.Culture = new CultureInfo(GlobalData.Config.Lang);
+
+            if (GlobalData.Config.Skin != SkinType.Default)
             {
-                var splashScreen = new SplashScreen("Resources/Img/Cover.png");
-                splashScreen.Show(true);
+                UpdateSkin(GlobalData.Config.Skin);
+            }
 
-                base.OnStartup(e);
-
-                UpdateRegistry();
-
-                ShutdownMode = ShutdownMode.OnMainWindowClose;
-                GlobalData.Init();
-                ConfigHelper.Instance.SetLang(GlobalData.Config.Lang);
-                LangProvider.Culture = new CultureInfo(GlobalData.Config.Lang);
-
-                if (GlobalData.Config.Skin != SkinType.Default)
-                {
-                    UpdateSkin(GlobalData.Config.Skin);
-                }
-
-                ConfigHelper.Instance.SetWindowDefaultStyle();
-                ConfigHelper.Instance.SetNavigationWindowDefaultStyle();
+            ConfigHelper.Instance.SetWindowDefaultStyle();
+            ConfigHelper.Instance.SetNavigationWindowDefaultStyle();
 
 #if NET40
-                ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
+            ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
 #else
                 ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 #endif
-            }
         }
+    }
 
-        protected override void OnExit(ExitEventArgs e)
+    protected override void OnExit(ExitEventArgs e)
+    {
+        base.OnExit(e);
+        GlobalData.Save();
+    }
+
+    internal void UpdateSkin(SkinType skin)
+    {
+        var skins0 = Resources.MergedDictionaries[0];
+        skins0.MergedDictionaries.Clear();
+        skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(skin));
+        skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skin));
+
+        var skins1 = Resources.MergedDictionaries[1];
+        skins1.MergedDictionaries.Clear();
+        skins1.MergedDictionaries.Add(new ResourceDictionary
         {
-            base.OnExit(e);
-            GlobalData.Save();
-        }
-
-        internal void UpdateSkin(SkinType skin)
+            Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
+        });
+        skins1.MergedDictionaries.Add(new ResourceDictionary
         {
-            var skins0 = Resources.MergedDictionaries[0];
-            skins0.MergedDictionaries.Clear();
-            skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(skin));
-            skins0.MergedDictionaries.Add(ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skin));
+            Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
+        });
 
-            var skins1 = Resources.MergedDictionaries[1];
-            skins1.MergedDictionaries.Clear();
-            skins1.MergedDictionaries.Add(new ResourceDictionary
-            {
-                Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
-            });
-            skins1.MergedDictionaries.Add(new ResourceDictionary
-            {
-                Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
-            });
+        Current.MainWindow?.OnApplyTemplate();
+    }
 
-            Current.MainWindow?.OnApplyTemplate();
-        }
-
-        private void UpdateRegistry()
+    private void UpdateRegistry()
+    {
+        var processModule = Process.GetCurrentProcess().MainModule;
+        if (processModule != null)
         {
-            var processModule = Process.GetCurrentProcess().MainModule;
-            if (processModule != null)
+            var registryFilePath = $"{Path.GetDirectoryName(processModule.FileName)}\\Registry.reg";
+            if (!File.Exists(registryFilePath))
             {
-                var registryFilePath = $"{Path.GetDirectoryName(processModule.FileName)}\\Registry.reg";
-                if (!File.Exists(registryFilePath))
+                var streamResourceInfo = GetResourceStream(new Uri("pack://application:,,,/Resources/Registry.txt"));
+                if (streamResourceInfo != null)
                 {
-                    var streamResourceInfo = GetResourceStream(new Uri("pack://application:,,,/Resources/Registry.txt"));
-                    if (streamResourceInfo != null)
+                    using var reader = new StreamReader(streamResourceInfo.Stream);
+                    var registryStr = reader.ReadToEnd();
+                    var newRegistryStr = registryStr.Replace("#", processModule.FileName.Replace("\\", "\\\\"));
+                    File.WriteAllText(registryFilePath, newRegistryStr);
+                    Process.Start(new ProcessStartInfo("cmd", $"/c {registryFilePath}")
                     {
-                        using var reader = new StreamReader(streamResourceInfo.Stream);
-                        var registryStr = reader.ReadToEnd();
-                        var newRegistryStr = registryStr.Replace("#", processModule.FileName.Replace("\\", "\\\\"));
-                        File.WriteAllText(registryFilePath, newRegistryStr);
-                        Process.Start(new ProcessStartInfo("cmd", $"/c {registryFilePath}")
-                        {
-                            UseShellExecute = false,
-                            CreateNoWindow = true
-                        });
-                    }
+                        UseShellExecute = false,
+                        CreateNoWindow = true
+                    });
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs b/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
index 5162608b..03b456d4 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
@@ -1,14 +1,13 @@
 using System;
 using HandyControl.Data;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+internal class AppConfig
 {
-    internal class AppConfig
-    {
-        public static readonly string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json";
+    public static readonly string SavePath = $"{AppDomain.CurrentDomain.BaseDirectory}AppConfig.json";
 
-        public string Lang { get; set; } = "zh-cn";
+    public string Lang { get; set; } = "zh-cn";
 
-        public SkinType Skin { get; set; }
-    }
-}
+    public SkinType Skin { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs b/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
index 1bc162c7..b2221317 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
@@ -1,13 +1,12 @@
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public enum DemoType
 {
-    public enum DemoType
-    {
-        Type1 = 1,
-        Type2,
-        Type3,
-        Type4,
-        Type5,
-        Type6
-    }
-}
+    Type1 = 1,
+    Type2,
+    Type3,
+    Type4,
+    Type5,
+    Type6
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs b/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
index d4c8af00..276ec339 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
@@ -1,38 +1,37 @@
 using System.IO;
 using Newtonsoft.Json;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+internal class GlobalData
 {
-    internal class GlobalData
+    public static void Init()
     {
-        public static void Init()
+        if (File.Exists(AppConfig.SavePath))
         {
-            if (File.Exists(AppConfig.SavePath))
+            try
             {
-                try
-                {
-                    var json = File.ReadAllText(AppConfig.SavePath);
-                    Config = (string.IsNullOrEmpty(json) ? new AppConfig() : JsonConvert.DeserializeObject<AppConfig>(json)) ?? new AppConfig();
-                }
-                catch
-                {
-                    Config = new AppConfig();
-                }
+                var json = File.ReadAllText(AppConfig.SavePath);
+                Config = (string.IsNullOrEmpty(json) ? new AppConfig() : JsonConvert.DeserializeObject<AppConfig>(json)) ?? new AppConfig();
             }
-            else
+            catch
             {
                 Config = new AppConfig();
             }
         }
-
-        public static void Save()
+        else
         {
-            var json = JsonConvert.SerializeObject(Config);
-            File.WriteAllText(AppConfig.SavePath, json);
+            Config = new AppConfig();
         }
-
-        public static AppConfig Config { get; set; }
-
-        public static bool NotifyIconIsShow { get; set; }
     }
-}
+
+    public static void Save()
+    {
+        var json = JsonConvert.SerializeObject(Config);
+        File.WriteAllText(AppConfig.SavePath, json);
+    }
+
+    public static AppConfig Config { get; set; }
+
+    public static bool NotifyIconIsShow { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
index 989304b7..71651e81 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
@@ -1,58 +1,57 @@
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class MessageToken
 {
-    public class MessageToken
-    {
-        public static readonly string LoadShowContent = nameof(LoadShowContent);
+    public static readonly string LoadShowContent = nameof(LoadShowContent);
 
-        public static readonly string FullSwitch = nameof(FullSwitch);
+    public static readonly string FullSwitch = nameof(FullSwitch);
 
-        public static readonly string ContributorsView = nameof(ContributorsView);
+    public static readonly string ContributorsView = nameof(ContributorsView);
 
-        public static readonly string ClearLeftSelected = nameof(ClearLeftSelected);
+    public static readonly string ClearLeftSelected = nameof(ClearLeftSelected);
 
-        public static readonly string SendChatMessage = nameof(SendChatMessage);
+    public static readonly string SendChatMessage = nameof(SendChatMessage);
 
-        public static readonly string GrowlDemoPanel = nameof(GrowlDemoPanel);
+    public static readonly string GrowlDemoPanel = nameof(GrowlDemoPanel);
 
-        public static readonly string DialogDemoWindow = nameof(DialogDemoWindow);
+    public static readonly string DialogDemoWindow = nameof(DialogDemoWindow);
 
-        public static readonly string MainWindow = nameof(MainWindow);
+    public static readonly string MainWindow = nameof(MainWindow);
 
-        public static readonly string PracticalDemo = nameof(PracticalDemo);
+    public static readonly string PracticalDemo = nameof(PracticalDemo);
 
-        public static readonly string ProjectsView = nameof(ProjectsView);
+    public static readonly string ProjectsView = nameof(ProjectsView);
 
-        public static readonly string BlogsView = nameof(BlogsView);
+    public static readonly string BlogsView = nameof(BlogsView);
 
-        public static readonly string WebsitesView = nameof(WebsitesView);
+    public static readonly string WebsitesView = nameof(WebsitesView);
 
-        public static readonly string NotifyIconDemo = nameof(NotifyIconDemo);
+    public static readonly string NotifyIconDemo = nameof(NotifyIconDemo);
 
-        public static readonly string NotifyIconContextDemo = nameof(NotifyIconContextDemo);
+    public static readonly string NotifyIconContextDemo = nameof(NotifyIconContextDemo);
 
-        public static readonly string CommonWindow = nameof(CommonWindow);
+    public static readonly string CommonWindow = nameof(CommonWindow);
 
-        public static readonly string BlurWindow = nameof(BlurWindow);
+    public static readonly string BlurWindow = nameof(BlurWindow);
 
-        public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow);
+    public static readonly string CustomNonClientAreaWindow = nameof(CustomNonClientAreaWindow);
 
-        public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow);
+    public static readonly string NoNonClientAreaDragableWindow = nameof(NoNonClientAreaDragableWindow);
 
-        public static readonly string QQGroupView = nameof(QQGroupView);
+    public static readonly string QQGroupView = nameof(QQGroupView);
 
-        public static readonly string GlowWindow = nameof(GlowWindow);
+    public static readonly string GlowWindow = nameof(GlowWindow);
 
-        public static readonly string NativeCommonWindow = nameof(NativeCommonWindow);
+    public static readonly string NativeCommonWindow = nameof(NativeCommonWindow);
 
-        public static readonly string NavigationWindow = nameof(NavigationWindow);
+    public static readonly string NavigationWindow = nameof(NavigationWindow);
 
-        public static readonly string TouchDragMoveWindow = nameof(TouchDragMoveWindow);
+    public static readonly string TouchDragMoveWindow = nameof(TouchDragMoveWindow);
 
-        public static readonly string DialogContainer = nameof(DialogContainer);
+    public static readonly string DialogContainer = nameof(DialogContainer);
 
-        public static readonly string LangUpdated = nameof(LangUpdated);
+    public static readonly string LangUpdated = nameof(LangUpdated);
 
-        public static readonly string SkinUpdated = nameof(SkinUpdated);
+    public static readonly string SkinUpdated = nameof(SkinUpdated);
 
-    }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
index 9168a52a..75cc2a50 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
@@ -1,12 +1,11 @@
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class AvatarModel
 {
-    public class AvatarModel
-    {
-        public string DisplayName { get; set; }
+    public string DisplayName { get; set; }
 
-        public string Link { get; set; }
+    public string Link { get; set; }
 
-        public string AvatarUri { get; set; }
-    }
-}
+    public string AvatarUri { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
index e8867f26..3e8ff759 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
@@ -1,11 +1,10 @@
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class CardModel
 {
-    public class CardModel
-    {
-        public string Header { get; set; }
+    public string Header { get; set; }
 
-        public string Content { get; set; }
+    public string Content { get; set; }
 
-        public string Footer { get; set; }
-    }
-}
+    public string Footer { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
index 6f77fefc..9e137151 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
@@ -1,17 +1,16 @@
 using HandyControl.Data;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public struct ChatInfoModel
 {
-    public struct ChatInfoModel
-    {
-        public object Message { get; set; }
+    public object Message { get; set; }
 
-        public string SenderId { get; set; }
+    public string SenderId { get; set; }
 
-        public ChatRoleType Role { get; set; }
+    public ChatRoleType Role { get; set; }
 
-        public ChatMessageType Type { get; set; }
+    public ChatMessageType Type { get; set; }
 
-        public object Enclosure { get; set; }
-    }
-}
+    public object Enclosure { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
index 23d5b341..b407c3c9 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
@@ -1,9 +1,8 @@
-namespace HandyControlDemo.Data
-{
-    public class CoverViewDemoModel
-    {
-        public string ImgPath { get; set; }
+namespace HandyControlDemo.Data;
 
-        public string BackgroundToken { get; set; }
-    }
-}
+public class CoverViewDemoModel
+{
+    public string ImgPath { get; set; }
+
+    public string BackgroundToken { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
index 800a5f38..0cfbcae0 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
@@ -1,22 +1,21 @@
 using System.Collections.Generic;
 
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class DemoDataModel
 {
-    public class DemoDataModel
-    {
-        public int Index { get; set; }
+    public int Index { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public bool IsSelected { get; set; }
+    public bool IsSelected { get; set; }
 
-        public string Remark { get; set; }
+    public string Remark { get; set; }
 
-        public DemoType Type { get; set; }
+    public DemoType Type { get; set; }
 
-        public string ImgPath { get; set; }
+    public string ImgPath { get; set; }
 
-        public List<DemoDataModel> DataList { get; set; }
-    }
-}
+    public List<DemoDataModel> DataList { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
index ad5dc2fd..f25a0746 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
@@ -1,38 +1,37 @@
 using System.Collections.Generic;
 using GalaSoft.MvvmLight;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class DemoInfoModel : ViewModelBase
 {
-    public class DemoInfoModel : ViewModelBase
+    public string Key { get; set; }
+
+    private string _title;
+
+    public string Title
     {
-        public string Key { get; set; }
-
-        private string _title;
-
-        public string Title
-        {
-            get => _title;
+        get => _title;
 #if NET40
             set => Set(nameof(Title), ref _title, value);
 #else
-            set => Set(ref _title, value);
+        set => Set(ref _title, value);
 #endif
-        }
+    }
 
-        private int _selectedIndex;
+    private int _selectedIndex;
 
-        public int SelectedIndex
-        {
-            get => _selectedIndex;
+    public int SelectedIndex
+    {
+        get => _selectedIndex;
 #if NET40
             set => Set(nameof(SelectedIndex), ref _selectedIndex, value);
 #else
-            set => Set(ref _selectedIndex, value);
+        set => Set(ref _selectedIndex, value);
 #endif   
-        }
-
-        public bool IsGroupEnabled { get; set; }
-
-        public IList<DemoItemModel> DemoItemList { get; set; }
     }
-}
+
+    public bool IsGroupEnabled { get; set; }
+
+    public IList<DemoItemModel> DemoItemList { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
index 3cbaab9c..e06440b5 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
@@ -1,40 +1,39 @@
 using GalaSoft.MvvmLight;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class DemoItemModel : ObservableObject
 {
-    public class DemoItemModel : ObservableObject
+    private bool _isVisible = true;
+    private string _queriesText = string.Empty;
+
+    public string Name { get; set; }
+
+    public string GroupName { get; set; }
+
+    public string TargetCtlName { get; set; }
+
+    public string ImageName { get; set; }
+
+    public bool IsNew { get; set; }
+
+    public string QueriesText
     {
-        private bool _isVisible = true;
-        private string _queriesText = string.Empty;
-
-        public string Name { get; set; }
-
-        public string GroupName { get; set; }
-
-        public string TargetCtlName { get; set; }
-
-        public string ImageName { get; set; }
-
-        public bool IsNew { get; set; }
-
-        public string QueriesText
-        {
-            get => _queriesText;
+        get => _queriesText;
 #if NET40
-            set => Set(nameof(QueriesText), ref _queriesText, value);
+        set => Set(nameof(QueriesText), ref _queriesText, value);
 #else
             set => Set(ref _queriesText, value);
 #endif
-        }
+    }
 
-        public bool IsVisible
-        {
-            get => _isVisible;
+    public bool IsVisible
+    {
+        get => _isVisible;
 #if NET40
-            set => Set(nameof(IsVisible), ref _isVisible, value);
+        set => Set(nameof(IsVisible), ref _isVisible, value);
 #else
             set => Set(ref _isVisible, value);
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
index 6068897a..53727ce9 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
@@ -1,13 +1,12 @@
 using System.Windows.Media;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class GeometryItemModel
 {
-    public class GeometryItemModel
-    {
-        public Geometry Data { get; set; }
+    public Geometry Data { get; set; }
 
-        public string Key { get; set; }
+    public string Key { get; set; }
 
-        public bool Line { get; set; }
-    }
-}
+    public bool Line { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
index a6c48a91..a5f9e2bc 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
@@ -2,32 +2,31 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControlDemo.Data
+namespace HandyControlDemo.Data;
+
+public class PropertyGridDemoModel
 {
-    public class PropertyGridDemoModel
-    {
-        [Category("Category1")]
-        public string String { get; set; }
+    [Category("Category1")]
+    public string String { get; set; }
 
-        [Category("Category2")]
-        public int Integer { get; set; }
+    [Category("Category2")]
+    public int Integer { get; set; }
 
-        [Category("Category2")]
-        public bool Boolean { get; set; }
+    [Category("Category2")]
+    public bool Boolean { get; set; }
 
-        [Category("Category1")]
-        public Gender Enum { get; set; }
+    [Category("Category1")]
+    public Gender Enum { get; set; }
 
-        public HorizontalAlignment HorizontalAlignment { get; set; }
+    public HorizontalAlignment HorizontalAlignment { get; set; }
 
-        public VerticalAlignment VerticalAlignment { get; set; }
+    public VerticalAlignment VerticalAlignment { get; set; }
 
-        public ImageSource ImageSource { get; set; }
-    }
-
-    public enum Gender
-    {
-        Male,
-        Female
-    }
+    public ImageSource ImageSource { get; set; }
 }
+
+public enum Gender
+{
+    Male,
+    Female
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
index 317054a5..a9c97244 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
@@ -1,9 +1,8 @@
-namespace HandyControlDemo.Data
-{
-    public class StepBarDemoModel
-    {
-        public string Header { get; set; }
+namespace HandyControlDemo.Data;
 
-        public string Content { get; set; }
-    }
-}
+public class StepBarDemoModel
+{
+    public string Header { get; set; }
+
+    public string Content { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
index 5f27697e..89b5fa1d 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
@@ -1,9 +1,8 @@
-namespace HandyControlDemo.Data
-{
-    public class TabControlDemoModel
-    {
-        public string Header { get; set; }
+namespace HandyControlDemo.Data;
 
-        public string BackgroundToken { get; set; }
-    }
-}
+public class TabControlDemoModel
+{
+    public string Header { get; set; }
+
+    public string BackgroundToken { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
index b49f96ba..6121e2a4 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
@@ -10,45 +10,44 @@ using HandyControlDemo.Tools;
 using HandyControlDemo.UserControl;
 using HandyControlDemo.ViewModel;
 
-namespace HandyControlDemo
+namespace HandyControlDemo;
+
+public partial class MainWindow
 {
-    public partial class MainWindow
+    public MainWindow() => InitializeComponent();
+
+    protected override void OnContentRendered(EventArgs e)
     {
-        public MainWindow() => InitializeComponent();
+        base.OnContentRendered(e);
 
-        protected override void OnContentRendered(EventArgs e)
+        DataContext = ViewModelLocator.Instance.Main;
+        NonClientAreaContent = new NonClientAreaContent();
+        ControlMain.Content = new MainWindowContent();
+
+        GlobalShortcut.Init(new List<KeyBinding>
         {
-            base.OnContentRendered(e);
+            new(ViewModelLocator.Instance.Main.GlobalShortcutInfoCmd, Key.I, ModifierKeys.Control | ModifierKeys.Alt),
+            new(ViewModelLocator.Instance.Main.GlobalShortcutWarningCmd, Key.E, ModifierKeys.Control | ModifierKeys.Alt)
+        });
 
-            DataContext = ViewModelLocator.Instance.Main;
-            NonClientAreaContent = new NonClientAreaContent();
-            ControlMain.Content = new MainWindowContent();
+        Dialog.SetToken(this, MessageToken.MainWindow);
+        WindowAttach.SetIgnoreAltF4(this, true);
 
-            GlobalShortcut.Init(new List<KeyBinding>
-            {
-                new(ViewModelLocator.Instance.Main.GlobalShortcutInfoCmd, Key.I, ModifierKeys.Control | ModifierKeys.Alt),
-                new(ViewModelLocator.Instance.Main.GlobalShortcutWarningCmd, Key.E, ModifierKeys.Control | ModifierKeys.Alt)
-            });
+        Messenger.Default.Send(true, MessageToken.FullSwitch);
+        Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
+    }
 
-            Dialog.SetToken(this, MessageToken.MainWindow);
-            WindowAttach.SetIgnoreAltF4(this, true);
-
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        if (GlobalData.NotifyIconIsShow)
+        {
+            MessageBox.Info(Properties.Langs.Lang.AppClosingTip, Properties.Langs.Lang.Tip);
+            Hide();
+            e.Cancel = true;
         }
-
-        protected override void OnClosing(CancelEventArgs e)
+        else
         {
-            if (GlobalData.NotifyIconIsShow)
-            {
-                MessageBox.Info(Properties.Langs.Lang.AppClosingTip, Properties.Langs.Lang.Tip);
-                Hide();
-                e.Cancel = true;
-            }
-            else
-            {
-                base.OnClosing(e);
-            }
+            base.OnClosing(e);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
index da3d7230..e1538e95 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -4,2557 +4,2556 @@ using System.Windows;
 using System.Windows.Data;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.Properties.Langs
+namespace HandyControlDemo.Properties.Langs;
+
+public class LangProvider : INotifyPropertyChanged
 {
-    public class LangProvider : INotifyPropertyChanged
+    internal static LangProvider Instance { get; } = ResourceHelper.GetResource<LangProvider>("DemoLangs");
+
+    private static string CultureInfoStr;
+
+    public static CultureInfo Culture
     {
-        internal static LangProvider Instance { get; } = ResourceHelper.GetResource<LangProvider>("DemoLangs");
-
-        private static string CultureInfoStr;
-
-        public static CultureInfo Culture
+        get => Lang.Culture;
+        set
         {
-            get => Lang.Culture;
-            set
-            {
-                if (value == null) return;
-                if (Equals(CultureInfoStr, value.EnglishName)) return;
-                Lang.Culture = value;
-                CultureInfoStr = value.EnglishName;
+            if (value == null) return;
+            if (Equals(CultureInfoStr, value.EnglishName)) return;
+            Lang.Culture = value;
+            CultureInfoStr = value.EnglishName;
 
-                Instance.UpdateLangs();
-            }
+            Instance.UpdateLangs();
         }
-
-        public static string GetLang(string key) => Lang.ResourceManager.GetString(key, Culture);
-
-        public static void SetLang(DependencyObject dependencyObject, DependencyProperty dependencyProperty, string key) =>
-            BindingOperations.SetBinding(dependencyObject, dependencyProperty, new Binding(key)
-            {
-                Source = Instance,
-                Mode = BindingMode.OneWay
-            });
-
-        private void UpdateLangs()
-        {
-            OnPropertyChanged(nameof(About));
-            OnPropertyChanged(nameof(AddItem));
-            OnPropertyChanged(nameof(AnimationPath));
-            OnPropertyChanged(nameof(AppClosingTip));
-            OnPropertyChanged(nameof(Ask));
-            OnPropertyChanged(nameof(AutoCompleteTextBox));
-            OnPropertyChanged(nameof(Badge));
-            OnPropertyChanged(nameof(BasicInfo));
-            OnPropertyChanged(nameof(BasicLayout));
-            OnPropertyChanged(nameof(Blink));
-            OnPropertyChanged(nameof(Blog));
-            OnPropertyChanged(nameof(Border));
-            OnPropertyChanged(nameof(Brush));
-            OnPropertyChanged(nameof(Button));
-            OnPropertyChanged(nameof(ButtonCustom));
-            OnPropertyChanged(nameof(ButtonGroup));
-            OnPropertyChanged(nameof(Calendar));
-            OnPropertyChanged(nameof(CalendarWithClock));
-            OnPropertyChanged(nameof(Card));
-            OnPropertyChanged(nameof(Carousel));
-            OnPropertyChanged(nameof(ChangeLangAsk));
-            OnPropertyChanged(nameof(ChatBubble));
-            OnPropertyChanged(nameof(Chatroom));
-            OnPropertyChanged(nameof(CheckBox));
-            OnPropertyChanged(nameof(CheckComboBox));
-            OnPropertyChanged(nameof(CirclePanel));
-            OnPropertyChanged(nameof(Clear));
-            OnPropertyChanged(nameof(Click2Count));
-            OnPropertyChanged(nameof(Clock));
-            OnPropertyChanged(nameof(ColorPicker));
-            OnPropertyChanged(nameof(ColumnOffset));
-            OnPropertyChanged(nameof(ColumnSpacing));
-            OnPropertyChanged(nameof(ComboBox));
-            OnPropertyChanged(nameof(ComingSoon));
-            OnPropertyChanged(nameof(Comment));
-            OnPropertyChanged(nameof(Common));
-            OnPropertyChanged(nameof(CompareSlider));
-            OnPropertyChanged(nameof(Complete));
-            OnPropertyChanged(nameof(ContentDemoStr));
-            OnPropertyChanged(nameof(Contributors));
-            OnPropertyChanged(nameof(Controls));
-            OnPropertyChanged(nameof(CoverFlow));
-            OnPropertyChanged(nameof(CoverView));
-            OnPropertyChanged(nameof(Danger));
-            OnPropertyChanged(nameof(DataDisplay));
-            OnPropertyChanged(nameof(DataEntry));
-            OnPropertyChanged(nameof(DataGrid));
-            OnPropertyChanged(nameof(DatePicker));
-            OnPropertyChanged(nameof(DateTimePicker));
-            OnPropertyChanged(nameof(Default));
-            OnPropertyChanged(nameof(Demo));
-            OnPropertyChanged(nameof(Dialog));
-            OnPropertyChanged(nameof(DialogDemo));
-            OnPropertyChanged(nameof(Divider));
-            OnPropertyChanged(nameof(Doc_cn));
-            OnPropertyChanged(nameof(Doc_en));
-            OnPropertyChanged(nameof(Documentation));
-            OnPropertyChanged(nameof(DragHere));
-            OnPropertyChanged(nameof(Drawer));
-            OnPropertyChanged(nameof(Effects));
-            OnPropertyChanged(nameof(ElementGroup));
-            OnPropertyChanged(nameof(Email));
-            OnPropertyChanged(nameof(Empty));
-            OnPropertyChanged(nameof(Error));
-            OnPropertyChanged(nameof(Exit));
-            OnPropertyChanged(nameof(Expander));
-            OnPropertyChanged(nameof(Fatal));
-            OnPropertyChanged(nameof(Feedback));
-            OnPropertyChanged(nameof(FlexPanel));
-            OnPropertyChanged(nameof(FlipClock));
-            OnPropertyChanged(nameof(FloatingBlock));
-            OnPropertyChanged(nameof(FlowDocument));
-            OnPropertyChanged(nameof(FlowDocumentPageViewer));
-            OnPropertyChanged(nameof(FlowDocumentReader));
-            OnPropertyChanged(nameof(FlowDocumentScrollViewer));
-            OnPropertyChanged(nameof(Frame));
-            OnPropertyChanged(nameof(Geometry));
-            OnPropertyChanged(nameof(GifImage));
-            OnPropertyChanged(nameof(GotoTop));
-            OnPropertyChanged(nameof(Gravatar));
-            OnPropertyChanged(nameof(Grid));
-            OnPropertyChanged(nameof(GroupBox));
-            OnPropertyChanged(nameof(Groups));
-            OnPropertyChanged(nameof(Growl));
-            OnPropertyChanged(nameof(GrowlAsk));
-            OnPropertyChanged(nameof(GrowlDemo));
-            OnPropertyChanged(nameof(GrowlError));
-            OnPropertyChanged(nameof(GrowlFatal));
-            OnPropertyChanged(nameof(GrowlInfo));
-            OnPropertyChanged(nameof(GrowlSuccess));
-            OnPropertyChanged(nameof(GrowlWarning));
-            OnPropertyChanged(nameof(HatchBrushGenerator));
-            OnPropertyChanged(nameof(HoneycombPanel));
-            OnPropertyChanged(nameof(HybridLayout));
-            OnPropertyChanged(nameof(Ignore));
-            OnPropertyChanged(nameof(ImageBlock));
-            OnPropertyChanged(nameof(ImageBrowser));
-            OnPropertyChanged(nameof(ImageSelector));
-            OnPropertyChanged(nameof(Index));
-            OnPropertyChanged(nameof(Info));
-            OnPropertyChanged(nameof(Interacting));
-            OnPropertyChanged(nameof(InteractiveDialog));
-            OnPropertyChanged(nameof(IsNotPhone));
-            OnPropertyChanged(nameof(Label));
-            OnPropertyChanged(nameof(LangComment));
-            OnPropertyChanged(nameof(Layout));
-            OnPropertyChanged(nameof(ListBox));
-            OnPropertyChanged(nameof(ListView));
-            OnPropertyChanged(nameof(Loading));
-            OnPropertyChanged(nameof(Magnifier));
-            OnPropertyChanged(nameof(Menu));
-            OnPropertyChanged(nameof(MessageBox));
-            OnPropertyChanged(nameof(Misc));
-            OnPropertyChanged(nameof(Morphing_Animation));
-            OnPropertyChanged(nameof(Name));
-            OnPropertyChanged(nameof(Navigation));
-            OnPropertyChanged(nameof(NewWindow));
-            OnPropertyChanged(nameof(Next));
-            OnPropertyChanged(nameof(Notification));
-            OnPropertyChanged(nameof(NotifyIcon));
-            OnPropertyChanged(nameof(NumericUpDown));
-            OnPropertyChanged(nameof(Off));
-            OnPropertyChanged(nameof(Ok));
-            OnPropertyChanged(nameof(On));
-            OnPropertyChanged(nameof(OpenBlurWindow));
-            OnPropertyChanged(nameof(OpenCommonWindow));
-            OnPropertyChanged(nameof(OpenCustomContentWindow));
-            OnPropertyChanged(nameof(OpenCustomMessageWindow));
-            OnPropertyChanged(nameof(OpenCustomNonClientAreaWindow));
-            OnPropertyChanged(nameof(OpenGlowWindow));
-            OnPropertyChanged(nameof(OpenImageBrowser));
-            OnPropertyChanged(nameof(OpenMessageWindow));
-            OnPropertyChanged(nameof(OpenMouseFollowWindow));
-            OnPropertyChanged(nameof(OpenNativeCommonWindow));
-            OnPropertyChanged(nameof(OpenNavigationWindow));
-            OnPropertyChanged(nameof(OpenNoNonClientAreaDragableWindow));
-            OnPropertyChanged(nameof(OpenPanel));
-            OnPropertyChanged(nameof(OpenSprite));
-            OnPropertyChanged(nameof(OpenTouchDragMoveWindow));
-            OnPropertyChanged(nameof(OutlineText));
-            OnPropertyChanged(nameof(Pagination));
-            OnPropertyChanged(nameof(PasswordBox));
-            OnPropertyChanged(nameof(PinBox));
-            OnPropertyChanged(nameof(PleaseInput));
-            OnPropertyChanged(nameof(PleaseWait));
-            OnPropertyChanged(nameof(PlsEnterContent));
-            OnPropertyChanged(nameof(PlsEnterEmail));
-            OnPropertyChanged(nameof(PlsEnterKey));
-            OnPropertyChanged(nameof(Poptip));
-            OnPropertyChanged(nameof(PoptipPositionStr));
-            OnPropertyChanged(nameof(PracticalDemos));
-            OnPropertyChanged(nameof(Prev));
-            OnPropertyChanged(nameof(PreviewSlider));
-            OnPropertyChanged(nameof(Primary));
-            OnPropertyChanged(nameof(ProgressBar));
-            OnPropertyChanged(nameof(ProgressButton));
-            OnPropertyChanged(nameof(Project));
-            OnPropertyChanged(nameof(PropertyGrid));
-            OnPropertyChanged(nameof(PushToTalk));
-            OnPropertyChanged(nameof(QQGroup));
-            OnPropertyChanged(nameof(RadioButton));
-            OnPropertyChanged(nameof(RangeSlider));
-            OnPropertyChanged(nameof(Rate));
-            OnPropertyChanged(nameof(Recommendation));
-            OnPropertyChanged(nameof(Register));
-            OnPropertyChanged(nameof(RelativePanel));
-            OnPropertyChanged(nameof(Remark));
-            OnPropertyChanged(nameof(RemoveItem));
-            OnPropertyChanged(nameof(RepeatButton));
-            OnPropertyChanged(nameof(Reply));
-            OnPropertyChanged(nameof(Repository));
-            OnPropertyChanged(nameof(ResponsiveLayout));
-            OnPropertyChanged(nameof(RichTextBox));
-            OnPropertyChanged(nameof(RightClickHere));
-            OnPropertyChanged(nameof(RunningBlock));
-            OnPropertyChanged(nameof(Screenshot));
-            OnPropertyChanged(nameof(ScrollViewer));
-            OnPropertyChanged(nameof(SearchBar));
-            OnPropertyChanged(nameof(Second));
-            OnPropertyChanged(nameof(Selected));
-            OnPropertyChanged(nameof(SendNotification));
-            OnPropertyChanged(nameof(Shield));
-            OnPropertyChanged(nameof(ShowInCurrentWindow));
-            OnPropertyChanged(nameof(ShowInMainWindow));
-            OnPropertyChanged(nameof(ShowRowNumber));
-            OnPropertyChanged(nameof(SideMenu));
-            OnPropertyChanged(nameof(Slider));
-            OnPropertyChanged(nameof(SplitButton));
-            OnPropertyChanged(nameof(Sprite));
-            OnPropertyChanged(nameof(StartScreenshot));
-            OnPropertyChanged(nameof(StaysOpen));
-            OnPropertyChanged(nameof(Step));
-            OnPropertyChanged(nameof(StepBar));
-            OnPropertyChanged(nameof(Styles));
-            OnPropertyChanged(nameof(SubTitle));
-            OnPropertyChanged(nameof(Success));
-            OnPropertyChanged(nameof(TabControl));
-            OnPropertyChanged(nameof(Tag));
-            OnPropertyChanged(nameof(Text));
-            OnPropertyChanged(nameof(TextBlock));
-            OnPropertyChanged(nameof(TextBox));
-            OnPropertyChanged(nameof(TextDialog));
-            OnPropertyChanged(nameof(TextDialogInControl));
-            OnPropertyChanged(nameof(TextDialogWithTimer));
-            OnPropertyChanged(nameof(TimeBar));
-            OnPropertyChanged(nameof(TimePicker));
-            OnPropertyChanged(nameof(Tip));
-            OnPropertyChanged(nameof(Title));
-            OnPropertyChanged(nameof(TitleDemoStr1));
-            OnPropertyChanged(nameof(TitleDemoStr2));
-            OnPropertyChanged(nameof(TitleDemoStr3));
-            OnPropertyChanged(nameof(ToggleButton));
-            OnPropertyChanged(nameof(ToolBar));
-            OnPropertyChanged(nameof(Tools));
-            OnPropertyChanged(nameof(Transfer));
-            OnPropertyChanged(nameof(TransitioningContentControl));
-            OnPropertyChanged(nameof(TreeView));
-            OnPropertyChanged(nameof(Try2CloseApp));
-            OnPropertyChanged(nameof(Type));
-            OnPropertyChanged(nameof(UniformSpacingPanel));
-            OnPropertyChanged(nameof(UploadFile));
-            OnPropertyChanged(nameof(UploadStr));
-            OnPropertyChanged(nameof(Visibility));
-            OnPropertyChanged(nameof(Vsix));
-            OnPropertyChanged(nameof(Warning));
-            OnPropertyChanged(nameof(WaterfallPanel));
-            OnPropertyChanged(nameof(Website));
-            OnPropertyChanged(nameof(Window));
-        }
-
-        /// <summary>
-        ///   查找类似 关于 的本地化字符串。
-        /// </summary>
-		public string About => Lang.About;
-
-        /// <summary>
-        ///   查找类似 添加项 的本地化字符串。
-        /// </summary>
-		public string AddItem => Lang.AddItem;
-
-        /// <summary>
-        ///   查找类似 动画路径 的本地化字符串。
-        /// </summary>
-		public string AnimationPath => Lang.AnimationPath;
-
-        /// <summary>
-        ///   查找类似 托盘图标已打开，将隐藏窗口而不是关闭程序 的本地化字符串。
-        /// </summary>
-		public string AppClosingTip => Lang.AppClosingTip;
-
-        /// <summary>
-        ///   查找类似 询问 的本地化字符串。
-        /// </summary>
-		public string Ask => Lang.Ask;
-
-        /// <summary>
-        ///   查找类似 自动补全文本框 的本地化字符串。
-        /// </summary>
-		public string AutoCompleteTextBox => Lang.AutoCompleteTextBox;
-
-        /// <summary>
-        ///   查找类似 标记 的本地化字符串。
-        /// </summary>
-		public string Badge => Lang.Badge;
-
-        /// <summary>
-        ///   查找类似 填写基本信息 的本地化字符串。
-        /// </summary>
-		public string BasicInfo => Lang.BasicInfo;
-
-        /// <summary>
-        ///   查找类似 基础布局 的本地化字符串。
-        /// </summary>
-		public string BasicLayout => Lang.BasicLayout;
-
-        /// <summary>
-        ///   查找类似 闪烁 的本地化字符串。
-        /// </summary>
-		public string Blink => Lang.Blink;
-
-        /// <summary>
-        ///   查找类似 博客 的本地化字符串。
-        /// </summary>
-		public string Blog => Lang.Blog;
-
-        /// <summary>
-        ///   查找类似 边框 的本地化字符串。
-        /// </summary>
-		public string Border => Lang.Border;
-
-        /// <summary>
-        ///   查找类似 画刷 的本地化字符串。
-        /// </summary>
-		public string Brush => Lang.Brush;
-
-        /// <summary>
-        ///   查找类似 按钮 的本地化字符串。
-        /// </summary>
-		public string Button => Lang.Button;
-
-        /// <summary>
-        ///   查找类似 自定义按钮 的本地化字符串。
-        /// </summary>
-		public string ButtonCustom => Lang.ButtonCustom;
-
-        /// <summary>
-        ///   查找类似 按钮组 的本地化字符串。
-        /// </summary>
-		public string ButtonGroup => Lang.ButtonGroup;
-
-        /// <summary>
-        ///   查找类似 日历 的本地化字符串。
-        /// </summary>
-		public string Calendar => Lang.Calendar;
-
-        /// <summary>
-        ///   查找类似 带时钟的日历 的本地化字符串。
-        /// </summary>
-		public string CalendarWithClock => Lang.CalendarWithClock;
-
-        /// <summary>
-        ///   查找类似 卡片 的本地化字符串。
-        /// </summary>
-		public string Card => Lang.Card;
-
-        /// <summary>
-        ///   查找类似 轮播 的本地化字符串。
-        /// </summary>
-		public string Carousel => Lang.Carousel;
-
-        /// <summary>
-        ///   查找类似 是否重启以更改语言？ 的本地化字符串。
-        /// </summary>
-		public string ChangeLangAsk => Lang.ChangeLangAsk;
-
-        /// <summary>
-        ///   查找类似 对话气泡 的本地化字符串。
-        /// </summary>
-		public string ChatBubble => Lang.ChatBubble;
-
-        /// <summary>
-        ///   查找类似 讨论室 的本地化字符串。
-        /// </summary>
-		public string Chatroom => Lang.Chatroom;
-
-        /// <summary>
-        ///   查找类似 复选框 的本地化字符串。
-        /// </summary>
-		public string CheckBox => Lang.CheckBox;
-
-        /// <summary>
-        ///   查找类似 多选组合框 的本地化字符串。
-        /// </summary>
-		public string CheckComboBox => Lang.CheckComboBox;
-
-        /// <summary>
-        ///   查找类似 圆形布局 的本地化字符串。
-        /// </summary>
-		public string CirclePanel => Lang.CirclePanel;
-
-        /// <summary>
-        ///   查找类似 清空 的本地化字符串。
-        /// </summary>
-		public string Clear => Lang.Clear;
-
-        /// <summary>
-        ///   查找类似 点击计数 的本地化字符串。
-        /// </summary>
-		public string Click2Count => Lang.Click2Count;
-
-        /// <summary>
-        ///   查找类似 时钟 的本地化字符串。
-        /// </summary>
-		public string Clock => Lang.Clock;
-
-        /// <summary>
-        ///   查找类似 颜色拾取器 的本地化字符串。
-        /// </summary>
-		public string ColorPicker => Lang.ColorPicker;
-
-        /// <summary>
-        ///   查找类似 分栏偏移 的本地化字符串。
-        /// </summary>
-		public string ColumnOffset => Lang.ColumnOffset;
-
-        /// <summary>
-        ///   查找类似 分栏间隔 的本地化字符串。
-        /// </summary>
-		public string ColumnSpacing => Lang.ColumnSpacing;
-
-        /// <summary>
-        ///   查找类似 组合框 的本地化字符串。
-        /// </summary>
-		public string ComboBox => Lang.ComboBox;
-
-        /// <summary>
-        ///   查找类似 敬请期待 的本地化字符串。
-        /// </summary>
-		public string ComingSoon => Lang.ComingSoon;
-
-        /// <summary>
-        ///   查找类似 评论 的本地化字符串。
-        /// </summary>
-		public string Comment => Lang.Comment;
-
-        /// <summary>
-        ///   查找类似 一般 的本地化字符串。
-        /// </summary>
-		public string Common => Lang.Common;
-
-        /// <summary>
-        ///   查找类似 对比滑块 的本地化字符串。
-        /// </summary>
-		public string CompareSlider => Lang.CompareSlider;
-
-        /// <summary>
-        ///   查找类似 完成 的本地化字符串。
-        /// </summary>
-		public string Complete => Lang.Complete;
-
-        /// <summary>
-        ///   查找类似 这是内容 的本地化字符串。
-        /// </summary>
-		public string ContentDemoStr => Lang.ContentDemoStr;
-
-        /// <summary>
-        ///   查找类似 贡献者 的本地化字符串。
-        /// </summary>
-		public string Contributors => Lang.Contributors;
-
-        /// <summary>
-        ///   查找类似 控件 的本地化字符串。
-        /// </summary>
-		public string Controls => Lang.Controls;
-
-        /// <summary>
-        ///   查找类似 封面流 的本地化字符串。
-        /// </summary>
-		public string CoverFlow => Lang.CoverFlow;
-
-        /// <summary>
-        ///   查找类似 封面视图 的本地化字符串。
-        /// </summary>
-		public string CoverView => Lang.CoverView;
-
-        /// <summary>
-        ///   查找类似 危险 的本地化字符串。
-        /// </summary>
-		public string Danger => Lang.Danger;
-
-        /// <summary>
-        ///   查找类似 数据展示 的本地化字符串。
-        /// </summary>
-		public string DataDisplay => Lang.DataDisplay;
-
-        /// <summary>
-        ///   查找类似 数据录入 的本地化字符串。
-        /// </summary>
-		public string DataEntry => Lang.DataEntry;
-
-        /// <summary>
-        ///   查找类似 数据表格 的本地化字符串。
-        /// </summary>
-		public string DataGrid => Lang.DataGrid;
-
-        /// <summary>
-        ///   查找类似 日期选择器 的本地化字符串。
-        /// </summary>
-		public string DatePicker => Lang.DatePicker;
-
-        /// <summary>
-        ///   查找类似 日期时间选择器 的本地化字符串。
-        /// </summary>
-		public string DateTimePicker => Lang.DateTimePicker;
-
-        /// <summary>
-        ///   查找类似 默认 的本地化字符串。
-        /// </summary>
-		public string Default => Lang.Default;
-
-        /// <summary>
-        ///   查找类似 示例 的本地化字符串。
-        /// </summary>
-		public string Demo => Lang.Demo;
-
-        /// <summary>
-        ///   查找类似 对话框 的本地化字符串。
-        /// </summary>
-		public string Dialog => Lang.Dialog;
-
-        /// <summary>
-        ///   查找类似 对话框示例 的本地化字符串。
-        /// </summary>
-		public string DialogDemo => Lang.DialogDemo;
-
-        /// <summary>
-        ///   查找类似 分割线 的本地化字符串。
-        /// </summary>
-		public string Divider => Lang.Divider;
-
-        /// <summary>
-        ///   查找类似 中文文档 的本地化字符串。
-        /// </summary>
-		public string Doc_cn => Lang.Doc_cn;
-
-        /// <summary>
-        ///   查找类似 英文文档 的本地化字符串。
-        /// </summary>
-		public string Doc_en => Lang.Doc_en;
-
-        /// <summary>
-        ///   查找类似 文献资料 的本地化字符串。
-        /// </summary>
-		public string Documentation => Lang.Documentation;
-
-        /// <summary>
-        ///   查找类似 在这里拖拽 的本地化字符串。
-        /// </summary>
-		public string DragHere => Lang.DragHere;
-
-        /// <summary>
-        ///   查找类似 抽屉 的本地化字符串。
-        /// </summary>
-		public string Drawer => Lang.Drawer;
-
-        /// <summary>
-        ///   查找类似 效果 的本地化字符串。
-        /// </summary>
-		public string Effects => Lang.Effects;
-
-        /// <summary>
-        ///   查找类似 元素组 的本地化字符串。
-        /// </summary>
-		public string ElementGroup => Lang.ElementGroup;
-
-        /// <summary>
-        ///   查找类似 邮箱 的本地化字符串。
-        /// </summary>
-		public string Email => Lang.Email;
-
-        /// <summary>
-        ///   查找类似 空状态 的本地化字符串。
-        /// </summary>
-		public string Empty => Lang.Empty;
-
-        /// <summary>
-        ///   查找类似 错误 的本地化字符串。
-        /// </summary>
-		public string Error => Lang.Error;
-
-        /// <summary>
-        ///   查找类似 退出 的本地化字符串。
-        /// </summary>
-		public string Exit => Lang.Exit;
-
-        /// <summary>
-        ///   查找类似 展开框 的本地化字符串。
-        /// </summary>
-		public string Expander => Lang.Expander;
-
-        /// <summary>
-        ///   查找类似 严重 的本地化字符串。
-        /// </summary>
-		public string Fatal => Lang.Fatal;
-
-        /// <summary>
-        ///   查找类似 反馈 的本地化字符串。
-        /// </summary>
-		public string Feedback => Lang.Feedback;
-
-        /// <summary>
-        ///   查找类似 弹性盒子 的本地化字符串。
-        /// </summary>
-		public string FlexPanel => Lang.FlexPanel;
-
-        /// <summary>
-        ///   查找类似 翻页时钟 的本地化字符串。
-        /// </summary>
-		public string FlipClock => Lang.FlipClock;
-
-        /// <summary>
-        ///   查找类似 漂浮块 的本地化字符串。
-        /// </summary>
-		public string FloatingBlock => Lang.FloatingBlock;
-
-        /// <summary>
-        ///   查找类似 流文档 的本地化字符串。
-        /// </summary>
-		public string FlowDocument => Lang.FlowDocument;
-
-        /// <summary>
-        ///   查找类似 流文档单页视图 的本地化字符串。
-        /// </summary>
-		public string FlowDocumentPageViewer => Lang.FlowDocumentPageViewer;
-
-        /// <summary>
-        ///   查找类似 流文档查看器 的本地化字符串。
-        /// </summary>
-		public string FlowDocumentReader => Lang.FlowDocumentReader;
-
-        /// <summary>
-        ///   查找类似 流文档滚动视图 的本地化字符串。
-        /// </summary>
-		public string FlowDocumentScrollViewer => Lang.FlowDocumentScrollViewer;
-
-        /// <summary>
-        ///   查找类似 导航框架 的本地化字符串。
-        /// </summary>
-		public string Frame => Lang.Frame;
-
-        /// <summary>
-        ///   查找类似 几何形状 的本地化字符串。
-        /// </summary>
-		public string Geometry => Lang.Geometry;
-
-        /// <summary>
-        ///   查找类似 Gif图片 的本地化字符串。
-        /// </summary>
-		public string GifImage => Lang.GifImage;
-
-        /// <summary>
-        ///   查找类似 回到顶部 的本地化字符串。
-        /// </summary>
-		public string GotoTop => Lang.GotoTop;
-
-        /// <summary>
-        ///   查找类似 头像 的本地化字符串。
-        /// </summary>
-		public string Gravatar => Lang.Gravatar;
-
-        /// <summary>
-        ///   查找类似 栅格 的本地化字符串。
-        /// </summary>
-		public string Grid => Lang.Grid;
-
-        /// <summary>
-        ///   查找类似 分组框 的本地化字符串。
-        /// </summary>
-		public string GroupBox => Lang.GroupBox;
-
-        /// <summary>
-        ///   查找类似 组数 的本地化字符串。
-        /// </summary>
-		public string Groups => Lang.Groups;
-
-        /// <summary>
-        ///   查找类似 信息通知 的本地化字符串。
-        /// </summary>
-		public string Growl => Lang.Growl;
-
-        /// <summary>
-        ///   查找类似 检测到有新版本！是否更新？ 的本地化字符串。
-        /// </summary>
-		public string GrowlAsk => Lang.GrowlAsk;
-
-        /// <summary>
-        ///   查找类似 消息通知示例 的本地化字符串。
-        /// </summary>
-		public string GrowlDemo => Lang.GrowlDemo;
-
-        /// <summary>
-        ///   查找类似 连接失败，请检查网络！ 的本地化字符串。
-        /// </summary>
-		public string GrowlError => Lang.GrowlError;
-
-        /// <summary>
-        ///   查找类似 程序已崩溃~~~ 的本地化字符串。
-        /// </summary>
-		public string GrowlFatal => Lang.GrowlFatal;
-
-        /// <summary>
-        ///   查找类似 今天的天气不错~~~ 的本地化字符串。
-        /// </summary>
-		public string GrowlInfo => Lang.GrowlInfo;
-
-        /// <summary>
-        ///   查找类似 文件保存成功！ 的本地化字符串。
-        /// </summary>
-		public string GrowlSuccess => Lang.GrowlSuccess;
-
-        /// <summary>
-        ///   查找类似 磁盘空间快要满了！ 的本地化字符串。
-        /// </summary>
-		public string GrowlWarning => Lang.GrowlWarning;
-
-        /// <summary>
-        ///   查找类似 阴影画笔生成器 的本地化字符串。
-        /// </summary>
-		public string HatchBrushGenerator => Lang.HatchBrushGenerator;
-
-        /// <summary>
-        ///   查找类似 蜂窝布局 的本地化字符串。
-        /// </summary>
-		public string HoneycombPanel => Lang.HoneycombPanel;
-
-        /// <summary>
-        ///   查找类似 混合布局 的本地化字符串。
-        /// </summary>
-		public string HybridLayout => Lang.HybridLayout;
-
-        /// <summary>
-        ///   查找类似 忽略 的本地化字符串。
-        /// </summary>
-		public string Ignore => Lang.Ignore;
-
-        /// <summary>
-        ///   查找类似 图片块 的本地化字符串。
-        /// </summary>
-		public string ImageBlock => Lang.ImageBlock;
-
-        /// <summary>
-        ///   查找类似 图片浏览器 的本地化字符串。
-        /// </summary>
-		public string ImageBrowser => Lang.ImageBrowser;
-
-        /// <summary>
-        ///   查找类似 图片选择器 的本地化字符串。
-        /// </summary>
-		public string ImageSelector => Lang.ImageSelector;
-
-        /// <summary>
-        ///   查找类似 索引 的本地化字符串。
-        /// </summary>
-		public string Index => Lang.Index;
-
-        /// <summary>
-        ///   查找类似 信息 的本地化字符串。
-        /// </summary>
-		public string Info => Lang.Info;
-
-        /// <summary>
-        ///   查找类似 交互 的本地化字符串。
-        /// </summary>
-		public string Interacting => Lang.Interacting;
-
-        /// <summary>
-        ///   查找类似 可交互对话框 的本地化字符串。
-        /// </summary>
-		public string InteractiveDialog => Lang.InteractiveDialog;
-
-        /// <summary>
-        ///   查找类似 不是手机号码 的本地化字符串。
-        /// </summary>
-		public string IsNotPhone => Lang.IsNotPhone;
-
-        /// <summary>
-        ///   查找类似 标签 的本地化字符串。
-        /// </summary>
-		public string Label => Lang.Label;
-
-        /// <summary>
-        ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
-        /// </summary>
-		public string LangComment => Lang.LangComment;
-
-        /// <summary>
-        ///   查找类似 布局 的本地化字符串。
-        /// </summary>
-		public string Layout => Lang.Layout;
-
-        /// <summary>
-        ///   查找类似 列表框 的本地化字符串。
-        /// </summary>
-		public string ListBox => Lang.ListBox;
-
-        /// <summary>
-        ///   查找类似 列表视图 的本地化字符串。
-        /// </summary>
-		public string ListView => Lang.ListView;
-
-        /// <summary>
-        ///   查找类似 加载条 的本地化字符串。
-        /// </summary>
-		public string Loading => Lang.Loading;
-
-        /// <summary>
-        ///   查找类似 放大镜 的本地化字符串。
-        /// </summary>
-		public string Magnifier => Lang.Magnifier;
-
-        /// <summary>
-        ///   查找类似 菜单 的本地化字符串。
-        /// </summary>
-		public string Menu => Lang.Menu;
-
-        /// <summary>
-        ///   查找类似 消息框 的本地化字符串。
-        /// </summary>
-		public string MessageBox => Lang.MessageBox;
-
-        /// <summary>
-        ///   查找类似 杂项 的本地化字符串。
-        /// </summary>
-		public string Misc => Lang.Misc;
-
-        /// <summary>
-        ///   查找类似  的本地化字符串。
-        /// </summary>
-		public string Morphing_Animation => Lang.Morphing_Animation;
-
-        /// <summary>
-        ///   查找类似 名称 的本地化字符串。
-        /// </summary>
-		public string Name => Lang.Name;
-
-        /// <summary>
-        ///   查找类似 导航 的本地化字符串。
-        /// </summary>
-		public string Navigation => Lang.Navigation;
-
-        /// <summary>
-        ///   查找类似 新建窗口 的本地化字符串。
-        /// </summary>
-		public string NewWindow => Lang.NewWindow;
-
-        /// <summary>
-        ///   查找类似 下一步 的本地化字符串。
-        /// </summary>
-		public string Next => Lang.Next;
-
-        /// <summary>
-        ///   查找类似 桌面通知 的本地化字符串。
-        /// </summary>
-		public string Notification => Lang.Notification;
-
-        /// <summary>
-        ///   查找类似 托盘图标 的本地化字符串。
-        /// </summary>
-		public string NotifyIcon => Lang.NotifyIcon;
-
-        /// <summary>
-        ///   查找类似 数值选择控件 的本地化字符串。
-        /// </summary>
-		public string NumericUpDown => Lang.NumericUpDown;
-
-        /// <summary>
-        ///   查找类似 关 的本地化字符串。
-        /// </summary>
-		public string Off => Lang.Off;
-
-        /// <summary>
-        ///   查找类似 确定 的本地化字符串。
-        /// </summary>
-		public string Ok => Lang.Ok;
-
-        /// <summary>
-        ///   查找类似 开 的本地化字符串。
-        /// </summary>
-		public string On => Lang.On;
-
-        /// <summary>
-        ///   查找类似 点击打开背景模糊窗口 的本地化字符串。
-        /// </summary>
-		public string OpenBlurWindow => Lang.OpenBlurWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开常规窗口 的本地化字符串。
-        /// </summary>
-		public string OpenCommonWindow => Lang.OpenCommonWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开自定义内容窗口 的本地化字符串。
-        /// </summary>
-		public string OpenCustomContentWindow => Lang.OpenCustomContentWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开自定义消息窗口 的本地化字符串。
-        /// </summary>
-		public string OpenCustomMessageWindow => Lang.OpenCustomMessageWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。
-        /// </summary>
-		public string OpenCustomNonClientAreaWindow => Lang.OpenCustomNonClientAreaWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开辉光窗口 的本地化字符串。
-        /// </summary>
-		public string OpenGlowWindow => Lang.OpenGlowWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开图片浏览器 的本地化字符串。
-        /// </summary>
-		public string OpenImageBrowser => Lang.OpenImageBrowser;
-
-        /// <summary>
-        ///   查找类似 点击打开消息窗口 的本地化字符串。
-        /// </summary>
-		public string OpenMessageWindow => Lang.OpenMessageWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开鼠标跟随窗口 的本地化字符串。
-        /// </summary>
-		public string OpenMouseFollowWindow => Lang.OpenMouseFollowWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开原生常规窗口 的本地化字符串。
-        /// </summary>
-		public string OpenNativeCommonWindow => Lang.OpenNativeCommonWindow;
-
-        /// <summary>
-        ///   查找类似 点击打开导航窗口 的本地化字符串。
-        /// </summary>
-		public string OpenNavigationWindow => Lang.OpenNavigationWindow;
-
-        /// <summary>
-        ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
-        /// </summary>
-		public string OpenNoNonClientAreaDragableWindow => Lang.OpenNoNonClientAreaDragableWindow;
-
-        /// <summary>
-        ///   查找类似 打开面板 的本地化字符串。
-        /// </summary>
-		public string OpenPanel => Lang.OpenPanel;
-
-        /// <summary>
-        ///   查找类似 打开精灵 的本地化字符串。
-        /// </summary>
-		public string OpenSprite => Lang.OpenSprite;
-
-        /// <summary>
-        ///   查找类似 点击打开触摸拖动窗口 的本地化字符串。
-        /// </summary>
-		public string OpenTouchDragMoveWindow => Lang.OpenTouchDragMoveWindow;
-
-        /// <summary>
-        ///   查找类似 轮廓文本 的本地化字符串。
-        /// </summary>
-		public string OutlineText => Lang.OutlineText;
-
-        /// <summary>
-        ///   查找类似 页码条 的本地化字符串。
-        /// </summary>
-		public string Pagination => Lang.Pagination;
-
-        /// <summary>
-        ///   查找类似 密码框 的本地化字符串。
-        /// </summary>
-		public string PasswordBox => Lang.PasswordBox;
-
-        /// <summary>
-        ///   查找类似 PIN码框 的本地化字符串。
-        /// </summary>
-		public string PinBox => Lang.PinBox;
-
-        /// <summary>
-        ///   查找类似 请输入... 的本地化字符串。
-        /// </summary>
-		public string PleaseInput => Lang.PleaseInput;
-
-        /// <summary>
-        ///   查找类似 请稍后... 的本地化字符串。
-        /// </summary>
-		public string PleaseWait => Lang.PleaseWait;
-
-        /// <summary>
-        ///   查找类似 请输入内容 的本地化字符串。
-        /// </summary>
-		public string PlsEnterContent => Lang.PlsEnterContent;
-
-        /// <summary>
-        ///   查找类似 请输入邮箱 的本地化字符串。
-        /// </summary>
-		public string PlsEnterEmail => Lang.PlsEnterEmail;
-
-        /// <summary>
-        ///   查找类似 请输入关键字 的本地化字符串。
-        /// </summary>
-		public string PlsEnterKey => Lang.PlsEnterKey;
-
-        /// <summary>
-        ///   查找类似 气泡提示 的本地化字符串。
-        /// </summary>
-		public string Poptip => Lang.Poptip;
-
-        /// <summary>
-        ///   查找类似 上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上 的本地化字符串。
-        /// </summary>
-		public string PoptipPositionStr => Lang.PoptipPositionStr;
-
-        /// <summary>
-        ///   查找类似 实用例子 的本地化字符串。
-        /// </summary>
-		public string PracticalDemos => Lang.PracticalDemos;
-
-        /// <summary>
-        ///   查找类似 上一步 的本地化字符串。
-        /// </summary>
-		public string Prev => Lang.Prev;
-
-        /// <summary>
-        ///   查找类似 预览滑块 的本地化字符串。
-        /// </summary>
-		public string PreviewSlider => Lang.PreviewSlider;
-
-        /// <summary>
-        ///   查找类似 主要 的本地化字符串。
-        /// </summary>
-		public string Primary => Lang.Primary;
-
-        /// <summary>
-        ///   查找类似 进度条 的本地化字符串。
-        /// </summary>
-		public string ProgressBar => Lang.ProgressBar;
-
-        /// <summary>
-        ///   查找类似 进度按钮 的本地化字符串。
-        /// </summary>
-		public string ProgressButton => Lang.ProgressButton;
-
-        /// <summary>
-        ///   查找类似 项目 的本地化字符串。
-        /// </summary>
-		public string Project => Lang.Project;
-
-        /// <summary>
-        ///   查找类似 属性编辑器 的本地化字符串。
-        /// </summary>
-		public string PropertyGrid => Lang.PropertyGrid;
-
-        /// <summary>
-        ///   查找类似 按住说话 的本地化字符串。
-        /// </summary>
-		public string PushToTalk => Lang.PushToTalk;
-
-        /// <summary>
-        ///   查找类似 QQ群 的本地化字符串。
-        /// </summary>
-		public string QQGroup => Lang.QQGroup;
-
-        /// <summary>
-        ///   查找类似 单选按钮 的本地化字符串。
-        /// </summary>
-		public string RadioButton => Lang.RadioButton;
-
-        /// <summary>
-        ///   查找类似 范围滑块 的本地化字符串。
-        /// </summary>
-		public string RangeSlider => Lang.RangeSlider;
-
-        /// <summary>
-        ///   查找类似 评分 的本地化字符串。
-        /// </summary>
-		public string Rate => Lang.Rate;
-
-        /// <summary>
-        ///   查找类似 群友推荐 的本地化字符串。
-        /// </summary>
-		public string Recommendation => Lang.Recommendation;
-
-        /// <summary>
-        ///   查找类似 注册 的本地化字符串。
-        /// </summary>
-		public string Register => Lang.Register;
-
-        /// <summary>
-        ///   查找类似 相对布局 的本地化字符串。
-        /// </summary>
-		public string RelativePanel => Lang.RelativePanel;
-
-        /// <summary>
-        ///   查找类似 备注 的本地化字符串。
-        /// </summary>
-		public string Remark => Lang.Remark;
-
-        /// <summary>
-        ///   查找类似 删除项 的本地化字符串。
-        /// </summary>
-		public string RemoveItem => Lang.RemoveItem;
-
-        /// <summary>
-        ///   查找类似 重复按钮 的本地化字符串。
-        /// </summary>
-		public string RepeatButton => Lang.RepeatButton;
-
-        /// <summary>
-        ///   查找类似 回复 的本地化字符串。
-        /// </summary>
-		public string Reply => Lang.Reply;
-
-        /// <summary>
-        ///   查找类似 代码仓库 的本地化字符串。
-        /// </summary>
-		public string Repository => Lang.Repository;
-
-        /// <summary>
-        ///   查找类似 响应式布局 的本地化字符串。
-        /// </summary>
-		public string ResponsiveLayout => Lang.ResponsiveLayout;
-
-        /// <summary>
-        ///   查找类似 富文本框 的本地化字符串。
-        /// </summary>
-		public string RichTextBox => Lang.RichTextBox;
-
-        /// <summary>
-        ///   查找类似 在这里右击 的本地化字符串。
-        /// </summary>
-		public string RightClickHere => Lang.RightClickHere;
-
-        /// <summary>
-        ///   查找类似 滚动块 的本地化字符串。
-        /// </summary>
-		public string RunningBlock => Lang.RunningBlock;
-
-        /// <summary>
-        ///   查找类似 截图 的本地化字符串。
-        /// </summary>
-		public string Screenshot => Lang.Screenshot;
-
-        /// <summary>
-        ///   查找类似 滚动视图 的本地化字符串。
-        /// </summary>
-		public string ScrollViewer => Lang.ScrollViewer;
-
-        /// <summary>
-        ///   查找类似 搜索栏 的本地化字符串。
-        /// </summary>
-		public string SearchBar => Lang.SearchBar;
-
-        /// <summary>
-        ///   查找类似 秒 的本地化字符串。
-        /// </summary>
-		public string Second => Lang.Second;
-
-        /// <summary>
-        ///   查找类似 选中 的本地化字符串。
-        /// </summary>
-		public string Selected => Lang.Selected;
-
-        /// <summary>
-        ///   查找类似 发送通知 的本地化字符串。
-        /// </summary>
-		public string SendNotification => Lang.SendNotification;
-
-        /// <summary>
-        ///   查找类似 徽章 的本地化字符串。
-        /// </summary>
-		public string Shield => Lang.Shield;
-
-        /// <summary>
-        ///   查找类似 在当前窗口显示 的本地化字符串。
-        /// </summary>
-		public string ShowInCurrentWindow => Lang.ShowInCurrentWindow;
-
-        /// <summary>
-        ///   查找类似 在主窗口显示 的本地化字符串。
-        /// </summary>
-		public string ShowInMainWindow => Lang.ShowInMainWindow;
-
-        /// <summary>
-        ///   查找类似 显示行号 的本地化字符串。
-        /// </summary>
-		public string ShowRowNumber => Lang.ShowRowNumber;
-
-        /// <summary>
-        ///   查找类似 侧边菜单 的本地化字符串。
-        /// </summary>
-		public string SideMenu => Lang.SideMenu;
-
-        /// <summary>
-        ///   查找类似 滑块 的本地化字符串。
-        /// </summary>
-		public string Slider => Lang.Slider;
-
-        /// <summary>
-        ///   查找类似 分割按钮 的本地化字符串。
-        /// </summary>
-		public string SplitButton => Lang.SplitButton;
-
-        /// <summary>
-        ///   查找类似 精灵 的本地化字符串。
-        /// </summary>
-		public string Sprite => Lang.Sprite;
-
-        /// <summary>
-        ///   查找类似 开始截图 的本地化字符串。
-        /// </summary>
-		public string StartScreenshot => Lang.StartScreenshot;
-
-        /// <summary>
-        ///   查找类似 保持打开 的本地化字符串。
-        /// </summary>
-		public string StaysOpen => Lang.StaysOpen;
-
-        /// <summary>
-        ///   查找类似 步骤 的本地化字符串。
-        /// </summary>
-		public string Step => Lang.Step;
-
-        /// <summary>
-        ///   查找类似 步骤条 的本地化字符串。
-        /// </summary>
-		public string StepBar => Lang.StepBar;
-
-        /// <summary>
-        ///   查找类似 样式模板 的本地化字符串。
-        /// </summary>
-		public string Styles => Lang.Styles;
-
-        /// <summary>
-        ///   查找类似 子标题 的本地化字符串。
-        /// </summary>
-		public string SubTitle => Lang.SubTitle;
-
-        /// <summary>
-        ///   查找类似 成功 的本地化字符串。
-        /// </summary>
-		public string Success => Lang.Success;
-
-        /// <summary>
-        ///   查找类似 选项卡控件 的本地化字符串。
-        /// </summary>
-		public string TabControl => Lang.TabControl;
-
-        /// <summary>
-        ///   查找类似 标签 的本地化字符串。
-        /// </summary>
-		public string Tag => Lang.Tag;
-
-        /// <summary>
-        ///   查找类似 正文 的本地化字符串。
-        /// </summary>
-		public string Text => Lang.Text;
-
-        /// <summary>
-        ///   查找类似 文本块 的本地化字符串。
-        /// </summary>
-		public string TextBlock => Lang.TextBlock;
-
-        /// <summary>
-        ///   查找类似 文本框 的本地化字符串。
-        /// </summary>
-		public string TextBox => Lang.TextBox;
-
-        /// <summary>
-        ///   查找类似 文本对话框 的本地化字符串。
-        /// </summary>
-		public string TextDialog => Lang.TextDialog;
-
-        /// <summary>
-        ///   查找类似 文本对话框（控件中） 的本地化字符串。
-        /// </summary>
-		public string TextDialogInControl => Lang.TextDialogInControl;
-
-        /// <summary>
-        ///   查找类似 文本对话框，带计时器 的本地化字符串。
-        /// </summary>
-		public string TextDialogWithTimer => Lang.TextDialogWithTimer;
-
-        /// <summary>
-        ///   查找类似 时间条 的本地化字符串。
-        /// </summary>
-		public string TimeBar => Lang.TimeBar;
-
-        /// <summary>
-        ///   查找类似 时间选择器 的本地化字符串。
-        /// </summary>
-		public string TimePicker => Lang.TimePicker;
-
-        /// <summary>
-        ///   查找类似 提示 的本地化字符串。
-        /// </summary>
-		public string Tip => Lang.Tip;
-
-        /// <summary>
-        ///   查找类似 标题 的本地化字符串。
-        /// </summary>
-		public string Title => Lang.Title;
-
-        /// <summary>
-        ///   查找类似 这是标题 的本地化字符串。
-        /// </summary>
-		public string TitleDemoStr1 => Lang.TitleDemoStr1;
-
-        /// <summary>
-        ///   查找类似 此项必填 的本地化字符串。
-        /// </summary>
-		public string TitleDemoStr2 => Lang.TitleDemoStr2;
-
-        /// <summary>
-        ///   查找类似 标题在左侧 的本地化字符串。
-        /// </summary>
-		public string TitleDemoStr3 => Lang.TitleDemoStr3;
-
-        /// <summary>
-        ///   查找类似 切换按钮 的本地化字符串。
-        /// </summary>
-		public string ToggleButton => Lang.ToggleButton;
-
-        /// <summary>
-        ///   查找类似 工具条 的本地化字符串。
-        /// </summary>
-		public string ToolBar => Lang.ToolBar;
-
-        /// <summary>
-        ///   查找类似 工具 的本地化字符串。
-        /// </summary>
-		public string Tools => Lang.Tools;
-
-        /// <summary>
-        ///   查找类似 穿梭框 的本地化字符串。
-        /// </summary>
-		public string Transfer => Lang.Transfer;
-
-        /// <summary>
-        ///   查找类似 内容过渡控件 的本地化字符串。
-        /// </summary>
-		public string TransitioningContentControl => Lang.TransitioningContentControl;
-
-        /// <summary>
-        ///   查找类似 树视图 的本地化字符串。
-        /// </summary>
-		public string TreeView => Lang.TreeView;
-
-        /// <summary>
-        ///   查找类似 试试关闭程序吧？ 的本地化字符串。
-        /// </summary>
-		public string Try2CloseApp => Lang.Try2CloseApp;
-
-        /// <summary>
-        ///   查找类似 类型 的本地化字符串。
-        /// </summary>
-		public string Type => Lang.Type;
-
-        /// <summary>
-        ///   查找类似 等间距布局 的本地化字符串。
-        /// </summary>
-		public string UniformSpacingPanel => Lang.UniformSpacingPanel;
-
-        /// <summary>
-        ///   查找类似 上传文件 的本地化字符串。
-        /// </summary>
-		public string UploadFile => Lang.UploadFile;
-
-        /// <summary>
-        ///   查找类似 上传;上传中 的本地化字符串。
-        /// </summary>
-		public string UploadStr => Lang.UploadStr;
-
-        /// <summary>
-        ///   查找类似 可见性 的本地化字符串。
-        /// </summary>
-		public string Visibility => Lang.Visibility;
-
-        /// <summary>
-        ///   查找类似 VS 插件 的本地化字符串。
-        /// </summary>
-		public string Vsix => Lang.Vsix;
-
-        /// <summary>
-        ///   查找类似 警告 的本地化字符串。
-        /// </summary>
-		public string Warning => Lang.Warning;
-
-        /// <summary>
-        ///   查找类似 瀑布流 的本地化字符串。
-        /// </summary>
-		public string WaterfallPanel => Lang.WaterfallPanel;
-
-        /// <summary>
-        ///   查找类似 网站 的本地化字符串。
-        /// </summary>
-		public string Website => Lang.Website;
-
-        /// <summary>
-        ///   查找类似 窗口 的本地化字符串。
-        /// </summary>
-		public string Window => Lang.Window;
-
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName) =>
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 
-    public class LangKeys
+    public static string GetLang(string key) => Lang.ResourceManager.GetString(key, Culture);
+
+    public static void SetLang(DependencyObject dependencyObject, DependencyProperty dependencyProperty, string key) =>
+        BindingOperations.SetBinding(dependencyObject, dependencyProperty, new Binding(key)
+        {
+            Source = Instance,
+            Mode = BindingMode.OneWay
+        });
+
+    private void UpdateLangs()
     {
-        /// <summary>
-        ///   查找类似 关于 的本地化字符串。
-        /// </summary>
-		public static string About = nameof(About);
-
-        /// <summary>
-        ///   查找类似 添加项 的本地化字符串。
-        /// </summary>
-		public static string AddItem = nameof(AddItem);
-
-        /// <summary>
-        ///   查找类似 动画路径 的本地化字符串。
-        /// </summary>
-		public static string AnimationPath = nameof(AnimationPath);
-
-        /// <summary>
-        ///   查找类似 托盘图标已打开，将隐藏窗口而不是关闭程序 的本地化字符串。
-        /// </summary>
-		public static string AppClosingTip = nameof(AppClosingTip);
-
-        /// <summary>
-        ///   查找类似 询问 的本地化字符串。
-        /// </summary>
-		public static string Ask = nameof(Ask);
-
-        /// <summary>
-        ///   查找类似 自动补全文本框 的本地化字符串。
-        /// </summary>
-		public static string AutoCompleteTextBox = nameof(AutoCompleteTextBox);
-
-        /// <summary>
-        ///   查找类似 标记 的本地化字符串。
-        /// </summary>
-		public static string Badge = nameof(Badge);
-
-        /// <summary>
-        ///   查找类似 填写基本信息 的本地化字符串。
-        /// </summary>
-		public static string BasicInfo = nameof(BasicInfo);
-
-        /// <summary>
-        ///   查找类似 基础布局 的本地化字符串。
-        /// </summary>
-		public static string BasicLayout = nameof(BasicLayout);
-
-        /// <summary>
-        ///   查找类似 闪烁 的本地化字符串。
-        /// </summary>
-		public static string Blink = nameof(Blink);
-
-        /// <summary>
-        ///   查找类似 博客 的本地化字符串。
-        /// </summary>
-		public static string Blog = nameof(Blog);
-
-        /// <summary>
-        ///   查找类似 边框 的本地化字符串。
-        /// </summary>
-		public static string Border = nameof(Border);
-
-        /// <summary>
-        ///   查找类似 画刷 的本地化字符串。
-        /// </summary>
-		public static string Brush = nameof(Brush);
-
-        /// <summary>
-        ///   查找类似 按钮 的本地化字符串。
-        /// </summary>
-		public static string Button = nameof(Button);
-
-        /// <summary>
-        ///   查找类似 自定义按钮 的本地化字符串。
-        /// </summary>
-		public static string ButtonCustom = nameof(ButtonCustom);
-
-        /// <summary>
-        ///   查找类似 按钮组 的本地化字符串。
-        /// </summary>
-		public static string ButtonGroup = nameof(ButtonGroup);
-
-        /// <summary>
-        ///   查找类似 日历 的本地化字符串。
-        /// </summary>
-		public static string Calendar = nameof(Calendar);
-
-        /// <summary>
-        ///   查找类似 带时钟的日历 的本地化字符串。
-        /// </summary>
-		public static string CalendarWithClock = nameof(CalendarWithClock);
-
-        /// <summary>
-        ///   查找类似 卡片 的本地化字符串。
-        /// </summary>
-		public static string Card = nameof(Card);
-
-        /// <summary>
-        ///   查找类似 轮播 的本地化字符串。
-        /// </summary>
-		public static string Carousel = nameof(Carousel);
-
-        /// <summary>
-        ///   查找类似 是否重启以更改语言？ 的本地化字符串。
-        /// </summary>
-		public static string ChangeLangAsk = nameof(ChangeLangAsk);
-
-        /// <summary>
-        ///   查找类似 对话气泡 的本地化字符串。
-        /// </summary>
-		public static string ChatBubble = nameof(ChatBubble);
-
-        /// <summary>
-        ///   查找类似 讨论室 的本地化字符串。
-        /// </summary>
-		public static string Chatroom = nameof(Chatroom);
-
-        /// <summary>
-        ///   查找类似 复选框 的本地化字符串。
-        /// </summary>
-		public static string CheckBox = nameof(CheckBox);
-
-        /// <summary>
-        ///   查找类似 多选组合框 的本地化字符串。
-        /// </summary>
-		public static string CheckComboBox = nameof(CheckComboBox);
-
-        /// <summary>
-        ///   查找类似 圆形布局 的本地化字符串。
-        /// </summary>
-		public static string CirclePanel = nameof(CirclePanel);
-
-        /// <summary>
-        ///   查找类似 清空 的本地化字符串。
-        /// </summary>
-		public static string Clear = nameof(Clear);
-
-        /// <summary>
-        ///   查找类似 点击计数 的本地化字符串。
-        /// </summary>
-		public static string Click2Count = nameof(Click2Count);
-
-        /// <summary>
-        ///   查找类似 时钟 的本地化字符串。
-        /// </summary>
-		public static string Clock = nameof(Clock);
-
-        /// <summary>
-        ///   查找类似 颜色拾取器 的本地化字符串。
-        /// </summary>
-		public static string ColorPicker = nameof(ColorPicker);
-
-        /// <summary>
-        ///   查找类似 分栏偏移 的本地化字符串。
-        /// </summary>
-		public static string ColumnOffset = nameof(ColumnOffset);
-
-        /// <summary>
-        ///   查找类似 分栏间隔 的本地化字符串。
-        /// </summary>
-		public static string ColumnSpacing = nameof(ColumnSpacing);
-
-        /// <summary>
-        ///   查找类似 组合框 的本地化字符串。
-        /// </summary>
-		public static string ComboBox = nameof(ComboBox);
-
-        /// <summary>
-        ///   查找类似 敬请期待 的本地化字符串。
-        /// </summary>
-		public static string ComingSoon = nameof(ComingSoon);
-
-        /// <summary>
-        ///   查找类似 评论 的本地化字符串。
-        /// </summary>
-		public static string Comment = nameof(Comment);
-
-        /// <summary>
-        ///   查找类似 一般 的本地化字符串。
-        /// </summary>
-		public static string Common = nameof(Common);
-
-        /// <summary>
-        ///   查找类似 对比滑块 的本地化字符串。
-        /// </summary>
-		public static string CompareSlider = nameof(CompareSlider);
-
-        /// <summary>
-        ///   查找类似 完成 的本地化字符串。
-        /// </summary>
-		public static string Complete = nameof(Complete);
-
-        /// <summary>
-        ///   查找类似 这是内容 的本地化字符串。
-        /// </summary>
-		public static string ContentDemoStr = nameof(ContentDemoStr);
-
-        /// <summary>
-        ///   查找类似 贡献者 的本地化字符串。
-        /// </summary>
-		public static string Contributors = nameof(Contributors);
-
-        /// <summary>
-        ///   查找类似 控件 的本地化字符串。
-        /// </summary>
-		public static string Controls = nameof(Controls);
-
-        /// <summary>
-        ///   查找类似 封面流 的本地化字符串。
-        /// </summary>
-		public static string CoverFlow = nameof(CoverFlow);
-
-        /// <summary>
-        ///   查找类似 封面视图 的本地化字符串。
-        /// </summary>
-		public static string CoverView = nameof(CoverView);
-
-        /// <summary>
-        ///   查找类似 危险 的本地化字符串。
-        /// </summary>
-		public static string Danger = nameof(Danger);
-
-        /// <summary>
-        ///   查找类似 数据展示 的本地化字符串。
-        /// </summary>
-		public static string DataDisplay = nameof(DataDisplay);
-
-        /// <summary>
-        ///   查找类似 数据录入 的本地化字符串。
-        /// </summary>
-		public static string DataEntry = nameof(DataEntry);
-
-        /// <summary>
-        ///   查找类似 数据表格 的本地化字符串。
-        /// </summary>
-		public static string DataGrid = nameof(DataGrid);
-
-        /// <summary>
-        ///   查找类似 日期选择器 的本地化字符串。
-        /// </summary>
-		public static string DatePicker = nameof(DatePicker);
-
-        /// <summary>
-        ///   查找类似 日期时间选择器 的本地化字符串。
-        /// </summary>
-		public static string DateTimePicker = nameof(DateTimePicker);
-
-        /// <summary>
-        ///   查找类似 默认 的本地化字符串。
-        /// </summary>
-		public static string Default = nameof(Default);
-
-        /// <summary>
-        ///   查找类似 示例 的本地化字符串。
-        /// </summary>
-		public static string Demo = nameof(Demo);
-
-        /// <summary>
-        ///   查找类似 对话框 的本地化字符串。
-        /// </summary>
-		public static string Dialog = nameof(Dialog);
-
-        /// <summary>
-        ///   查找类似 对话框示例 的本地化字符串。
-        /// </summary>
-		public static string DialogDemo = nameof(DialogDemo);
-
-        /// <summary>
-        ///   查找类似 分割线 的本地化字符串。
-        /// </summary>
-		public static string Divider = nameof(Divider);
-
-        /// <summary>
-        ///   查找类似 中文文档 的本地化字符串。
-        /// </summary>
-		public static string Doc_cn = nameof(Doc_cn);
-
-        /// <summary>
-        ///   查找类似 英文文档 的本地化字符串。
-        /// </summary>
-		public static string Doc_en = nameof(Doc_en);
-
-        /// <summary>
-        ///   查找类似 文献资料 的本地化字符串。
-        /// </summary>
-		public static string Documentation = nameof(Documentation);
-
-        /// <summary>
-        ///   查找类似 在这里拖拽 的本地化字符串。
-        /// </summary>
-		public static string DragHere = nameof(DragHere);
-
-        /// <summary>
-        ///   查找类似 抽屉 的本地化字符串。
-        /// </summary>
-		public static string Drawer = nameof(Drawer);
-
-        /// <summary>
-        ///   查找类似 效果 的本地化字符串。
-        /// </summary>
-		public static string Effects = nameof(Effects);
-
-        /// <summary>
-        ///   查找类似 元素组 的本地化字符串。
-        /// </summary>
-		public static string ElementGroup = nameof(ElementGroup);
-
-        /// <summary>
-        ///   查找类似 邮箱 的本地化字符串。
-        /// </summary>
-		public static string Email = nameof(Email);
-
-        /// <summary>
-        ///   查找类似 空状态 的本地化字符串。
-        /// </summary>
-		public static string Empty = nameof(Empty);
-
-        /// <summary>
-        ///   查找类似 错误 的本地化字符串。
-        /// </summary>
-		public static string Error = nameof(Error);
-
-        /// <summary>
-        ///   查找类似 退出 的本地化字符串。
-        /// </summary>
-		public static string Exit = nameof(Exit);
-
-        /// <summary>
-        ///   查找类似 展开框 的本地化字符串。
-        /// </summary>
-		public static string Expander = nameof(Expander);
-
-        /// <summary>
-        ///   查找类似 严重 的本地化字符串。
-        /// </summary>
-		public static string Fatal = nameof(Fatal);
-
-        /// <summary>
-        ///   查找类似 反馈 的本地化字符串。
-        /// </summary>
-		public static string Feedback = nameof(Feedback);
-
-        /// <summary>
-        ///   查找类似 弹性盒子 的本地化字符串。
-        /// </summary>
-		public static string FlexPanel = nameof(FlexPanel);
-
-        /// <summary>
-        ///   查找类似 翻页时钟 的本地化字符串。
-        /// </summary>
-		public static string FlipClock = nameof(FlipClock);
-
-        /// <summary>
-        ///   查找类似 漂浮块 的本地化字符串。
-        /// </summary>
-		public static string FloatingBlock = nameof(FloatingBlock);
-
-        /// <summary>
-        ///   查找类似 流文档 的本地化字符串。
-        /// </summary>
-		public static string FlowDocument = nameof(FlowDocument);
-
-        /// <summary>
-        ///   查找类似 流文档单页视图 的本地化字符串。
-        /// </summary>
-		public static string FlowDocumentPageViewer = nameof(FlowDocumentPageViewer);
-
-        /// <summary>
-        ///   查找类似 流文档查看器 的本地化字符串。
-        /// </summary>
-		public static string FlowDocumentReader = nameof(FlowDocumentReader);
-
-        /// <summary>
-        ///   查找类似 流文档滚动视图 的本地化字符串。
-        /// </summary>
-		public static string FlowDocumentScrollViewer = nameof(FlowDocumentScrollViewer);
-
-        /// <summary>
-        ///   查找类似 导航框架 的本地化字符串。
-        /// </summary>
-		public static string Frame = nameof(Frame);
-
-        /// <summary>
-        ///   查找类似 几何形状 的本地化字符串。
-        /// </summary>
-		public static string Geometry = nameof(Geometry);
-
-        /// <summary>
-        ///   查找类似 Gif图片 的本地化字符串。
-        /// </summary>
-		public static string GifImage = nameof(GifImage);
-
-        /// <summary>
-        ///   查找类似 回到顶部 的本地化字符串。
-        /// </summary>
-		public static string GotoTop = nameof(GotoTop);
-
-        /// <summary>
-        ///   查找类似 头像 的本地化字符串。
-        /// </summary>
-		public static string Gravatar = nameof(Gravatar);
-
-        /// <summary>
-        ///   查找类似 栅格 的本地化字符串。
-        /// </summary>
-		public static string Grid = nameof(Grid);
-
-        /// <summary>
-        ///   查找类似 分组框 的本地化字符串。
-        /// </summary>
-		public static string GroupBox = nameof(GroupBox);
-
-        /// <summary>
-        ///   查找类似 组数 的本地化字符串。
-        /// </summary>
-		public static string Groups = nameof(Groups);
-
-        /// <summary>
-        ///   查找类似 信息通知 的本地化字符串。
-        /// </summary>
-		public static string Growl = nameof(Growl);
-
-        /// <summary>
-        ///   查找类似 检测到有新版本！是否更新？ 的本地化字符串。
-        /// </summary>
-		public static string GrowlAsk = nameof(GrowlAsk);
-
-        /// <summary>
-        ///   查找类似 消息通知示例 的本地化字符串。
-        /// </summary>
-		public static string GrowlDemo = nameof(GrowlDemo);
-
-        /// <summary>
-        ///   查找类似 连接失败，请检查网络！ 的本地化字符串。
-        /// </summary>
-		public static string GrowlError = nameof(GrowlError);
-
-        /// <summary>
-        ///   查找类似 程序已崩溃~~~ 的本地化字符串。
-        /// </summary>
-		public static string GrowlFatal = nameof(GrowlFatal);
-
-        /// <summary>
-        ///   查找类似 今天的天气不错~~~ 的本地化字符串。
-        /// </summary>
-		public static string GrowlInfo = nameof(GrowlInfo);
-
-        /// <summary>
-        ///   查找类似 文件保存成功！ 的本地化字符串。
-        /// </summary>
-		public static string GrowlSuccess = nameof(GrowlSuccess);
-
-        /// <summary>
-        ///   查找类似 磁盘空间快要满了！ 的本地化字符串。
-        /// </summary>
-		public static string GrowlWarning = nameof(GrowlWarning);
-
-        /// <summary>
-        ///   查找类似 阴影画笔生成器 的本地化字符串。
-        /// </summary>
-		public static string HatchBrushGenerator = nameof(HatchBrushGenerator);
-
-        /// <summary>
-        ///   查找类似 蜂窝布局 的本地化字符串。
-        /// </summary>
-		public static string HoneycombPanel = nameof(HoneycombPanel);
-
-        /// <summary>
-        ///   查找类似 混合布局 的本地化字符串。
-        /// </summary>
-		public static string HybridLayout = nameof(HybridLayout);
-
-        /// <summary>
-        ///   查找类似 忽略 的本地化字符串。
-        /// </summary>
-		public static string Ignore = nameof(Ignore);
-
-        /// <summary>
-        ///   查找类似 图片块 的本地化字符串。
-        /// </summary>
-		public static string ImageBlock = nameof(ImageBlock);
-
-        /// <summary>
-        ///   查找类似 图片浏览器 的本地化字符串。
-        /// </summary>
-		public static string ImageBrowser = nameof(ImageBrowser);
-
-        /// <summary>
-        ///   查找类似 图片选择器 的本地化字符串。
-        /// </summary>
-		public static string ImageSelector = nameof(ImageSelector);
-
-        /// <summary>
-        ///   查找类似 索引 的本地化字符串。
-        /// </summary>
-		public static string Index = nameof(Index);
-
-        /// <summary>
-        ///   查找类似 信息 的本地化字符串。
-        /// </summary>
-		public static string Info = nameof(Info);
-
-        /// <summary>
-        ///   查找类似 交互 的本地化字符串。
-        /// </summary>
-		public static string Interacting = nameof(Interacting);
-
-        /// <summary>
-        ///   查找类似 可交互对话框 的本地化字符串。
-        /// </summary>
-		public static string InteractiveDialog = nameof(InteractiveDialog);
-
-        /// <summary>
-        ///   查找类似 不是手机号码 的本地化字符串。
-        /// </summary>
-		public static string IsNotPhone = nameof(IsNotPhone);
-
-        /// <summary>
-        ///   查找类似 标签 的本地化字符串。
-        /// </summary>
-		public static string Label = nameof(Label);
-
-        /// <summary>
-        ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
-        /// </summary>
-		public static string LangComment = nameof(LangComment);
-
-        /// <summary>
-        ///   查找类似 布局 的本地化字符串。
-        /// </summary>
-		public static string Layout = nameof(Layout);
-
-        /// <summary>
-        ///   查找类似 列表框 的本地化字符串。
-        /// </summary>
-		public static string ListBox = nameof(ListBox);
-
-        /// <summary>
-        ///   查找类似 列表视图 的本地化字符串。
-        /// </summary>
-		public static string ListView = nameof(ListView);
-
-        /// <summary>
-        ///   查找类似 加载条 的本地化字符串。
-        /// </summary>
-		public static string Loading = nameof(Loading);
-
-        /// <summary>
-        ///   查找类似 放大镜 的本地化字符串。
-        /// </summary>
-		public static string Magnifier = nameof(Magnifier);
-
-        /// <summary>
-        ///   查找类似 菜单 的本地化字符串。
-        /// </summary>
-		public static string Menu = nameof(Menu);
-
-        /// <summary>
-        ///   查找类似 消息框 的本地化字符串。
-        /// </summary>
-		public static string MessageBox = nameof(MessageBox);
-
-        /// <summary>
-        ///   查找类似 杂项 的本地化字符串。
-        /// </summary>
-		public static string Misc = nameof(Misc);
-
-        /// <summary>
-        ///   查找类似  的本地化字符串。
-        /// </summary>
-		public static string Morphing_Animation = nameof(Morphing_Animation);
-
-        /// <summary>
-        ///   查找类似 名称 的本地化字符串。
-        /// </summary>
-		public static string Name = nameof(Name);
-
-        /// <summary>
-        ///   查找类似 导航 的本地化字符串。
-        /// </summary>
-		public static string Navigation = nameof(Navigation);
-
-        /// <summary>
-        ///   查找类似 新建窗口 的本地化字符串。
-        /// </summary>
-		public static string NewWindow = nameof(NewWindow);
-
-        /// <summary>
-        ///   查找类似 下一步 的本地化字符串。
-        /// </summary>
-		public static string Next = nameof(Next);
-
-        /// <summary>
-        ///   查找类似 桌面通知 的本地化字符串。
-        /// </summary>
-		public static string Notification = nameof(Notification);
-
-        /// <summary>
-        ///   查找类似 托盘图标 的本地化字符串。
-        /// </summary>
-		public static string NotifyIcon = nameof(NotifyIcon);
-
-        /// <summary>
-        ///   查找类似 数值选择控件 的本地化字符串。
-        /// </summary>
-		public static string NumericUpDown = nameof(NumericUpDown);
-
-        /// <summary>
-        ///   查找类似 关 的本地化字符串。
-        /// </summary>
-		public static string Off = nameof(Off);
-
-        /// <summary>
-        ///   查找类似 确定 的本地化字符串。
-        /// </summary>
-		public static string Ok = nameof(Ok);
-
-        /// <summary>
-        ///   查找类似 开 的本地化字符串。
-        /// </summary>
-		public static string On = nameof(On);
-
-        /// <summary>
-        ///   查找类似 点击打开背景模糊窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenBlurWindow = nameof(OpenBlurWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开常规窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenCommonWindow = nameof(OpenCommonWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开自定义内容窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenCustomContentWindow = nameof(OpenCustomContentWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开自定义消息窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenCustomMessageWindow = nameof(OpenCustomMessageWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenCustomNonClientAreaWindow = nameof(OpenCustomNonClientAreaWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开辉光窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenGlowWindow = nameof(OpenGlowWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开图片浏览器 的本地化字符串。
-        /// </summary>
-		public static string OpenImageBrowser = nameof(OpenImageBrowser);
-
-        /// <summary>
-        ///   查找类似 点击打开消息窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenMessageWindow = nameof(OpenMessageWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开鼠标跟随窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenMouseFollowWindow = nameof(OpenMouseFollowWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开原生常规窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenNativeCommonWindow = nameof(OpenNativeCommonWindow);
-
-        /// <summary>
-        ///   查找类似 点击打开导航窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenNavigationWindow = nameof(OpenNavigationWindow);
-
-        /// <summary>
-        ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenNoNonClientAreaDragableWindow = nameof(OpenNoNonClientAreaDragableWindow);
-
-        /// <summary>
-        ///   查找类似 打开面板 的本地化字符串。
-        /// </summary>
-		public static string OpenPanel = nameof(OpenPanel);
-
-        /// <summary>
-        ///   查找类似 打开精灵 的本地化字符串。
-        /// </summary>
-		public static string OpenSprite = nameof(OpenSprite);
-
-        /// <summary>
-        ///   查找类似 点击打开触摸拖动窗口 的本地化字符串。
-        /// </summary>
-		public static string OpenTouchDragMoveWindow = nameof(OpenTouchDragMoveWindow);
-
-        /// <summary>
-        ///   查找类似 轮廓文本 的本地化字符串。
-        /// </summary>
-		public static string OutlineText = nameof(OutlineText);
-
-        /// <summary>
-        ///   查找类似 页码条 的本地化字符串。
-        /// </summary>
-		public static string Pagination = nameof(Pagination);
-
-        /// <summary>
-        ///   查找类似 密码框 的本地化字符串。
-        /// </summary>
-		public static string PasswordBox = nameof(PasswordBox);
-
-        /// <summary>
-        ///   查找类似 PIN码框 的本地化字符串。
-        /// </summary>
-		public static string PinBox = nameof(PinBox);
-
-        /// <summary>
-        ///   查找类似 请输入... 的本地化字符串。
-        /// </summary>
-		public static string PleaseInput = nameof(PleaseInput);
-
-        /// <summary>
-        ///   查找类似 请稍后... 的本地化字符串。
-        /// </summary>
-		public static string PleaseWait = nameof(PleaseWait);
-
-        /// <summary>
-        ///   查找类似 请输入内容 的本地化字符串。
-        /// </summary>
-		public static string PlsEnterContent = nameof(PlsEnterContent);
-
-        /// <summary>
-        ///   查找类似 请输入邮箱 的本地化字符串。
-        /// </summary>
-		public static string PlsEnterEmail = nameof(PlsEnterEmail);
-
-        /// <summary>
-        ///   查找类似 请输入关键字 的本地化字符串。
-        /// </summary>
-		public static string PlsEnterKey = nameof(PlsEnterKey);
-
-        /// <summary>
-        ///   查找类似 气泡提示 的本地化字符串。
-        /// </summary>
-		public static string Poptip = nameof(Poptip);
-
-        /// <summary>
-        ///   查找类似 上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上 的本地化字符串。
-        /// </summary>
-		public static string PoptipPositionStr = nameof(PoptipPositionStr);
-
-        /// <summary>
-        ///   查找类似 实用例子 的本地化字符串。
-        /// </summary>
-		public static string PracticalDemos = nameof(PracticalDemos);
-
-        /// <summary>
-        ///   查找类似 上一步 的本地化字符串。
-        /// </summary>
-		public static string Prev = nameof(Prev);
-
-        /// <summary>
-        ///   查找类似 预览滑块 的本地化字符串。
-        /// </summary>
-		public static string PreviewSlider = nameof(PreviewSlider);
-
-        /// <summary>
-        ///   查找类似 主要 的本地化字符串。
-        /// </summary>
-		public static string Primary = nameof(Primary);
-
-        /// <summary>
-        ///   查找类似 进度条 的本地化字符串。
-        /// </summary>
-		public static string ProgressBar = nameof(ProgressBar);
-
-        /// <summary>
-        ///   查找类似 进度按钮 的本地化字符串。
-        /// </summary>
-		public static string ProgressButton = nameof(ProgressButton);
-
-        /// <summary>
-        ///   查找类似 项目 的本地化字符串。
-        /// </summary>
-		public static string Project = nameof(Project);
-
-        /// <summary>
-        ///   查找类似 属性编辑器 的本地化字符串。
-        /// </summary>
-		public static string PropertyGrid = nameof(PropertyGrid);
-
-        /// <summary>
-        ///   查找类似 按住说话 的本地化字符串。
-        /// </summary>
-		public static string PushToTalk = nameof(PushToTalk);
-
-        /// <summary>
-        ///   查找类似 QQ群 的本地化字符串。
-        /// </summary>
-		public static string QQGroup = nameof(QQGroup);
-
-        /// <summary>
-        ///   查找类似 单选按钮 的本地化字符串。
-        /// </summary>
-		public static string RadioButton = nameof(RadioButton);
-
-        /// <summary>
-        ///   查找类似 范围滑块 的本地化字符串。
-        /// </summary>
-		public static string RangeSlider = nameof(RangeSlider);
-
-        /// <summary>
-        ///   查找类似 评分 的本地化字符串。
-        /// </summary>
-		public static string Rate = nameof(Rate);
-
-        /// <summary>
-        ///   查找类似 群友推荐 的本地化字符串。
-        /// </summary>
-		public static string Recommendation = nameof(Recommendation);
-
-        /// <summary>
-        ///   查找类似 注册 的本地化字符串。
-        /// </summary>
-		public static string Register = nameof(Register);
-
-        /// <summary>
-        ///   查找类似 相对布局 的本地化字符串。
-        /// </summary>
-		public static string RelativePanel = nameof(RelativePanel);
-
-        /// <summary>
-        ///   查找类似 备注 的本地化字符串。
-        /// </summary>
-		public static string Remark = nameof(Remark);
-
-        /// <summary>
-        ///   查找类似 删除项 的本地化字符串。
-        /// </summary>
-		public static string RemoveItem = nameof(RemoveItem);
-
-        /// <summary>
-        ///   查找类似 重复按钮 的本地化字符串。
-        /// </summary>
-		public static string RepeatButton = nameof(RepeatButton);
-
-        /// <summary>
-        ///   查找类似 回复 的本地化字符串。
-        /// </summary>
-		public static string Reply = nameof(Reply);
-
-        /// <summary>
-        ///   查找类似 代码仓库 的本地化字符串。
-        /// </summary>
-		public static string Repository = nameof(Repository);
-
-        /// <summary>
-        ///   查找类似 响应式布局 的本地化字符串。
-        /// </summary>
-		public static string ResponsiveLayout = nameof(ResponsiveLayout);
-
-        /// <summary>
-        ///   查找类似 富文本框 的本地化字符串。
-        /// </summary>
-		public static string RichTextBox = nameof(RichTextBox);
-
-        /// <summary>
-        ///   查找类似 在这里右击 的本地化字符串。
-        /// </summary>
-		public static string RightClickHere = nameof(RightClickHere);
-
-        /// <summary>
-        ///   查找类似 滚动块 的本地化字符串。
-        /// </summary>
-		public static string RunningBlock = nameof(RunningBlock);
-
-        /// <summary>
-        ///   查找类似 截图 的本地化字符串。
-        /// </summary>
-		public static string Screenshot = nameof(Screenshot);
-
-        /// <summary>
-        ///   查找类似 滚动视图 的本地化字符串。
-        /// </summary>
-		public static string ScrollViewer = nameof(ScrollViewer);
-
-        /// <summary>
-        ///   查找类似 搜索栏 的本地化字符串。
-        /// </summary>
-		public static string SearchBar = nameof(SearchBar);
-
-        /// <summary>
-        ///   查找类似 秒 的本地化字符串。
-        /// </summary>
-		public static string Second = nameof(Second);
-
-        /// <summary>
-        ///   查找类似 选中 的本地化字符串。
-        /// </summary>
-		public static string Selected = nameof(Selected);
-
-        /// <summary>
-        ///   查找类似 发送通知 的本地化字符串。
-        /// </summary>
-		public static string SendNotification = nameof(SendNotification);
-
-        /// <summary>
-        ///   查找类似 徽章 的本地化字符串。
-        /// </summary>
-		public static string Shield = nameof(Shield);
-
-        /// <summary>
-        ///   查找类似 在当前窗口显示 的本地化字符串。
-        /// </summary>
-		public static string ShowInCurrentWindow = nameof(ShowInCurrentWindow);
-
-        /// <summary>
-        ///   查找类似 在主窗口显示 的本地化字符串。
-        /// </summary>
-		public static string ShowInMainWindow = nameof(ShowInMainWindow);
-
-        /// <summary>
-        ///   查找类似 显示行号 的本地化字符串。
-        /// </summary>
-		public static string ShowRowNumber = nameof(ShowRowNumber);
-
-        /// <summary>
-        ///   查找类似 侧边菜单 的本地化字符串。
-        /// </summary>
-		public static string SideMenu = nameof(SideMenu);
-
-        /// <summary>
-        ///   查找类似 滑块 的本地化字符串。
-        /// </summary>
-		public static string Slider = nameof(Slider);
-
-        /// <summary>
-        ///   查找类似 分割按钮 的本地化字符串。
-        /// </summary>
-		public static string SplitButton = nameof(SplitButton);
-
-        /// <summary>
-        ///   查找类似 精灵 的本地化字符串。
-        /// </summary>
-		public static string Sprite = nameof(Sprite);
-
-        /// <summary>
-        ///   查找类似 开始截图 的本地化字符串。
-        /// </summary>
-		public static string StartScreenshot = nameof(StartScreenshot);
-
-        /// <summary>
-        ///   查找类似 保持打开 的本地化字符串。
-        /// </summary>
-		public static string StaysOpen = nameof(StaysOpen);
-
-        /// <summary>
-        ///   查找类似 步骤 的本地化字符串。
-        /// </summary>
-		public static string Step = nameof(Step);
-
-        /// <summary>
-        ///   查找类似 步骤条 的本地化字符串。
-        /// </summary>
-		public static string StepBar = nameof(StepBar);
-
-        /// <summary>
-        ///   查找类似 样式模板 的本地化字符串。
-        /// </summary>
-		public static string Styles = nameof(Styles);
-
-        /// <summary>
-        ///   查找类似 子标题 的本地化字符串。
-        /// </summary>
-		public static string SubTitle = nameof(SubTitle);
-
-        /// <summary>
-        ///   查找类似 成功 的本地化字符串。
-        /// </summary>
-		public static string Success = nameof(Success);
-
-        /// <summary>
-        ///   查找类似 选项卡控件 的本地化字符串。
-        /// </summary>
-		public static string TabControl = nameof(TabControl);
-
-        /// <summary>
-        ///   查找类似 标签 的本地化字符串。
-        /// </summary>
-		public static string Tag = nameof(Tag);
-
-        /// <summary>
-        ///   查找类似 正文 的本地化字符串。
-        /// </summary>
-		public static string Text = nameof(Text);
-
-        /// <summary>
-        ///   查找类似 文本块 的本地化字符串。
-        /// </summary>
-		public static string TextBlock = nameof(TextBlock);
-
-        /// <summary>
-        ///   查找类似 文本框 的本地化字符串。
-        /// </summary>
-		public static string TextBox = nameof(TextBox);
-
-        /// <summary>
-        ///   查找类似 文本对话框 的本地化字符串。
-        /// </summary>
-		public static string TextDialog = nameof(TextDialog);
-
-        /// <summary>
-        ///   查找类似 文本对话框（控件中） 的本地化字符串。
-        /// </summary>
-		public static string TextDialogInControl = nameof(TextDialogInControl);
-
-        /// <summary>
-        ///   查找类似 文本对话框，带计时器 的本地化字符串。
-        /// </summary>
-		public static string TextDialogWithTimer = nameof(TextDialogWithTimer);
-
-        /// <summary>
-        ///   查找类似 时间条 的本地化字符串。
-        /// </summary>
-		public static string TimeBar = nameof(TimeBar);
-
-        /// <summary>
-        ///   查找类似 时间选择器 的本地化字符串。
-        /// </summary>
-		public static string TimePicker = nameof(TimePicker);
-
-        /// <summary>
-        ///   查找类似 提示 的本地化字符串。
-        /// </summary>
-		public static string Tip = nameof(Tip);
-
-        /// <summary>
-        ///   查找类似 标题 的本地化字符串。
-        /// </summary>
-		public static string Title = nameof(Title);
-
-        /// <summary>
-        ///   查找类似 这是标题 的本地化字符串。
-        /// </summary>
-		public static string TitleDemoStr1 = nameof(TitleDemoStr1);
-
-        /// <summary>
-        ///   查找类似 此项必填 的本地化字符串。
-        /// </summary>
-		public static string TitleDemoStr2 = nameof(TitleDemoStr2);
-
-        /// <summary>
-        ///   查找类似 标题在左侧 的本地化字符串。
-        /// </summary>
-		public static string TitleDemoStr3 = nameof(TitleDemoStr3);
-
-        /// <summary>
-        ///   查找类似 切换按钮 的本地化字符串。
-        /// </summary>
-		public static string ToggleButton = nameof(ToggleButton);
-
-        /// <summary>
-        ///   查找类似 工具条 的本地化字符串。
-        /// </summary>
-		public static string ToolBar = nameof(ToolBar);
-
-        /// <summary>
-        ///   查找类似 工具 的本地化字符串。
-        /// </summary>
-		public static string Tools = nameof(Tools);
-
-        /// <summary>
-        ///   查找类似 穿梭框 的本地化字符串。
-        /// </summary>
-		public static string Transfer = nameof(Transfer);
-
-        /// <summary>
-        ///   查找类似 内容过渡控件 的本地化字符串。
-        /// </summary>
-		public static string TransitioningContentControl = nameof(TransitioningContentControl);
-
-        /// <summary>
-        ///   查找类似 树视图 的本地化字符串。
-        /// </summary>
-		public static string TreeView = nameof(TreeView);
-
-        /// <summary>
-        ///   查找类似 试试关闭程序吧？ 的本地化字符串。
-        /// </summary>
-		public static string Try2CloseApp = nameof(Try2CloseApp);
-
-        /// <summary>
-        ///   查找类似 类型 的本地化字符串。
-        /// </summary>
-		public static string Type = nameof(Type);
-
-        /// <summary>
-        ///   查找类似 等间距布局 的本地化字符串。
-        /// </summary>
-		public static string UniformSpacingPanel = nameof(UniformSpacingPanel);
-
-        /// <summary>
-        ///   查找类似 上传文件 的本地化字符串。
-        /// </summary>
-		public static string UploadFile = nameof(UploadFile);
-
-        /// <summary>
-        ///   查找类似 上传;上传中 的本地化字符串。
-        /// </summary>
-		public static string UploadStr = nameof(UploadStr);
-
-        /// <summary>
-        ///   查找类似 可见性 的本地化字符串。
-        /// </summary>
-		public static string Visibility = nameof(Visibility);
-
-        /// <summary>
-        ///   查找类似 VS 插件 的本地化字符串。
-        /// </summary>
-		public static string Vsix = nameof(Vsix);
-
-        /// <summary>
-        ///   查找类似 警告 的本地化字符串。
-        /// </summary>
-		public static string Warning = nameof(Warning);
-
-        /// <summary>
-        ///   查找类似 瀑布流 的本地化字符串。
-        /// </summary>
-		public static string WaterfallPanel = nameof(WaterfallPanel);
-
-        /// <summary>
-        ///   查找类似 网站 的本地化字符串。
-        /// </summary>
-		public static string Website = nameof(Website);
-
-        /// <summary>
-        ///   查找类似 窗口 的本地化字符串。
-        /// </summary>
-		public static string Window = nameof(Window);
-
+        OnPropertyChanged(nameof(About));
+        OnPropertyChanged(nameof(AddItem));
+        OnPropertyChanged(nameof(AnimationPath));
+        OnPropertyChanged(nameof(AppClosingTip));
+        OnPropertyChanged(nameof(Ask));
+        OnPropertyChanged(nameof(AutoCompleteTextBox));
+        OnPropertyChanged(nameof(Badge));
+        OnPropertyChanged(nameof(BasicInfo));
+        OnPropertyChanged(nameof(BasicLayout));
+        OnPropertyChanged(nameof(Blink));
+        OnPropertyChanged(nameof(Blog));
+        OnPropertyChanged(nameof(Border));
+        OnPropertyChanged(nameof(Brush));
+        OnPropertyChanged(nameof(Button));
+        OnPropertyChanged(nameof(ButtonCustom));
+        OnPropertyChanged(nameof(ButtonGroup));
+        OnPropertyChanged(nameof(Calendar));
+        OnPropertyChanged(nameof(CalendarWithClock));
+        OnPropertyChanged(nameof(Card));
+        OnPropertyChanged(nameof(Carousel));
+        OnPropertyChanged(nameof(ChangeLangAsk));
+        OnPropertyChanged(nameof(ChatBubble));
+        OnPropertyChanged(nameof(Chatroom));
+        OnPropertyChanged(nameof(CheckBox));
+        OnPropertyChanged(nameof(CheckComboBox));
+        OnPropertyChanged(nameof(CirclePanel));
+        OnPropertyChanged(nameof(Clear));
+        OnPropertyChanged(nameof(Click2Count));
+        OnPropertyChanged(nameof(Clock));
+        OnPropertyChanged(nameof(ColorPicker));
+        OnPropertyChanged(nameof(ColumnOffset));
+        OnPropertyChanged(nameof(ColumnSpacing));
+        OnPropertyChanged(nameof(ComboBox));
+        OnPropertyChanged(nameof(ComingSoon));
+        OnPropertyChanged(nameof(Comment));
+        OnPropertyChanged(nameof(Common));
+        OnPropertyChanged(nameof(CompareSlider));
+        OnPropertyChanged(nameof(Complete));
+        OnPropertyChanged(nameof(ContentDemoStr));
+        OnPropertyChanged(nameof(Contributors));
+        OnPropertyChanged(nameof(Controls));
+        OnPropertyChanged(nameof(CoverFlow));
+        OnPropertyChanged(nameof(CoverView));
+        OnPropertyChanged(nameof(Danger));
+        OnPropertyChanged(nameof(DataDisplay));
+        OnPropertyChanged(nameof(DataEntry));
+        OnPropertyChanged(nameof(DataGrid));
+        OnPropertyChanged(nameof(DatePicker));
+        OnPropertyChanged(nameof(DateTimePicker));
+        OnPropertyChanged(nameof(Default));
+        OnPropertyChanged(nameof(Demo));
+        OnPropertyChanged(nameof(Dialog));
+        OnPropertyChanged(nameof(DialogDemo));
+        OnPropertyChanged(nameof(Divider));
+        OnPropertyChanged(nameof(Doc_cn));
+        OnPropertyChanged(nameof(Doc_en));
+        OnPropertyChanged(nameof(Documentation));
+        OnPropertyChanged(nameof(DragHere));
+        OnPropertyChanged(nameof(Drawer));
+        OnPropertyChanged(nameof(Effects));
+        OnPropertyChanged(nameof(ElementGroup));
+        OnPropertyChanged(nameof(Email));
+        OnPropertyChanged(nameof(Empty));
+        OnPropertyChanged(nameof(Error));
+        OnPropertyChanged(nameof(Exit));
+        OnPropertyChanged(nameof(Expander));
+        OnPropertyChanged(nameof(Fatal));
+        OnPropertyChanged(nameof(Feedback));
+        OnPropertyChanged(nameof(FlexPanel));
+        OnPropertyChanged(nameof(FlipClock));
+        OnPropertyChanged(nameof(FloatingBlock));
+        OnPropertyChanged(nameof(FlowDocument));
+        OnPropertyChanged(nameof(FlowDocumentPageViewer));
+        OnPropertyChanged(nameof(FlowDocumentReader));
+        OnPropertyChanged(nameof(FlowDocumentScrollViewer));
+        OnPropertyChanged(nameof(Frame));
+        OnPropertyChanged(nameof(Geometry));
+        OnPropertyChanged(nameof(GifImage));
+        OnPropertyChanged(nameof(GotoTop));
+        OnPropertyChanged(nameof(Gravatar));
+        OnPropertyChanged(nameof(Grid));
+        OnPropertyChanged(nameof(GroupBox));
+        OnPropertyChanged(nameof(Groups));
+        OnPropertyChanged(nameof(Growl));
+        OnPropertyChanged(nameof(GrowlAsk));
+        OnPropertyChanged(nameof(GrowlDemo));
+        OnPropertyChanged(nameof(GrowlError));
+        OnPropertyChanged(nameof(GrowlFatal));
+        OnPropertyChanged(nameof(GrowlInfo));
+        OnPropertyChanged(nameof(GrowlSuccess));
+        OnPropertyChanged(nameof(GrowlWarning));
+        OnPropertyChanged(nameof(HatchBrushGenerator));
+        OnPropertyChanged(nameof(HoneycombPanel));
+        OnPropertyChanged(nameof(HybridLayout));
+        OnPropertyChanged(nameof(Ignore));
+        OnPropertyChanged(nameof(ImageBlock));
+        OnPropertyChanged(nameof(ImageBrowser));
+        OnPropertyChanged(nameof(ImageSelector));
+        OnPropertyChanged(nameof(Index));
+        OnPropertyChanged(nameof(Info));
+        OnPropertyChanged(nameof(Interacting));
+        OnPropertyChanged(nameof(InteractiveDialog));
+        OnPropertyChanged(nameof(IsNotPhone));
+        OnPropertyChanged(nameof(Label));
+        OnPropertyChanged(nameof(LangComment));
+        OnPropertyChanged(nameof(Layout));
+        OnPropertyChanged(nameof(ListBox));
+        OnPropertyChanged(nameof(ListView));
+        OnPropertyChanged(nameof(Loading));
+        OnPropertyChanged(nameof(Magnifier));
+        OnPropertyChanged(nameof(Menu));
+        OnPropertyChanged(nameof(MessageBox));
+        OnPropertyChanged(nameof(Misc));
+        OnPropertyChanged(nameof(Morphing_Animation));
+        OnPropertyChanged(nameof(Name));
+        OnPropertyChanged(nameof(Navigation));
+        OnPropertyChanged(nameof(NewWindow));
+        OnPropertyChanged(nameof(Next));
+        OnPropertyChanged(nameof(Notification));
+        OnPropertyChanged(nameof(NotifyIcon));
+        OnPropertyChanged(nameof(NumericUpDown));
+        OnPropertyChanged(nameof(Off));
+        OnPropertyChanged(nameof(Ok));
+        OnPropertyChanged(nameof(On));
+        OnPropertyChanged(nameof(OpenBlurWindow));
+        OnPropertyChanged(nameof(OpenCommonWindow));
+        OnPropertyChanged(nameof(OpenCustomContentWindow));
+        OnPropertyChanged(nameof(OpenCustomMessageWindow));
+        OnPropertyChanged(nameof(OpenCustomNonClientAreaWindow));
+        OnPropertyChanged(nameof(OpenGlowWindow));
+        OnPropertyChanged(nameof(OpenImageBrowser));
+        OnPropertyChanged(nameof(OpenMessageWindow));
+        OnPropertyChanged(nameof(OpenMouseFollowWindow));
+        OnPropertyChanged(nameof(OpenNativeCommonWindow));
+        OnPropertyChanged(nameof(OpenNavigationWindow));
+        OnPropertyChanged(nameof(OpenNoNonClientAreaDragableWindow));
+        OnPropertyChanged(nameof(OpenPanel));
+        OnPropertyChanged(nameof(OpenSprite));
+        OnPropertyChanged(nameof(OpenTouchDragMoveWindow));
+        OnPropertyChanged(nameof(OutlineText));
+        OnPropertyChanged(nameof(Pagination));
+        OnPropertyChanged(nameof(PasswordBox));
+        OnPropertyChanged(nameof(PinBox));
+        OnPropertyChanged(nameof(PleaseInput));
+        OnPropertyChanged(nameof(PleaseWait));
+        OnPropertyChanged(nameof(PlsEnterContent));
+        OnPropertyChanged(nameof(PlsEnterEmail));
+        OnPropertyChanged(nameof(PlsEnterKey));
+        OnPropertyChanged(nameof(Poptip));
+        OnPropertyChanged(nameof(PoptipPositionStr));
+        OnPropertyChanged(nameof(PracticalDemos));
+        OnPropertyChanged(nameof(Prev));
+        OnPropertyChanged(nameof(PreviewSlider));
+        OnPropertyChanged(nameof(Primary));
+        OnPropertyChanged(nameof(ProgressBar));
+        OnPropertyChanged(nameof(ProgressButton));
+        OnPropertyChanged(nameof(Project));
+        OnPropertyChanged(nameof(PropertyGrid));
+        OnPropertyChanged(nameof(PushToTalk));
+        OnPropertyChanged(nameof(QQGroup));
+        OnPropertyChanged(nameof(RadioButton));
+        OnPropertyChanged(nameof(RangeSlider));
+        OnPropertyChanged(nameof(Rate));
+        OnPropertyChanged(nameof(Recommendation));
+        OnPropertyChanged(nameof(Register));
+        OnPropertyChanged(nameof(RelativePanel));
+        OnPropertyChanged(nameof(Remark));
+        OnPropertyChanged(nameof(RemoveItem));
+        OnPropertyChanged(nameof(RepeatButton));
+        OnPropertyChanged(nameof(Reply));
+        OnPropertyChanged(nameof(Repository));
+        OnPropertyChanged(nameof(ResponsiveLayout));
+        OnPropertyChanged(nameof(RichTextBox));
+        OnPropertyChanged(nameof(RightClickHere));
+        OnPropertyChanged(nameof(RunningBlock));
+        OnPropertyChanged(nameof(Screenshot));
+        OnPropertyChanged(nameof(ScrollViewer));
+        OnPropertyChanged(nameof(SearchBar));
+        OnPropertyChanged(nameof(Second));
+        OnPropertyChanged(nameof(Selected));
+        OnPropertyChanged(nameof(SendNotification));
+        OnPropertyChanged(nameof(Shield));
+        OnPropertyChanged(nameof(ShowInCurrentWindow));
+        OnPropertyChanged(nameof(ShowInMainWindow));
+        OnPropertyChanged(nameof(ShowRowNumber));
+        OnPropertyChanged(nameof(SideMenu));
+        OnPropertyChanged(nameof(Slider));
+        OnPropertyChanged(nameof(SplitButton));
+        OnPropertyChanged(nameof(Sprite));
+        OnPropertyChanged(nameof(StartScreenshot));
+        OnPropertyChanged(nameof(StaysOpen));
+        OnPropertyChanged(nameof(Step));
+        OnPropertyChanged(nameof(StepBar));
+        OnPropertyChanged(nameof(Styles));
+        OnPropertyChanged(nameof(SubTitle));
+        OnPropertyChanged(nameof(Success));
+        OnPropertyChanged(nameof(TabControl));
+        OnPropertyChanged(nameof(Tag));
+        OnPropertyChanged(nameof(Text));
+        OnPropertyChanged(nameof(TextBlock));
+        OnPropertyChanged(nameof(TextBox));
+        OnPropertyChanged(nameof(TextDialog));
+        OnPropertyChanged(nameof(TextDialogInControl));
+        OnPropertyChanged(nameof(TextDialogWithTimer));
+        OnPropertyChanged(nameof(TimeBar));
+        OnPropertyChanged(nameof(TimePicker));
+        OnPropertyChanged(nameof(Tip));
+        OnPropertyChanged(nameof(Title));
+        OnPropertyChanged(nameof(TitleDemoStr1));
+        OnPropertyChanged(nameof(TitleDemoStr2));
+        OnPropertyChanged(nameof(TitleDemoStr3));
+        OnPropertyChanged(nameof(ToggleButton));
+        OnPropertyChanged(nameof(ToolBar));
+        OnPropertyChanged(nameof(Tools));
+        OnPropertyChanged(nameof(Transfer));
+        OnPropertyChanged(nameof(TransitioningContentControl));
+        OnPropertyChanged(nameof(TreeView));
+        OnPropertyChanged(nameof(Try2CloseApp));
+        OnPropertyChanged(nameof(Type));
+        OnPropertyChanged(nameof(UniformSpacingPanel));
+        OnPropertyChanged(nameof(UploadFile));
+        OnPropertyChanged(nameof(UploadStr));
+        OnPropertyChanged(nameof(Visibility));
+        OnPropertyChanged(nameof(Vsix));
+        OnPropertyChanged(nameof(Warning));
+        OnPropertyChanged(nameof(WaterfallPanel));
+        OnPropertyChanged(nameof(Website));
+        OnPropertyChanged(nameof(Window));
     }
+
+    /// <summary>
+    ///   查找类似 关于 的本地化字符串。
+    /// </summary>
+    public string About => Lang.About;
+
+    /// <summary>
+    ///   查找类似 添加项 的本地化字符串。
+    /// </summary>
+    public string AddItem => Lang.AddItem;
+
+    /// <summary>
+    ///   查找类似 动画路径 的本地化字符串。
+    /// </summary>
+    public string AnimationPath => Lang.AnimationPath;
+
+    /// <summary>
+    ///   查找类似 托盘图标已打开，将隐藏窗口而不是关闭程序 的本地化字符串。
+    /// </summary>
+    public string AppClosingTip => Lang.AppClosingTip;
+
+    /// <summary>
+    ///   查找类似 询问 的本地化字符串。
+    /// </summary>
+    public string Ask => Lang.Ask;
+
+    /// <summary>
+    ///   查找类似 自动补全文本框 的本地化字符串。
+    /// </summary>
+    public string AutoCompleteTextBox => Lang.AutoCompleteTextBox;
+
+    /// <summary>
+    ///   查找类似 标记 的本地化字符串。
+    /// </summary>
+    public string Badge => Lang.Badge;
+
+    /// <summary>
+    ///   查找类似 填写基本信息 的本地化字符串。
+    /// </summary>
+    public string BasicInfo => Lang.BasicInfo;
+
+    /// <summary>
+    ///   查找类似 基础布局 的本地化字符串。
+    /// </summary>
+    public string BasicLayout => Lang.BasicLayout;
+
+    /// <summary>
+    ///   查找类似 闪烁 的本地化字符串。
+    /// </summary>
+    public string Blink => Lang.Blink;
+
+    /// <summary>
+    ///   查找类似 博客 的本地化字符串。
+    /// </summary>
+    public string Blog => Lang.Blog;
+
+    /// <summary>
+    ///   查找类似 边框 的本地化字符串。
+    /// </summary>
+    public string Border => Lang.Border;
+
+    /// <summary>
+    ///   查找类似 画刷 的本地化字符串。
+    /// </summary>
+    public string Brush => Lang.Brush;
+
+    /// <summary>
+    ///   查找类似 按钮 的本地化字符串。
+    /// </summary>
+    public string Button => Lang.Button;
+
+    /// <summary>
+    ///   查找类似 自定义按钮 的本地化字符串。
+    /// </summary>
+    public string ButtonCustom => Lang.ButtonCustom;
+
+    /// <summary>
+    ///   查找类似 按钮组 的本地化字符串。
+    /// </summary>
+    public string ButtonGroup => Lang.ButtonGroup;
+
+    /// <summary>
+    ///   查找类似 日历 的本地化字符串。
+    /// </summary>
+    public string Calendar => Lang.Calendar;
+
+    /// <summary>
+    ///   查找类似 带时钟的日历 的本地化字符串。
+    /// </summary>
+    public string CalendarWithClock => Lang.CalendarWithClock;
+
+    /// <summary>
+    ///   查找类似 卡片 的本地化字符串。
+    /// </summary>
+    public string Card => Lang.Card;
+
+    /// <summary>
+    ///   查找类似 轮播 的本地化字符串。
+    /// </summary>
+    public string Carousel => Lang.Carousel;
+
+    /// <summary>
+    ///   查找类似 是否重启以更改语言？ 的本地化字符串。
+    /// </summary>
+    public string ChangeLangAsk => Lang.ChangeLangAsk;
+
+    /// <summary>
+    ///   查找类似 对话气泡 的本地化字符串。
+    /// </summary>
+    public string ChatBubble => Lang.ChatBubble;
+
+    /// <summary>
+    ///   查找类似 讨论室 的本地化字符串。
+    /// </summary>
+    public string Chatroom => Lang.Chatroom;
+
+    /// <summary>
+    ///   查找类似 复选框 的本地化字符串。
+    /// </summary>
+    public string CheckBox => Lang.CheckBox;
+
+    /// <summary>
+    ///   查找类似 多选组合框 的本地化字符串。
+    /// </summary>
+    public string CheckComboBox => Lang.CheckComboBox;
+
+    /// <summary>
+    ///   查找类似 圆形布局 的本地化字符串。
+    /// </summary>
+    public string CirclePanel => Lang.CirclePanel;
+
+    /// <summary>
+    ///   查找类似 清空 的本地化字符串。
+    /// </summary>
+    public string Clear => Lang.Clear;
+
+    /// <summary>
+    ///   查找类似 点击计数 的本地化字符串。
+    /// </summary>
+    public string Click2Count => Lang.Click2Count;
+
+    /// <summary>
+    ///   查找类似 时钟 的本地化字符串。
+    /// </summary>
+    public string Clock => Lang.Clock;
+
+    /// <summary>
+    ///   查找类似 颜色拾取器 的本地化字符串。
+    /// </summary>
+    public string ColorPicker => Lang.ColorPicker;
+
+    /// <summary>
+    ///   查找类似 分栏偏移 的本地化字符串。
+    /// </summary>
+    public string ColumnOffset => Lang.ColumnOffset;
+
+    /// <summary>
+    ///   查找类似 分栏间隔 的本地化字符串。
+    /// </summary>
+    public string ColumnSpacing => Lang.ColumnSpacing;
+
+    /// <summary>
+    ///   查找类似 组合框 的本地化字符串。
+    /// </summary>
+    public string ComboBox => Lang.ComboBox;
+
+    /// <summary>
+    ///   查找类似 敬请期待 的本地化字符串。
+    /// </summary>
+    public string ComingSoon => Lang.ComingSoon;
+
+    /// <summary>
+    ///   查找类似 评论 的本地化字符串。
+    /// </summary>
+    public string Comment => Lang.Comment;
+
+    /// <summary>
+    ///   查找类似 一般 的本地化字符串。
+    /// </summary>
+    public string Common => Lang.Common;
+
+    /// <summary>
+    ///   查找类似 对比滑块 的本地化字符串。
+    /// </summary>
+    public string CompareSlider => Lang.CompareSlider;
+
+    /// <summary>
+    ///   查找类似 完成 的本地化字符串。
+    /// </summary>
+    public string Complete => Lang.Complete;
+
+    /// <summary>
+    ///   查找类似 这是内容 的本地化字符串。
+    /// </summary>
+    public string ContentDemoStr => Lang.ContentDemoStr;
+
+    /// <summary>
+    ///   查找类似 贡献者 的本地化字符串。
+    /// </summary>
+    public string Contributors => Lang.Contributors;
+
+    /// <summary>
+    ///   查找类似 控件 的本地化字符串。
+    /// </summary>
+    public string Controls => Lang.Controls;
+
+    /// <summary>
+    ///   查找类似 封面流 的本地化字符串。
+    /// </summary>
+    public string CoverFlow => Lang.CoverFlow;
+
+    /// <summary>
+    ///   查找类似 封面视图 的本地化字符串。
+    /// </summary>
+    public string CoverView => Lang.CoverView;
+
+    /// <summary>
+    ///   查找类似 危险 的本地化字符串。
+    /// </summary>
+    public string Danger => Lang.Danger;
+
+    /// <summary>
+    ///   查找类似 数据展示 的本地化字符串。
+    /// </summary>
+    public string DataDisplay => Lang.DataDisplay;
+
+    /// <summary>
+    ///   查找类似 数据录入 的本地化字符串。
+    /// </summary>
+    public string DataEntry => Lang.DataEntry;
+
+    /// <summary>
+    ///   查找类似 数据表格 的本地化字符串。
+    /// </summary>
+    public string DataGrid => Lang.DataGrid;
+
+    /// <summary>
+    ///   查找类似 日期选择器 的本地化字符串。
+    /// </summary>
+    public string DatePicker => Lang.DatePicker;
+
+    /// <summary>
+    ///   查找类似 日期时间选择器 的本地化字符串。
+    /// </summary>
+    public string DateTimePicker => Lang.DateTimePicker;
+
+    /// <summary>
+    ///   查找类似 默认 的本地化字符串。
+    /// </summary>
+    public string Default => Lang.Default;
+
+    /// <summary>
+    ///   查找类似 示例 的本地化字符串。
+    /// </summary>
+    public string Demo => Lang.Demo;
+
+    /// <summary>
+    ///   查找类似 对话框 的本地化字符串。
+    /// </summary>
+    public string Dialog => Lang.Dialog;
+
+    /// <summary>
+    ///   查找类似 对话框示例 的本地化字符串。
+    /// </summary>
+    public string DialogDemo => Lang.DialogDemo;
+
+    /// <summary>
+    ///   查找类似 分割线 的本地化字符串。
+    /// </summary>
+    public string Divider => Lang.Divider;
+
+    /// <summary>
+    ///   查找类似 中文文档 的本地化字符串。
+    /// </summary>
+    public string Doc_cn => Lang.Doc_cn;
+
+    /// <summary>
+    ///   查找类似 英文文档 的本地化字符串。
+    /// </summary>
+    public string Doc_en => Lang.Doc_en;
+
+    /// <summary>
+    ///   查找类似 文献资料 的本地化字符串。
+    /// </summary>
+    public string Documentation => Lang.Documentation;
+
+    /// <summary>
+    ///   查找类似 在这里拖拽 的本地化字符串。
+    /// </summary>
+    public string DragHere => Lang.DragHere;
+
+    /// <summary>
+    ///   查找类似 抽屉 的本地化字符串。
+    /// </summary>
+    public string Drawer => Lang.Drawer;
+
+    /// <summary>
+    ///   查找类似 效果 的本地化字符串。
+    /// </summary>
+    public string Effects => Lang.Effects;
+
+    /// <summary>
+    ///   查找类似 元素组 的本地化字符串。
+    /// </summary>
+    public string ElementGroup => Lang.ElementGroup;
+
+    /// <summary>
+    ///   查找类似 邮箱 的本地化字符串。
+    /// </summary>
+    public string Email => Lang.Email;
+
+    /// <summary>
+    ///   查找类似 空状态 的本地化字符串。
+    /// </summary>
+    public string Empty => Lang.Empty;
+
+    /// <summary>
+    ///   查找类似 错误 的本地化字符串。
+    /// </summary>
+    public string Error => Lang.Error;
+
+    /// <summary>
+    ///   查找类似 退出 的本地化字符串。
+    /// </summary>
+    public string Exit => Lang.Exit;
+
+    /// <summary>
+    ///   查找类似 展开框 的本地化字符串。
+    /// </summary>
+    public string Expander => Lang.Expander;
+
+    /// <summary>
+    ///   查找类似 严重 的本地化字符串。
+    /// </summary>
+    public string Fatal => Lang.Fatal;
+
+    /// <summary>
+    ///   查找类似 反馈 的本地化字符串。
+    /// </summary>
+    public string Feedback => Lang.Feedback;
+
+    /// <summary>
+    ///   查找类似 弹性盒子 的本地化字符串。
+    /// </summary>
+    public string FlexPanel => Lang.FlexPanel;
+
+    /// <summary>
+    ///   查找类似 翻页时钟 的本地化字符串。
+    /// </summary>
+    public string FlipClock => Lang.FlipClock;
+
+    /// <summary>
+    ///   查找类似 漂浮块 的本地化字符串。
+    /// </summary>
+    public string FloatingBlock => Lang.FloatingBlock;
+
+    /// <summary>
+    ///   查找类似 流文档 的本地化字符串。
+    /// </summary>
+    public string FlowDocument => Lang.FlowDocument;
+
+    /// <summary>
+    ///   查找类似 流文档单页视图 的本地化字符串。
+    /// </summary>
+    public string FlowDocumentPageViewer => Lang.FlowDocumentPageViewer;
+
+    /// <summary>
+    ///   查找类似 流文档查看器 的本地化字符串。
+    /// </summary>
+    public string FlowDocumentReader => Lang.FlowDocumentReader;
+
+    /// <summary>
+    ///   查找类似 流文档滚动视图 的本地化字符串。
+    /// </summary>
+    public string FlowDocumentScrollViewer => Lang.FlowDocumentScrollViewer;
+
+    /// <summary>
+    ///   查找类似 导航框架 的本地化字符串。
+    /// </summary>
+    public string Frame => Lang.Frame;
+
+    /// <summary>
+    ///   查找类似 几何形状 的本地化字符串。
+    /// </summary>
+    public string Geometry => Lang.Geometry;
+
+    /// <summary>
+    ///   查找类似 Gif图片 的本地化字符串。
+    /// </summary>
+    public string GifImage => Lang.GifImage;
+
+    /// <summary>
+    ///   查找类似 回到顶部 的本地化字符串。
+    /// </summary>
+    public string GotoTop => Lang.GotoTop;
+
+    /// <summary>
+    ///   查找类似 头像 的本地化字符串。
+    /// </summary>
+    public string Gravatar => Lang.Gravatar;
+
+    /// <summary>
+    ///   查找类似 栅格 的本地化字符串。
+    /// </summary>
+    public string Grid => Lang.Grid;
+
+    /// <summary>
+    ///   查找类似 分组框 的本地化字符串。
+    /// </summary>
+    public string GroupBox => Lang.GroupBox;
+
+    /// <summary>
+    ///   查找类似 组数 的本地化字符串。
+    /// </summary>
+    public string Groups => Lang.Groups;
+
+    /// <summary>
+    ///   查找类似 信息通知 的本地化字符串。
+    /// </summary>
+    public string Growl => Lang.Growl;
+
+    /// <summary>
+    ///   查找类似 检测到有新版本！是否更新？ 的本地化字符串。
+    /// </summary>
+    public string GrowlAsk => Lang.GrowlAsk;
+
+    /// <summary>
+    ///   查找类似 消息通知示例 的本地化字符串。
+    /// </summary>
+    public string GrowlDemo => Lang.GrowlDemo;
+
+    /// <summary>
+    ///   查找类似 连接失败，请检查网络！ 的本地化字符串。
+    /// </summary>
+    public string GrowlError => Lang.GrowlError;
+
+    /// <summary>
+    ///   查找类似 程序已崩溃~~~ 的本地化字符串。
+    /// </summary>
+    public string GrowlFatal => Lang.GrowlFatal;
+
+    /// <summary>
+    ///   查找类似 今天的天气不错~~~ 的本地化字符串。
+    /// </summary>
+    public string GrowlInfo => Lang.GrowlInfo;
+
+    /// <summary>
+    ///   查找类似 文件保存成功！ 的本地化字符串。
+    /// </summary>
+    public string GrowlSuccess => Lang.GrowlSuccess;
+
+    /// <summary>
+    ///   查找类似 磁盘空间快要满了！ 的本地化字符串。
+    /// </summary>
+    public string GrowlWarning => Lang.GrowlWarning;
+
+    /// <summary>
+    ///   查找类似 阴影画笔生成器 的本地化字符串。
+    /// </summary>
+    public string HatchBrushGenerator => Lang.HatchBrushGenerator;
+
+    /// <summary>
+    ///   查找类似 蜂窝布局 的本地化字符串。
+    /// </summary>
+    public string HoneycombPanel => Lang.HoneycombPanel;
+
+    /// <summary>
+    ///   查找类似 混合布局 的本地化字符串。
+    /// </summary>
+    public string HybridLayout => Lang.HybridLayout;
+
+    /// <summary>
+    ///   查找类似 忽略 的本地化字符串。
+    /// </summary>
+    public string Ignore => Lang.Ignore;
+
+    /// <summary>
+    ///   查找类似 图片块 的本地化字符串。
+    /// </summary>
+    public string ImageBlock => Lang.ImageBlock;
+
+    /// <summary>
+    ///   查找类似 图片浏览器 的本地化字符串。
+    /// </summary>
+    public string ImageBrowser => Lang.ImageBrowser;
+
+    /// <summary>
+    ///   查找类似 图片选择器 的本地化字符串。
+    /// </summary>
+    public string ImageSelector => Lang.ImageSelector;
+
+    /// <summary>
+    ///   查找类似 索引 的本地化字符串。
+    /// </summary>
+    public string Index => Lang.Index;
+
+    /// <summary>
+    ///   查找类似 信息 的本地化字符串。
+    /// </summary>
+    public string Info => Lang.Info;
+
+    /// <summary>
+    ///   查找类似 交互 的本地化字符串。
+    /// </summary>
+    public string Interacting => Lang.Interacting;
+
+    /// <summary>
+    ///   查找类似 可交互对话框 的本地化字符串。
+    /// </summary>
+    public string InteractiveDialog => Lang.InteractiveDialog;
+
+    /// <summary>
+    ///   查找类似 不是手机号码 的本地化字符串。
+    /// </summary>
+    public string IsNotPhone => Lang.IsNotPhone;
+
+    /// <summary>
+    ///   查找类似 标签 的本地化字符串。
+    /// </summary>
+    public string Label => Lang.Label;
+
+    /// <summary>
+    ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
+    /// </summary>
+    public string LangComment => Lang.LangComment;
+
+    /// <summary>
+    ///   查找类似 布局 的本地化字符串。
+    /// </summary>
+    public string Layout => Lang.Layout;
+
+    /// <summary>
+    ///   查找类似 列表框 的本地化字符串。
+    /// </summary>
+    public string ListBox => Lang.ListBox;
+
+    /// <summary>
+    ///   查找类似 列表视图 的本地化字符串。
+    /// </summary>
+    public string ListView => Lang.ListView;
+
+    /// <summary>
+    ///   查找类似 加载条 的本地化字符串。
+    /// </summary>
+    public string Loading => Lang.Loading;
+
+    /// <summary>
+    ///   查找类似 放大镜 的本地化字符串。
+    /// </summary>
+    public string Magnifier => Lang.Magnifier;
+
+    /// <summary>
+    ///   查找类似 菜单 的本地化字符串。
+    /// </summary>
+    public string Menu => Lang.Menu;
+
+    /// <summary>
+    ///   查找类似 消息框 的本地化字符串。
+    /// </summary>
+    public string MessageBox => Lang.MessageBox;
+
+    /// <summary>
+    ///   查找类似 杂项 的本地化字符串。
+    /// </summary>
+    public string Misc => Lang.Misc;
+
+    /// <summary>
+    ///   查找类似  的本地化字符串。
+    /// </summary>
+    public string Morphing_Animation => Lang.Morphing_Animation;
+
+    /// <summary>
+    ///   查找类似 名称 的本地化字符串。
+    /// </summary>
+    public string Name => Lang.Name;
+
+    /// <summary>
+    ///   查找类似 导航 的本地化字符串。
+    /// </summary>
+    public string Navigation => Lang.Navigation;
+
+    /// <summary>
+    ///   查找类似 新建窗口 的本地化字符串。
+    /// </summary>
+    public string NewWindow => Lang.NewWindow;
+
+    /// <summary>
+    ///   查找类似 下一步 的本地化字符串。
+    /// </summary>
+    public string Next => Lang.Next;
+
+    /// <summary>
+    ///   查找类似 桌面通知 的本地化字符串。
+    /// </summary>
+    public string Notification => Lang.Notification;
+
+    /// <summary>
+    ///   查找类似 托盘图标 的本地化字符串。
+    /// </summary>
+    public string NotifyIcon => Lang.NotifyIcon;
+
+    /// <summary>
+    ///   查找类似 数值选择控件 的本地化字符串。
+    /// </summary>
+    public string NumericUpDown => Lang.NumericUpDown;
+
+    /// <summary>
+    ///   查找类似 关 的本地化字符串。
+    /// </summary>
+    public string Off => Lang.Off;
+
+    /// <summary>
+    ///   查找类似 确定 的本地化字符串。
+    /// </summary>
+    public string Ok => Lang.Ok;
+
+    /// <summary>
+    ///   查找类似 开 的本地化字符串。
+    /// </summary>
+    public string On => Lang.On;
+
+    /// <summary>
+    ///   查找类似 点击打开背景模糊窗口 的本地化字符串。
+    /// </summary>
+    public string OpenBlurWindow => Lang.OpenBlurWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开常规窗口 的本地化字符串。
+    /// </summary>
+    public string OpenCommonWindow => Lang.OpenCommonWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开自定义内容窗口 的本地化字符串。
+    /// </summary>
+    public string OpenCustomContentWindow => Lang.OpenCustomContentWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开自定义消息窗口 的本地化字符串。
+    /// </summary>
+    public string OpenCustomMessageWindow => Lang.OpenCustomMessageWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。
+    /// </summary>
+    public string OpenCustomNonClientAreaWindow => Lang.OpenCustomNonClientAreaWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开辉光窗口 的本地化字符串。
+    /// </summary>
+    public string OpenGlowWindow => Lang.OpenGlowWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开图片浏览器 的本地化字符串。
+    /// </summary>
+    public string OpenImageBrowser => Lang.OpenImageBrowser;
+
+    /// <summary>
+    ///   查找类似 点击打开消息窗口 的本地化字符串。
+    /// </summary>
+    public string OpenMessageWindow => Lang.OpenMessageWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开鼠标跟随窗口 的本地化字符串。
+    /// </summary>
+    public string OpenMouseFollowWindow => Lang.OpenMouseFollowWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开原生常规窗口 的本地化字符串。
+    /// </summary>
+    public string OpenNativeCommonWindow => Lang.OpenNativeCommonWindow;
+
+    /// <summary>
+    ///   查找类似 点击打开导航窗口 的本地化字符串。
+    /// </summary>
+    public string OpenNavigationWindow => Lang.OpenNavigationWindow;
+
+    /// <summary>
+    ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
+    /// </summary>
+    public string OpenNoNonClientAreaDragableWindow => Lang.OpenNoNonClientAreaDragableWindow;
+
+    /// <summary>
+    ///   查找类似 打开面板 的本地化字符串。
+    /// </summary>
+    public string OpenPanel => Lang.OpenPanel;
+
+    /// <summary>
+    ///   查找类似 打开精灵 的本地化字符串。
+    /// </summary>
+    public string OpenSprite => Lang.OpenSprite;
+
+    /// <summary>
+    ///   查找类似 点击打开触摸拖动窗口 的本地化字符串。
+    /// </summary>
+    public string OpenTouchDragMoveWindow => Lang.OpenTouchDragMoveWindow;
+
+    /// <summary>
+    ///   查找类似 轮廓文本 的本地化字符串。
+    /// </summary>
+    public string OutlineText => Lang.OutlineText;
+
+    /// <summary>
+    ///   查找类似 页码条 的本地化字符串。
+    /// </summary>
+    public string Pagination => Lang.Pagination;
+
+    /// <summary>
+    ///   查找类似 密码框 的本地化字符串。
+    /// </summary>
+    public string PasswordBox => Lang.PasswordBox;
+
+    /// <summary>
+    ///   查找类似 PIN码框 的本地化字符串。
+    /// </summary>
+    public string PinBox => Lang.PinBox;
+
+    /// <summary>
+    ///   查找类似 请输入... 的本地化字符串。
+    /// </summary>
+    public string PleaseInput => Lang.PleaseInput;
+
+    /// <summary>
+    ///   查找类似 请稍后... 的本地化字符串。
+    /// </summary>
+    public string PleaseWait => Lang.PleaseWait;
+
+    /// <summary>
+    ///   查找类似 请输入内容 的本地化字符串。
+    /// </summary>
+    public string PlsEnterContent => Lang.PlsEnterContent;
+
+    /// <summary>
+    ///   查找类似 请输入邮箱 的本地化字符串。
+    /// </summary>
+    public string PlsEnterEmail => Lang.PlsEnterEmail;
+
+    /// <summary>
+    ///   查找类似 请输入关键字 的本地化字符串。
+    /// </summary>
+    public string PlsEnterKey => Lang.PlsEnterKey;
+
+    /// <summary>
+    ///   查找类似 气泡提示 的本地化字符串。
+    /// </summary>
+    public string Poptip => Lang.Poptip;
+
+    /// <summary>
+    ///   查找类似 上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上 的本地化字符串。
+    /// </summary>
+    public string PoptipPositionStr => Lang.PoptipPositionStr;
+
+    /// <summary>
+    ///   查找类似 实用例子 的本地化字符串。
+    /// </summary>
+    public string PracticalDemos => Lang.PracticalDemos;
+
+    /// <summary>
+    ///   查找类似 上一步 的本地化字符串。
+    /// </summary>
+    public string Prev => Lang.Prev;
+
+    /// <summary>
+    ///   查找类似 预览滑块 的本地化字符串。
+    /// </summary>
+    public string PreviewSlider => Lang.PreviewSlider;
+
+    /// <summary>
+    ///   查找类似 主要 的本地化字符串。
+    /// </summary>
+    public string Primary => Lang.Primary;
+
+    /// <summary>
+    ///   查找类似 进度条 的本地化字符串。
+    /// </summary>
+    public string ProgressBar => Lang.ProgressBar;
+
+    /// <summary>
+    ///   查找类似 进度按钮 的本地化字符串。
+    /// </summary>
+    public string ProgressButton => Lang.ProgressButton;
+
+    /// <summary>
+    ///   查找类似 项目 的本地化字符串。
+    /// </summary>
+    public string Project => Lang.Project;
+
+    /// <summary>
+    ///   查找类似 属性编辑器 的本地化字符串。
+    /// </summary>
+    public string PropertyGrid => Lang.PropertyGrid;
+
+    /// <summary>
+    ///   查找类似 按住说话 的本地化字符串。
+    /// </summary>
+    public string PushToTalk => Lang.PushToTalk;
+
+    /// <summary>
+    ///   查找类似 QQ群 的本地化字符串。
+    /// </summary>
+    public string QQGroup => Lang.QQGroup;
+
+    /// <summary>
+    ///   查找类似 单选按钮 的本地化字符串。
+    /// </summary>
+    public string RadioButton => Lang.RadioButton;
+
+    /// <summary>
+    ///   查找类似 范围滑块 的本地化字符串。
+    /// </summary>
+    public string RangeSlider => Lang.RangeSlider;
+
+    /// <summary>
+    ///   查找类似 评分 的本地化字符串。
+    /// </summary>
+    public string Rate => Lang.Rate;
+
+    /// <summary>
+    ///   查找类似 群友推荐 的本地化字符串。
+    /// </summary>
+    public string Recommendation => Lang.Recommendation;
+
+    /// <summary>
+    ///   查找类似 注册 的本地化字符串。
+    /// </summary>
+    public string Register => Lang.Register;
+
+    /// <summary>
+    ///   查找类似 相对布局 的本地化字符串。
+    /// </summary>
+    public string RelativePanel => Lang.RelativePanel;
+
+    /// <summary>
+    ///   查找类似 备注 的本地化字符串。
+    /// </summary>
+    public string Remark => Lang.Remark;
+
+    /// <summary>
+    ///   查找类似 删除项 的本地化字符串。
+    /// </summary>
+    public string RemoveItem => Lang.RemoveItem;
+
+    /// <summary>
+    ///   查找类似 重复按钮 的本地化字符串。
+    /// </summary>
+    public string RepeatButton => Lang.RepeatButton;
+
+    /// <summary>
+    ///   查找类似 回复 的本地化字符串。
+    /// </summary>
+    public string Reply => Lang.Reply;
+
+    /// <summary>
+    ///   查找类似 代码仓库 的本地化字符串。
+    /// </summary>
+    public string Repository => Lang.Repository;
+
+    /// <summary>
+    ///   查找类似 响应式布局 的本地化字符串。
+    /// </summary>
+    public string ResponsiveLayout => Lang.ResponsiveLayout;
+
+    /// <summary>
+    ///   查找类似 富文本框 的本地化字符串。
+    /// </summary>
+    public string RichTextBox => Lang.RichTextBox;
+
+    /// <summary>
+    ///   查找类似 在这里右击 的本地化字符串。
+    /// </summary>
+    public string RightClickHere => Lang.RightClickHere;
+
+    /// <summary>
+    ///   查找类似 滚动块 的本地化字符串。
+    /// </summary>
+    public string RunningBlock => Lang.RunningBlock;
+
+    /// <summary>
+    ///   查找类似 截图 的本地化字符串。
+    /// </summary>
+    public string Screenshot => Lang.Screenshot;
+
+    /// <summary>
+    ///   查找类似 滚动视图 的本地化字符串。
+    /// </summary>
+    public string ScrollViewer => Lang.ScrollViewer;
+
+    /// <summary>
+    ///   查找类似 搜索栏 的本地化字符串。
+    /// </summary>
+    public string SearchBar => Lang.SearchBar;
+
+    /// <summary>
+    ///   查找类似 秒 的本地化字符串。
+    /// </summary>
+    public string Second => Lang.Second;
+
+    /// <summary>
+    ///   查找类似 选中 的本地化字符串。
+    /// </summary>
+    public string Selected => Lang.Selected;
+
+    /// <summary>
+    ///   查找类似 发送通知 的本地化字符串。
+    /// </summary>
+    public string SendNotification => Lang.SendNotification;
+
+    /// <summary>
+    ///   查找类似 徽章 的本地化字符串。
+    /// </summary>
+    public string Shield => Lang.Shield;
+
+    /// <summary>
+    ///   查找类似 在当前窗口显示 的本地化字符串。
+    /// </summary>
+    public string ShowInCurrentWindow => Lang.ShowInCurrentWindow;
+
+    /// <summary>
+    ///   查找类似 在主窗口显示 的本地化字符串。
+    /// </summary>
+    public string ShowInMainWindow => Lang.ShowInMainWindow;
+
+    /// <summary>
+    ///   查找类似 显示行号 的本地化字符串。
+    /// </summary>
+    public string ShowRowNumber => Lang.ShowRowNumber;
+
+    /// <summary>
+    ///   查找类似 侧边菜单 的本地化字符串。
+    /// </summary>
+    public string SideMenu => Lang.SideMenu;
+
+    /// <summary>
+    ///   查找类似 滑块 的本地化字符串。
+    /// </summary>
+    public string Slider => Lang.Slider;
+
+    /// <summary>
+    ///   查找类似 分割按钮 的本地化字符串。
+    /// </summary>
+    public string SplitButton => Lang.SplitButton;
+
+    /// <summary>
+    ///   查找类似 精灵 的本地化字符串。
+    /// </summary>
+    public string Sprite => Lang.Sprite;
+
+    /// <summary>
+    ///   查找类似 开始截图 的本地化字符串。
+    /// </summary>
+    public string StartScreenshot => Lang.StartScreenshot;
+
+    /// <summary>
+    ///   查找类似 保持打开 的本地化字符串。
+    /// </summary>
+    public string StaysOpen => Lang.StaysOpen;
+
+    /// <summary>
+    ///   查找类似 步骤 的本地化字符串。
+    /// </summary>
+    public string Step => Lang.Step;
+
+    /// <summary>
+    ///   查找类似 步骤条 的本地化字符串。
+    /// </summary>
+    public string StepBar => Lang.StepBar;
+
+    /// <summary>
+    ///   查找类似 样式模板 的本地化字符串。
+    /// </summary>
+    public string Styles => Lang.Styles;
+
+    /// <summary>
+    ///   查找类似 子标题 的本地化字符串。
+    /// </summary>
+    public string SubTitle => Lang.SubTitle;
+
+    /// <summary>
+    ///   查找类似 成功 的本地化字符串。
+    /// </summary>
+    public string Success => Lang.Success;
+
+    /// <summary>
+    ///   查找类似 选项卡控件 的本地化字符串。
+    /// </summary>
+    public string TabControl => Lang.TabControl;
+
+    /// <summary>
+    ///   查找类似 标签 的本地化字符串。
+    /// </summary>
+    public string Tag => Lang.Tag;
+
+    /// <summary>
+    ///   查找类似 正文 的本地化字符串。
+    /// </summary>
+    public string Text => Lang.Text;
+
+    /// <summary>
+    ///   查找类似 文本块 的本地化字符串。
+    /// </summary>
+    public string TextBlock => Lang.TextBlock;
+
+    /// <summary>
+    ///   查找类似 文本框 的本地化字符串。
+    /// </summary>
+    public string TextBox => Lang.TextBox;
+
+    /// <summary>
+    ///   查找类似 文本对话框 的本地化字符串。
+    /// </summary>
+    public string TextDialog => Lang.TextDialog;
+
+    /// <summary>
+    ///   查找类似 文本对话框（控件中） 的本地化字符串。
+    /// </summary>
+    public string TextDialogInControl => Lang.TextDialogInControl;
+
+    /// <summary>
+    ///   查找类似 文本对话框，带计时器 的本地化字符串。
+    /// </summary>
+    public string TextDialogWithTimer => Lang.TextDialogWithTimer;
+
+    /// <summary>
+    ///   查找类似 时间条 的本地化字符串。
+    /// </summary>
+    public string TimeBar => Lang.TimeBar;
+
+    /// <summary>
+    ///   查找类似 时间选择器 的本地化字符串。
+    /// </summary>
+    public string TimePicker => Lang.TimePicker;
+
+    /// <summary>
+    ///   查找类似 提示 的本地化字符串。
+    /// </summary>
+    public string Tip => Lang.Tip;
+
+    /// <summary>
+    ///   查找类似 标题 的本地化字符串。
+    /// </summary>
+    public string Title => Lang.Title;
+
+    /// <summary>
+    ///   查找类似 这是标题 的本地化字符串。
+    /// </summary>
+    public string TitleDemoStr1 => Lang.TitleDemoStr1;
+
+    /// <summary>
+    ///   查找类似 此项必填 的本地化字符串。
+    /// </summary>
+    public string TitleDemoStr2 => Lang.TitleDemoStr2;
+
+    /// <summary>
+    ///   查找类似 标题在左侧 的本地化字符串。
+    /// </summary>
+    public string TitleDemoStr3 => Lang.TitleDemoStr3;
+
+    /// <summary>
+    ///   查找类似 切换按钮 的本地化字符串。
+    /// </summary>
+    public string ToggleButton => Lang.ToggleButton;
+
+    /// <summary>
+    ///   查找类似 工具条 的本地化字符串。
+    /// </summary>
+    public string ToolBar => Lang.ToolBar;
+
+    /// <summary>
+    ///   查找类似 工具 的本地化字符串。
+    /// </summary>
+    public string Tools => Lang.Tools;
+
+    /// <summary>
+    ///   查找类似 穿梭框 的本地化字符串。
+    /// </summary>
+    public string Transfer => Lang.Transfer;
+
+    /// <summary>
+    ///   查找类似 内容过渡控件 的本地化字符串。
+    /// </summary>
+    public string TransitioningContentControl => Lang.TransitioningContentControl;
+
+    /// <summary>
+    ///   查找类似 树视图 的本地化字符串。
+    /// </summary>
+    public string TreeView => Lang.TreeView;
+
+    /// <summary>
+    ///   查找类似 试试关闭程序吧？ 的本地化字符串。
+    /// </summary>
+    public string Try2CloseApp => Lang.Try2CloseApp;
+
+    /// <summary>
+    ///   查找类似 类型 的本地化字符串。
+    /// </summary>
+    public string Type => Lang.Type;
+
+    /// <summary>
+    ///   查找类似 等间距布局 的本地化字符串。
+    /// </summary>
+    public string UniformSpacingPanel => Lang.UniformSpacingPanel;
+
+    /// <summary>
+    ///   查找类似 上传文件 的本地化字符串。
+    /// </summary>
+    public string UploadFile => Lang.UploadFile;
+
+    /// <summary>
+    ///   查找类似 上传;上传中 的本地化字符串。
+    /// </summary>
+    public string UploadStr => Lang.UploadStr;
+
+    /// <summary>
+    ///   查找类似 可见性 的本地化字符串。
+    /// </summary>
+    public string Visibility => Lang.Visibility;
+
+    /// <summary>
+    ///   查找类似 VS 插件 的本地化字符串。
+    /// </summary>
+    public string Vsix => Lang.Vsix;
+
+    /// <summary>
+    ///   查找类似 警告 的本地化字符串。
+    /// </summary>
+    public string Warning => Lang.Warning;
+
+    /// <summary>
+    ///   查找类似 瀑布流 的本地化字符串。
+    /// </summary>
+    public string WaterfallPanel => Lang.WaterfallPanel;
+
+    /// <summary>
+    ///   查找类似 网站 的本地化字符串。
+    /// </summary>
+    public string Website => Lang.Website;
+
+    /// <summary>
+    ///   查找类似 窗口 的本地化字符串。
+    /// </summary>
+    public string Window => Lang.Window;
+
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged(string propertyName) =>
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 }
+
+public class LangKeys
+{
+    /// <summary>
+    ///   查找类似 关于 的本地化字符串。
+    /// </summary>
+    public static string About = nameof(About);
+
+    /// <summary>
+    ///   查找类似 添加项 的本地化字符串。
+    /// </summary>
+    public static string AddItem = nameof(AddItem);
+
+    /// <summary>
+    ///   查找类似 动画路径 的本地化字符串。
+    /// </summary>
+    public static string AnimationPath = nameof(AnimationPath);
+
+    /// <summary>
+    ///   查找类似 托盘图标已打开，将隐藏窗口而不是关闭程序 的本地化字符串。
+    /// </summary>
+    public static string AppClosingTip = nameof(AppClosingTip);
+
+    /// <summary>
+    ///   查找类似 询问 的本地化字符串。
+    /// </summary>
+    public static string Ask = nameof(Ask);
+
+    /// <summary>
+    ///   查找类似 自动补全文本框 的本地化字符串。
+    /// </summary>
+    public static string AutoCompleteTextBox = nameof(AutoCompleteTextBox);
+
+    /// <summary>
+    ///   查找类似 标记 的本地化字符串。
+    /// </summary>
+    public static string Badge = nameof(Badge);
+
+    /// <summary>
+    ///   查找类似 填写基本信息 的本地化字符串。
+    /// </summary>
+    public static string BasicInfo = nameof(BasicInfo);
+
+    /// <summary>
+    ///   查找类似 基础布局 的本地化字符串。
+    /// </summary>
+    public static string BasicLayout = nameof(BasicLayout);
+
+    /// <summary>
+    ///   查找类似 闪烁 的本地化字符串。
+    /// </summary>
+    public static string Blink = nameof(Blink);
+
+    /// <summary>
+    ///   查找类似 博客 的本地化字符串。
+    /// </summary>
+    public static string Blog = nameof(Blog);
+
+    /// <summary>
+    ///   查找类似 边框 的本地化字符串。
+    /// </summary>
+    public static string Border = nameof(Border);
+
+    /// <summary>
+    ///   查找类似 画刷 的本地化字符串。
+    /// </summary>
+    public static string Brush = nameof(Brush);
+
+    /// <summary>
+    ///   查找类似 按钮 的本地化字符串。
+    /// </summary>
+    public static string Button = nameof(Button);
+
+    /// <summary>
+    ///   查找类似 自定义按钮 的本地化字符串。
+    /// </summary>
+    public static string ButtonCustom = nameof(ButtonCustom);
+
+    /// <summary>
+    ///   查找类似 按钮组 的本地化字符串。
+    /// </summary>
+    public static string ButtonGroup = nameof(ButtonGroup);
+
+    /// <summary>
+    ///   查找类似 日历 的本地化字符串。
+    /// </summary>
+    public static string Calendar = nameof(Calendar);
+
+    /// <summary>
+    ///   查找类似 带时钟的日历 的本地化字符串。
+    /// </summary>
+    public static string CalendarWithClock = nameof(CalendarWithClock);
+
+    /// <summary>
+    ///   查找类似 卡片 的本地化字符串。
+    /// </summary>
+    public static string Card = nameof(Card);
+
+    /// <summary>
+    ///   查找类似 轮播 的本地化字符串。
+    /// </summary>
+    public static string Carousel = nameof(Carousel);
+
+    /// <summary>
+    ///   查找类似 是否重启以更改语言？ 的本地化字符串。
+    /// </summary>
+    public static string ChangeLangAsk = nameof(ChangeLangAsk);
+
+    /// <summary>
+    ///   查找类似 对话气泡 的本地化字符串。
+    /// </summary>
+    public static string ChatBubble = nameof(ChatBubble);
+
+    /// <summary>
+    ///   查找类似 讨论室 的本地化字符串。
+    /// </summary>
+    public static string Chatroom = nameof(Chatroom);
+
+    /// <summary>
+    ///   查找类似 复选框 的本地化字符串。
+    /// </summary>
+    public static string CheckBox = nameof(CheckBox);
+
+    /// <summary>
+    ///   查找类似 多选组合框 的本地化字符串。
+    /// </summary>
+    public static string CheckComboBox = nameof(CheckComboBox);
+
+    /// <summary>
+    ///   查找类似 圆形布局 的本地化字符串。
+    /// </summary>
+    public static string CirclePanel = nameof(CirclePanel);
+
+    /// <summary>
+    ///   查找类似 清空 的本地化字符串。
+    /// </summary>
+    public static string Clear = nameof(Clear);
+
+    /// <summary>
+    ///   查找类似 点击计数 的本地化字符串。
+    /// </summary>
+    public static string Click2Count = nameof(Click2Count);
+
+    /// <summary>
+    ///   查找类似 时钟 的本地化字符串。
+    /// </summary>
+    public static string Clock = nameof(Clock);
+
+    /// <summary>
+    ///   查找类似 颜色拾取器 的本地化字符串。
+    /// </summary>
+    public static string ColorPicker = nameof(ColorPicker);
+
+    /// <summary>
+    ///   查找类似 分栏偏移 的本地化字符串。
+    /// </summary>
+    public static string ColumnOffset = nameof(ColumnOffset);
+
+    /// <summary>
+    ///   查找类似 分栏间隔 的本地化字符串。
+    /// </summary>
+    public static string ColumnSpacing = nameof(ColumnSpacing);
+
+    /// <summary>
+    ///   查找类似 组合框 的本地化字符串。
+    /// </summary>
+    public static string ComboBox = nameof(ComboBox);
+
+    /// <summary>
+    ///   查找类似 敬请期待 的本地化字符串。
+    /// </summary>
+    public static string ComingSoon = nameof(ComingSoon);
+
+    /// <summary>
+    ///   查找类似 评论 的本地化字符串。
+    /// </summary>
+    public static string Comment = nameof(Comment);
+
+    /// <summary>
+    ///   查找类似 一般 的本地化字符串。
+    /// </summary>
+    public static string Common = nameof(Common);
+
+    /// <summary>
+    ///   查找类似 对比滑块 的本地化字符串。
+    /// </summary>
+    public static string CompareSlider = nameof(CompareSlider);
+
+    /// <summary>
+    ///   查找类似 完成 的本地化字符串。
+    /// </summary>
+    public static string Complete = nameof(Complete);
+
+    /// <summary>
+    ///   查找类似 这是内容 的本地化字符串。
+    /// </summary>
+    public static string ContentDemoStr = nameof(ContentDemoStr);
+
+    /// <summary>
+    ///   查找类似 贡献者 的本地化字符串。
+    /// </summary>
+    public static string Contributors = nameof(Contributors);
+
+    /// <summary>
+    ///   查找类似 控件 的本地化字符串。
+    /// </summary>
+    public static string Controls = nameof(Controls);
+
+    /// <summary>
+    ///   查找类似 封面流 的本地化字符串。
+    /// </summary>
+    public static string CoverFlow = nameof(CoverFlow);
+
+    /// <summary>
+    ///   查找类似 封面视图 的本地化字符串。
+    /// </summary>
+    public static string CoverView = nameof(CoverView);
+
+    /// <summary>
+    ///   查找类似 危险 的本地化字符串。
+    /// </summary>
+    public static string Danger = nameof(Danger);
+
+    /// <summary>
+    ///   查找类似 数据展示 的本地化字符串。
+    /// </summary>
+    public static string DataDisplay = nameof(DataDisplay);
+
+    /// <summary>
+    ///   查找类似 数据录入 的本地化字符串。
+    /// </summary>
+    public static string DataEntry = nameof(DataEntry);
+
+    /// <summary>
+    ///   查找类似 数据表格 的本地化字符串。
+    /// </summary>
+    public static string DataGrid = nameof(DataGrid);
+
+    /// <summary>
+    ///   查找类似 日期选择器 的本地化字符串。
+    /// </summary>
+    public static string DatePicker = nameof(DatePicker);
+
+    /// <summary>
+    ///   查找类似 日期时间选择器 的本地化字符串。
+    /// </summary>
+    public static string DateTimePicker = nameof(DateTimePicker);
+
+    /// <summary>
+    ///   查找类似 默认 的本地化字符串。
+    /// </summary>
+    public static string Default = nameof(Default);
+
+    /// <summary>
+    ///   查找类似 示例 的本地化字符串。
+    /// </summary>
+    public static string Demo = nameof(Demo);
+
+    /// <summary>
+    ///   查找类似 对话框 的本地化字符串。
+    /// </summary>
+    public static string Dialog = nameof(Dialog);
+
+    /// <summary>
+    ///   查找类似 对话框示例 的本地化字符串。
+    /// </summary>
+    public static string DialogDemo = nameof(DialogDemo);
+
+    /// <summary>
+    ///   查找类似 分割线 的本地化字符串。
+    /// </summary>
+    public static string Divider = nameof(Divider);
+
+    /// <summary>
+    ///   查找类似 中文文档 的本地化字符串。
+    /// </summary>
+    public static string Doc_cn = nameof(Doc_cn);
+
+    /// <summary>
+    ///   查找类似 英文文档 的本地化字符串。
+    /// </summary>
+    public static string Doc_en = nameof(Doc_en);
+
+    /// <summary>
+    ///   查找类似 文献资料 的本地化字符串。
+    /// </summary>
+    public static string Documentation = nameof(Documentation);
+
+    /// <summary>
+    ///   查找类似 在这里拖拽 的本地化字符串。
+    /// </summary>
+    public static string DragHere = nameof(DragHere);
+
+    /// <summary>
+    ///   查找类似 抽屉 的本地化字符串。
+    /// </summary>
+    public static string Drawer = nameof(Drawer);
+
+    /// <summary>
+    ///   查找类似 效果 的本地化字符串。
+    /// </summary>
+    public static string Effects = nameof(Effects);
+
+    /// <summary>
+    ///   查找类似 元素组 的本地化字符串。
+    /// </summary>
+    public static string ElementGroup = nameof(ElementGroup);
+
+    /// <summary>
+    ///   查找类似 邮箱 的本地化字符串。
+    /// </summary>
+    public static string Email = nameof(Email);
+
+    /// <summary>
+    ///   查找类似 空状态 的本地化字符串。
+    /// </summary>
+    public static string Empty = nameof(Empty);
+
+    /// <summary>
+    ///   查找类似 错误 的本地化字符串。
+    /// </summary>
+    public static string Error = nameof(Error);
+
+    /// <summary>
+    ///   查找类似 退出 的本地化字符串。
+    /// </summary>
+    public static string Exit = nameof(Exit);
+
+    /// <summary>
+    ///   查找类似 展开框 的本地化字符串。
+    /// </summary>
+    public static string Expander = nameof(Expander);
+
+    /// <summary>
+    ///   查找类似 严重 的本地化字符串。
+    /// </summary>
+    public static string Fatal = nameof(Fatal);
+
+    /// <summary>
+    ///   查找类似 反馈 的本地化字符串。
+    /// </summary>
+    public static string Feedback = nameof(Feedback);
+
+    /// <summary>
+    ///   查找类似 弹性盒子 的本地化字符串。
+    /// </summary>
+    public static string FlexPanel = nameof(FlexPanel);
+
+    /// <summary>
+    ///   查找类似 翻页时钟 的本地化字符串。
+    /// </summary>
+    public static string FlipClock = nameof(FlipClock);
+
+    /// <summary>
+    ///   查找类似 漂浮块 的本地化字符串。
+    /// </summary>
+    public static string FloatingBlock = nameof(FloatingBlock);
+
+    /// <summary>
+    ///   查找类似 流文档 的本地化字符串。
+    /// </summary>
+    public static string FlowDocument = nameof(FlowDocument);
+
+    /// <summary>
+    ///   查找类似 流文档单页视图 的本地化字符串。
+    /// </summary>
+    public static string FlowDocumentPageViewer = nameof(FlowDocumentPageViewer);
+
+    /// <summary>
+    ///   查找类似 流文档查看器 的本地化字符串。
+    /// </summary>
+    public static string FlowDocumentReader = nameof(FlowDocumentReader);
+
+    /// <summary>
+    ///   查找类似 流文档滚动视图 的本地化字符串。
+    /// </summary>
+    public static string FlowDocumentScrollViewer = nameof(FlowDocumentScrollViewer);
+
+    /// <summary>
+    ///   查找类似 导航框架 的本地化字符串。
+    /// </summary>
+    public static string Frame = nameof(Frame);
+
+    /// <summary>
+    ///   查找类似 几何形状 的本地化字符串。
+    /// </summary>
+    public static string Geometry = nameof(Geometry);
+
+    /// <summary>
+    ///   查找类似 Gif图片 的本地化字符串。
+    /// </summary>
+    public static string GifImage = nameof(GifImage);
+
+    /// <summary>
+    ///   查找类似 回到顶部 的本地化字符串。
+    /// </summary>
+    public static string GotoTop = nameof(GotoTop);
+
+    /// <summary>
+    ///   查找类似 头像 的本地化字符串。
+    /// </summary>
+    public static string Gravatar = nameof(Gravatar);
+
+    /// <summary>
+    ///   查找类似 栅格 的本地化字符串。
+    /// </summary>
+    public static string Grid = nameof(Grid);
+
+    /// <summary>
+    ///   查找类似 分组框 的本地化字符串。
+    /// </summary>
+    public static string GroupBox = nameof(GroupBox);
+
+    /// <summary>
+    ///   查找类似 组数 的本地化字符串。
+    /// </summary>
+    public static string Groups = nameof(Groups);
+
+    /// <summary>
+    ///   查找类似 信息通知 的本地化字符串。
+    /// </summary>
+    public static string Growl = nameof(Growl);
+
+    /// <summary>
+    ///   查找类似 检测到有新版本！是否更新？ 的本地化字符串。
+    /// </summary>
+    public static string GrowlAsk = nameof(GrowlAsk);
+
+    /// <summary>
+    ///   查找类似 消息通知示例 的本地化字符串。
+    /// </summary>
+    public static string GrowlDemo = nameof(GrowlDemo);
+
+    /// <summary>
+    ///   查找类似 连接失败，请检查网络！ 的本地化字符串。
+    /// </summary>
+    public static string GrowlError = nameof(GrowlError);
+
+    /// <summary>
+    ///   查找类似 程序已崩溃~~~ 的本地化字符串。
+    /// </summary>
+    public static string GrowlFatal = nameof(GrowlFatal);
+
+    /// <summary>
+    ///   查找类似 今天的天气不错~~~ 的本地化字符串。
+    /// </summary>
+    public static string GrowlInfo = nameof(GrowlInfo);
+
+    /// <summary>
+    ///   查找类似 文件保存成功！ 的本地化字符串。
+    /// </summary>
+    public static string GrowlSuccess = nameof(GrowlSuccess);
+
+    /// <summary>
+    ///   查找类似 磁盘空间快要满了！ 的本地化字符串。
+    /// </summary>
+    public static string GrowlWarning = nameof(GrowlWarning);
+
+    /// <summary>
+    ///   查找类似 阴影画笔生成器 的本地化字符串。
+    /// </summary>
+    public static string HatchBrushGenerator = nameof(HatchBrushGenerator);
+
+    /// <summary>
+    ///   查找类似 蜂窝布局 的本地化字符串。
+    /// </summary>
+    public static string HoneycombPanel = nameof(HoneycombPanel);
+
+    /// <summary>
+    ///   查找类似 混合布局 的本地化字符串。
+    /// </summary>
+    public static string HybridLayout = nameof(HybridLayout);
+
+    /// <summary>
+    ///   查找类似 忽略 的本地化字符串。
+    /// </summary>
+    public static string Ignore = nameof(Ignore);
+
+    /// <summary>
+    ///   查找类似 图片块 的本地化字符串。
+    /// </summary>
+    public static string ImageBlock = nameof(ImageBlock);
+
+    /// <summary>
+    ///   查找类似 图片浏览器 的本地化字符串。
+    /// </summary>
+    public static string ImageBrowser = nameof(ImageBrowser);
+
+    /// <summary>
+    ///   查找类似 图片选择器 的本地化字符串。
+    /// </summary>
+    public static string ImageSelector = nameof(ImageSelector);
+
+    /// <summary>
+    ///   查找类似 索引 的本地化字符串。
+    /// </summary>
+    public static string Index = nameof(Index);
+
+    /// <summary>
+    ///   查找类似 信息 的本地化字符串。
+    /// </summary>
+    public static string Info = nameof(Info);
+
+    /// <summary>
+    ///   查找类似 交互 的本地化字符串。
+    /// </summary>
+    public static string Interacting = nameof(Interacting);
+
+    /// <summary>
+    ///   查找类似 可交互对话框 的本地化字符串。
+    /// </summary>
+    public static string InteractiveDialog = nameof(InteractiveDialog);
+
+    /// <summary>
+    ///   查找类似 不是手机号码 的本地化字符串。
+    /// </summary>
+    public static string IsNotPhone = nameof(IsNotPhone);
+
+    /// <summary>
+    ///   查找类似 标签 的本地化字符串。
+    /// </summary>
+    public static string Label = nameof(Label);
+
+    /// <summary>
+    ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
+    /// </summary>
+    public static string LangComment = nameof(LangComment);
+
+    /// <summary>
+    ///   查找类似 布局 的本地化字符串。
+    /// </summary>
+    public static string Layout = nameof(Layout);
+
+    /// <summary>
+    ///   查找类似 列表框 的本地化字符串。
+    /// </summary>
+    public static string ListBox = nameof(ListBox);
+
+    /// <summary>
+    ///   查找类似 列表视图 的本地化字符串。
+    /// </summary>
+    public static string ListView = nameof(ListView);
+
+    /// <summary>
+    ///   查找类似 加载条 的本地化字符串。
+    /// </summary>
+    public static string Loading = nameof(Loading);
+
+    /// <summary>
+    ///   查找类似 放大镜 的本地化字符串。
+    /// </summary>
+    public static string Magnifier = nameof(Magnifier);
+
+    /// <summary>
+    ///   查找类似 菜单 的本地化字符串。
+    /// </summary>
+    public static string Menu = nameof(Menu);
+
+    /// <summary>
+    ///   查找类似 消息框 的本地化字符串。
+    /// </summary>
+    public static string MessageBox = nameof(MessageBox);
+
+    /// <summary>
+    ///   查找类似 杂项 的本地化字符串。
+    /// </summary>
+    public static string Misc = nameof(Misc);
+
+    /// <summary>
+    ///   查找类似  的本地化字符串。
+    /// </summary>
+    public static string Morphing_Animation = nameof(Morphing_Animation);
+
+    /// <summary>
+    ///   查找类似 名称 的本地化字符串。
+    /// </summary>
+    public static string Name = nameof(Name);
+
+    /// <summary>
+    ///   查找类似 导航 的本地化字符串。
+    /// </summary>
+    public static string Navigation = nameof(Navigation);
+
+    /// <summary>
+    ///   查找类似 新建窗口 的本地化字符串。
+    /// </summary>
+    public static string NewWindow = nameof(NewWindow);
+
+    /// <summary>
+    ///   查找类似 下一步 的本地化字符串。
+    /// </summary>
+    public static string Next = nameof(Next);
+
+    /// <summary>
+    ///   查找类似 桌面通知 的本地化字符串。
+    /// </summary>
+    public static string Notification = nameof(Notification);
+
+    /// <summary>
+    ///   查找类似 托盘图标 的本地化字符串。
+    /// </summary>
+    public static string NotifyIcon = nameof(NotifyIcon);
+
+    /// <summary>
+    ///   查找类似 数值选择控件 的本地化字符串。
+    /// </summary>
+    public static string NumericUpDown = nameof(NumericUpDown);
+
+    /// <summary>
+    ///   查找类似 关 的本地化字符串。
+    /// </summary>
+    public static string Off = nameof(Off);
+
+    /// <summary>
+    ///   查找类似 确定 的本地化字符串。
+    /// </summary>
+    public static string Ok = nameof(Ok);
+
+    /// <summary>
+    ///   查找类似 开 的本地化字符串。
+    /// </summary>
+    public static string On = nameof(On);
+
+    /// <summary>
+    ///   查找类似 点击打开背景模糊窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenBlurWindow = nameof(OpenBlurWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开常规窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenCommonWindow = nameof(OpenCommonWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开自定义内容窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenCustomContentWindow = nameof(OpenCustomContentWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开自定义消息窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenCustomMessageWindow = nameof(OpenCustomMessageWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开自定义非客户端区域窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenCustomNonClientAreaWindow = nameof(OpenCustomNonClientAreaWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开辉光窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenGlowWindow = nameof(OpenGlowWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开图片浏览器 的本地化字符串。
+    /// </summary>
+    public static string OpenImageBrowser = nameof(OpenImageBrowser);
+
+    /// <summary>
+    ///   查找类似 点击打开消息窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenMessageWindow = nameof(OpenMessageWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开鼠标跟随窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenMouseFollowWindow = nameof(OpenMouseFollowWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开原生常规窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenNativeCommonWindow = nameof(OpenNativeCommonWindow);
+
+    /// <summary>
+    ///   查找类似 点击打开导航窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenNavigationWindow = nameof(OpenNavigationWindow);
+
+    /// <summary>
+    ///   查找类似 打开无非客户端区域可拖拽窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenNoNonClientAreaDragableWindow = nameof(OpenNoNonClientAreaDragableWindow);
+
+    /// <summary>
+    ///   查找类似 打开面板 的本地化字符串。
+    /// </summary>
+    public static string OpenPanel = nameof(OpenPanel);
+
+    /// <summary>
+    ///   查找类似 打开精灵 的本地化字符串。
+    /// </summary>
+    public static string OpenSprite = nameof(OpenSprite);
+
+    /// <summary>
+    ///   查找类似 点击打开触摸拖动窗口 的本地化字符串。
+    /// </summary>
+    public static string OpenTouchDragMoveWindow = nameof(OpenTouchDragMoveWindow);
+
+    /// <summary>
+    ///   查找类似 轮廓文本 的本地化字符串。
+    /// </summary>
+    public static string OutlineText = nameof(OutlineText);
+
+    /// <summary>
+    ///   查找类似 页码条 的本地化字符串。
+    /// </summary>
+    public static string Pagination = nameof(Pagination);
+
+    /// <summary>
+    ///   查找类似 密码框 的本地化字符串。
+    /// </summary>
+    public static string PasswordBox = nameof(PasswordBox);
+
+    /// <summary>
+    ///   查找类似 PIN码框 的本地化字符串。
+    /// </summary>
+    public static string PinBox = nameof(PinBox);
+
+    /// <summary>
+    ///   查找类似 请输入... 的本地化字符串。
+    /// </summary>
+    public static string PleaseInput = nameof(PleaseInput);
+
+    /// <summary>
+    ///   查找类似 请稍后... 的本地化字符串。
+    /// </summary>
+    public static string PleaseWait = nameof(PleaseWait);
+
+    /// <summary>
+    ///   查找类似 请输入内容 的本地化字符串。
+    /// </summary>
+    public static string PlsEnterContent = nameof(PlsEnterContent);
+
+    /// <summary>
+    ///   查找类似 请输入邮箱 的本地化字符串。
+    /// </summary>
+    public static string PlsEnterEmail = nameof(PlsEnterEmail);
+
+    /// <summary>
+    ///   查找类似 请输入关键字 的本地化字符串。
+    /// </summary>
+    public static string PlsEnterKey = nameof(PlsEnterKey);
+
+    /// <summary>
+    ///   查找类似 气泡提示 的本地化字符串。
+    /// </summary>
+    public static string Poptip = nameof(Poptip);
+
+    /// <summary>
+    ///   查找类似 上左;上边;上右;右上;右边;右下;下右;下边;下左;左下;左边;左上 的本地化字符串。
+    /// </summary>
+    public static string PoptipPositionStr = nameof(PoptipPositionStr);
+
+    /// <summary>
+    ///   查找类似 实用例子 的本地化字符串。
+    /// </summary>
+    public static string PracticalDemos = nameof(PracticalDemos);
+
+    /// <summary>
+    ///   查找类似 上一步 的本地化字符串。
+    /// </summary>
+    public static string Prev = nameof(Prev);
+
+    /// <summary>
+    ///   查找类似 预览滑块 的本地化字符串。
+    /// </summary>
+    public static string PreviewSlider = nameof(PreviewSlider);
+
+    /// <summary>
+    ///   查找类似 主要 的本地化字符串。
+    /// </summary>
+    public static string Primary = nameof(Primary);
+
+    /// <summary>
+    ///   查找类似 进度条 的本地化字符串。
+    /// </summary>
+    public static string ProgressBar = nameof(ProgressBar);
+
+    /// <summary>
+    ///   查找类似 进度按钮 的本地化字符串。
+    /// </summary>
+    public static string ProgressButton = nameof(ProgressButton);
+
+    /// <summary>
+    ///   查找类似 项目 的本地化字符串。
+    /// </summary>
+    public static string Project = nameof(Project);
+
+    /// <summary>
+    ///   查找类似 属性编辑器 的本地化字符串。
+    /// </summary>
+    public static string PropertyGrid = nameof(PropertyGrid);
+
+    /// <summary>
+    ///   查找类似 按住说话 的本地化字符串。
+    /// </summary>
+    public static string PushToTalk = nameof(PushToTalk);
+
+    /// <summary>
+    ///   查找类似 QQ群 的本地化字符串。
+    /// </summary>
+    public static string QQGroup = nameof(QQGroup);
+
+    /// <summary>
+    ///   查找类似 单选按钮 的本地化字符串。
+    /// </summary>
+    public static string RadioButton = nameof(RadioButton);
+
+    /// <summary>
+    ///   查找类似 范围滑块 的本地化字符串。
+    /// </summary>
+    public static string RangeSlider = nameof(RangeSlider);
+
+    /// <summary>
+    ///   查找类似 评分 的本地化字符串。
+    /// </summary>
+    public static string Rate = nameof(Rate);
+
+    /// <summary>
+    ///   查找类似 群友推荐 的本地化字符串。
+    /// </summary>
+    public static string Recommendation = nameof(Recommendation);
+
+    /// <summary>
+    ///   查找类似 注册 的本地化字符串。
+    /// </summary>
+    public static string Register = nameof(Register);
+
+    /// <summary>
+    ///   查找类似 相对布局 的本地化字符串。
+    /// </summary>
+    public static string RelativePanel = nameof(RelativePanel);
+
+    /// <summary>
+    ///   查找类似 备注 的本地化字符串。
+    /// </summary>
+    public static string Remark = nameof(Remark);
+
+    /// <summary>
+    ///   查找类似 删除项 的本地化字符串。
+    /// </summary>
+    public static string RemoveItem = nameof(RemoveItem);
+
+    /// <summary>
+    ///   查找类似 重复按钮 的本地化字符串。
+    /// </summary>
+    public static string RepeatButton = nameof(RepeatButton);
+
+    /// <summary>
+    ///   查找类似 回复 的本地化字符串。
+    /// </summary>
+    public static string Reply = nameof(Reply);
+
+    /// <summary>
+    ///   查找类似 代码仓库 的本地化字符串。
+    /// </summary>
+    public static string Repository = nameof(Repository);
+
+    /// <summary>
+    ///   查找类似 响应式布局 的本地化字符串。
+    /// </summary>
+    public static string ResponsiveLayout = nameof(ResponsiveLayout);
+
+    /// <summary>
+    ///   查找类似 富文本框 的本地化字符串。
+    /// </summary>
+    public static string RichTextBox = nameof(RichTextBox);
+
+    /// <summary>
+    ///   查找类似 在这里右击 的本地化字符串。
+    /// </summary>
+    public static string RightClickHere = nameof(RightClickHere);
+
+    /// <summary>
+    ///   查找类似 滚动块 的本地化字符串。
+    /// </summary>
+    public static string RunningBlock = nameof(RunningBlock);
+
+    /// <summary>
+    ///   查找类似 截图 的本地化字符串。
+    /// </summary>
+    public static string Screenshot = nameof(Screenshot);
+
+    /// <summary>
+    ///   查找类似 滚动视图 的本地化字符串。
+    /// </summary>
+    public static string ScrollViewer = nameof(ScrollViewer);
+
+    /// <summary>
+    ///   查找类似 搜索栏 的本地化字符串。
+    /// </summary>
+    public static string SearchBar = nameof(SearchBar);
+
+    /// <summary>
+    ///   查找类似 秒 的本地化字符串。
+    /// </summary>
+    public static string Second = nameof(Second);
+
+    /// <summary>
+    ///   查找类似 选中 的本地化字符串。
+    /// </summary>
+    public static string Selected = nameof(Selected);
+
+    /// <summary>
+    ///   查找类似 发送通知 的本地化字符串。
+    /// </summary>
+    public static string SendNotification = nameof(SendNotification);
+
+    /// <summary>
+    ///   查找类似 徽章 的本地化字符串。
+    /// </summary>
+    public static string Shield = nameof(Shield);
+
+    /// <summary>
+    ///   查找类似 在当前窗口显示 的本地化字符串。
+    /// </summary>
+    public static string ShowInCurrentWindow = nameof(ShowInCurrentWindow);
+
+    /// <summary>
+    ///   查找类似 在主窗口显示 的本地化字符串。
+    /// </summary>
+    public static string ShowInMainWindow = nameof(ShowInMainWindow);
+
+    /// <summary>
+    ///   查找类似 显示行号 的本地化字符串。
+    /// </summary>
+    public static string ShowRowNumber = nameof(ShowRowNumber);
+
+    /// <summary>
+    ///   查找类似 侧边菜单 的本地化字符串。
+    /// </summary>
+    public static string SideMenu = nameof(SideMenu);
+
+    /// <summary>
+    ///   查找类似 滑块 的本地化字符串。
+    /// </summary>
+    public static string Slider = nameof(Slider);
+
+    /// <summary>
+    ///   查找类似 分割按钮 的本地化字符串。
+    /// </summary>
+    public static string SplitButton = nameof(SplitButton);
+
+    /// <summary>
+    ///   查找类似 精灵 的本地化字符串。
+    /// </summary>
+    public static string Sprite = nameof(Sprite);
+
+    /// <summary>
+    ///   查找类似 开始截图 的本地化字符串。
+    /// </summary>
+    public static string StartScreenshot = nameof(StartScreenshot);
+
+    /// <summary>
+    ///   查找类似 保持打开 的本地化字符串。
+    /// </summary>
+    public static string StaysOpen = nameof(StaysOpen);
+
+    /// <summary>
+    ///   查找类似 步骤 的本地化字符串。
+    /// </summary>
+    public static string Step = nameof(Step);
+
+    /// <summary>
+    ///   查找类似 步骤条 的本地化字符串。
+    /// </summary>
+    public static string StepBar = nameof(StepBar);
+
+    /// <summary>
+    ///   查找类似 样式模板 的本地化字符串。
+    /// </summary>
+    public static string Styles = nameof(Styles);
+
+    /// <summary>
+    ///   查找类似 子标题 的本地化字符串。
+    /// </summary>
+    public static string SubTitle = nameof(SubTitle);
+
+    /// <summary>
+    ///   查找类似 成功 的本地化字符串。
+    /// </summary>
+    public static string Success = nameof(Success);
+
+    /// <summary>
+    ///   查找类似 选项卡控件 的本地化字符串。
+    /// </summary>
+    public static string TabControl = nameof(TabControl);
+
+    /// <summary>
+    ///   查找类似 标签 的本地化字符串。
+    /// </summary>
+    public static string Tag = nameof(Tag);
+
+    /// <summary>
+    ///   查找类似 正文 的本地化字符串。
+    /// </summary>
+    public static string Text = nameof(Text);
+
+    /// <summary>
+    ///   查找类似 文本块 的本地化字符串。
+    /// </summary>
+    public static string TextBlock = nameof(TextBlock);
+
+    /// <summary>
+    ///   查找类似 文本框 的本地化字符串。
+    /// </summary>
+    public static string TextBox = nameof(TextBox);
+
+    /// <summary>
+    ///   查找类似 文本对话框 的本地化字符串。
+    /// </summary>
+    public static string TextDialog = nameof(TextDialog);
+
+    /// <summary>
+    ///   查找类似 文本对话框（控件中） 的本地化字符串。
+    /// </summary>
+    public static string TextDialogInControl = nameof(TextDialogInControl);
+
+    /// <summary>
+    ///   查找类似 文本对话框，带计时器 的本地化字符串。
+    /// </summary>
+    public static string TextDialogWithTimer = nameof(TextDialogWithTimer);
+
+    /// <summary>
+    ///   查找类似 时间条 的本地化字符串。
+    /// </summary>
+    public static string TimeBar = nameof(TimeBar);
+
+    /// <summary>
+    ///   查找类似 时间选择器 的本地化字符串。
+    /// </summary>
+    public static string TimePicker = nameof(TimePicker);
+
+    /// <summary>
+    ///   查找类似 提示 的本地化字符串。
+    /// </summary>
+    public static string Tip = nameof(Tip);
+
+    /// <summary>
+    ///   查找类似 标题 的本地化字符串。
+    /// </summary>
+    public static string Title = nameof(Title);
+
+    /// <summary>
+    ///   查找类似 这是标题 的本地化字符串。
+    /// </summary>
+    public static string TitleDemoStr1 = nameof(TitleDemoStr1);
+
+    /// <summary>
+    ///   查找类似 此项必填 的本地化字符串。
+    /// </summary>
+    public static string TitleDemoStr2 = nameof(TitleDemoStr2);
+
+    /// <summary>
+    ///   查找类似 标题在左侧 的本地化字符串。
+    /// </summary>
+    public static string TitleDemoStr3 = nameof(TitleDemoStr3);
+
+    /// <summary>
+    ///   查找类似 切换按钮 的本地化字符串。
+    /// </summary>
+    public static string ToggleButton = nameof(ToggleButton);
+
+    /// <summary>
+    ///   查找类似 工具条 的本地化字符串。
+    /// </summary>
+    public static string ToolBar = nameof(ToolBar);
+
+    /// <summary>
+    ///   查找类似 工具 的本地化字符串。
+    /// </summary>
+    public static string Tools = nameof(Tools);
+
+    /// <summary>
+    ///   查找类似 穿梭框 的本地化字符串。
+    /// </summary>
+    public static string Transfer = nameof(Transfer);
+
+    /// <summary>
+    ///   查找类似 内容过渡控件 的本地化字符串。
+    /// </summary>
+    public static string TransitioningContentControl = nameof(TransitioningContentControl);
+
+    /// <summary>
+    ///   查找类似 树视图 的本地化字符串。
+    /// </summary>
+    public static string TreeView = nameof(TreeView);
+
+    /// <summary>
+    ///   查找类似 试试关闭程序吧？ 的本地化字符串。
+    /// </summary>
+    public static string Try2CloseApp = nameof(Try2CloseApp);
+
+    /// <summary>
+    ///   查找类似 类型 的本地化字符串。
+    /// </summary>
+    public static string Type = nameof(Type);
+
+    /// <summary>
+    ///   查找类似 等间距布局 的本地化字符串。
+    /// </summary>
+    public static string UniformSpacingPanel = nameof(UniformSpacingPanel);
+
+    /// <summary>
+    ///   查找类似 上传文件 的本地化字符串。
+    /// </summary>
+    public static string UploadFile = nameof(UploadFile);
+
+    /// <summary>
+    ///   查找类似 上传;上传中 的本地化字符串。
+    /// </summary>
+    public static string UploadStr = nameof(UploadStr);
+
+    /// <summary>
+    ///   查找类似 可见性 的本地化字符串。
+    /// </summary>
+    public static string Visibility = nameof(Visibility);
+
+    /// <summary>
+    ///   查找类似 VS 插件 的本地化字符串。
+    /// </summary>
+    public static string Vsix = nameof(Vsix);
+
+    /// <summary>
+    ///   查找类似 警告 的本地化字符串。
+    /// </summary>
+    public static string Warning = nameof(Warning);
+
+    /// <summary>
+    ///   查找类似 瀑布流 的本地化字符串。
+    /// </summary>
+    public static string WaterfallPanel = nameof(WaterfallPanel);
+
+    /// <summary>
+    ///   查找类似 网站 的本地化字符串。
+    /// </summary>
+    public static string Website = nameof(Website);
+
+    /// <summary>
+    ///   查找类似 窗口 的本地化字符串。
+    /// </summary>
+    public static string Window = nameof(Window);
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
index cbade368..155ac909 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
+++ b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
@@ -4,16 +4,15 @@ using HandyControl.Data;
 using HandyControl.Themes;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.Resources
-{
-    public class DemoTheme : Theme
-    {
-        public override ResourceDictionary GetSkin(SkinType skinType) =>
-            ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skinType);
+namespace HandyControlDemo.Resources;
 
-        public override ResourceDictionary GetTheme() => new()
-        {
-            Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
-        };
-    }
-}
+public class DemoTheme : Theme
+{
+    public override ResourceDictionary GetSkin(SkinType skinType) =>
+        ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skinType);
+
+    public override ResourceDictionary GetTheme() => new()
+    {
+        Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
+    };
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
index aa09bcc5..b6549001 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
@@ -12,431 +12,430 @@ using HandyControlDemo.Properties.Langs;
 using HandyControlDemo.Tools.Converter;
 using Newtonsoft.Json;
 
-namespace HandyControlDemo.Service
+namespace HandyControlDemo.Service;
+
+public class DataService
 {
-    public class DataService
+    internal ObservableCollection<TabControlDemoModel> GetTabControlDemoDataList()
     {
-        internal ObservableCollection<TabControlDemoModel> GetTabControlDemoDataList()
+        return new()
         {
-            return new()
+            new TabControlDemoModel
             {
-                new TabControlDemoModel
-                {
-                    Header = "Success",
-                    BackgroundToken = ResourceToken.SuccessBrush
-                },
-                new TabControlDemoModel
-                {
-                    Header = "Primary",
-                    BackgroundToken = ResourceToken.PrimaryBrush
-                },
-                new TabControlDemoModel
-                {
-                    Header = "Warning",
-                    BackgroundToken = ResourceToken.WarningBrush
-                },
-                new TabControlDemoModel
-                {
-                    Header = "Danger",
-                    BackgroundToken = ResourceToken.DangerBrush
-                },
-                new TabControlDemoModel
-                {
-                    Header = "Info",
-                    BackgroundToken = ResourceToken.InfoBrush
-                }
-            };
-        }
-
-        internal List<DemoDataModel> GetDemoDataList()
-        {
-            var list = new List<DemoDataModel>();
-            for (var i = 1; i <= 20; i++)
+                Header = "Success",
+                BackgroundToken = ResourceToken.SuccessBrush
+            },
+            new TabControlDemoModel
             {
-                var dataList = new List<DemoDataModel>();
-                for (var j = 0; j < 3; j++)
-                {
-                    dataList.Add(new DemoDataModel
-                    {
-                        Index = j,
-                        IsSelected = j % 2 == 0,
-                        Name = $"SubName{j}",
-                        Type = (DemoType) j
-                    });
-                }
-                var model = new DemoDataModel
-                {
-                    Index = i,
-                    IsSelected = i % 2 == 0,
-                    Name = $"Name{i}",
-                    Type = (DemoType) (i % 6 + 1),
-                    DataList = dataList,
-                    ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i % 6 + 1}.png",
-                    Remark = new string(i.ToString()[0], 10)
-                };
-                list.Add(model);
+                Header = "Primary",
+                BackgroundToken = ResourceToken.PrimaryBrush
+            },
+            new TabControlDemoModel
+            {
+                Header = "Warning",
+                BackgroundToken = ResourceToken.WarningBrush
+            },
+            new TabControlDemoModel
+            {
+                Header = "Danger",
+                BackgroundToken = ResourceToken.DangerBrush
+            },
+            new TabControlDemoModel
+            {
+                Header = "Info",
+                BackgroundToken = ResourceToken.InfoBrush
             }
+        };
+    }
 
-            return list;
-        }
-
-        internal List<DemoDataModel> GetDemoDataList(int count)
+    internal List<DemoDataModel> GetDemoDataList()
+    {
+        var list = new List<DemoDataModel>();
+        for (var i = 1; i <= 20; i++)
         {
-            var list = new List<DemoDataModel>();
-            for (var i = 1; i <= count; i++)
+            var dataList = new List<DemoDataModel>();
+            for (var j = 0; j < 3; j++)
             {
-                var index = i % 6 + 1;
-                var model = new DemoDataModel
+                dataList.Add(new DemoDataModel
                 {
-                    Index = i,
-                    IsSelected = i % 2 == 0,
-                    Name = $"Name{i}",
-                    Type = (DemoType) index,
-                    ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{index}.png",
-                    Remark = new string(i.ToString()[0], 10)
-                };
-                list.Add(model);
-            }
-
-            return list;
-        }
-
-        internal List<AvatarModel> GetContributorDataList()
-        {
-            var client = new WebClient();
-            client.Headers.Add("User-Agent", "request");
-            var list = new List<AvatarModel>();
-            try
-            {
-                var json = client.DownloadString(new Uri("https://api.github.com/repos/nabian/handycontrol/contributors"));
-                var objList = JsonConvert.DeserializeObject<List<dynamic>>(json);
-                list.AddRange(objList.Select(item => new AvatarModel
-                {
-                    DisplayName = item.login,
-                    AvatarUri = item.avatar_url,
-                    Link = item.html_url
-                }));
-            }
-            catch (Exception e)
-            {
-                HandyControl.Controls.MessageBox.Error(e.Message, Lang.Error);
-            }
-
-            return list;
-        }
-
-        internal List<AvatarModel> GetBlogDataList()
-        {
-            return new()
-            {
-                new AvatarModel
-                {
-                    DisplayName = "林德熙",
-                    AvatarUri = "https://avatars3.githubusercontent.com/u/16054566?s=400&v=4",
-                    Link = "https://blog.lindexi.com/"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "吕毅",
-                    AvatarUri = "https://avatars2.githubusercontent.com/u/9959623?s=400&v=4",
-                    Link = "https://blog.walterlv.com/"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "DinoChan",
-                    AvatarUri = "https://avatars1.githubusercontent.com/u/6076257?s=400&v=4",
-                    Link = "https://www.cnblogs.com/dino623/"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "noctwolf",
-                    AvatarUri = "https://avatars3.githubusercontent.com/u/21022467?s=400&v=4",
-                    Link = "https://www.cnblogs.com/noctwolf/"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "关关长语",
-                    AvatarUri = "https://avatars3.githubusercontent.com/u/25916858?s=400&v=4",
-                    Link = "https://blog.csdn.net/qq_28806349/category_11213909.html"
-                }
-            };
-        }
-
-        internal List<AvatarModel> GetProjectDataList()
-        {
-            return new()
-            {
-                new AvatarModel
-                {
-                    DisplayName = "phpEnv",
-                    AvatarUri = "https://cdn.phpenv.cn:444/logo.png",
-                    Link = "https://www.phpenv.cn/"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "AutumnBox",
-                    AvatarUri = "https://raw.githubusercontent.com/zsh2401/AutumnBox/master/src/AutumnBox.GUI/Resources/Images/icon.png",
-                    Link = "https://github.com/zsh2401/AutumnBox"
-                },
-                new AvatarModel
-                {
-                    DisplayName = "quicker",
-                    AvatarUri = "https://files.getquicker.net/_sitefiles/quicker_round_128.png",
-                    Link = "https://getquicker.net"
-                }
-            };
-        }
-
-        internal List<AvatarModel> GetWebsiteDataList()
-        {
-            return new()
-            {
-                new AvatarModel
-                {
-                    DisplayName = "Dotnet9",
-                    AvatarUri = "https://pic.cnblogs.com/avatar/1663243/20191124121029.png",
-                    Link = "https://dotnet9.com/"
-                }
-            };
-        }
-
-        internal ObservableCollection<CardModel> GetCardDataList()
-        {
-            return new()
-            {
-                new CardModel
-                {
-                    Header = "Atomic",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/1.jpg",
-                    Footer = "Stive Morgan"
-                },
-                new CardModel
-                {
-                    Header = "Zinderlong",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/2.jpg",
-                    Footer = "Zonderling"
-                },
-                new CardModel
-                {
-                    Header = "Busy Doin' Nothin'",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/3.jpg",
-                    Footer = "Ace Wilder"
-                },
-                new CardModel
-                {
-                    Header = "Wrong",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/4.jpg",
-                    Footer = "Blaxy Girls"
-                },
-                new CardModel
-                {
-                    Header = "The Lights",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/5.jpg",
-                    Footer = "Panda Eyes"
-                },
-                new CardModel
-                {
-                    Header = "EA7-50-Cent Disco",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/6.jpg",
-                    Footer = "еяхат музыка"
-                },
-                new CardModel
-                {
-                    Header = "Monsters",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/7.jpg",
-                    Footer = "Different Heaven"
-                },
-                new CardModel
-                {
-                    Header = "Gangsta Walk",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/8.jpg",
-                    Footer = "Illusionize"
-                },
-                new CardModel
-                {
-                    Header = "Won't Back Down",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/9.jpg",
-                    Footer = "Boehm / Benjamin Francis Leftwich"
-                },
-                new CardModel
-                {
-                    Header = "Katchi",
-                    Content = "/HandyControlDemo;component/Resources/Img/Album/10.jpg",
-                    Footer = "Ofenbach / Nick Waterhouse"
-                }
-            };
-        }
-
-        internal CardModel GetCardData()
-        {
-            return new()
-            {
-                Content = $"/HandyControlDemo;component/Resources/Img/Album/{DateTime.Now.Second % 10 + 1}.jpg"
-            };
-        }
-
-        internal List<StepBarDemoModel> GetStepBarDemoDataList()
-        {
-            return new()
-            {
-                new StepBarDemoModel
-                {
-                    Header = LangKeys.Step,
-                    Content = LangKeys.Register
-                },
-                new StepBarDemoModel
-                {
-                    Header = LangKeys.Step,
-                    Content = LangKeys.BasicInfo
-                },
-                new StepBarDemoModel
-                {
-                    Header = LangKeys.Step,
-                    Content = LangKeys.UploadFile
-                },
-                new StepBarDemoModel
-                {
-                    Header = LangKeys.Step,
-                    Content = LangKeys.Complete
-                }
-            };
-        }
-
-        internal ObservableCollection<CoverViewDemoModel> GetCoverViewDemoDataList()
-        {
-            return new()
-            {
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/1.jpg",
-                    BackgroundToken = ResourceToken.SuccessBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/2.jpg",
-                    BackgroundToken = ResourceToken.PrimaryBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/3.jpg",
-                    BackgroundToken = ResourceToken.WarningBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/4.jpg",
-                    BackgroundToken = ResourceToken.DangerBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/5.jpg",
-                    BackgroundToken = ResourceToken.SuccessBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/6.jpg",
-                    BackgroundToken = ResourceToken.PrimaryBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/7.jpg",
-                    BackgroundToken = ResourceToken.InfoBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/8.jpg",
-                    BackgroundToken = ResourceToken.WarningBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/9.jpg",
-                    BackgroundToken = ResourceToken.PrimaryBrush
-                },
-                new CoverViewDemoModel
-                {
-                    ImgPath = "/HandyControlDemo;component/Resources/Img/Album/10.jpg",
-                    BackgroundToken = ResourceToken.DangerBrush
-                }
-            };
-        }
-
-        internal List<DemoInfoModel> GetDemoInfo()
-        {
-            var infoList = new List<DemoInfoModel>();
-
-            var stream = Application.GetResourceStream(new Uri("Data/DemoInfo.json", UriKind.Relative))?.Stream;
-            if (stream == null) return infoList;
-
-            string jsonStr;
-            using (var reader = new StreamReader(stream))
-            {
-                jsonStr = reader.ReadToEnd();
-            }
-
-            var jsonObj = JsonConvert.DeserializeObject<dynamic>(jsonStr);
-            foreach (var item in jsonObj)
-            {
-                var titleKey = (string) item.title;
-                var title = titleKey;
-                List<DemoItemModel> list = Convert2DemoItemList(item.demoItemList);
-
-                var demoInfoModel = new DemoInfoModel
-                {
-                    Key = titleKey,
-                    Title = title,
-                    DemoItemList = list,
-                    SelectedIndex = (int) item.selectedIndex,
-                    IsGroupEnabled = (bool) item.group
-                };
-
-                infoList.Add(demoInfoModel);
-            }
-
-            return infoList;
-        }
-
-        private List<DemoItemModel> Convert2DemoItemList(dynamic list)
-        {
-            var resultList = new List<DemoItemModel>();
-
-            foreach (var item in list)
-            {
-                var name = (string) item[0];
-                string targetCtlName = item[1];
-                string imageName = item[2];
-                var isNew = !string.IsNullOrEmpty((string) item[3]);
-                var groupName = (string) item[4];
-                if (string.IsNullOrEmpty(groupName))
-                {
-                    groupName = "Misc";
-                }
-
-                resultList.Add(new DemoItemModel
-                {
-                    Name = name,
-                    TargetCtlName = targetCtlName,
-                    ImageName = $"../../Resources/Img/LeftMainContent/{imageName}.png",
-                    IsNew = isNew,
-                    GroupName = groupName
+                    Index = j,
+                    IsSelected = j % 2 == 0,
+                    Name = $"SubName{j}",
+                    Type = (DemoType) j
                 });
             }
-
-            return resultList;
+            var model = new DemoDataModel
+            {
+                Index = i,
+                IsSelected = i % 2 == 0,
+                Name = $"Name{i}",
+                Type = (DemoType) (i % 6 + 1),
+                DataList = dataList,
+                ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{i % 6 + 1}.png",
+                Remark = new string(i.ToString()[0], 10)
+            };
+            list.Add(model);
         }
 
-        public string GetDemoUrl(DemoInfoModel demoInfo, DemoItemModel demoItem)
+        return list;
+    }
+
+    internal List<DemoDataModel> GetDemoDataList(int count)
+    {
+        var list = new List<DemoDataModel>();
+        for (var i = 1; i <= count; i++)
         {
-            var key = demoInfo.Key switch
+            var index = i % 6 + 1;
+            var model = new DemoDataModel
             {
-                "Styles" => "native_controls",
-                "Controls" => "extend_controls",
-                "Tools" => "tools",
-                _ => string.Empty
+                Index = i,
+                IsSelected = i % 2 == 0,
+                Name = $"Name{i}",
+                Type = (DemoType) index,
+                ImgPath = $"/HandyControlDemo;component/Resources/Img/Avatar/avatar{index}.png",
+                Remark = new string(i.ToString()[0], 10)
+            };
+            list.Add(model);
+        }
+
+        return list;
+    }
+
+    internal List<AvatarModel> GetContributorDataList()
+    {
+        var client = new WebClient();
+        client.Headers.Add("User-Agent", "request");
+        var list = new List<AvatarModel>();
+        try
+        {
+            var json = client.DownloadString(new Uri("https://api.github.com/repos/nabian/handycontrol/contributors"));
+            var objList = JsonConvert.DeserializeObject<List<dynamic>>(json);
+            list.AddRange(objList.Select(item => new AvatarModel
+            {
+                DisplayName = item.login,
+                AvatarUri = item.avatar_url,
+                Link = item.html_url
+            }));
+        }
+        catch (Exception e)
+        {
+            HandyControl.Controls.MessageBox.Error(e.Message, Lang.Error);
+        }
+
+        return list;
+    }
+
+    internal List<AvatarModel> GetBlogDataList()
+    {
+        return new()
+        {
+            new AvatarModel
+            {
+                DisplayName = "林德熙",
+                AvatarUri = "https://avatars3.githubusercontent.com/u/16054566?s=400&v=4",
+                Link = "https://blog.lindexi.com/"
+            },
+            new AvatarModel
+            {
+                DisplayName = "吕毅",
+                AvatarUri = "https://avatars2.githubusercontent.com/u/9959623?s=400&v=4",
+                Link = "https://blog.walterlv.com/"
+            },
+            new AvatarModel
+            {
+                DisplayName = "DinoChan",
+                AvatarUri = "https://avatars1.githubusercontent.com/u/6076257?s=400&v=4",
+                Link = "https://www.cnblogs.com/dino623/"
+            },
+            new AvatarModel
+            {
+                DisplayName = "noctwolf",
+                AvatarUri = "https://avatars3.githubusercontent.com/u/21022467?s=400&v=4",
+                Link = "https://www.cnblogs.com/noctwolf/"
+            },
+            new AvatarModel
+            {
+                DisplayName = "关关长语",
+                AvatarUri = "https://avatars3.githubusercontent.com/u/25916858?s=400&v=4",
+                Link = "https://blog.csdn.net/qq_28806349/category_11213909.html"
+            }
+        };
+    }
+
+    internal List<AvatarModel> GetProjectDataList()
+    {
+        return new()
+        {
+            new AvatarModel
+            {
+                DisplayName = "phpEnv",
+                AvatarUri = "https://cdn.phpenv.cn:444/logo.png",
+                Link = "https://www.phpenv.cn/"
+            },
+            new AvatarModel
+            {
+                DisplayName = "AutumnBox",
+                AvatarUri = "https://raw.githubusercontent.com/zsh2401/AutumnBox/master/src/AutumnBox.GUI/Resources/Images/icon.png",
+                Link = "https://github.com/zsh2401/AutumnBox"
+            },
+            new AvatarModel
+            {
+                DisplayName = "quicker",
+                AvatarUri = "https://files.getquicker.net/_sitefiles/quicker_round_128.png",
+                Link = "https://getquicker.net"
+            }
+        };
+    }
+
+    internal List<AvatarModel> GetWebsiteDataList()
+    {
+        return new()
+        {
+            new AvatarModel
+            {
+                DisplayName = "Dotnet9",
+                AvatarUri = "https://pic.cnblogs.com/avatar/1663243/20191124121029.png",
+                Link = "https://dotnet9.com/"
+            }
+        };
+    }
+
+    internal ObservableCollection<CardModel> GetCardDataList()
+    {
+        return new()
+        {
+            new CardModel
+            {
+                Header = "Atomic",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/1.jpg",
+                Footer = "Stive Morgan"
+            },
+            new CardModel
+            {
+                Header = "Zinderlong",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/2.jpg",
+                Footer = "Zonderling"
+            },
+            new CardModel
+            {
+                Header = "Busy Doin' Nothin'",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/3.jpg",
+                Footer = "Ace Wilder"
+            },
+            new CardModel
+            {
+                Header = "Wrong",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/4.jpg",
+                Footer = "Blaxy Girls"
+            },
+            new CardModel
+            {
+                Header = "The Lights",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/5.jpg",
+                Footer = "Panda Eyes"
+            },
+            new CardModel
+            {
+                Header = "EA7-50-Cent Disco",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/6.jpg",
+                Footer = "еяхат музыка"
+            },
+            new CardModel
+            {
+                Header = "Monsters",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/7.jpg",
+                Footer = "Different Heaven"
+            },
+            new CardModel
+            {
+                Header = "Gangsta Walk",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/8.jpg",
+                Footer = "Illusionize"
+            },
+            new CardModel
+            {
+                Header = "Won't Back Down",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/9.jpg",
+                Footer = "Boehm / Benjamin Francis Leftwich"
+            },
+            new CardModel
+            {
+                Header = "Katchi",
+                Content = "/HandyControlDemo;component/Resources/Img/Album/10.jpg",
+                Footer = "Ofenbach / Nick Waterhouse"
+            }
+        };
+    }
+
+    internal CardModel GetCardData()
+    {
+        return new()
+        {
+            Content = $"/HandyControlDemo;component/Resources/Img/Album/{DateTime.Now.Second % 10 + 1}.jpg"
+        };
+    }
+
+    internal List<StepBarDemoModel> GetStepBarDemoDataList()
+    {
+        return new()
+        {
+            new StepBarDemoModel
+            {
+                Header = LangKeys.Step,
+                Content = LangKeys.Register
+            },
+            new StepBarDemoModel
+            {
+                Header = LangKeys.Step,
+                Content = LangKeys.BasicInfo
+            },
+            new StepBarDemoModel
+            {
+                Header = LangKeys.Step,
+                Content = LangKeys.UploadFile
+            },
+            new StepBarDemoModel
+            {
+                Header = LangKeys.Step,
+                Content = LangKeys.Complete
+            }
+        };
+    }
+
+    internal ObservableCollection<CoverViewDemoModel> GetCoverViewDemoDataList()
+    {
+        return new()
+        {
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/1.jpg",
+                BackgroundToken = ResourceToken.SuccessBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/2.jpg",
+                BackgroundToken = ResourceToken.PrimaryBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/3.jpg",
+                BackgroundToken = ResourceToken.WarningBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/4.jpg",
+                BackgroundToken = ResourceToken.DangerBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/5.jpg",
+                BackgroundToken = ResourceToken.SuccessBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/6.jpg",
+                BackgroundToken = ResourceToken.PrimaryBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/7.jpg",
+                BackgroundToken = ResourceToken.InfoBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/8.jpg",
+                BackgroundToken = ResourceToken.WarningBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/9.jpg",
+                BackgroundToken = ResourceToken.PrimaryBrush
+            },
+            new CoverViewDemoModel
+            {
+                ImgPath = "/HandyControlDemo;component/Resources/Img/Album/10.jpg",
+                BackgroundToken = ResourceToken.DangerBrush
+            }
+        };
+    }
+
+    internal List<DemoInfoModel> GetDemoInfo()
+    {
+        var infoList = new List<DemoInfoModel>();
+
+        var stream = Application.GetResourceStream(new Uri("Data/DemoInfo.json", UriKind.Relative))?.Stream;
+        if (stream == null) return infoList;
+
+        string jsonStr;
+        using (var reader = new StreamReader(stream))
+        {
+            jsonStr = reader.ReadToEnd();
+        }
+
+        var jsonObj = JsonConvert.DeserializeObject<dynamic>(jsonStr);
+        foreach (var item in jsonObj)
+        {
+            var titleKey = (string) item.title;
+            var title = titleKey;
+            List<DemoItemModel> list = Convert2DemoItemList(item.demoItemList);
+
+            var demoInfoModel = new DemoInfoModel
+            {
+                Key = titleKey,
+                Title = title,
+                DemoItemList = list,
+                SelectedIndex = (int) item.selectedIndex,
+                IsGroupEnabled = (bool) item.group
             };
 
-            var domainName = LangProvider.Culture == null || LangProvider.Culture.Name.ToLower() == "zh-cn"
-                ? "handyorg"
-                : "ghost1372";
-            return $"https://{domainName}.github.io/handycontrol/{key}/{demoItem.Name[0].ToString().ToLower()}{demoItem.Name.Substring(1)}";
+            infoList.Add(demoInfoModel);
         }
+
+        return infoList;
     }
-}
+
+    private List<DemoItemModel> Convert2DemoItemList(dynamic list)
+    {
+        var resultList = new List<DemoItemModel>();
+
+        foreach (var item in list)
+        {
+            var name = (string) item[0];
+            string targetCtlName = item[1];
+            string imageName = item[2];
+            var isNew = !string.IsNullOrEmpty((string) item[3]);
+            var groupName = (string) item[4];
+            if (string.IsNullOrEmpty(groupName))
+            {
+                groupName = "Misc";
+            }
+
+            resultList.Add(new DemoItemModel
+            {
+                Name = name,
+                TargetCtlName = targetCtlName,
+                ImageName = $"../../Resources/Img/LeftMainContent/{imageName}.png",
+                IsNew = isNew,
+                GroupName = groupName
+            });
+        }
+
+        return resultList;
+    }
+
+    public string GetDemoUrl(DemoInfoModel demoInfo, DemoItemModel demoItem)
+    {
+        var key = demoInfo.Key switch
+        {
+            "Styles" => "native_controls",
+            "Controls" => "extend_controls",
+            "Tools" => "tools",
+            _ => string.Empty
+        };
+
+        var domainName = LangProvider.Culture == null || LangProvider.Culture.Name.ToLower() == "zh-cn"
+            ? "handyorg"
+            : "ghost1372";
+        return $"https://{domainName}.github.io/handycontrol/{key}/{demoItem.Name[0].ToString().ToLower()}{demoItem.Name.Substring(1)}";
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
index 978efe48..caf07363 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
@@ -5,29 +5,28 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.Tools.Converter
+namespace HandyControlDemo.Tools.Converter;
+
+public class HatchBrushConverter : IValueConverter
 {
-    public class HatchBrushConverter : IValueConverter
+    private readonly HatchBrushGenerator _brushGenerator;
+
+    public HatchBrushConverter()
     {
-        private readonly HatchBrushGenerator _brushGenerator;
-
-        public HatchBrushConverter()
-        {
-            _brushGenerator = new HatchBrushGenerator();
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is HatchStyle style)
-            {
-                return _brushGenerator.GetHatchBrush(style, ResourceHelper.GetResource<Color>(ResourceToken.DarkPrimaryColor), Colors.Transparent);
-            }
-            return Brushes.Transparent;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        _brushGenerator = new HatchBrushGenerator();
     }
-}
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is HatchStyle style)
+        {
+            return _brushGenerator.GetHatchBrush(style, ResourceHelper.GetResource<Color>(ResourceToken.DarkPrimaryColor), Colors.Transparent);
+        }
+        return Brushes.Transparent;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
index a6a66284..676807c9 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
@@ -4,18 +4,17 @@ using System.Windows.Data;
 using System.Windows.Media;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.Tools.Converter
-{
-    public class String2BrushConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is string str ? ResourceHelper.GetResource<Brush>(str) : default;
-        }
+namespace HandyControlDemo.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class String2BrushConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value is string str ? ResourceHelper.GetResource<Brush>(str) : default;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
index 77ed023f..4a8db1cf 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
@@ -3,43 +3,42 @@ using System.Globalization;
 using System.Text;
 using System.Windows.Data;
 
-namespace HandyControlDemo.Tools.Converter
+namespace HandyControlDemo.Tools.Converter;
+
+public class StringRepeatConverter : IValueConverter
 {
-    public class StringRepeatConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        if (value is string strValue)
         {
-            if (value is string strValue)
+            var builder = new StringBuilder();
+            int num;
+            if (parameter is string numStr)
             {
-                var builder = new StringBuilder();
-                int num;
-                if (parameter is string numStr)
-                {
-                    if (!int.TryParse(numStr, out num))
-                    {
-                        return strValue;
-                    }
-                }
-                else if (parameter is int intValue)
-                {
-                    num = intValue;
-                }
-                else
+                if (!int.TryParse(numStr, out num))
                 {
                     return strValue;
                 }
-                for (var i = 0; i < num; i++)
-                {
-                    builder.Append(strValue);
-                }
-                return builder.ToString();
             }
-            return string.Empty;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
+            else if (parameter is int intValue)
+            {
+                num = intValue;
+            }
+            else
+            {
+                return strValue;
+            }
+            for (var i = 0; i < num; i++)
+            {
+                builder.Append(strValue);
+            }
+            return builder.ToString();
         }
+        return string.Empty;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs b/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
index 00f8d96d..3722b133 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
@@ -1,12 +1,11 @@
 using HandyControlDemo.Properties.Langs;
 
-namespace HandyControlDemo.Tools.Extension
+namespace HandyControlDemo.Tools.Extension;
+
+public class LangExtension : HandyControl.Tools.Extension.LangExtension
 {
-    public class LangExtension : HandyControl.Tools.Extension.LangExtension
+    public LangExtension()
     {
-        public LangExtension()
-        {
-            Source = LangProvider.Instance;
-        }
+        Source = LangProvider.Instance;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
index b3921178..849d9111 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
@@ -1,37 +1,36 @@
 using System;
 using System.Collections.Generic;
 
-namespace HandyControlDemo.Tools
+namespace HandyControlDemo.Tools;
+
+internal class AssemblyHelper
 {
-    internal class AssemblyHelper
+    private static readonly string NameSpaceStr = typeof(AssemblyHelper).Assembly.GetName().Name;
+
+    private static readonly Dictionary<string, object> CacheDic = new();
+
+    public static void Register(string name, object instance) => CacheDic[name] = instance;
+
+    public static object ResolveByKey(string key)
     {
-        private static readonly string NameSpaceStr = typeof(AssemblyHelper).Assembly.GetName().Name;
-
-        private static readonly Dictionary<string, object> CacheDic = new();
-
-        public static void Register(string name, object instance) => CacheDic[name] = instance;
-
-        public static object ResolveByKey(string key)
+        if (CacheDic.TryGetValue(key, out var value))
         {
-            if (CacheDic.TryGetValue(key, out var value))
-            {
-                return value;
-            }
+            return value;
+        }
 
+        return null;
+    }
+
+    public static object CreateInternalInstance(string className)
+    {
+        try
+        {
+            var type = Type.GetType($"{NameSpaceStr}.{className}");
+            return type == null ? null : Activator.CreateInstance(type);
+        }
+        catch
+        {
             return null;
         }
-
-        public static object CreateInternalInstance(string className)
-        {
-            try
-            {
-                var type = Type.GetType($"{NameSpaceStr}.{className}");
-                return type == null ? null : Activator.CreateInstance(type);
-            }
-            catch
-            {
-                return null;
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
index 84bbed1c..adfccb0f 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -1,15 +1,15 @@
 using System.Diagnostics;
 using System.Reflection;
 
-namespace HandyControlDemo.Tools
+namespace HandyControlDemo.Tools;
+
+internal class VersionHelper
 {
-    internal class VersionHelper
+    internal static string GetVersion()
     {
-        internal static string GetVersion()
-        {
-            var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
+        var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location);
 #if NET40
-            var netVersion = "NET 40";
+        var netVersion = "NET 40";
 #elif NET45
             var netVersion = "NET 45";
 #elif NET451
@@ -39,10 +39,9 @@ namespace HandyControlDemo.Tools
 #elif NETCOREAPP3_1
             var netVersion = "CORE 31";
 #endif
-            return $"v {versionInfo.FileVersion} {netVersion}";
-        }
-
-        internal static string GetCopyright() =>
-            FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).LegalCopyright;
+        return $"v {versionInfo.FileVersion} {netVersion}";
     }
-}
+
+    internal static string GetCopyright() =>
+        FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).LegalCopyright;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
index c8929ae9..1b5b3ac6 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace HandyControlDemo.Tools
-{
-    internal class Win32Helper
-    {
-        [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool SetForegroundWindow(IntPtr hWnd);
+namespace HandyControlDemo.Tools;
 
-        [DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)]
-        public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback);
-    }
-}
+internal class Win32Helper
+{
+    [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
+    public static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)]
+    public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs b/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
index 48770e36..9a6a519c 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
@@ -6,75 +6,74 @@ using HandyControl.Data;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
 
-namespace HandyControlDemo.Tools
+namespace HandyControlDemo.Tools;
+
+internal class HighlightingProvider
 {
-    internal class HighlightingProvider
+    public static HighlightingProvider Default = new Lazy<HighlightingProvider>(() => new HighlightingProvider()).Value;
+
+    protected static readonly Lazy<IHighlightingDefinition> DefaultDefinition = new(() => HighlightingManager.Instance.GetDefinition("C#"));
+
+    private static readonly Dictionary<SkinType, HighlightingProvider> Providers = new();
+
+    protected Dictionary<string, Lazy<IHighlightingDefinition>> Definition;
+
+    public static void Register(SkinType skinType, HighlightingProvider provider)
     {
-        public static HighlightingProvider Default = new Lazy<HighlightingProvider>(() => new HighlightingProvider()).Value;
-
-        protected static readonly Lazy<IHighlightingDefinition> DefaultDefinition = new(() => HighlightingManager.Instance.GetDefinition("C#"));
-
-        private static readonly Dictionary<SkinType, HighlightingProvider> Providers = new();
-
-        protected Dictionary<string, Lazy<IHighlightingDefinition>> Definition;
-
-        public static void Register(SkinType skinType, HighlightingProvider provider)
-        {
-            Providers[skinType] = provider ?? throw new ArgumentNullException(nameof(provider));
-            provider.InitDefinitions();
-        }
-
-        public static IHighlightingDefinition GetDefinition(SkinType skinType, string name)
-        {
-            if (Providers.TryGetValue(skinType, out var provider))
-            {
-                return provider.GetDefinition(name);
-            }
-
-            return DefaultDefinition.Value;
-        }
-
-        protected static IHighlightingDefinition LoadDefinition(string xshdName)
-        {
-            var streamResourceInfo = Application.GetResourceStream(new Uri($"pack://application:,,,/Resources/xshd/{xshdName}.xshd"));
-            if (streamResourceInfo == null)
-            {
-                return DefaultDefinition.Value;
-            }
-
-            using var reader = new XmlTextReader(streamResourceInfo.Stream);
-            return HighlightingLoader.Load(reader, HighlightingManager.Instance);
-        }
-
-        protected virtual IHighlightingDefinition GetDefinition(string name)
-        {
-            if (Definition.TryGetValue(name, out var definition))
-            {
-                return definition.Value;
-            }
-
-            return DefaultDefinition.Value;
-        }
-
-        protected virtual void InitDefinitions()
-        {
-            Definition = new Dictionary<string, Lazy<IHighlightingDefinition>>
-            {
-                ["XML"] = new(() => HighlightingManager.Instance.GetDefinition("XML")),
-                ["C#"] = new(() => DefaultDefinition.Value)
-            };
-        }
+        Providers[skinType] = provider ?? throw new ArgumentNullException(nameof(provider));
+        provider.InitDefinitions();
     }
 
-    internal class HighlightingProviderDark : HighlightingProvider
+    public static IHighlightingDefinition GetDefinition(SkinType skinType, string name)
     {
-        protected override void InitDefinitions()
+        if (Providers.TryGetValue(skinType, out var provider))
         {
-            Definition = new Dictionary<string, Lazy<IHighlightingDefinition>>
-            {
-                ["XML"] = new(() => LoadDefinition("XML-Dark")),
-                ["C#"] = new(() => LoadDefinition("CSharp-Dark")),
-            };
+            return provider.GetDefinition(name);
         }
+
+        return DefaultDefinition.Value;
+    }
+
+    protected static IHighlightingDefinition LoadDefinition(string xshdName)
+    {
+        var streamResourceInfo = Application.GetResourceStream(new Uri($"pack://application:,,,/Resources/xshd/{xshdName}.xshd"));
+        if (streamResourceInfo == null)
+        {
+            return DefaultDefinition.Value;
+        }
+
+        using var reader = new XmlTextReader(streamResourceInfo.Stream);
+        return HighlightingLoader.Load(reader, HighlightingManager.Instance);
+    }
+
+    protected virtual IHighlightingDefinition GetDefinition(string name)
+    {
+        if (Definition.TryGetValue(name, out var definition))
+        {
+            return definition.Value;
+        }
+
+        return DefaultDefinition.Value;
+    }
+
+    protected virtual void InitDefinitions()
+    {
+        Definition = new Dictionary<string, Lazy<IHighlightingDefinition>>
+        {
+            ["XML"] = new(() => HighlightingManager.Instance.GetDefinition("XML")),
+            ["C#"] = new(() => DefaultDefinition.Value)
+        };
     }
 }
+
+internal class HighlightingProviderDark : HighlightingProvider
+{
+    protected override void InitDefinitions()
+    {
+        Definition = new Dictionary<string, Lazy<IHighlightingDefinition>>
+        {
+            ["XML"] = new(() => LoadDefinition("XML-Dark")),
+            ["C#"] = new(() => LoadDefinition("CSharp-Dark")),
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
index 3ee1da1e..6309f694 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
@@ -1,40 +1,39 @@
 using System.Windows;
 using System.Windows.Media.Imaging;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class Avatar
 {
-    public partial class Avatar
+    public Avatar()
     {
-        public Avatar()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(BitmapFrame), typeof(Avatar), new PropertyMetadata(default(BitmapFrame)));
-
-        public BitmapFrame Source
-        {
-            get => (BitmapFrame) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register(
-            "DisplayName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
-
-        public string DisplayName
-        {
-            get => (string) GetValue(UserNameProperty);
-            set => SetValue(UserNameProperty, value);
-        }
-
-        public static readonly DependencyProperty LinkProperty = DependencyProperty.Register(
-            "Link", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
-
-        public string Link
-        {
-            get => (string) GetValue(LinkProperty);
-            set => SetValue(LinkProperty, value);
-        }
+        InitializeComponent();
     }
-}
+
+    public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+        "Source", typeof(BitmapFrame), typeof(Avatar), new PropertyMetadata(default(BitmapFrame)));
+
+    public BitmapFrame Source
+    {
+        get => (BitmapFrame) GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+
+    public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register(
+        "DisplayName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
+
+    public string DisplayName
+    {
+        get => (string) GetValue(UserNameProperty);
+        set => SetValue(UserNameProperty, value);
+    }
+
+    public static readonly DependencyProperty LinkProperty = DependencyProperty.Register(
+        "Link", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
+
+    public string Link
+    {
+        get => (string) GetValue(LinkProperty);
+        set => SetValue(LinkProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
index 86df6eef..4507049e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
@@ -1,22 +1,21 @@
 using System.Windows.Controls;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ChatBox
 {
-    public partial class ChatBox
+    private ScrollViewer _scrollViewer;
+
+    public ChatBox()
     {
-        private ScrollViewer _scrollViewer;
-
-        public ChatBox()
-        {
-            InitializeComponent();
-            ListBoxChat.ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
-        }
-
-        private void ItemContainerGenerator_ItemsChanged(object sender, System.Windows.Controls.Primitives.ItemsChangedEventArgs e)
-        {
-            _scrollViewer ??= VisualHelper.GetChild<ScrollViewer>(ListBoxChat);
-            _scrollViewer?.ScrollToBottom();
-        }
+        InitializeComponent();
+        ListBoxChat.ItemContainerGenerator.ItemsChanged += ItemContainerGenerator_ItemsChanged;
     }
-}
+
+    private void ItemContainerGenerator_ItemsChanged(object sender, System.Windows.Controls.Primitives.ItemsChangedEventArgs e)
+    {
+        _scrollViewer ??= VisualHelper.GetChild<ScrollViewer>(ListBoxChat);
+        _scrollViewer?.ScrollToBottom();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
index ae6da16c..d7fe1cf0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
@@ -1,19 +1,18 @@
 using System.Windows;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GeometryItem
 {
-    public partial class GeometryItem
+    public GeometryItem() => InitializeComponent();
+
+    public static readonly DependencyProperty InfoProperty = DependencyProperty.Register(
+        "Info", typeof(GeometryItemModel), typeof(GeometryItem), new PropertyMetadata(default(GeometryItemModel)));
+
+    public GeometryItemModel Info
     {
-        public GeometryItem() => InitializeComponent();
-
-        public static readonly DependencyProperty InfoProperty = DependencyProperty.Register(
-            "Info", typeof(GeometryItemModel), typeof(GeometryItem), new PropertyMetadata(default(GeometryItemModel)));
-
-        public GeometryItemModel Info
-        {
-            get => (GeometryItemModel) GetValue(InfoProperty);
-            set => SetValue(InfoProperty, value);
-        }
+        get => (GeometryItemModel) GetValue(InfoProperty);
+        set => SetValue(InfoProperty, value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
index 8d7e9aa4..781f1960 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
@@ -1,7 +1,6 @@
-namespace HandyControlDemo.UserControl
-{
-    internal interface IFull
-    {
+namespace HandyControlDemo.UserControl;
 
-    }
-}
+internal interface IFull
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
index 393fa350..e63fb04f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class InteractiveDialog
 {
-    public partial class InteractiveDialog
+    public InteractiveDialog()
     {
-        public InteractiveDialog()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
index 5977cf29..4a0fb073 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TextDialog
 {
-    public partial class TextDialog
+    public TextDialog()
     {
-        public TextDialog()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
index 73765ea6..c2dbbe6a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
@@ -2,23 +2,22 @@
 using System.Windows.Controls.Primitives;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TextDialogWithTimer
 {
-    public partial class TextDialogWithTimer
+    public TextDialogWithTimer()
     {
-        public TextDialogWithTimer()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            var animation = AnimationHelper.CreateAnimation(100, 5000);
-            animation.EasingFunction = null;
-            animation.Completed += Animation_Completed;
-            ProgressBarTimer.BeginAnimation(RangeBase.ValueProperty, animation);
-        }
-
-        private void Animation_Completed(object sender, EventArgs e)
-        {
-            ButtonClose.Command.Execute(null);
-        }
+        var animation = AnimationHelper.CreateAnimation(100, 5000);
+        animation.EasingFunction = null;
+        animation.Completed += Animation_Completed;
+        ProgressBarTimer.BeginAnimation(RangeBase.ValueProperty, animation);
     }
-}
+
+    private void Animation_Completed(object sender, EventArgs e)
+    {
+        ButtonClose.Command.Execute(null);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
index e24baa6e..c21e1e0f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class AnimationPathDemoCtl
 {
-    public partial class AnimationPathDemoCtl
+    public AnimationPathDemoCtl()
     {
-        public AnimationPathDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
index 1baf6628..2d7c0b57 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class AutoCompleteTextBoxDemoCtl
 {
-    public partial class AutoCompleteTextBoxDemoCtl
+    public AutoCompleteTextBoxDemoCtl()
     {
-        public AutoCompleteTextBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
index 7c745584..29d86bba 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class BadgeDemoCtl
 {
-    public partial class BadgeDemoCtl
+    public BadgeDemoCtl()
     {
-        public BadgeDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
index eb922b4c..464b40f5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
@@ -1,40 +1,39 @@
 using System.Windows;
 using System.Windows.Media.Imaging;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ButtonGroupDemoCtl
 {
-    public partial class ButtonGroupDemoCtl
+    public ButtonGroupDemoCtl()
     {
-        public ButtonGroupDemoCtl()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(BitmapFrame), typeof(Avatar), new PropertyMetadata(default(BitmapFrame)));
-
-        public BitmapFrame Source
-        {
-            get => (BitmapFrame) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register(
-            "DisplayName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
-
-        public string DisplayName
-        {
-            get => (string) GetValue(UserNameProperty);
-            set => SetValue(UserNameProperty, value);
-        }
-
-        public static readonly DependencyProperty LinkProperty = DependencyProperty.Register(
-            "Link", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
-
-        public string Link
-        {
-            get => (string) GetValue(LinkProperty);
-            set => SetValue(LinkProperty, value);
-        }
+        InitializeComponent();
     }
-}
+
+    public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+        "Source", typeof(BitmapFrame), typeof(Avatar), new PropertyMetadata(default(BitmapFrame)));
+
+    public BitmapFrame Source
+    {
+        get => (BitmapFrame) GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+
+    public static readonly DependencyProperty UserNameProperty = DependencyProperty.Register(
+        "DisplayName", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
+
+    public string DisplayName
+    {
+        get => (string) GetValue(UserNameProperty);
+        set => SetValue(UserNameProperty, value);
+    }
+
+    public static readonly DependencyProperty LinkProperty = DependencyProperty.Register(
+        "Link", typeof(string), typeof(Avatar), new PropertyMetadata(default(string)));
+
+    public string Link
+    {
+        get => (string) GetValue(LinkProperty);
+        set => SetValue(LinkProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
index ec65eb73..5d98c916 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CalendarWithClockDemoCtl
 {
-    public partial class CalendarWithClockDemoCtl
+    public CalendarWithClockDemoCtl()
     {
-        public CalendarWithClockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
index bff18126..e11d66c0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CardDemoCtl
 {
-    public partial class CardDemoCtl
+    public CardDemoCtl()
     {
-        public CardDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
index 51545d68..f4b283c6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CarouselDemoCtl
 {
-    public partial class CarouselDemoCtl
+    public CarouselDemoCtl()
     {
-        public CarouselDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
index 6c68a1de..faae0b96 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ChatBubbleDemoCtl
 {
-    public partial class ChatBubbleDemoCtl
+    public ChatBubbleDemoCtl()
     {
-        public ChatBubbleDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
index 44bbec67..02b162dc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CheckComboBoxDemoCtl
 {
-    public partial class CheckComboBoxDemoCtl
+    public CheckComboBoxDemoCtl()
     {
-        public CheckComboBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
index 62bee1d5..86f3e060 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CirclePanelDemoCtl
 {
-    public partial class CirclePanelDemoCtl
+    public CirclePanelDemoCtl()
     {
-        public CirclePanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
index 2603a663..4029c869 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ClockDemoCtl
 {
-    public partial class ClockDemoCtl
+    public ClockDemoCtl()
     {
-        public ClockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
index 16863a27..cdaaa8de 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ColorPickerDemoCtl
 {
-    public partial class ColorPickerDemoCtl
+    public ColorPickerDemoCtl()
     {
-        public ColorPickerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
index 95f82acf..732861b7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ComboBoxDemoCtl
 {
-    public partial class ComboBoxDemoCtl
+    public ComboBoxDemoCtl()
     {
-        public ComboBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
index 4ae9ffa1..6f95f6a0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CompareSliderDemoCtl
 {
-    public partial class CompareSliderDemoCtl
+    public CompareSliderDemoCtl()
     {
-        public CompareSliderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
index b482538a..055c0647 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
@@ -1,28 +1,27 @@
 using System;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CoverFlowDemoCtl
 {
-    public partial class CoverFlowDemoCtl
+    public CoverFlowDemoCtl()
     {
-        public CoverFlowDemoCtl()
+        InitializeComponent();
+
+        CoverFlowMain.AddRange(new[]
         {
-            InitializeComponent();
+            new Uri(@"pack://application:,,,/Resources/Img/Album/1.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/2.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/3.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/4.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/5.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/6.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/7.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/8.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/9.jpg"),
+            new Uri(@"pack://application:,,,/Resources/Img/Album/10.jpg")
+        });
 
-            CoverFlowMain.AddRange(new[]
-            {
-                new Uri(@"pack://application:,,,/Resources/Img/Album/1.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/2.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/3.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/4.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/5.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/6.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/7.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/8.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/9.jpg"),
-                new Uri(@"pack://application:,,,/Resources/Img/Album/10.jpg")
-            });
-
-            CoverFlowMain.PageIndex = 2;
-        }
+        CoverFlowMain.PageIndex = 2;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
index 32f1adf9..cd236e23 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CoverViewDemoCtl
 {
-    public partial class CoverViewDemoCtl
+    public CoverViewDemoCtl()
     {
-        public CoverViewDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
index a7f7a755..92c3311d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DatePickerDemoCtl
 {
-    public partial class DatePickerDemoCtl
+    public DatePickerDemoCtl()
     {
-        public DatePickerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
index 2ddac486..7a1158ff 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DateTimePickerDemoCtl
 {
-    public partial class DateTimePickerDemoCtl
+    public DateTimePickerDemoCtl()
     {
-        public DateTimePickerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
index a67e46c5..1f2bdab3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DialogDemoCtl
 {
-    public partial class DialogDemoCtl
+    public DialogDemoCtl()
     {
-        public DialogDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
index 7cd8f16f..80858209 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DividerDemoCtl
 {
-    public partial class DividerDemoCtl
+    public DividerDemoCtl()
     {
-        public DividerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
index 81259d96..a465d301 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DrawerDemoCtl
 {
-    public partial class DrawerDemoCtl
+    public DrawerDemoCtl()
     {
-        public DrawerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
index e18109c3..cdcaeee8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ElementGroupDemoCtl
 {
-    public partial class ElementGroupDemoCtl
+    public ElementGroupDemoCtl()
     {
-        public ElementGroupDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
index d9089da2..0108f042 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class FlexPanelDemoCtl : IFull
 {
-    public partial class FlexPanelDemoCtl : IFull
+    public FlexPanelDemoCtl()
     {
-        public FlexPanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
index 01474c10..f551b19a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class FlipClockDemoCtl
 {
-    public partial class FlipClockDemoCtl
+    public FlipClockDemoCtl()
     {
-        public FlipClockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
index f7cbc776..2483dd02 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class FloatingBlockDemoCtl
 {
-    public partial class FloatingBlockDemoCtl
+    public FloatingBlockDemoCtl()
     {
-        public FloatingBlockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
index 315e0296..11cd210c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace HandyControlDemo.UserControl
-{
-    public partial class GifImageDemoCtl : IDisposable
-    {
-        public GifImageDemoCtl()
-        {
-            InitializeComponent();
-        }
+namespace HandyControlDemo.UserControl;
 
-        public void Dispose()
-        {
-            GifImageMain.Dispose();
-        }
+public partial class GifImageDemoCtl : IDisposable
+{
+    public GifImageDemoCtl()
+    {
+        InitializeComponent();
     }
-}
+
+    public void Dispose()
+    {
+        GifImageMain.Dispose();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
index 3626a1df..fb97c5b1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GotoTopDemoCtl
 {
-    public partial class GotoTopDemoCtl
+    public GotoTopDemoCtl()
     {
-        public GotoTopDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
index 3a27748e..2c8e5957 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GravatarDemoCtl
 {
-    public partial class GravatarDemoCtl
+    public GravatarDemoCtl()
     {
-        public GravatarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
index f8443e4e..a19b3137 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GridDemoCtl : IFull
 {
-    public partial class GridDemoCtl : IFull
+    public GridDemoCtl()
     {
-        public GridDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
index c3474865..3dcb6714 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GrowlDemoCtl
 {
-    public partial class GrowlDemoCtl
+    public GrowlDemoCtl()
     {
-        public GrowlDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
index 13c4d23e..d52f881d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class HoneycombPanelDemoCtl
 {
-    public partial class HoneycombPanelDemoCtl
+    public HoneycombPanelDemoCtl()
     {
-        public HoneycombPanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
index abf2962a..62ee9dc0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ImageBlockDemoCtl
 {
-    public partial class ImageBlockDemoCtl
+    public ImageBlockDemoCtl()
     {
-        public ImageBlockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
index da51a2c1..50c047d6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ImageBrowserDemoCtl
 {
-    public partial class ImageBrowserDemoCtl
+    public ImageBrowserDemoCtl()
     {
-        public ImageBrowserDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
index b71a7746..f2a4c8ee 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ImageSelectorDemoCtl
 {
-    public partial class ImageSelectorDemoCtl
+    public ImageSelectorDemoCtl()
     {
-        public ImageSelectorDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
index 005ed41a..7e36a7d5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class LoadingDemoCtl
 {
-    public partial class LoadingDemoCtl
+    public LoadingDemoCtl()
     {
-        public LoadingDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
index a09d3502..ddbf7a80 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class MagnifierDemoCtl
 {
-    public partial class MagnifierDemoCtl
+    public MagnifierDemoCtl()
     {
-        public MagnifierDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
index 4a86ef88..8142824e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NotificationDemoCtl
 {
-    public partial class NotificationDemoCtl
+    public NotificationDemoCtl()
     {
-        public NotificationDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
index 402408dd..cd461a9b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
@@ -2,20 +2,19 @@
 using HandyControlDemo.Tools;
 using HandyControlDemo.ViewModel;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NotifyIconDemoCtl
 {
-    public partial class NotifyIconDemoCtl
+    public NotifyIconDemoCtl()
     {
-        public NotifyIconDemoCtl()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            AssemblyHelper.Register(nameof(NotifyIconDemoCtl), this);
-            Unloaded += NotifyIconDemoCtl_Unloaded;
-        }
-
-        private void NotifyIconDemoCtl_Unloaded(object sender, RoutedEventArgs e) => ViewModelLocator.Instance.NotifyIconDemo.Cleanup();
-
-        private void ButtonPush_OnClick(object sender, RoutedEventArgs e) => NotifyIconContextContent.CloseContextControl();
+        AssemblyHelper.Register(nameof(NotifyIconDemoCtl), this);
+        Unloaded += NotifyIconDemoCtl_Unloaded;
     }
-}
+
+    private void NotifyIconDemoCtl_Unloaded(object sender, RoutedEventArgs e) => ViewModelLocator.Instance.NotifyIconDemo.Cleanup();
+
+    private void ButtonPush_OnClick(object sender, RoutedEventArgs e) => NotifyIconContextContent.CloseContextControl();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
index 8e966a21..6e8097bd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NumericUpDownDemoCtl
 {
-    public partial class NumericUpDownDemoCtl
+    public NumericUpDownDemoCtl()
     {
-        public NumericUpDownDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
index 1e637136..a4afac74 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class OutlineTextDemoCtl
 {
-    public partial class OutlineTextDemoCtl
+    public OutlineTextDemoCtl()
     {
-        public OutlineTextDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
index 054499d8..43280026 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PaginationDemoCtl
 {
-    public partial class PaginationDemoCtl
+    public PaginationDemoCtl()
     {
-        public PaginationDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
index 8e750253..3c30f019 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PasswordBoxDemoCtl
 {
-    public partial class PasswordBoxDemoCtl
+    public PasswordBoxDemoCtl()
     {
-        public PasswordBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
index 02c0ca3a..8d367028 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
@@ -1,21 +1,20 @@
 using System.Windows;
 using HandyControl.Controls;
 
-namespace HandyControlDemo.UserControl
-{
-    public partial class PinBoxDemoCtl
-    {
-        public PinBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+namespace HandyControlDemo.UserControl;
 
-        private void PinBox_OnCompleted(object sender, RoutedEventArgs e)
+public partial class PinBoxDemoCtl
+{
+    public PinBoxDemoCtl()
+    {
+        InitializeComponent();
+    }
+
+    private void PinBox_OnCompleted(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is PinBox pinBox)
         {
-            if (e.OriginalSource is PinBox pinBox)
-            {
-                Growl.Info(pinBox.Password);
-            }
+            Growl.Info(pinBox.Password);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
index 8daa08f5..3ae529d7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PoptipDemoCtl
 {
-    public partial class PoptipDemoCtl
+    public PoptipDemoCtl()
     {
-        public PoptipDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
index 9869b2ca..c7de6e22 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PreviewSliderDemoCtl
 {
-    public partial class PreviewSliderDemoCtl
+    public PreviewSliderDemoCtl()
     {
-        public PreviewSliderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
index eb096c94..8e63b600 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ProgressBarDemoCtl
 {
-    public partial class ProgressBarDemoCtl
+    public ProgressBarDemoCtl()
     {
-        public ProgressBarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
index f44f7110..1db731a7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
@@ -2,64 +2,63 @@
 using System.Windows;
 using System.Windows.Threading;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ProgressButtonDemoCtl
 {
-    public partial class ProgressButtonDemoCtl
+    public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register(
+        "Progress", typeof(int), typeof(ProgressButtonDemoCtl), new PropertyMetadata(default(int)));
+
+    public int Progress
     {
-        public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register(
-            "Progress", typeof(int), typeof(ProgressButtonDemoCtl), new PropertyMetadata(default(int)));
+        get => (int) GetValue(ProgressProperty);
+        set => SetValue(ProgressProperty, value);
+    }
 
-        public int Progress
+    public static readonly DependencyProperty IsUploadingProperty = DependencyProperty.Register(
+        "IsUploading", typeof(bool), typeof(ProgressButtonDemoCtl), new PropertyMetadata(default(bool)));
+
+    public bool IsUploading
+    {
+        get => (bool) GetValue(IsUploadingProperty);
+        set => SetValue(IsUploadingProperty, value);
+    }
+
+    private readonly DispatcherTimer _timer;
+
+    public ProgressButtonDemoCtl()
+    {
+        InitializeComponent();
+
+        DataContext = this;
+
+        _timer = new DispatcherTimer
         {
-            get => (int) GetValue(ProgressProperty);
-            set => SetValue(ProgressProperty, value);
-        }
+            Interval = TimeSpan.FromMilliseconds(200)
+        };
+        _timer.Tick += Timer_Tick;
+    }
 
-        public static readonly DependencyProperty IsUploadingProperty = DependencyProperty.Register(
-            "IsUploading", typeof(bool), typeof(ProgressButtonDemoCtl), new PropertyMetadata(default(bool)));
-
-        public bool IsUploading
+    private void Timer_Tick(object sender, EventArgs e)
+    {
+        Progress++;
+        if (Progress == 100)
         {
-            get => (bool) GetValue(IsUploadingProperty);
-            set => SetValue(IsUploadingProperty, value);
-        }
-
-        private readonly DispatcherTimer _timer;
-
-        public ProgressButtonDemoCtl()
-        {
-            InitializeComponent();
-
-            DataContext = this;
-
-            _timer = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromMilliseconds(200)
-            };
-            _timer.Tick += Timer_Tick;
-        }
-
-        private void Timer_Tick(object sender, EventArgs e)
-        {
-            Progress++;
-            if (Progress == 100)
-            {
-                Progress = 0;
-                _timer.Stop();
-                IsUploading = false;
-            }
-        }
-
-        private void ButtonProgress_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (_timer.IsEnabled)
-            {
-                _timer.Stop();
-            }
-            else
-            {
-                _timer.Start();
-            }
+            Progress = 0;
+            _timer.Stop();
+            IsUploading = false;
         }
     }
-}
+
+    private void ButtonProgress_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (_timer.IsEnabled)
+        {
+            _timer.Stop();
+        }
+        else
+        {
+            _timer.Start();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
index 54d15322..bfc235ac 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
@@ -1,31 +1,30 @@
 using System.Windows;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PropertyGridDemoCtl
 {
-    public partial class PropertyGridDemoCtl
+    public PropertyGridDemoCtl()
     {
-        public PropertyGridDemoCtl()
+        InitializeComponent();
+
+        DemoModel = new PropertyGridDemoModel
         {
-            InitializeComponent();
-
-            DemoModel = new PropertyGridDemoModel
-            {
-                String = "TestString",
-                Enum = Gender.Female,
-                Boolean = true,
-                Integer = 98,
-                VerticalAlignment = VerticalAlignment.Stretch
-            };
-        }
-
-        public static readonly DependencyProperty DemoModelProperty = DependencyProperty.Register(
-            "DemoModel", typeof(PropertyGridDemoModel), typeof(PropertyGridDemoCtl), new PropertyMetadata(default(PropertyGridDemoModel)));
-
-        public PropertyGridDemoModel DemoModel
-        {
-            get => (PropertyGridDemoModel) GetValue(DemoModelProperty);
-            set => SetValue(DemoModelProperty, value);
-        }
+            String = "TestString",
+            Enum = Gender.Female,
+            Boolean = true,
+            Integer = 98,
+            VerticalAlignment = VerticalAlignment.Stretch
+        };
     }
-}
+
+    public static readonly DependencyProperty DemoModelProperty = DependencyProperty.Register(
+        "DemoModel", typeof(PropertyGridDemoModel), typeof(PropertyGridDemoCtl), new PropertyMetadata(default(PropertyGridDemoModel)));
+
+    public PropertyGridDemoModel DemoModel
+    {
+        get => (PropertyGridDemoModel) GetValue(DemoModelProperty);
+        set => SetValue(DemoModelProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
index cf953706..dfb64cc0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RangeSliderDemoCtl
 {
-    public partial class RangeSliderDemoCtl
+    public RangeSliderDemoCtl()
     {
-        public RangeSliderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
index 5f5c2bb6..17770b5a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RateDemoCtl
 {
-    public partial class RateDemoCtl
+    public RateDemoCtl()
     {
-        public RateDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
index 747c9b57..c905890f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RelativePanelDemoCtl
 {
-    public partial class RelativePanelDemoCtl
+    public RelativePanelDemoCtl()
     {
-        public RelativePanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
index a115d149..1a7e1291 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RunningBlockDemoCtl
 {
-    public partial class RunningBlockDemoCtl
+    public RunningBlockDemoCtl()
     {
-        public RunningBlockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
index 7f237020..107719b8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
@@ -5,29 +5,28 @@ using System.Windows.Media;
 using HandyControl.Controls;
 using HandyControl.Data;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ScreenshotDemoCtl : IDisposable
 {
-    public partial class ScreenshotDemoCtl : IDisposable
+    public ScreenshotDemoCtl()
     {
-        public ScreenshotDemoCtl()
-        {
-            InitializeComponent();
-            Screenshot.Snapped += Screenshot_Snapped;
-        }
-
-        private void Screenshot_Snapped(object sender, FunctionEventArgs<ImageSource> e)
-        {
-            new HandyControl.Controls.Window
-            {
-                Content = new Image
-                {
-                    Source = e.Info,
-                    Stretch = Stretch.None
-                },
-                WindowStartupLocation = WindowStartupLocation.CenterScreen
-            }.ShowDialog();
-        }
-
-        public void Dispose() => Screenshot.Snapped -= Screenshot_Snapped;
+        InitializeComponent();
+        Screenshot.Snapped += Screenshot_Snapped;
     }
-}
+
+    private void Screenshot_Snapped(object sender, FunctionEventArgs<ImageSource> e)
+    {
+        new HandyControl.Controls.Window
+        {
+            Content = new Image
+            {
+                Source = e.Info,
+                Stretch = Stretch.None
+            },
+            WindowStartupLocation = WindowStartupLocation.CenterScreen
+        }.ShowDialog();
+    }
+
+    public void Dispose() => Screenshot.Snapped -= Screenshot_Snapped;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
index 56df29a7..8c43ec1f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ScrollViewerDemoCtl
 {
-    public partial class ScrollViewerDemoCtl
+    public ScrollViewerDemoCtl()
     {
-        public ScrollViewerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
index 0375fd53..ec99efd4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class SearchBarDemoCtl
 {
-    public partial class SearchBarDemoCtl
+    public SearchBarDemoCtl()
     {
-        public SearchBarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
index 6cfbc669..04c7a55e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ShieldDemoCtl
 {
-    public partial class ShieldDemoCtl
+    public ShieldDemoCtl()
     {
-        public ShieldDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
index 021ff249..7283c25e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class SideMenuDemoCtl
 {
-    public partial class SideMenuDemoCtl
+    public SideMenuDemoCtl()
     {
-        public SideMenuDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
index 6c369070..b5f7011d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
@@ -1,17 +1,16 @@
 using System.Windows;
 
-namespace HandyControlDemo.UserControl
-{
-    public partial class SplitButtonDemoCtl
-    {
-        public SplitButtonDemoCtl()
-        {
-            InitializeComponent();
-        }
+namespace HandyControlDemo.UserControl;
 
-        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show("123");
-        }
+public partial class SplitButtonDemoCtl
+{
+    public SplitButtonDemoCtl()
+    {
+        InitializeComponent();
     }
-}
+
+    private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+    {
+        MessageBox.Show("123");
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
index fa59e94e..607e5cf3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class SpriteDemoCtl
 {
-    public partial class SpriteDemoCtl
+    public SpriteDemoCtl()
     {
-        public SpriteDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
index 991bab9b..d6305143 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class StepBarDemoCtl
 {
-    public partial class StepBarDemoCtl
+    public StepBarDemoCtl()
     {
-        public StepBarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
index 7df67fc8..9bb07a7e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TabControlDemoCtl
 {
-    public partial class TabControlDemoCtl
+    public TabControlDemoCtl()
     {
-        public TabControlDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
index aaeb7890..9b0f5056 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TagDemoCtl
 {
-    public partial class TagDemoCtl
+    public TagDemoCtl()
     {
-        public TagDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
index f68246b0..30b7a3aa 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TextBoxDemoCtl
 {
-    public partial class TextBoxDemoCtl
+    public TextBoxDemoCtl()
     {
-        public TextBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
index 03270e26..5f65974e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
@@ -1,20 +1,19 @@
 using System;
 using HandyControl.Data;
 
-namespace HandyControlDemo.UserControl
-{
-    public partial class TimeBarDemoCtl
-    {
-        public TimeBarDemoCtl()
-        {
-            InitializeComponent();
+namespace HandyControlDemo.UserControl;
 
-            for (int i = 0; i < 10; i++)
-            {
-                var hour = 6 * i;
-                TimeBarDemo.Hotspots.Add(new DateTimeRange(DateTime.Today.AddHours(hour), DateTime.Today.AddHours(hour + 1)));
-                TimeBarDemo.Hotspots.Add(new DateTimeRange(DateTime.Today.AddHours(-hour), DateTime.Today.AddHours(-hour + 1)));
-            }
+public partial class TimeBarDemoCtl
+{
+    public TimeBarDemoCtl()
+    {
+        InitializeComponent();
+
+        for (int i = 0; i < 10; i++)
+        {
+            var hour = 6 * i;
+            TimeBarDemo.Hotspots.Add(new DateTimeRange(DateTime.Today.AddHours(hour), DateTime.Today.AddHours(hour + 1)));
+            TimeBarDemo.Hotspots.Add(new DateTimeRange(DateTime.Today.AddHours(-hour), DateTime.Today.AddHours(-hour + 1)));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
index 9c4fcf0f..4fdd4b89 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TimePickerDemoCtl
 {
-    public partial class TimePickerDemoCtl
+    public TimePickerDemoCtl()
     {
-        public TimePickerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
index 4fba3b92..a708d975 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TransferDemoCtl
 {
-    public partial class TransferDemoCtl
+    public TransferDemoCtl()
     {
-        public TransferDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
index 92a140ce..5bfd12bb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TransitioningContentControlDemoCtl
 {
-    public partial class TransitioningContentControlDemoCtl
+    public TransitioningContentControlDemoCtl()
     {
-        public TransitioningContentControlDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
index 781aa558..14b3700b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class UniformSpacingPanelDemoCtl
 {
-    public partial class UniformSpacingPanelDemoCtl
+    public UniformSpacingPanelDemoCtl()
     {
-        public UniformSpacingPanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
index 3e9c2468..442ab8d1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class WaterfallPanelDemoCtl
 {
-    public partial class WaterfallPanelDemoCtl
+    public WaterfallPanelDemoCtl()
     {
-        public WaterfallPanelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
index dccc1d0f..fe8108cd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
@@ -4,61 +4,60 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using MessageBox = HandyControl.Controls.MessageBox;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class WindowDemoCtl
 {
-    public partial class WindowDemoCtl
+    public WindowDemoCtl()
     {
-        public WindowDemoCtl()
-        {
-            InitializeComponent();
-        }
-
-        private void ButtonMessage_OnClick(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show(Properties.Langs.Lang.GrowlAsk, Properties.Langs.Lang.Title, MessageBoxButton.YesNo, MessageBoxImage.Question);
-        }
-
-        private void ButtonCustomMessage_OnClick(object sender, RoutedEventArgs e)
-        {
-            MessageBox.Show(new MessageBoxInfo
-            {
-                Message = Properties.Langs.Lang.GrowlAsk,
-                Caption = Properties.Langs.Lang.Title,
-                Button = MessageBoxButton.YesNo,
-                IconBrushKey = ResourceToken.AccentBrush,
-                IconKey = ResourceToken.AskGeometry,
-                StyleKey = "MessageBoxCustom"
-            });
-        }
-
-        private void ButtonMouseFollow_OnClick(object sender, RoutedEventArgs e)
-        {
-            var picker = SingleOpenHelper.CreateControl<ColorPicker>();
-            var window = new PopupWindow
-            {
-                PopupElement = picker
-            };
-            picker.SelectedColorChanged += delegate { window.Close(); };
-            picker.Canceled += delegate { window.Close(); };
-            window.Show(ButtonMouseFollow, false);
-        }
-
-        private void ButtonCustomContent_OnClick(object sender, RoutedEventArgs e)
-        {
-            var picker = SingleOpenHelper.CreateControl<ColorPicker>();
-            var window = new PopupWindow
-            {
-                PopupElement = picker,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                AllowsTransparency = true,
-                WindowStyle = WindowStyle.None,
-                MinWidth = 0,
-                MinHeight = 0,
-                Title = Properties.Langs.Lang.ColorPicker
-            };
-            picker.SelectedColorChanged += delegate { window.Close(); };
-            picker.Canceled += delegate { window.Close(); };
-            window.Show();
-        }
+        InitializeComponent();
     }
-}
+
+    private void ButtonMessage_OnClick(object sender, RoutedEventArgs e)
+    {
+        MessageBox.Show(Properties.Langs.Lang.GrowlAsk, Properties.Langs.Lang.Title, MessageBoxButton.YesNo, MessageBoxImage.Question);
+    }
+
+    private void ButtonCustomMessage_OnClick(object sender, RoutedEventArgs e)
+    {
+        MessageBox.Show(new MessageBoxInfo
+        {
+            Message = Properties.Langs.Lang.GrowlAsk,
+            Caption = Properties.Langs.Lang.Title,
+            Button = MessageBoxButton.YesNo,
+            IconBrushKey = ResourceToken.AccentBrush,
+            IconKey = ResourceToken.AskGeometry,
+            StyleKey = "MessageBoxCustom"
+        });
+    }
+
+    private void ButtonMouseFollow_OnClick(object sender, RoutedEventArgs e)
+    {
+        var picker = SingleOpenHelper.CreateControl<ColorPicker>();
+        var window = new PopupWindow
+        {
+            PopupElement = picker
+        };
+        picker.SelectedColorChanged += delegate { window.Close(); };
+        picker.Canceled += delegate { window.Close(); };
+        window.Show(ButtonMouseFollow, false);
+    }
+
+    private void ButtonCustomContent_OnClick(object sender, RoutedEventArgs e)
+    {
+        var picker = SingleOpenHelper.CreateControl<ColorPicker>();
+        var window = new PopupWindow
+        {
+            PopupElement = picker,
+            WindowStartupLocation = WindowStartupLocation.CenterScreen,
+            AllowsTransparency = true,
+            WindowStyle = WindowStyle.None,
+            MinWidth = 0,
+            MinHeight = 0,
+            Title = Properties.Langs.Lang.ColorPicker
+        };
+        picker.SelectedColorChanged += delegate { window.Close(); };
+        picker.Canceled += delegate { window.Close(); };
+        window.Show();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
index ffc76c31..53887f7b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class AppNotification
 {
-    public partial class AppNotification
+    public AppNotification()
     {
-        public AppNotification()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
index b0cba5f3..bee165cc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class AppSprite
 {
-    public partial class AppSprite
+    public AppSprite()
     {
-        public AppSprite()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
index 8c69a7c4..a47ba05f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class BlogsView
 {
-    public partial class BlogsView
+    public BlogsView()
     {
-        public BlogsView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
index 3f213c1d..00592399 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ContributorsView
 {
-    public partial class ContributorsView
+    public ContributorsView()
     {
-        public ContributorsView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
index 224a8ae3..6a06b8ac 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
@@ -11,112 +11,111 @@ using HandyControlDemo.Data;
 using HandyControlDemo.ViewModel;
 
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+/// <summary>
+///     左侧主内容
+/// </summary>
+public partial class LeftMainContent
 {
-    /// <summary>
-    ///     左侧主内容
-    /// </summary>
-    public partial class LeftMainContent
+    private string _searchKey;
+
+    public LeftMainContent()
     {
-        private string _searchKey;
+        InitializeComponent();
+    }
 
-        public LeftMainContent()
+    private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (e.AddedItems.Count == 0) return;
+        if (e.AddedItems[0] is DemoInfoModel demoInfo)
         {
-            InitializeComponent();
-        }
+            ViewModelLocator.Instance.Main.DemoInfoCurrent = demoInfo;
+            var selectedIndex = demoInfo.SelectedIndex;
+            demoInfo.SelectedIndex = -1;
+            demoInfo.SelectedIndex = selectedIndex;
 
-        private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is DemoInfoModel demoInfo)
-            {
-                ViewModelLocator.Instance.Main.DemoInfoCurrent = demoInfo;
-                var selectedIndex = demoInfo.SelectedIndex;
-                demoInfo.SelectedIndex = -1;
-                demoInfo.SelectedIndex = selectedIndex;
-
-                FilterItems();
-                GroupItems(sender as TabControl, demoInfo);
-            }
-        }
-
-        private void ButtonAscending_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (sender is ToggleButton button && button.Tag is ItemsControl itemsControl)
-            {
-                if (button.IsChecked == true)
-                {
-                    itemsControl.Items.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
-                }
-                else
-                {
-                    itemsControl.Items.SortDescriptions.Clear();
-                }
-            }
-        }
-
-        private void SearchBar_OnSearchStarted(object sender, FunctionEventArgs<string> e)
-        {
-            _searchKey = e.Info;
             FilterItems();
+            GroupItems(sender as TabControl, demoInfo);
         }
+    }
 
-        private void FilterItems()
+    private void ButtonAscending_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (sender is ToggleButton button && button.Tag is ItemsControl itemsControl)
         {
-            if (string.IsNullOrEmpty(_searchKey))
+            if (button.IsChecked == true)
             {
-                foreach (var item in ViewModelLocator.Instance.Main.DemoInfoCurrent.DemoItemList)
-                {
-                    item.IsVisible = true;
-                    item.QueriesText = string.Empty;
-                }
+                itemsControl.Items.SortDescriptions.Add(new SortDescription("Name", ListSortDirection.Ascending));
             }
             else
             {
-                var key = _searchKey.ToLower();
-                foreach (var item in ViewModelLocator.Instance.Main.DemoInfoCurrent.DemoItemList)
+                itemsControl.Items.SortDescriptions.Clear();
+            }
+        }
+    }
+
+    private void SearchBar_OnSearchStarted(object sender, FunctionEventArgs<string> e)
+    {
+        _searchKey = e.Info;
+        FilterItems();
+    }
+
+    private void FilterItems()
+    {
+        if (string.IsNullOrEmpty(_searchKey))
+        {
+            foreach (var item in ViewModelLocator.Instance.Main.DemoInfoCurrent.DemoItemList)
+            {
+                item.IsVisible = true;
+                item.QueriesText = string.Empty;
+            }
+        }
+        else
+        {
+            var key = _searchKey.ToLower();
+            foreach (var item in ViewModelLocator.Instance.Main.DemoInfoCurrent.DemoItemList)
+            {
+                if (item.Name.ToLower().Contains(key))
                 {
-                    if (item.Name.ToLower().Contains(key))
-                    {
-                        item.IsVisible = true;
-                        item.QueriesText = _searchKey;
-                    }
-                    else if (item.TargetCtlName.Replace("DemoCtl", "").ToLower().Contains(key))
+                    item.IsVisible = true;
+                    item.QueriesText = _searchKey;
+                }
+                else if (item.TargetCtlName.Replace("DemoCtl", "").ToLower().Contains(key))
+                {
+                    item.IsVisible = true;
+                    item.QueriesText = _searchKey;
+                }
+                else
+                {
+                    var name = Properties.Langs.LangProvider.GetLang(item.Name);
+                    if (!string.IsNullOrEmpty(name) && name.ToLower().Contains(key))
                     {
                         item.IsVisible = true;
                         item.QueriesText = _searchKey;
                     }
                     else
                     {
-                        var name = Properties.Langs.LangProvider.GetLang(item.Name);
-                        if (!string.IsNullOrEmpty(name) && name.ToLower().Contains(key))
-                        {
-                            item.IsVisible = true;
-                            item.QueriesText = _searchKey;
-                        }
-                        else
-                        {
-                            item.IsVisible = false;
-                            item.QueriesText = string.Empty;
-                        }
+                        item.IsVisible = false;
+                        item.QueriesText = string.Empty;
                     }
                 }
             }
         }
+    }
 
-        private void GroupItems(TabControl tabControl, DemoInfoModel demoInfo)
+    private void GroupItems(TabControl tabControl, DemoInfoModel demoInfo)
+    {
+        var listBox = VisualHelper.GetChild<ListBox>(tabControl);
+        if (listBox == null) return;
+        listBox.Items.GroupDescriptions?.Clear();
+
+        if (demoInfo.IsGroupEnabled)
         {
-            var listBox = VisualHelper.GetChild<ListBox>(tabControl);
-            if (listBox == null) return;
-            listBox.Items.GroupDescriptions?.Clear();
-
-            if (demoInfo.IsGroupEnabled)
+            Dispatcher.BeginInvoke(new Action(() =>
             {
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    listBox.Items.GroupDescriptions?.Add(new PropertyGroupDescription("GroupName"));
-                }), DispatcherPriority.Background);
-            }
+                listBox.Items.GroupDescriptions?.Add(new PropertyGroupDescription("GroupName"));
+            }), DispatcherPriority.Background);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
index 173ed9b6..d54fa484 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
@@ -11,173 +11,172 @@ using HandyControlDemo.ViewModel;
 using ICSharpCode.AvalonEdit;
 
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+/// <summary>
+///     主内容
+/// </summary>
+public partial class MainContent
 {
-    /// <summary>
-    ///     主内容
-    /// </summary>
-    public partial class MainContent
+    private bool _isFull;
+
+    private string _currentDemoKey;
+
+    private bool _drawerCodeUsed;
+
+    private Dictionary<string, TextEditor> _textEditor;
+
+    public MainContent()
     {
-        private bool _isFull;
+        InitializeComponent();
 
-        private string _currentDemoKey;
+        Messenger.Default.Register<bool>(this, MessageToken.FullSwitch, FullSwitch);
+        Messenger.Default.Register<SkinType>(this, MessageToken.SkinUpdated, SkinUpdated);
+    }
 
-        private bool _drawerCodeUsed;
-
-        private Dictionary<string, TextEditor> _textEditor;
-
-        public MainContent()
+    private void FullSwitch(bool isFull)
+    {
+        if (_isFull == isFull)
         {
-            InitializeComponent();
-
-            Messenger.Default.Register<bool>(this, MessageToken.FullSwitch, FullSwitch);
-            Messenger.Default.Register<SkinType>(this, MessageToken.SkinUpdated, SkinUpdated);
+            return;
         }
 
-        private void FullSwitch(bool isFull)
+        _isFull = isFull;
+
+        if (_isFull)
         {
-            if (_isFull == isFull)
-            {
-                return;
-            }
-
-            _isFull = isFull;
-
-            if (_isFull)
-            {
-                BorderRootEffect.Show();
-                BorderEffect.Collapse();
-                BorderTitle.Collapse();
-                GridMain.HorizontalAlignment = HorizontalAlignment.Stretch;
-                GridMain.VerticalAlignment = VerticalAlignment.Stretch;
-                PresenterMain.Margin = new Thickness();
-                BorderRoot.CornerRadius = new CornerRadius(10);
-                BorderRoot.Style = ResourceHelper.GetResource<Style>("BorderClip");
-            }
-            else
-            {
-                BorderRootEffect.Collapse();
-                BorderEffect.Show();
-                BorderTitle.Show();
-                GridMain.HorizontalAlignment = HorizontalAlignment.Center;
-                GridMain.VerticalAlignment = VerticalAlignment.Center;
-                PresenterMain.Margin = new Thickness(0, 0, 0, 10);
-                BorderRoot.CornerRadius = new CornerRadius();
-                BorderRoot.Style = null;
-            }
+            BorderRootEffect.Show();
+            BorderEffect.Collapse();
+            BorderTitle.Collapse();
+            GridMain.HorizontalAlignment = HorizontalAlignment.Stretch;
+            GridMain.VerticalAlignment = VerticalAlignment.Stretch;
+            PresenterMain.Margin = new Thickness();
+            BorderRoot.CornerRadius = new CornerRadius(10);
+            BorderRoot.Style = ResourceHelper.GetResource<Style>("BorderClip");
         }
-
-        private void SkinUpdated(SkinType skinType)
+        else
         {
-            if (!_drawerCodeUsed)
-            {
-                return;
-            }
-
-            _textEditor[ConstString.Xaml].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Xml);
-            _textEditor[ConstString.Cs].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs);
-            _textEditor[ConstString.Vm].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs);
-        }
-
-        private void InitTextEditor()
-        {
-            HighlightingProvider.Register(SkinType.Default, HighlightingProvider.Default);
-            HighlightingProvider.Register(SkinType.Dark, new HighlightingProviderDark());
-            HighlightingProvider.Register(SkinType.Violet, HighlightingProvider.Default);
-
-            var textEditorCustomStyle = ResourceHelper.GetResource<Style>("TextEditorCustom");
-            var skinType = GlobalData.Config.Skin;
-
-            _textEditor = new Dictionary<string, TextEditor>
-            {
-                [ConstString.Xaml] = new()
-                {
-                    Style = textEditorCustomStyle,
-                    SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Xml)
-                },
-                [ConstString.Cs] = new()
-                {
-                    Style = textEditorCustomStyle,
-                    SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs)
-                },
-                [ConstString.Vm] = new()
-                {
-                    Style = textEditorCustomStyle,
-                    SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs)
-                }
-            };
-
-            BorderCode.Child = new TabControl
-            {
-                Style = ResourceHelper.GetResource<Style>("TabControlInLine"),
-                Items =
-                {
-                    new TabItem
-                    {
-                        Header = ConstString.Xaml,
-                        Content = _textEditor[ConstString.Xaml]
-                    },
-                    new TabItem
-                    {
-                        Header = ConstString.Cs,
-                        Content = _textEditor[ConstString.Cs]
-                    },
-                    new TabItem
-                    {
-                        Header = ConstString.Vm,
-                        Content = _textEditor[ConstString.Vm]
-                    }
-                }
-            };
-        }
-
-        private void UpdateTextEditor()
-        {
-            var typeKey = ViewModelLocator.Instance.Main.DemoInfoCurrent.Key;
-            var demoKey = ViewModelLocator.Instance.Main.DemoItemCurrent.TargetCtlName;
-            if (Equals(_currentDemoKey, demoKey))
-            {
-                return;
-            }
-
-            _currentDemoKey = demoKey;
-
-            if (ViewModelLocator.Instance.Main.SubContent is FrameworkElement demoCtl)
-            {
-                var demoCtlTypeName = demoCtl.GetType().Name;
-                var xamlPath = $"UserControl/{typeKey}/{demoCtlTypeName}.xaml";
-                var dc = demoCtl.DataContext;
-                var dcTypeName = dc.GetType().Name;
-                var vmPath = !Equals(dcTypeName, demoCtlTypeName)
-                    ? $"ViewModel/{dcTypeName}"
-                    : xamlPath;
-
-                _textEditor[ConstString.Xaml].Text = DemoHelper.GetCode(xamlPath);
-                _textEditor[ConstString.Cs].Text = DemoHelper.GetCode($"{xamlPath}.cs");
-                _textEditor[ConstString.Vm].Text = DemoHelper.GetCode($"{vmPath}.cs");
-            }
-        }
-
-        private void DrawerCode_OnOpened(object sender, RoutedEventArgs e)
-        {
-            if (!_drawerCodeUsed)
-            {
-                InitTextEditor();
-                _drawerCodeUsed = true;
-            }
-
-            UpdateTextEditor();
-        }
-
-        private static class ConstString
-        {
-            public const string Xaml = "XAML";
-
-            public const string Vm = "VM";
-
-            public const string Cs = "C#";
-
-            public const string Xml = "XML";
+            BorderRootEffect.Collapse();
+            BorderEffect.Show();
+            BorderTitle.Show();
+            GridMain.HorizontalAlignment = HorizontalAlignment.Center;
+            GridMain.VerticalAlignment = VerticalAlignment.Center;
+            PresenterMain.Margin = new Thickness(0, 0, 0, 10);
+            BorderRoot.CornerRadius = new CornerRadius();
+            BorderRoot.Style = null;
         }
     }
-}
+
+    private void SkinUpdated(SkinType skinType)
+    {
+        if (!_drawerCodeUsed)
+        {
+            return;
+        }
+
+        _textEditor[ConstString.Xaml].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Xml);
+        _textEditor[ConstString.Cs].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs);
+        _textEditor[ConstString.Vm].SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs);
+    }
+
+    private void InitTextEditor()
+    {
+        HighlightingProvider.Register(SkinType.Default, HighlightingProvider.Default);
+        HighlightingProvider.Register(SkinType.Dark, new HighlightingProviderDark());
+        HighlightingProvider.Register(SkinType.Violet, HighlightingProvider.Default);
+
+        var textEditorCustomStyle = ResourceHelper.GetResource<Style>("TextEditorCustom");
+        var skinType = GlobalData.Config.Skin;
+
+        _textEditor = new Dictionary<string, TextEditor>
+        {
+            [ConstString.Xaml] = new()
+            {
+                Style = textEditorCustomStyle,
+                SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Xml)
+            },
+            [ConstString.Cs] = new()
+            {
+                Style = textEditorCustomStyle,
+                SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs)
+            },
+            [ConstString.Vm] = new()
+            {
+                Style = textEditorCustomStyle,
+                SyntaxHighlighting = HighlightingProvider.GetDefinition(skinType, ConstString.Cs)
+            }
+        };
+
+        BorderCode.Child = new TabControl
+        {
+            Style = ResourceHelper.GetResource<Style>("TabControlInLine"),
+            Items =
+            {
+                new TabItem
+                {
+                    Header = ConstString.Xaml,
+                    Content = _textEditor[ConstString.Xaml]
+                },
+                new TabItem
+                {
+                    Header = ConstString.Cs,
+                    Content = _textEditor[ConstString.Cs]
+                },
+                new TabItem
+                {
+                    Header = ConstString.Vm,
+                    Content = _textEditor[ConstString.Vm]
+                }
+            }
+        };
+    }
+
+    private void UpdateTextEditor()
+    {
+        var typeKey = ViewModelLocator.Instance.Main.DemoInfoCurrent.Key;
+        var demoKey = ViewModelLocator.Instance.Main.DemoItemCurrent.TargetCtlName;
+        if (Equals(_currentDemoKey, demoKey))
+        {
+            return;
+        }
+
+        _currentDemoKey = demoKey;
+
+        if (ViewModelLocator.Instance.Main.SubContent is FrameworkElement demoCtl)
+        {
+            var demoCtlTypeName = demoCtl.GetType().Name;
+            var xamlPath = $"UserControl/{typeKey}/{demoCtlTypeName}.xaml";
+            var dc = demoCtl.DataContext;
+            var dcTypeName = dc.GetType().Name;
+            var vmPath = !Equals(dcTypeName, demoCtlTypeName)
+                ? $"ViewModel/{dcTypeName}"
+                : xamlPath;
+
+            _textEditor[ConstString.Xaml].Text = DemoHelper.GetCode(xamlPath);
+            _textEditor[ConstString.Cs].Text = DemoHelper.GetCode($"{xamlPath}.cs");
+            _textEditor[ConstString.Vm].Text = DemoHelper.GetCode($"{vmPath}.cs");
+        }
+    }
+
+    private void DrawerCode_OnOpened(object sender, RoutedEventArgs e)
+    {
+        if (!_drawerCodeUsed)
+        {
+            InitTextEditor();
+            _drawerCodeUsed = true;
+        }
+
+        UpdateTextEditor();
+    }
+
+    private static class ConstString
+    {
+        public const string Xaml = "XAML";
+
+        public const string Vm = "VM";
+
+        public const string Cs = "C#";
+
+        public const string Xml = "XML";
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
index 9efdba24..675f6a93 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class MainWindowContent
 {
-    public partial class MainWindowContent
+    public MainWindowContent()
     {
-        public MainWindowContent()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
index 9493728c..197feca9 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
@@ -8,59 +8,58 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Properties.Langs;
 using HandyControlDemo.Window;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NonClientAreaContent
 {
-    public partial class NonClientAreaContent
+    public NonClientAreaContent()
     {
-        public NonClientAreaContent()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
+    }
 
-        private void ButtonLangs_OnClick(object sender, RoutedEventArgs e)
+    private void ButtonLangs_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Button { Tag: string langName })
         {
-            if (e.OriginalSource is Button { Tag: string langName })
+            PopupConfig.IsOpen = false;
+            if (langName.Equals(GlobalData.Config.Lang))
             {
-                PopupConfig.IsOpen = false;
-                if (langName.Equals(GlobalData.Config.Lang))
-                {
-                    return;
-                }
-
-                ConfigHelper.Instance.SetLang(langName);
-                LangProvider.Culture = new CultureInfo(langName);
-                Messenger.Default.Send<object>(null, MessageToken.LangUpdated);
-
-                GlobalData.Config.Lang = langName;
-                GlobalData.Save();
+                return;
             }
-        }
 
-        private void ButtonConfig_OnClick(object sender, RoutedEventArgs e) => PopupConfig.IsOpen = true;
+            ConfigHelper.Instance.SetLang(langName);
+            LangProvider.Culture = new CultureInfo(langName);
+            Messenger.Default.Send<object>(null, MessageToken.LangUpdated);
 
-        private void ButtonSkins_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is Button { Tag: SkinType skinType })
-            {
-                PopupConfig.IsOpen = false;
-                if (skinType.Equals(GlobalData.Config.Skin))
-                {
-                    return;
-                }
-
-                GlobalData.Config.Skin = skinType;
-                GlobalData.Save();
-                ((App) Application.Current).UpdateSkin(skinType);
-                Messenger.Default.Send(skinType, MessageToken.SkinUpdated);
-            }
-        }
-
-        private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
-        {
-            new AboutWindow
-            {
-                Owner = Application.Current.MainWindow
-            }.ShowDialog();
+            GlobalData.Config.Lang = langName;
+            GlobalData.Save();
         }
     }
-}
+
+    private void ButtonConfig_OnClick(object sender, RoutedEventArgs e) => PopupConfig.IsOpen = true;
+
+    private void ButtonSkins_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Button { Tag: SkinType skinType })
+        {
+            PopupConfig.IsOpen = false;
+            if (skinType.Equals(GlobalData.Config.Skin))
+            {
+                return;
+            }
+
+            GlobalData.Config.Skin = skinType;
+            GlobalData.Save();
+            ((App) Application.Current).UpdateSkin(skinType);
+            Messenger.Default.Send(skinType, MessageToken.SkinUpdated);
+        }
+    }
+
+    private void MenuAbout_OnClick(object sender, RoutedEventArgs e)
+    {
+        new AboutWindow
+        {
+            Owner = Application.Current.MainWindow
+        }.ShowDialog();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
index ee1aa783..7e2af7de 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class PracticalDemo
 {
-    public partial class PracticalDemo
+    public PracticalDemo()
     {
-        public PracticalDemo()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
index 674aa8f2..39fcf149 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ProjectsView
 {
-    public partial class ProjectsView
+    public ProjectsView()
     {
-        public ProjectsView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
index 510956ef..ac28ff73 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class UnderConstruction
 {
-    public partial class UnderConstruction
+    public UnderConstruction()
     {
-        public UnderConstruction()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
index e4bba9d3..e2a68e28 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class WebsitesView
 {
-    public partial class WebsitesView
+    public WebsitesView()
     {
-        public WebsitesView()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
index 98e61d87..a8271f8c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class Login
 {
-    public partial class Login
+    public Login()
     {
-        public Login()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
index 101e7a91..231d3a1b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class BorderDemoCtl
 {
-    public partial class BorderDemoCtl
+    public BorderDemoCtl()
     {
-        public BorderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
index 2b757c25..addd1278 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class BrushDemoCtl
 {
-    public partial class BrushDemoCtl
+    public BrushDemoCtl()
     {
-        public BrushDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
index fee4a10e..c970655e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ButtonDemoCtl
 {
-    public partial class ButtonDemoCtl
+    public ButtonDemoCtl()
     {
-        public ButtonDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
index e0c14d30..b04019c7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CalendarDemoCtl
 {
-    public partial class CalendarDemoCtl
+    public CalendarDemoCtl()
     {
-        public CalendarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
index e0270dc3..1ee63b49 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class CheckBoxDemoCtl
 {
-    public partial class CheckBoxDemoCtl
+    public CheckBoxDemoCtl()
     {
-        public CheckBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
index b87c46e0..2e9dbc21 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class DataGridDemoCtl
 {
-    public partial class DataGridDemoCtl
+    public DataGridDemoCtl()
     {
-        public DataGridDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
index 6987f5c9..4dc492a2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
@@ -1,12 +1,11 @@
 
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ExpanderDemoCtl
 {
-    public partial class ExpanderDemoCtl
+    public ExpanderDemoCtl()
     {
-        public ExpanderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
index 3e69b3e6..f0fb2f4b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class FlowDocumentDemoCtl
 {
-    public partial class FlowDocumentDemoCtl
+    public FlowDocumentDemoCtl()
     {
-        public FlowDocumentDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
index eaf46ef0..0dd5752a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
@@ -4,54 +4,53 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using HandyControl.Tools.Extension;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class FrameDemoCtl
 {
-    public partial class FrameDemoCtl
+
+    private readonly List<Page> _pageList;
+
+    public FrameDemoCtl()
     {
+        InitializeComponent();
 
-        private readonly List<Page> _pageList;
+        AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Button_Click));
 
-        public FrameDemoCtl()
+        _pageList = new List<Page>();
+        for (var i = 0; i < 5; i++)
         {
-            InitializeComponent();
-
-            AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Button_Click));
-
-            _pageList = new List<Page>();
-            for (var i = 0; i < 5; i++)
-            {
-                _pageList.Add(CreatePage(i));
-            }
-
-            FrameDemo.Navigate(_pageList[0]);
+            _pageList.Add(CreatePage(i));
         }
 
-        private Page CreatePage(int index)
-        {
-            var indexStr = index.ToString();
-            var button = new Button
-            {
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Content = indexStr,
-                Width = 320,
-                Tag = indexStr
-            };
+        FrameDemo.Navigate(_pageList[0]);
+    }
 
-            return new Page
-            {
-                Title = indexStr,
-                Content = button
-            };
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
+    private Page CreatePage(int index)
+    {
+        var indexStr = index.ToString();
+        var button = new Button
         {
-            if (e.OriginalSource is Button button && button.Tag is string tag)
-            {
-                var index = tag.Value<int>() + 1;
-                FrameDemo.Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
-            }
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = indexStr,
+            Width = 320,
+            Tag = indexStr
+        };
+
+        return new Page
+        {
+            Title = indexStr,
+            Content = button
+        };
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Button button && button.Tag is string tag)
+        {
+            var index = tag.Value<int>() + 1;
+            FrameDemo.Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
index 3c3ecc33..6f21308d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
@@ -6,36 +6,35 @@ using System.Windows.Media;
 using HandyControl.Tools;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GeometryDemoCtl
 {
-    public partial class GeometryDemoCtl
+    private readonly HashSet<string> _lineSet = new()
     {
-        private readonly HashSet<string> _lineSet = new()
-        {
-            "CheckedGeometry"
-        };
+        "CheckedGeometry"
+    };
 
-        public ObservableCollection<GeometryItemModel> GeometryItems { get; set; } =
-            new();
+    public ObservableCollection<GeometryItemModel> GeometryItems { get; set; } =
+        new();
 
-        public GeometryDemoCtl()
-        {
-            InitializeComponent();
-            GenerateGeometries();
-        }
+    public GeometryDemoCtl()
+    {
+        InitializeComponent();
+        GenerateGeometries();
+    }
 
-        public void GenerateGeometries()
+    public void GenerateGeometries()
+    {
+        foreach (var key in Application.Current.Resources.MergedDictionaries[1].MergedDictionaries[0].Keys.OfType<string>().OrderBy(item => item))
         {
-            foreach (var key in Application.Current.Resources.MergedDictionaries[1].MergedDictionaries[0].Keys.OfType<string>().OrderBy(item => item))
+            if (!key.EndsWith("Geometry")) continue;
+            GeometryItems.Add(new GeometryItemModel
             {
-                if (!key.EndsWith("Geometry")) continue;
-                GeometryItems.Add(new GeometryItemModel
-                {
-                    Key = key,
-                    Data = ResourceHelper.GetResource<Geometry>(key),
-                    Line = _lineSet.Contains(key)
-                });
-            }
+                Key = key,
+                Data = ResourceHelper.GetResource<Geometry>(key),
+                Line = _lineSet.Contains(key)
+            });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
index 0489fb71..3e917bed 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GroupBoxDemoCtl
 {
-    public partial class GroupBoxDemoCtl
+    public GroupBoxDemoCtl()
     {
-        public GroupBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
index aaa52331..20b85fcb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class LabelDemoCtl
 {
-    public partial class LabelDemoCtl
+    public LabelDemoCtl()
     {
-        public LabelDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
index 3b53333b..dcb10ff2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ListBoxDemoCtl
 {
-    public partial class ListBoxDemoCtl
+    public ListBoxDemoCtl()
     {
-        public ListBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
index 3aed76aa..12aee505 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ListViewDemoCtl
 {
-    public partial class ListViewDemoCtl
+    public ListViewDemoCtl()
     {
-        public ListViewDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
index 3077306d..d6e8e409 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class MenuDemoCtl
 {
-    public partial class MenuDemoCtl
+    public MenuDemoCtl()
     {
-        public MenuDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
index bb43f3e3..0d722523 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeComboBoxDemoCtl
 {
-    public partial class NativeComboBoxDemoCtl
+    public NativeComboBoxDemoCtl()
     {
-        public NativeComboBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
index b244fce8..3b95c3cf 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeDatePickerDemoCtl
 {
-    public partial class NativeDatePickerDemoCtl
+    public NativeDatePickerDemoCtl()
     {
-        public NativeDatePickerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
index 303db2ff..055898e5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativePasswordBoxDemoCtl
 {
-    public partial class NativePasswordBoxDemoCtl
+    public NativePasswordBoxDemoCtl()
     {
-        public NativePasswordBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
index 82b5e47c..45facae8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeProgressBarDemoCtl
 {
-    public partial class NativeProgressBarDemoCtl
+    public NativeProgressBarDemoCtl()
     {
-        public NativeProgressBarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
index 083f4ca6..9eff2bcb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeScrollViewerDemoCtl
 {
-    public partial class NativeScrollViewerDemoCtl
+    public NativeScrollViewerDemoCtl()
     {
-        public NativeScrollViewerDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
index 3812e54b..b5289d4f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeTabControlDemoCtl
 {
-    public partial class NativeTabControlDemoCtl
+    public NativeTabControlDemoCtl()
     {
-        public NativeTabControlDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
index 02c50edc..45f34839 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeTextBoxDemoCtl
 {
-    public partial class NativeTextBoxDemoCtl
+    public NativeTextBoxDemoCtl()
     {
-        public NativeTextBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
index 8b81cce4..17bcdecb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class NativeWindowDemoCtl
 {
-    public partial class NativeWindowDemoCtl
+    public NativeWindowDemoCtl()
     {
-        public NativeWindowDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
index 67a4cf20..43e3335e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RadioButtonDemoCtl
 {
-    public partial class RadioButtonDemoCtl
+    public RadioButtonDemoCtl()
     {
-        public RadioButtonDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
index 49820298..5a963bc0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RepeatButtonDemoCtl
 {
-    public partial class RepeatButtonDemoCtl
+    public RepeatButtonDemoCtl()
     {
-        public RepeatButtonDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
index e70602fe..5cf4fa5b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class RichTextBoxDemoCtl
 {
-    public partial class RichTextBoxDemoCtl
+    public RichTextBoxDemoCtl()
     {
-        public RichTextBoxDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
index 500e9430..4e55df28 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class SliderDemoCtl
 {
-    public partial class SliderDemoCtl
+    public SliderDemoCtl()
     {
-        public SliderDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
index faea8b77..4c6f539c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TextBlockDemoCtl
 {
-    public partial class TextBlockDemoCtl
+    public TextBlockDemoCtl()
     {
-        public TextBlockDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
index 9f5240df..322ef41c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ToggleButtonDemoCtl
 {
-    public partial class ToggleButtonDemoCtl
+    public ToggleButtonDemoCtl()
     {
-        public ToggleButtonDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
index 42e88b98..f4e32fcd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class ToolBarDemoCtl
 {
-    public partial class ToolBarDemoCtl
+    public ToolBarDemoCtl()
     {
-        public ToolBarDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
index 23563efe..f773d8a1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
@@ -1,11 +1,10 @@
 
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class TreeViewDemoCtl
 {
-    public partial class TreeViewDemoCtl
+    public TreeViewDemoCtl()
     {
-        public TreeViewDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
index 7f56b93f..a81115f8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class EffectsDemoCtl
 {
-    public partial class EffectsDemoCtl
+    public EffectsDemoCtl()
     {
-        public EffectsDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
index 959bc541..e3fe188e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class GeometryAnimationDemoCtl
 {
-    public partial class GeometryAnimationDemoCtl
+    public GeometryAnimationDemoCtl()
     {
-        public GeometryAnimationDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
index c0b53b05..395b40af 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.UserControl
+namespace HandyControlDemo.UserControl;
+
+public partial class HatchBrushGeneratorDemoCtl
 {
-    public partial class HatchBrushGeneratorDemoCtl
+    public HatchBrushGeneratorDemoCtl()
     {
-        public HatchBrushGeneratorDemoCtl()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
index 9b03c782..0df7bbef 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
@@ -16,157 +16,156 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 using Microsoft.Win32;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class ChatBoxViewModel : ViewModelBase
 {
-    public class ChatBoxViewModel : ViewModelBase
+    private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
+
+    private readonly string _id = Guid.NewGuid().ToString();
+
+    private readonly Stopwatch _stopwatch = new();
+
+    public ChatBoxViewModel()
     {
-        private static readonly string AudioCachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
+        Messenger.Default.Register<ChatInfoModel>(this, MessageToken.SendChatMessage, ReceiveMessage);
+    }
 
-        private readonly string _id = Guid.NewGuid().ToString();
+    private void ReceiveMessage(ChatInfoModel info)
+    {
+        if (_id.Equals(info.SenderId)) return;
+        info.Role = ChatRoleType.Receiver;
+        ChatInfos.Add(info);
+    }
 
-        private readonly Stopwatch _stopwatch = new();
+    private string _chatString;
 
-        public ChatBoxViewModel()
-        {
-            Messenger.Default.Register<ChatInfoModel>(this, MessageToken.SendChatMessage, ReceiveMessage);
-        }
-
-        private void ReceiveMessage(ChatInfoModel info)
-        {
-            if (_id.Equals(info.SenderId)) return;
-            info.Role = ChatRoleType.Receiver;
-            ChatInfos.Add(info);
-        }
-
-        private string _chatString;
-
-        public string ChatString
-        {
-            get => _chatString;
+    public string ChatString
+    {
+        get => _chatString;
 #if NET40
-            set => Set(nameof(ChatString), ref _chatString, value);
+        set => Set(nameof(ChatString), ref _chatString, value);
 #else
             set => Set(ref _chatString, value);
 #endif
-        }
+    }
 
-        public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new();
+    public ObservableCollection<ChatInfoModel> ChatInfos { get; set; } = new();
 
-        public RelayCommand<KeyEventArgs> SendStringCmd => new(SendString);
+    public RelayCommand<KeyEventArgs> SendStringCmd => new(SendString);
 
-        private void SendString(KeyEventArgs e)
+    private void SendString(KeyEventArgs e)
+    {
+        if (e.Key == Key.Enter)
         {
-            if (e.Key == Key.Enter)
-            {
-                if (string.IsNullOrEmpty(ChatString)) return;
-                var info = new ChatInfoModel
-                {
-                    Message = ChatString,
-                    SenderId = _id,
-                    Type = ChatMessageType.String,
-                    Role = ChatRoleType.Sender
-                };
-                ChatInfos.Add(info);
-                Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                ChatString = string.Empty;
-            }
-        }
-
-        public RelayCommand<RoutedEventArgs> ReadMessageCmd => new(ReadMessage);
-
-        private void ReadMessage(RoutedEventArgs e)
-        {
-            if (e.OriginalSource is FrameworkElement { Tag: ChatInfoModel info })
-            {
-                if (info.Type == ChatMessageType.Image)
-                {
-                    new ImageBrowser(new Uri(info.Enclosure.ToString()))
-                    {
-                        Owner = WindowHelper.GetActiveWindow()
-                    }.Show();
-                }
-                else if (info.Type == ChatMessageType.Audio)
-                {
-                    var player = new SoundPlayer(info.Enclosure.ToString());
-                    player.PlaySync();
-                }
-            }
-        }
-
-        public RelayCommand StartRecordCmd => new(StartRecord);
-
-        private void StartRecord()
-        {
-            Win32Helper.MciSendString("set wave bitpersample 8", "", 0, 0);
-            Win32Helper.MciSendString("set wave samplespersec 20000", "", 0, 0);
-            Win32Helper.MciSendString("set wave channels 2", "", 0, 0);
-            Win32Helper.MciSendString("set wave format tag pcm", "", 0, 0);
-            Win32Helper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0);
-            Win32Helper.MciSendString("record movie", "", 0, 0);
-
-            _stopwatch.Reset();
-            _stopwatch.Start();
-        }
-
-        public RelayCommand StopRecordCmd => new(StopRecord);
-
-        private void StopRecord()
-        {
-            if (!Directory.Exists(AudioCachePath))
-            {
-                try
-                {
-                    Directory.CreateDirectory(AudioCachePath);
-                }
-                catch (Exception e)
-                {
-                    Growl.Error(e.Message);
-                    return;
-                }
-            }
-
-            var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}";
-            var cachePathWithQuotes = $"\"{cachePath}\"";
-            Win32Helper.MciSendString("stop movie", "", 0, 0);
-            Win32Helper.MciSendString($"save movie {cachePathWithQuotes}", "", 0, 0);
-            Win32Helper.MciSendString("close movie", "", 0, 0);
-
-            _stopwatch.Stop();
-
+            if (string.IsNullOrEmpty(ChatString)) return;
             var info = new ChatInfoModel
             {
-                Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}",
+                Message = ChatString,
                 SenderId = _id,
-                Type = ChatMessageType.Audio,
-                Role = ChatRoleType.Sender,
-                Enclosure = cachePath
+                Type = ChatMessageType.String,
+                Role = ChatRoleType.Sender
             };
             ChatInfos.Add(info);
             Messenger.Default.Send(info, MessageToken.SendChatMessage);
+            ChatString = string.Empty;
         }
+    }
 
-        public RelayCommand OpenImageCmd => new(OpenImage);
+    public RelayCommand<RoutedEventArgs> ReadMessageCmd => new(ReadMessage);
 
-        private void OpenImage()
+    private void ReadMessage(RoutedEventArgs e)
+    {
+        if (e.OriginalSource is FrameworkElement { Tag: ChatInfoModel info })
         {
-            var dialog = new OpenFileDialog();
-            if (dialog.ShowDialog() == true)
+            if (info.Type == ChatMessageType.Image)
             {
-                var fileName = dialog.FileName;
-                if (File.Exists(fileName))
+                new ImageBrowser(new Uri(info.Enclosure.ToString()))
                 {
-                    var info = new ChatInfoModel
-                    {
-                        Message = BitmapFrame.Create(new Uri(fileName)),
-                        SenderId = _id,
-                        Type = ChatMessageType.Image,
-                        Role = ChatRoleType.Sender,
-                        Enclosure = fileName
-                    };
-                    ChatInfos.Add(info);
-                    Messenger.Default.Send(info, MessageToken.SendChatMessage);
-                }
+                    Owner = WindowHelper.GetActiveWindow()
+                }.Show();
+            }
+            else if (info.Type == ChatMessageType.Audio)
+            {
+                var player = new SoundPlayer(info.Enclosure.ToString());
+                player.PlaySync();
             }
         }
     }
-}
+
+    public RelayCommand StartRecordCmd => new(StartRecord);
+
+    private void StartRecord()
+    {
+        Win32Helper.MciSendString("set wave bitpersample 8", "", 0, 0);
+        Win32Helper.MciSendString("set wave samplespersec 20000", "", 0, 0);
+        Win32Helper.MciSendString("set wave channels 2", "", 0, 0);
+        Win32Helper.MciSendString("set wave format tag pcm", "", 0, 0);
+        Win32Helper.MciSendString("open new type WAVEAudio alias movie", "", 0, 0);
+        Win32Helper.MciSendString("record movie", "", 0, 0);
+
+        _stopwatch.Reset();
+        _stopwatch.Start();
+    }
+
+    public RelayCommand StopRecordCmd => new(StopRecord);
+
+    private void StopRecord()
+    {
+        if (!Directory.Exists(AudioCachePath))
+        {
+            try
+            {
+                Directory.CreateDirectory(AudioCachePath);
+            }
+            catch (Exception e)
+            {
+                Growl.Error(e.Message);
+                return;
+            }
+        }
+
+        var cachePath = $"{AudioCachePath}\\{Guid.NewGuid().ToString()}";
+        var cachePathWithQuotes = $"\"{cachePath}\"";
+        Win32Helper.MciSendString("stop movie", "", 0, 0);
+        Win32Helper.MciSendString($"save movie {cachePathWithQuotes}", "", 0, 0);
+        Win32Helper.MciSendString("close movie", "", 0, 0);
+
+        _stopwatch.Stop();
+
+        var info = new ChatInfoModel
+        {
+            Message = $"{_stopwatch.Elapsed.Seconds.ToString()} {Properties.Langs.Lang.Second}",
+            SenderId = _id,
+            Type = ChatMessageType.Audio,
+            Role = ChatRoleType.Sender,
+            Enclosure = cachePath
+        };
+        ChatInfos.Add(info);
+        Messenger.Default.Send(info, MessageToken.SendChatMessage);
+    }
+
+    public RelayCommand OpenImageCmd => new(OpenImage);
+
+    private void OpenImage()
+    {
+        var dialog = new OpenFileDialog();
+        if (dialog.ShowDialog() == true)
+        {
+            var fileName = dialog.FileName;
+            if (File.Exists(fileName))
+            {
+                var info = new ChatInfoModel
+                {
+                    Message = BitmapFrame.Create(new Uri(fileName)),
+                    SenderId = _id,
+                    Type = ChatMessageType.Image,
+                    Role = ChatRoleType.Sender,
+                    Enclosure = fileName
+                };
+                ChatInfos.Add(info);
+                Messenger.Default.Send(info, MessageToken.SendChatMessage);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
index ee4c3f14..83e1eba3 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
@@ -3,36 +3,35 @@ using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 using HandyControl.Tools.Extension;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
 {
-    public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<string>
+    public Action CloseAction { get; set; }
+
+    private string _result;
+
+    public string Result
     {
-        public Action CloseAction { get; set; }
-
-        private string _result;
-
-        public string Result
-        {
-            get => _result;
+        get => _result;
 #if NET40
-            set => Set(nameof(Result), ref _result, value);
+        set => Set(nameof(Result), ref _result, value);
 #else
             set => Set(ref _result, value);
 #endif
-        }
+    }
 
-        private string _message;
+    private string _message;
 
-        public string Message
-        {
-            get => _message;
+    public string Message
+    {
+        get => _message;
 #if NET40
-            set => Set(nameof(Message), ref _message, value);
+        set => Set(nameof(Message), ref _message, value);
 #else
             set => Set(ref _message, value);
 #endif
-        }
-
-        public RelayCommand CloseCmd => new(() => CloseAction?.Invoke());
     }
-}
+
+    public RelayCommand CloseCmd => new(() => CloseAction?.Invoke());
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
index 4a8e2d33..dd3f2446 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
@@ -4,21 +4,21 @@ using HandyControl.Collections;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
-{
-    public class AutoCompleteTextBoxDemoViewModel : ViewModelBase
-    {
-        private string _searchText;
+namespace HandyControlDemo.ViewModel;
 
-        public string SearchText
-        {
-            get => _searchText;
+public class AutoCompleteTextBoxDemoViewModel : ViewModelBase
+{
+    private string _searchText;
+
+    public string SearchText
+    {
+        get => _searchText;
 #if NET40
-            set
-            {
-                Set(nameof(SearchText), ref _searchText, value);
-                FilterItems(value);
-            }
+        set
+        {
+            Set(nameof(SearchText), ref _searchText, value);
+            FilterItems(value);
+        }
 #else
             set
             {
@@ -26,32 +26,31 @@ namespace HandyControlDemo.ViewModel
                 FilterItems(value);
             }
 #endif
-        }
-
-        public ManualObservableCollection<DemoDataModel> Items { get; set; } = new();
-
-        private readonly List<DemoDataModel> _dataList;
-
-        public AutoCompleteTextBoxDemoViewModel(DataService dataService)
-        {
-            _dataList = dataService.GetDemoDataList(10);
-        }
-
-        private void FilterItems(string key)
-        {
-            Items.CanNotify = false;
-
-            Items.Clear();
-
-            foreach (var data in _dataList)
-            {
-                if (data.Name.ToLower().Contains(key.ToLower()))
-                {
-                    Items.Add(data);
-                }
-            }
-
-            Items.CanNotify = true;
-        }
     }
-}
+
+    public ManualObservableCollection<DemoDataModel> Items { get; set; } = new();
+
+    private readonly List<DemoDataModel> _dataList;
+
+    public AutoCompleteTextBoxDemoViewModel(DataService dataService)
+    {
+        _dataList = dataService.GetDemoDataList(10);
+    }
+
+    private void FilterItems(string key)
+    {
+        Items.CanNotify = false;
+
+        Items.Clear();
+
+        foreach (var data in _dataList)
+        {
+            if (data.Name.ToLower().Contains(key.ToLower()))
+            {
+                Items.Add(data);
+            }
+        }
+
+        Items.CanNotify = true;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
index d621cbef..a12b7a5c 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
@@ -1,22 +1,21 @@
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
 
-namespace HandyControlDemo.ViewModel
-{
-    public class BadgeDemoViewModel : ViewModelBase
-    {
-        private int _count = 1;
+namespace HandyControlDemo.ViewModel;
 
-        public int Count
-        {
-            get => _count;
+public class BadgeDemoViewModel : ViewModelBase
+{
+    private int _count = 1;
+
+    public int Count
+    {
+        get => _count;
 #if NET40
-            set => Set(nameof(Count), ref _count, value);
+        set => Set(nameof(Count), ref _count, value);
 #else
             set => Set(ref _count, value);
 #endif
-        }
-
-        public RelayCommand CountCmd => new(() => Count++);
     }
-}
+
+    public RelayCommand CountCmd => new(() => Count++);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
index d48468a3..8e6157eb 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
@@ -2,26 +2,25 @@
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class CardDemoViewModel : DemoViewModelBase<CardModel>
 {
-    public class CardDemoViewModel : DemoViewModelBase<CardModel>
+    private readonly DataService _dataService;
+
+    public CardDemoViewModel(DataService dataService)
     {
-        private readonly DataService _dataService;
-
-        public CardDemoViewModel(DataService dataService)
-        {
-            _dataService = dataService;
-            DataList = dataService.GetCardDataList();
-        }
-
-        public RelayCommand AddItemCmd => new(() => DataList.Insert(0, _dataService.GetCardData()));
-
-        public RelayCommand RemoveItemCmd => new(() =>
-        {
-            if (DataList.Count > 0)
-            {
-                DataList.RemoveAt(0);
-            }
-        });
+        _dataService = dataService;
+        DataList = dataService.GetCardDataList();
     }
-}
+
+    public RelayCommand AddItemCmd => new(() => DataList.Insert(0, _dataService.GetCardData()));
+
+    public RelayCommand RemoveItemCmd => new(() =>
+    {
+        if (DataList.Count > 0)
+        {
+            DataList.RemoveAt(0);
+        }
+    });
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
index 58060aab..35ba2198 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
@@ -1,10 +1,9 @@
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class CoverViewModel : DemoViewModelBase<CoverViewDemoModel>
 {
-    public class CoverViewModel : DemoViewModelBase<CoverViewDemoModel>
-    {
-        public CoverViewModel(DataService dataService) => DataList = dataService.GetCoverViewDemoDataList();
-    }
-}
+    public CoverViewModel(DataService dataService) => DataList = dataService.GetCoverViewDemoDataList();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
index 7f9572c1..1f308be7 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
@@ -11,52 +11,52 @@ using HandyControlDemo.Data;
 using HandyControlDemo.UserControl;
 using HandyControlDemo.Window;
 
-namespace HandyControlDemo.ViewModel
-{
-    public class DialogDemoViewModel : ViewModelBase
-    {
-        private string _dialogResult;
+namespace HandyControlDemo.ViewModel;
 
-        public string DialogResult
-        {
-            get => _dialogResult;
+public class DialogDemoViewModel : ViewModelBase
+{
+    private string _dialogResult;
+
+    public string DialogResult
+    {
+        get => _dialogResult;
 #if NET40
-            set => Set(nameof(DialogResult), ref _dialogResult, value);
+        set => Set(nameof(DialogResult), ref _dialogResult, value);
 #else
             set => Set(ref _dialogResult, value);
 #endif
-        }
+    }
 
-        public RelayCommand<FrameworkElement> ShowTextCmd => new(ShowText);
+    public RelayCommand<FrameworkElement> ShowTextCmd => new(ShowText);
 
-        private void ShowText(FrameworkElement element)
+    private void ShowText(FrameworkElement element)
+    {
+        if (element == null)
         {
-            if (element == null)
-            {
-                Dialog.Show(new TextDialog());
-            }
-            else
-            {
-                Dialog.Show(new TextDialog(), MessageToken.DialogContainer);
-            }
+            Dialog.Show(new TextDialog());
         }
+        else
+        {
+            Dialog.Show(new TextDialog(), MessageToken.DialogContainer);
+        }
+    }
 
 #if NET40
-        public RelayCommand<bool> ShowInteractiveDialogCmd => new(ShowInteractiveDialog);
+    public RelayCommand<bool> ShowInteractiveDialogCmd => new(ShowInteractiveDialog);
 
-        private void ShowInteractiveDialog(bool withTimer)
+    private void ShowInteractiveDialog(bool withTimer)
+    {
+        if (!withTimer)
         {
-            if (!withTimer)
-            {
-                Dialog.Show<InteractiveDialog>()
-                    .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                    .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
-            }
-            else
-            {
-                Dialog.Show<TextDialogWithTimer>(MessageToken.MainWindow).GetResultAsync<string>();
-            }
+            Dialog.Show<InteractiveDialog>()
+                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                .GetResultAsync<string>().ContinueWith(str => DialogResult = str.Result);
         }
+        else
+        {
+            Dialog.Show<TextDialogWithTimer>(MessageToken.MainWindow).GetResultAsync<string>();
+        }
+    }
 #else
         public RelayCommand<bool> ShowInteractiveDialogCmd => new(async withTimer => await ShowInteractiveDialog(withTimer));
 
@@ -75,11 +75,10 @@ namespace HandyControlDemo.ViewModel
         }
 #endif
 
-        public RelayCommand NewWindowCmd => new(() => new DialogDemoWindow
-        {
-            Owner = Application.Current.MainWindow
-        }.Show());
+    public RelayCommand NewWindowCmd => new(() => new DialogDemoWindow
+    {
+        Owner = Application.Current.MainWindow
+    }.Show());
 
-        public RelayCommand<string> ShowWithTokenCmd => new(token => Dialog.Show(new TextDialog(), token));
-    }
-}
+    public RelayCommand<string> ShowWithTokenCmd => new(token => Dialog.Show(new TextDialog(), token));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
index af86c3d6..f5144690 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -4,97 +4,96 @@ using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Window;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class GrowlDemoViewModel
 {
-    public class GrowlDemoViewModel
+    private readonly string _token;
+
+    public GrowlDemoViewModel()
     {
-        private readonly string _token;
 
-        public GrowlDemoViewModel()
-        {
+    }
 
-        }
+    public GrowlDemoViewModel(string token)
+    {
+        _token = token;
+    }
 
-        public GrowlDemoViewModel(string token)
-        {
-            _token = token;
-        }
+    #region Window
 
-        #region Window
+    public RelayCommand InfoCmd => new(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token));
 
-        public RelayCommand InfoCmd => new(() => Growl.Info(Properties.Langs.Lang.GrowlInfo, _token));
+    public RelayCommand SuccessCmd => new(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token));
 
-        public RelayCommand SuccessCmd => new(() => Growl.Success(Properties.Langs.Lang.GrowlSuccess, _token));
-
-        public RelayCommand WarningCmd => new(() => Growl.Warning(new GrowlInfo
-        {
-            Message = Properties.Langs.Lang.GrowlWarning,
-            CancelStr = Properties.Langs.Lang.Ignore,
-            ActionBeforeClose = isConfirmed =>
-            {
-                Growl.Info(isConfirmed.ToString());
-                return true;
-            },
-            Token = _token
-        }));
-
-        public RelayCommand ErrorCmd => new(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token));
-
-        public RelayCommand AskCmd => new(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
+    public RelayCommand WarningCmd => new(() => Growl.Warning(new GrowlInfo
+    {
+        Message = Properties.Langs.Lang.GrowlWarning,
+        CancelStr = Properties.Langs.Lang.Ignore,
+        ActionBeforeClose = isConfirmed =>
         {
             Growl.Info(isConfirmed.ToString());
             return true;
-        }, _token));
+        },
+        Token = _token
+    }));
 
-        public RelayCommand FatalCmd => new(() => Growl.Fatal(new GrowlInfo
-        {
-            Message = Properties.Langs.Lang.GrowlFatal,
-            ShowDateTime = false,
-            Token = _token
-        }));
+    public RelayCommand ErrorCmd => new(() => Growl.Error(Properties.Langs.Lang.GrowlError, _token));
 
-        public RelayCommand ClearCmd => new(() => Growl.Clear(_token));
+    public RelayCommand AskCmd => new(() => Growl.Ask(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
+    {
+        Growl.Info(isConfirmed.ToString());
+        return true;
+    }, _token));
 
-        #endregion
+    public RelayCommand FatalCmd => new(() => Growl.Fatal(new GrowlInfo
+    {
+        Message = Properties.Langs.Lang.GrowlFatal,
+        ShowDateTime = false,
+        Token = _token
+    }));
 
-        #region Desktop
+    public RelayCommand ClearCmd => new(() => Growl.Clear(_token));
 
-        public RelayCommand InfoGlobalCmd => new(() => Growl.InfoGlobal(Properties.Langs.Lang.GrowlInfo));
+    #endregion
 
-        public RelayCommand SuccessGlobalCmd => new(() => Growl.SuccessGlobal(Properties.Langs.Lang.GrowlSuccess));
+    #region Desktop
 
-        public RelayCommand WarningGlobalCmd => new(() => Growl.WarningGlobal(new GrowlInfo
-        {
-            Message = Properties.Langs.Lang.GrowlWarning,
-            CancelStr = Properties.Langs.Lang.Ignore,
-            ActionBeforeClose = isConfirmed =>
-            {
-                Growl.InfoGlobal(isConfirmed.ToString());
-                return true;
-            }
-        }));
+    public RelayCommand InfoGlobalCmd => new(() => Growl.InfoGlobal(Properties.Langs.Lang.GrowlInfo));
 
-        public RelayCommand ErrorGlobalCmd => new(() => Growl.ErrorGlobal(Properties.Langs.Lang.GrowlError));
+    public RelayCommand SuccessGlobalCmd => new(() => Growl.SuccessGlobal(Properties.Langs.Lang.GrowlSuccess));
 
-        public RelayCommand AskGlobalCmd => new(() => Growl.AskGlobal(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
+    public RelayCommand WarningGlobalCmd => new(() => Growl.WarningGlobal(new GrowlInfo
+    {
+        Message = Properties.Langs.Lang.GrowlWarning,
+        CancelStr = Properties.Langs.Lang.Ignore,
+        ActionBeforeClose = isConfirmed =>
         {
             Growl.InfoGlobal(isConfirmed.ToString());
             return true;
-        }));
+        }
+    }));
 
-        public RelayCommand FatalGlobalCmd => new(() => Growl.FatalGlobal(new GrowlInfo
-        {
-            Message = Properties.Langs.Lang.GrowlFatal,
-            ShowDateTime = false
-        }));
+    public RelayCommand ErrorGlobalCmd => new(() => Growl.ErrorGlobal(Properties.Langs.Lang.GrowlError));
 
-        public RelayCommand ClearGlobalCmd => new(Growl.ClearGlobal);
+    public RelayCommand AskGlobalCmd => new(() => Growl.AskGlobal(Properties.Langs.Lang.GrowlAsk, isConfirmed =>
+    {
+        Growl.InfoGlobal(isConfirmed.ToString());
+        return true;
+    }));
 
-        #endregion
+    public RelayCommand FatalGlobalCmd => new(() => Growl.FatalGlobal(new GrowlInfo
+    {
+        Message = Properties.Langs.Lang.GrowlFatal,
+        ShowDateTime = false
+    }));
 
-        public RelayCommand NewWindowCmd => new(() => new GrowlDemoWindow
-        {
-            Owner = Application.Current.MainWindow
-        }.Show());
-    }
-}
+    public RelayCommand ClearGlobalCmd => new(Growl.ClearGlobal);
+
+    #endregion
+
+    public RelayCommand NewWindowCmd => new(() => new GrowlDemoWindow
+    {
+        Owner = Application.Current.MainWindow
+    }.Show());
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
index 4be859e6..13c34579 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
@@ -2,11 +2,10 @@
 using GalaSoft.MvvmLight.Command;
 using HandyControl.Controls;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class ImageBrowserDemoViewModel
 {
-    public class ImageBrowserDemoViewModel
-    {
-        public RelayCommand OpenImgCmd => new(() =>
-            new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show());
-    }
-}
+    public RelayCommand OpenImgCmd => new(() =>
+        new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show());
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
index be74cc4c..5f278c71 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
@@ -4,34 +4,33 @@ using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.UserControl;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class NotificationDemoViewModel : ViewModelBase
 {
-    public class NotificationDemoViewModel : ViewModelBase
+    public RelayCommand OpenCmd => new(() => Notification.Show(new AppNotification(), ShowAnimation, StaysOpen));
+
+    private ShowAnimation _showAnimation;
+
+    public ShowAnimation ShowAnimation
     {
-        public RelayCommand OpenCmd => new(() => Notification.Show(new AppNotification(), ShowAnimation, StaysOpen));
-
-        private ShowAnimation _showAnimation;
-
-        public ShowAnimation ShowAnimation
-        {
-            get => _showAnimation;
+        get => _showAnimation;
 #if NET40
-            set => Set(nameof(ShowAnimation) ,ref _showAnimation, value);
+        set => Set(nameof(ShowAnimation) ,ref _showAnimation, value);
 #else
             set => Set(ref _showAnimation, value);
 #endif
-        }
+    }
 
-        private bool _staysOpen = true;
+    private bool _staysOpen = true;
 
-        public bool StaysOpen
-        {
-            get => _staysOpen;
+    public bool StaysOpen
+    {
+        get => _staysOpen;
 #if NET40
-            set => Set(nameof(StaysOpen) ,ref _staysOpen, value);
+        set => Set(nameof(StaysOpen) ,ref _staysOpen, value);
 #else
             set => Set(ref _staysOpen, value);
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
index 88e29879..abd00ae5 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
@@ -5,114 +5,113 @@ using HandyControl.Controls;
 using HandyControl.Data;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class NotifyIconDemoViewModel : ViewModelBase
 {
-    public class NotifyIconDemoViewModel : ViewModelBase
+    private bool _isCleanup;
+
+    private bool _reversed;
+
+    private string _content = "Hello~~~";
+
+    public string Content
     {
-        private bool _isCleanup;
-
-        private bool _reversed;
-
-        private string _content = "Hello~~~";
-
-        public string Content
-        {
-            get => _content;
+        get => _content;
 #if NET40
             set => Set(nameof(Content), ref _content, value);
 #else
-            set => Set(ref _content, value);
+        set => Set(ref _content, value);
 #endif
-        }
+    }
 
-        private bool _contextMenuIsShow;
+    private bool _contextMenuIsShow;
 
-        public bool ContextMenuIsShow
+    public bool ContextMenuIsShow
+    {
+        get => _contextMenuIsShow;
+        set
         {
-            get => _contextMenuIsShow;
-            set
-            {
 #if NET40
                 Set(nameof(ContextMenuIsShow), ref _contextMenuIsShow, value);
 #else
-                Set(ref _contextMenuIsShow, value);
+            Set(ref _contextMenuIsShow, value);
 #endif
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-                if (!_isCleanup && !_reversed)
-                {
-                    _reversed = true;
-                    ContextContentIsShow = !value;
-                    _reversed = false;
-                }
+            GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
+            if (!_isCleanup && !_reversed)
+            {
+                _reversed = true;
+                ContextContentIsShow = !value;
+                _reversed = false;
             }
         }
+    }
 
-        private bool _contextMenuIsBlink;
+    private bool _contextMenuIsBlink;
 
-        public bool ContextMenuIsBlink
-        {
-            get => _contextMenuIsBlink;
+    public bool ContextMenuIsBlink
+    {
+        get => _contextMenuIsBlink;
 #if NET40
             set => Set(nameof(ContextMenuIsBlink), ref _contextMenuIsBlink, value);
 #else
-            set => Set(ref _contextMenuIsBlink, value);
+        set => Set(ref _contextMenuIsBlink, value);
 #endif
-        }
+    }
 
-        private bool _contextContentIsShow;
+    private bool _contextContentIsShow;
 
-        public bool ContextContentIsShow
+    public bool ContextContentIsShow
+    {
+        get => _contextContentIsShow;
+        set
         {
-            get => _contextContentIsShow;
-            set
-            {
 #if NET40
                 Set(nameof(ContextContentIsShow), ref _contextContentIsShow, value);
 #else
-                Set(ref _contextContentIsShow, value);
+            Set(ref _contextContentIsShow, value);
 #endif
-                GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
-                if (!_isCleanup && !_reversed)
-                {
-                    _reversed = true;
-                    ContextMenuIsShow = !value;
-                    _reversed = false;
-                }
+            GlobalData.NotifyIconIsShow = ContextMenuIsShow || ContextContentIsShow;
+            if (!_isCleanup && !_reversed)
+            {
+                _reversed = true;
+                ContextMenuIsShow = !value;
+                _reversed = false;
             }
         }
+    }
 
-        private bool _contextContentIsBlink;
+    private bool _contextContentIsBlink;
 
-        public bool ContextContentIsBlink
-        {
-            get => _contextContentIsBlink;
+    public bool ContextContentIsBlink
+    {
+        get => _contextContentIsBlink;
 #if NET40
             set => Set(nameof(ContextContentIsBlink), ref _contextContentIsBlink, value);
 #else
-            set => Set(ref _contextContentIsBlink, value);
+        set => Set(ref _contextContentIsBlink, value);
 #endif
-        }
-
-        public RelayCommand<object> MouseCmd => new(str => Growl.Info(str.ToString()));
-
-        public RelayCommand SendNotificationCmd => new(SendNotification);
-
-        private void SendNotification()
-        {
-            NotifyIcon.ShowBalloonTip("HandyControl", Content, NotifyIconInfoType.None, ContextMenuIsShow ? MessageToken.NotifyIconDemo : MessageToken.NotifyIconContextDemo);
-        }
-
-        public override void Cleanup()
-        {
-            base.Cleanup();
-
-            _isCleanup = true;
-            ContextMenuIsShow = false;
-            ContextMenuIsBlink = false;
-            ContextContentIsShow = false;
-            ContextContentIsBlink = false;
-            GlobalData.NotifyIconIsShow = false;
-            _isCleanup = false;
-        }
     }
-}
+
+    public RelayCommand<object> MouseCmd => new(str => Growl.Info(str.ToString()));
+
+    public RelayCommand SendNotificationCmd => new(SendNotification);
+
+    private void SendNotification()
+    {
+        NotifyIcon.ShowBalloonTip("HandyControl", Content, NotifyIconInfoType.None, ContextMenuIsShow ? MessageToken.NotifyIconDemo : MessageToken.NotifyIconContextDemo);
+    }
+
+    public override void Cleanup()
+    {
+        base.Cleanup();
+
+        _isCleanup = true;
+        ContextMenuIsShow = false;
+        ContextMenuIsBlink = false;
+        ContextContentIsShow = false;
+        ContextContentIsBlink = false;
+        GlobalData.NotifyIconIsShow = false;
+        _isCleanup = false;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
index f2d71b32..c3665958 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
@@ -5,50 +5,49 @@ using HandyControl.Data;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
 {
-    public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
+    /// <summary>
+    ///     所有数据
+    /// </summary>
+    private readonly List<DemoDataModel> _totalDataList;
+
+    /// <summary>
+    ///     页码
+    /// </summary>
+    private int _pageIndex = 1;
+
+    /// <summary>
+    ///     页码
+    /// </summary>
+    public int PageIndex
     {
-        /// <summary>
-        ///     所有数据
-        /// </summary>
-        private readonly List<DemoDataModel> _totalDataList;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        private int _pageIndex = 1;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
-        {
-            get => _pageIndex;
+        get => _pageIndex;
 #if NET40
             set => Set(nameof(PageIndex), ref _pageIndex, value);
 #else
-            set => Set(ref _pageIndex, value);
+        set => Set(ref _pageIndex, value);
 #endif
-        }
-
-        public PaginationDemoViewModel(DataService dataService)
-        {
-            _totalDataList = dataService.GetDemoDataList(100);
-            DataList = _totalDataList.Take(10).ToList();
-        }
-
-        /// <summary>
-        ///     页码改变命令
-        /// </summary>
-        public RelayCommand<FunctionEventArgs<int>> PageUpdatedCmd => new(PageUpdated);
-
-        /// <summary>
-        ///     页码改变
-        /// </summary>
-        private void PageUpdated(FunctionEventArgs<int> info)
-        {
-            DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
-        }
     }
-}
+
+    public PaginationDemoViewModel(DataService dataService)
+    {
+        _totalDataList = dataService.GetDemoDataList(100);
+        DataList = _totalDataList.Take(10).ToList();
+    }
+
+    /// <summary>
+    ///     页码改变命令
+    /// </summary>
+    public RelayCommand<FunctionEventArgs<int>> PageUpdatedCmd => new(PageUpdated);
+
+    /// <summary>
+    ///     页码改变
+    /// </summary>
+    private void PageUpdated(FunctionEventArgs<int> info)
+    {
+        DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
index 461a2e66..8fc78147 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
@@ -3,16 +3,15 @@ using GalaSoft.MvvmLight.Command;
 using HandyControl.Controls;
 using HandyControl.Data;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class SideMenuDemoViewModel : ViewModelBase
 {
-    public class SideMenuDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<FunctionEventArgs<object>> SwitchItemCmd => new(SwitchItem);
+    public RelayCommand<FunctionEventArgs<object>> SwitchItemCmd => new(SwitchItem);
 
-        private void SwitchItem(FunctionEventArgs<object> info) => Growl.Info((info.Info as SideMenuItem)?.Header.ToString());
+    private void SwitchItem(FunctionEventArgs<object> info) => Growl.Info((info.Info as SideMenuItem)?.Header.ToString());
 
-        public RelayCommand<string> SelectCmd => new(Select);
+    public RelayCommand<string> SelectCmd => new(Select);
 
-        private void Select(string header) => Growl.Success(header);
-    }
-}
+    private void Select(string header) => Growl.Success(header);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
index 65ab3c8e..7fd615c4 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
@@ -2,10 +2,9 @@
 using GalaSoft.MvvmLight.Command;
 using HandyControl.Controls;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class SplitButtonDemoViewModel : ViewModelBase
 {
-    public class SplitButtonDemoViewModel : ViewModelBase
-    {
-        public RelayCommand<string> SelectCmd => new(str => Growl.Info(str));
-    }
-}
+    public RelayCommand<string> SelectCmd => new(str => Growl.Info(str));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
index 9de153b2..195a2774 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
@@ -2,10 +2,9 @@
 using HandyControl.Controls;
 using HandyControlDemo.UserControl;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class SpriteDemoViewModel
 {
-    public class SpriteDemoViewModel
-    {
-        public RelayCommand OpenCmd => new(() => Sprite.Show(new AppSprite()));
-    }
-}
+    public RelayCommand OpenCmd => new(() => Sprite.Show(new AppSprite()));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
index 41f4de2f..24ddc640 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
@@ -5,48 +5,47 @@ using HandyControl.Controls;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
 {
-    public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
+    public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
+
+    private int _stepIndex;
+
+    public int StepIndex
     {
-        public StepBarDemoViewModel(DataService dataService) => DataList = dataService.GetStepBarDemoDataList();
-
-        private int _stepIndex;
-
-        public int StepIndex
-        {
-            get => _stepIndex;
+        get => _stepIndex;
 #if NET40
-            set => Set(nameof(StepIndex), ref _stepIndex, value);
+        set => Set(nameof(StepIndex), ref _stepIndex, value);
 #else
             set => Set(ref _stepIndex, value);
 #endif
-        }
+    }
 
-        /// <summary>
-        ///     下一步
-        /// </summary>
-        public RelayCommand<Panel> NextCmd => new(Next);
+    /// <summary>
+    ///     下一步
+    /// </summary>
+    public RelayCommand<Panel> NextCmd => new(Next);
 
-        /// <summary>
-        ///     上一步
-        /// </summary>
-        public RelayCommand<Panel> PrevCmd => new(Prev);
+    /// <summary>
+    ///     上一步
+    /// </summary>
+    public RelayCommand<Panel> PrevCmd => new(Prev);
 
-        private void Next(Panel panel)
+    private void Next(Panel panel)
+    {
+        foreach (var stepBar in panel.Children.OfType<StepBar>())
         {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Next();
-            }
-        }
-
-        private void Prev(Panel panel)
-        {
-            foreach (var stepBar in panel.Children.OfType<StepBar>())
-            {
-                stepBar.Prev();
-            }
+            stepBar.Next();
         }
     }
-}
+
+    private void Prev(Panel panel)
+    {
+        foreach (var stepBar in panel.Children.OfType<StepBar>())
+        {
+            stepBar.Prev();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
index 7d4ea723..06e05db7 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
@@ -5,24 +5,23 @@ using HandyControl.Data;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class TabControlDemoViewModel : DemoViewModelBase<TabControlDemoModel>
 {
-    public class TabControlDemoViewModel : DemoViewModelBase<TabControlDemoModel>
+    public TabControlDemoViewModel(DataService dataService) => DataList = dataService.GetTabControlDemoDataList();
+
+    public RelayCommand<CancelRoutedEventArgs> ClosingCmd => new(Closing);
+
+    private void Closing(CancelRoutedEventArgs args)
     {
-        public TabControlDemoViewModel(DataService dataService) => DataList = dataService.GetTabControlDemoDataList();
-
-        public RelayCommand<CancelRoutedEventArgs> ClosingCmd => new(Closing);
-
-        private void Closing(CancelRoutedEventArgs args)
-        {
-            Growl.Info($"{(args.OriginalSource as TabItem)?.Header} Closing");
-        }
-
-        public RelayCommand<RoutedEventArgs> ClosedCmd => new(Closed);
-
-        private void Closed(RoutedEventArgs args)
-        {
-            Growl.Info($"{(args.OriginalSource as TabItem)?.Header} Closed");
-        }
+        Growl.Info($"{(args.OriginalSource as TabItem)?.Header} Closing");
     }
-}
+
+    public RelayCommand<RoutedEventArgs> ClosedCmd => new(Closed);
+
+    private void Closed(RoutedEventArgs args)
+    {
+        Growl.Info($"{(args.OriginalSource as TabItem)?.Header} Closed");
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
index b73eaae6..8c65b98a 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
@@ -6,43 +6,42 @@ using HandyControlDemo.Data;
 using HandyControlDemo.Properties.Langs;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class TagDemoViewModel : ViewModelBase
 {
-    public class TagDemoViewModel : ViewModelBase
+    public TagDemoViewModel(DataService dataService)
     {
-        public TagDemoViewModel(DataService dataService)
-        {
-            DataList = new ObservableCollection<DemoDataModel>(dataService.GetDemoDataList(10));
-        }
+        DataList = new ObservableCollection<DemoDataModel>(dataService.GetDemoDataList(10));
+    }
 
-        public ObservableCollection<DemoDataModel> DataList { get; set; }
+    public ObservableCollection<DemoDataModel> DataList { get; set; }
 
-        private string _tagName;
+    private string _tagName;
 
-        public string TagName
-        {
-            get => _tagName;
+    public string TagName
+    {
+        get => _tagName;
 #if NET40
-            set => Set(nameof(TagName), ref _tagName, value);
+        set => Set(nameof(TagName), ref _tagName, value);
 #else
             set => Set(ref _tagName, value);
 #endif
+    }
+
+    public RelayCommand AddItemCmd => new(() =>
+    {
+        if (string.IsNullOrEmpty(TagName))
+        {
+            Growl.Warning(Lang.PlsEnterContent);
+            return;
         }
 
-        public RelayCommand AddItemCmd => new(() =>
+        DataList.Insert(0, new DemoDataModel
         {
-            if (string.IsNullOrEmpty(TagName))
-            {
-                Growl.Warning(Lang.PlsEnterContent);
-                return;
-            }
-
-            DataList.Insert(0, new DemoDataModel
-            {
-                IsSelected = DataList.Count % 2 == 0,
-                Name = TagName
-            });
-            TagName = string.Empty;
+            IsSelected = DataList.Count % 2 == 0,
+            Name = TagName
         });
-    }
-}
+        TagName = string.Empty;
+    });
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
index 227fac1b..bef40e81 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
@@ -2,19 +2,18 @@
 using GalaSoft.MvvmLight.Command;
 using HandyControlDemo.Tools;
 
-namespace HandyControlDemo.ViewModel
-{
-    public class WindowDemoViewModel
-    {
-        public RelayCommand<string> OpenWindowCmd => new(OpenWindow);
+namespace HandyControlDemo.ViewModel;
 
-        private void OpenWindow(string windowTag)
+public class WindowDemoViewModel
+{
+    public RelayCommand<string> OpenWindowCmd => new(OpenWindow);
+
+    private void OpenWindow(string windowTag)
+    {
+        if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window)
         {
-            if (AssemblyHelper.CreateInternalInstance($"Window.{windowTag}") is System.Windows.Window window)
-            {
-                window.Owner = Application.Current.MainWindow;
-                window.ShowDialog();
-            }
+            window.Owner = Application.Current.MainWindow;
+            window.ShowDialog();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
index d20b6d65..349c78b8 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
@@ -1,26 +1,25 @@
 using System.Collections.Generic;
 using GalaSoft.MvvmLight;
 
-namespace HandyControlDemo.ViewModel
-{
-    public class DemoViewModelBase<T> : ViewModelBase
-    {
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        private IList<T> _dataList;
+namespace HandyControlDemo.ViewModel;
 
-        /// <summary>
-        ///     数据列表
-        /// </summary>
-        public IList<T> DataList
-        {
-            get => _dataList;
+public class DemoViewModelBase<T> : ViewModelBase
+{
+    /// <summary>
+    ///     数据列表
+    /// </summary>
+    private IList<T> _dataList;
+
+    /// <summary>
+    ///     数据列表
+    /// </summary>
+    public IList<T> DataList
+    {
+        get => _dataList;
 #if NET40
-            set => Set(nameof(DataList), ref _dataList, value);
+        set => Set(nameof(DataList), ref _dataList, value);
 #else
             set => Set(ref _dataList, value);
 #endif       
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
index 85d1e5c9..b4b6021e 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
@@ -3,29 +3,28 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class ItemsDisplayViewModel : DemoViewModelBase<AvatarModel>
 {
-    public class ItemsDisplayViewModel : DemoViewModelBase<AvatarModel>
+    public ItemsDisplayViewModel(Func<List<AvatarModel>> getDataAction)
     {
-        public ItemsDisplayViewModel(Func<List<AvatarModel>> getDataAction)
-        {
 #if NET40
             Task.Factory.StartNew(() => DataList = getDataAction?.Invoke()).ContinueWith(obj => DataGot = true);
 #else
-            Task.Run(() => DataList = getDataAction?.Invoke()).ContinueWith(obj => DataGot = true);
+        Task.Run(() => DataList = getDataAction?.Invoke()).ContinueWith(obj => DataGot = true);
 #endif
-        }
+    }
 
-        private bool _dataGot;
+    private bool _dataGot;
 
-        public bool DataGot
-        {
-            get => _dataGot;
+    public bool DataGot
+    {
+        get => _dataGot;
 #if NET40
             set => Set(nameof(DataGot), ref _dataGot, value);
 #else
-            set => Set(ref _dataGot, value);
+        set => Set(ref _dataGot, value);
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
index d2b610fe..849ff600 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
@@ -14,178 +14,177 @@ using HandyControlDemo.Service;
 using HandyControlDemo.Tools;
 using HandyControlDemo.UserControl;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class MainViewModel : DemoViewModelBase<DemoDataModel>
 {
-    public class MainViewModel : DemoViewModelBase<DemoDataModel>
+    #region 字段
+
+    /// <summary>
+    ///     内容标题
+    /// </summary>
+    private object _contentTitle;
+
+    /// <summary>
+    ///     子内容
+    /// </summary>
+    private object _subContent;
+
+    private readonly DataService _dataService;
+
+    #endregion
+
+    public MainViewModel(DataService dataService)
     {
-        #region 字段
+        _dataService = dataService;
 
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        private object _contentTitle;
+        UpdateMainContent();
+        UpdateLeftContent();
+    }
 
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        private object _subContent;
+    #region 属性
 
-        private readonly DataService _dataService;
+    /// <summary>
+    ///     当前选中的demo项
+    /// </summary>
+    public DemoItemModel DemoItemCurrent { get; private set; }
 
-        #endregion
+    public DemoInfoModel DemoInfoCurrent { get; set; }
 
-        public MainViewModel(DataService dataService)
-        {
-            _dataService = dataService;
-
-            UpdateMainContent();
-            UpdateLeftContent();
-        }
-
-        #region 属性
-
-        /// <summary>
-        ///     当前选中的demo项
-        /// </summary>
-        public DemoItemModel DemoItemCurrent { get; private set; }
-
-        public DemoInfoModel DemoInfoCurrent { get; set; }
-
-        /// <summary>
-        ///     子内容
-        /// </summary>
-        public object SubContent
-        {
-            get => _subContent;
+    /// <summary>
+    ///     子内容
+    /// </summary>
+    public object SubContent
+    {
+        get => _subContent;
 #if NET40
-            set => Set(nameof(SubContent), ref _subContent, value);
+        set => Set(nameof(SubContent), ref _subContent, value);
 #else
             set => Set(ref _subContent, value);
 #endif
-        }
+    }
 
-        /// <summary>
-        ///     内容标题
-        /// </summary>
-        public object ContentTitle
-        {
-            get => _contentTitle;
+    /// <summary>
+    ///     内容标题
+    /// </summary>
+    public object ContentTitle
+    {
+        get => _contentTitle;
 #if NET40
-            set => Set(nameof(ContentTitle), ref _contentTitle, value);
+        set => Set(nameof(ContentTitle), ref _contentTitle, value);
 #else
             set => Set(ref _contentTitle, value);
 #endif
-        }
+    }
 
-        /// <summary>
-        ///     demo信息
-        /// </summary>
-        public ObservableCollection<DemoInfoModel> DemoInfoCollection { get; set; }
+    /// <summary>
+    ///     demo信息
+    /// </summary>
+    public ObservableCollection<DemoInfoModel> DemoInfoCollection { get; set; }
 
-        #endregion
+    #endregion
 
-        #region 命令
+    #region 命令
 
-        /// <summary>
-        ///     切换例子命令
-        /// </summary>
-        public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd => new(SwitchDemo);
+    /// <summary>
+    ///     切换例子命令
+    /// </summary>
+    public RelayCommand<SelectionChangedEventArgs> SwitchDemoCmd => new(SwitchDemo);
 
-        public RelayCommand OpenPracticalDemoCmd => new(OpenPracticalDemo);
+    public RelayCommand OpenPracticalDemoCmd => new(OpenPracticalDemo);
 
-        public RelayCommand GlobalShortcutInfoCmd => new(() => Growl.Info("Global Shortcut Info"));
+    public RelayCommand GlobalShortcutInfoCmd => new(() => Growl.Info("Global Shortcut Info"));
 
-        public RelayCommand GlobalShortcutWarningCmd => new(() => Growl.Warning("Global Shortcut Warning"));
+    public RelayCommand GlobalShortcutWarningCmd => new(() => Growl.Warning("Global Shortcut Warning"));
 
-        public RelayCommand OpenDocCmd => new(() =>
+    public RelayCommand OpenDocCmd => new(() =>
+    {
+        ControlCommands.OpenLink.Execute(_dataService.GetDemoUrl(DemoInfoCurrent, DemoItemCurrent));
+    });
+
+    #endregion
+
+    #region 方法
+
+    private void UpdateMainContent()
+    {
+        Messenger.Default.Register<object>(this, MessageToken.LoadShowContent, obj =>
         {
-            ControlCommands.OpenLink.Execute(_dataService.GetDemoUrl(DemoInfoCurrent, DemoItemCurrent));
+            if (SubContent is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+            SubContent = obj;
+        }, true);
+    }
+
+    private void UpdateLeftContent()
+    {
+        //clear status
+        Messenger.Default.Register<object>(this, MessageToken.ClearLeftSelected, obj =>
+        {
+            DemoItemCurrent = null;
+            foreach (var item in DemoInfoCollection)
+            {
+                item.SelectedIndex = -1;
+            }
         });
 
-        #endregion
-
-        #region 方法
-
-        private void UpdateMainContent()
+        Messenger.Default.Register<object>(this, MessageToken.LangUpdated, obj =>
         {
-            Messenger.Default.Register<object>(this, MessageToken.LoadShowContent, obj =>
-            {
-                if (SubContent is IDisposable disposable)
-                {
-                    disposable.Dispose();
-                }
-                SubContent = obj;
-            }, true);
-        }
+            if (DemoItemCurrent == null) return;
+            ContentTitle = LangProvider.GetLang(DemoItemCurrent.Name);
+        });
 
-        private void UpdateLeftContent()
-        {
-            //clear status
-            Messenger.Default.Register<object>(this, MessageToken.ClearLeftSelected, obj =>
-            {
-                DemoItemCurrent = null;
-                foreach (var item in DemoInfoCollection)
-                {
-                    item.SelectedIndex = -1;
-                }
-            });
-
-            Messenger.Default.Register<object>(this, MessageToken.LangUpdated, obj =>
-            {
-                if (DemoItemCurrent == null) return;
-                ContentTitle = LangProvider.GetLang(DemoItemCurrent.Name);
-            });
-
-            //load items
-            DemoInfoCollection = new ObservableCollection<DemoInfoModel>();
+        //load items
+        DemoInfoCollection = new ObservableCollection<DemoInfoModel>();
 #if NET40
-            Task.Factory.StartNew(() =>
+        Task.Factory.StartNew(() =>
 #else
             Task.Run(() =>
 #endif
-            {
-                DataList = _dataService.GetDemoDataList();
+        {
+            DataList = _dataService.GetDemoDataList();
 
-                foreach (var item in _dataService.GetDemoInfo())
+            foreach (var item in _dataService.GetDemoInfo())
+            {
+                Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                 {
-                    Application.Current.Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        DemoInfoCollection.Add(item);
-                    }), DispatcherPriority.ApplicationIdle);
-                }
-            });
-        }
-
-        /// <summary>
-        ///     切换例子
-        /// </summary>
-        private void SwitchDemo(SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0) return;
-            if (e.AddedItems[0] is DemoItemModel item)
-            {
-                if (Equals(DemoItemCurrent, item)) return;
-                SwitchDemo(item);
+                    DemoInfoCollection.Add(item);
+                }), DispatcherPriority.ApplicationIdle);
             }
-        }
-
-        private void SwitchDemo(DemoItemModel item)
-        {
-            DemoItemCurrent = item;
-            ContentTitle = LangProvider.GetLang(item.Name);
-            var obj = AssemblyHelper.ResolveByKey(item.TargetCtlName);
-            var ctl = obj ?? AssemblyHelper.CreateInternalInstance($"UserControl.{item.TargetCtlName}");
-            Messenger.Default.Send(ctl is IFull, MessageToken.FullSwitch);
-            Messenger.Default.Send(ctl, MessageToken.LoadShowContent);
-        }
-
-        private void OpenPracticalDemo()
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-        }
-
-        #endregion
+        });
     }
-}
+
+    /// <summary>
+    ///     切换例子
+    /// </summary>
+    private void SwitchDemo(SelectionChangedEventArgs e)
+    {
+        if (e.AddedItems.Count == 0) return;
+        if (e.AddedItems[0] is DemoItemModel item)
+        {
+            if (Equals(DemoItemCurrent, item)) return;
+            SwitchDemo(item);
+        }
+    }
+
+    private void SwitchDemo(DemoItemModel item)
+    {
+        DemoItemCurrent = item;
+        ContentTitle = LangProvider.GetLang(item.Name);
+        var obj = AssemblyHelper.ResolveByKey(item.TargetCtlName);
+        var ctl = obj ?? AssemblyHelper.CreateInternalInstance($"UserControl.{item.TargetCtlName}");
+        Messenger.Default.Send(ctl is IFull, MessageToken.FullSwitch);
+        Messenger.Default.Send(ctl, MessageToken.LoadShowContent);
+    }
+
+    private void OpenPracticalDemo()
+    {
+        Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
+        Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{MessageToken.PracticalDemo}"), MessageToken.LoadShowContent);
+        Messenger.Default.Send(true, MessageToken.FullSwitch);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
index 4f2ecd43..c5b07bc6 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
@@ -4,34 +4,33 @@ using GalaSoft.MvvmLight.Messaging;
 using HandyControlDemo.Data;
 using HandyControlDemo.Tools;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class NonClientAreaViewModel : ViewModelBase
 {
-    public class NonClientAreaViewModel : ViewModelBase
+    public NonClientAreaViewModel()
     {
-        public NonClientAreaViewModel()
-        {
-            VersionInfo = VersionHelper.GetVersion();
-        }
+        VersionInfo = VersionHelper.GetVersion();
+    }
 
-        public RelayCommand<string> OpenViewCmd => new(OpenView);
+    public RelayCommand<string> OpenViewCmd => new(OpenView);
 
-        private void OpenView(string viewName)
-        {
-            Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
-            Messenger.Default.Send(true, MessageToken.FullSwitch);
-            Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{viewName}"), MessageToken.LoadShowContent);
-        }
+    private void OpenView(string viewName)
+    {
+        Messenger.Default.Send<object>(null, MessageToken.ClearLeftSelected);
+        Messenger.Default.Send(true, MessageToken.FullSwitch);
+        Messenger.Default.Send(AssemblyHelper.CreateInternalInstance($"UserControl.{viewName}"), MessageToken.LoadShowContent);
+    }
 
-        private string _versionInfo;
+    private string _versionInfo;
 
-        public string VersionInfo
-        {
-            get => _versionInfo;
+    public string VersionInfo
+    {
+        get => _versionInfo;
 #if NET40
-            set => Set(nameof(VersionInfo), ref _versionInfo, value);
+        set => Set(nameof(VersionInfo), ref _versionInfo, value);
 #else
             set => Set(ref _versionInfo, value);
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
index 7d686d69..e21a46a0 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
@@ -4,102 +4,101 @@ using GalaSoft.MvvmLight.Ioc;
 using HandyControlDemo.Data;
 using HandyControlDemo.Service;
 
-namespace HandyControlDemo.ViewModel
+namespace HandyControlDemo.ViewModel;
+
+public class ViewModelLocator
 {
-    public class ViewModelLocator
+    public ViewModelLocator()
     {
-        public ViewModelLocator()
-        {
-            SimpleIoc.Default.Register<DataService>();
-            var dataService = SimpleIoc.Default.GetInstance<DataService>();
+        SimpleIoc.Default.Register<DataService>();
+        var dataService = SimpleIoc.Default.GetInstance<DataService>();
 
-            SimpleIoc.Default.Register<MainViewModel>();
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
-            SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
-            SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
-            SimpleIoc.Default.Register<WindowDemoViewModel>();
-            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetBlogDataList), "Blogs");
-            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetProjectDataList), "Projects");
-            SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetWebsiteDataList), "Websites");
-            SimpleIoc.Default.Register<StepBarDemoViewModel>();
-            SimpleIoc.Default.Register<PaginationDemoViewModel>();
-            SimpleIoc.Default.Register<ChatBoxViewModel>();
-            SimpleIoc.Default.Register<CoverViewModel>();
-            SimpleIoc.Default.Register<DialogDemoViewModel>();
-            SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
-            SimpleIoc.Default.Register<InteractiveDialogViewModel>();
-            SimpleIoc.Default.Register<BadgeDemoViewModel>();
-            SimpleIoc.Default.Register<SideMenuDemoViewModel>();
-            SimpleIoc.Default.Register<TabControlDemoViewModel>();
-            SimpleIoc.Default.Register<NonClientAreaViewModel>();
-            SimpleIoc.Default.Register<CardDemoViewModel>();
-            SimpleIoc.Default.Register<SpriteDemoViewModel>();
-            SimpleIoc.Default.Register<NotificationDemoViewModel>();
-            SimpleIoc.Default.Register<SplitButtonDemoViewModel>();
-            SimpleIoc.Default.Register<TagDemoViewModel>();
-            SimpleIoc.Default.Register<AutoCompleteTextBoxDemoViewModel>();
-            SimpleIoc.Default.Register<InputElementDemoViewModel>();
-        }
-
-        public static ViewModelLocator Instance = new Lazy<ViewModelLocator>(() =>
-            Application.Current.TryFindResource("Locator") as ViewModelLocator).Value;
-
-        #region Vm
-
-        public MainViewModel Main => SimpleIoc.Default.GetInstance<MainViewModel>();
-
-        public GrowlDemoViewModel GrowlDemo => SimpleIoc.Default.GetInstance<GrowlDemoViewModel>("GrowlDemo");
-
-        public GrowlDemoViewModel GrowlDemoWithToken => SimpleIoc.Default.GetInstance<GrowlDemoViewModel>("GrowlDemoWithToken");
-
-        public ImageBrowserDemoViewModel ImageBrowserDemo => SimpleIoc.Default.GetInstance<ImageBrowserDemoViewModel>();
-
-        public WindowDemoViewModel WindowDemo => SimpleIoc.Default.GetInstance<WindowDemoViewModel>();
-
-        public ItemsDisplayViewModel ContributorsView => new(SimpleIoc.Default.GetInstance<DataService>().GetContributorDataList);
-
-        public ItemsDisplayViewModel BlogsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Blogs");
-
-        public ItemsDisplayViewModel ProjectsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Projects");
-
-        public ItemsDisplayViewModel WebsitesView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Websites");
-
-        public StepBarDemoViewModel StepBarDemo => SimpleIoc.Default.GetInstance<StepBarDemoViewModel>();
-
-        public PaginationDemoViewModel PaginationDemo => SimpleIoc.Default.GetInstance<PaginationDemoViewModel>();
-
-        public ChatBoxViewModel ChatBox => new();
-
-        public CoverViewModel CoverView => SimpleIoc.Default.GetInstance<CoverViewModel>();
-
-        public DialogDemoViewModel DialogDemo => SimpleIoc.Default.GetInstance<DialogDemoViewModel>();
-
-        public NotifyIconDemoViewModel NotifyIconDemo => SimpleIoc.Default.GetInstance<NotifyIconDemoViewModel>();
-
-        public InteractiveDialogViewModel InteractiveDialog => SimpleIoc.Default.GetInstance<InteractiveDialogViewModel>();
-
-        public BadgeDemoViewModel BadgeDemo => SimpleIoc.Default.GetInstance<BadgeDemoViewModel>();
-
-        public SideMenuDemoViewModel SideMenuDemo => SimpleIoc.Default.GetInstance<SideMenuDemoViewModel>();
-
-        public TabControlDemoViewModel TabControlDemo => new(SimpleIoc.Default.GetInstance<DataService>());
-
-        public NonClientAreaViewModel NoUser => SimpleIoc.Default.GetInstance<NonClientAreaViewModel>();
-
-        public CardDemoViewModel CardDemo => new(SimpleIoc.Default.GetInstance<DataService>());
-
-        public SpriteDemoViewModel SpriteDemo => SimpleIoc.Default.GetInstance<SpriteDemoViewModel>();
-
-        public NotificationDemoViewModel NotificationDemo => SimpleIoc.Default.GetInstance<NotificationDemoViewModel>();
-
-        public SplitButtonDemoViewModel SplitButtonDemo => SimpleIoc.Default.GetInstance<SplitButtonDemoViewModel>();
-
-        public TagDemoViewModel TagDemo => new(SimpleIoc.Default.GetInstance<DataService>());
-
-        public AutoCompleteTextBoxDemoViewModel AutoCompleteTextBoxDemo => new(SimpleIoc.Default.GetInstance<DataService>());
-
-        public InputElementDemoViewModel InputElementDemo => new();
-
-        #endregion
+        SimpleIoc.Default.Register<MainViewModel>();
+        SimpleIoc.Default.Register(() => new GrowlDemoViewModel(), "GrowlDemo");
+        SimpleIoc.Default.Register(() => new GrowlDemoViewModel(MessageToken.GrowlDemoPanel), "GrowlDemoWithToken");
+        SimpleIoc.Default.Register<ImageBrowserDemoViewModel>();
+        SimpleIoc.Default.Register<WindowDemoViewModel>();
+        SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetBlogDataList), "Blogs");
+        SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetProjectDataList), "Projects");
+        SimpleIoc.Default.Register(() => new ItemsDisplayViewModel(dataService.GetWebsiteDataList), "Websites");
+        SimpleIoc.Default.Register<StepBarDemoViewModel>();
+        SimpleIoc.Default.Register<PaginationDemoViewModel>();
+        SimpleIoc.Default.Register<ChatBoxViewModel>();
+        SimpleIoc.Default.Register<CoverViewModel>();
+        SimpleIoc.Default.Register<DialogDemoViewModel>();
+        SimpleIoc.Default.Register<NotifyIconDemoViewModel>();
+        SimpleIoc.Default.Register<InteractiveDialogViewModel>();
+        SimpleIoc.Default.Register<BadgeDemoViewModel>();
+        SimpleIoc.Default.Register<SideMenuDemoViewModel>();
+        SimpleIoc.Default.Register<TabControlDemoViewModel>();
+        SimpleIoc.Default.Register<NonClientAreaViewModel>();
+        SimpleIoc.Default.Register<CardDemoViewModel>();
+        SimpleIoc.Default.Register<SpriteDemoViewModel>();
+        SimpleIoc.Default.Register<NotificationDemoViewModel>();
+        SimpleIoc.Default.Register<SplitButtonDemoViewModel>();
+        SimpleIoc.Default.Register<TagDemoViewModel>();
+        SimpleIoc.Default.Register<AutoCompleteTextBoxDemoViewModel>();
+        SimpleIoc.Default.Register<InputElementDemoViewModel>();
     }
-}
+
+    public static ViewModelLocator Instance = new Lazy<ViewModelLocator>(() =>
+        Application.Current.TryFindResource("Locator") as ViewModelLocator).Value;
+
+    #region Vm
+
+    public MainViewModel Main => SimpleIoc.Default.GetInstance<MainViewModel>();
+
+    public GrowlDemoViewModel GrowlDemo => SimpleIoc.Default.GetInstance<GrowlDemoViewModel>("GrowlDemo");
+
+    public GrowlDemoViewModel GrowlDemoWithToken => SimpleIoc.Default.GetInstance<GrowlDemoViewModel>("GrowlDemoWithToken");
+
+    public ImageBrowserDemoViewModel ImageBrowserDemo => SimpleIoc.Default.GetInstance<ImageBrowserDemoViewModel>();
+
+    public WindowDemoViewModel WindowDemo => SimpleIoc.Default.GetInstance<WindowDemoViewModel>();
+
+    public ItemsDisplayViewModel ContributorsView => new(SimpleIoc.Default.GetInstance<DataService>().GetContributorDataList);
+
+    public ItemsDisplayViewModel BlogsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Blogs");
+
+    public ItemsDisplayViewModel ProjectsView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Projects");
+
+    public ItemsDisplayViewModel WebsitesView => SimpleIoc.Default.GetInstance<ItemsDisplayViewModel>("Websites");
+
+    public StepBarDemoViewModel StepBarDemo => SimpleIoc.Default.GetInstance<StepBarDemoViewModel>();
+
+    public PaginationDemoViewModel PaginationDemo => SimpleIoc.Default.GetInstance<PaginationDemoViewModel>();
+
+    public ChatBoxViewModel ChatBox => new();
+
+    public CoverViewModel CoverView => SimpleIoc.Default.GetInstance<CoverViewModel>();
+
+    public DialogDemoViewModel DialogDemo => SimpleIoc.Default.GetInstance<DialogDemoViewModel>();
+
+    public NotifyIconDemoViewModel NotifyIconDemo => SimpleIoc.Default.GetInstance<NotifyIconDemoViewModel>();
+
+    public InteractiveDialogViewModel InteractiveDialog => SimpleIoc.Default.GetInstance<InteractiveDialogViewModel>();
+
+    public BadgeDemoViewModel BadgeDemo => SimpleIoc.Default.GetInstance<BadgeDemoViewModel>();
+
+    public SideMenuDemoViewModel SideMenuDemo => SimpleIoc.Default.GetInstance<SideMenuDemoViewModel>();
+
+    public TabControlDemoViewModel TabControlDemo => new(SimpleIoc.Default.GetInstance<DataService>());
+
+    public NonClientAreaViewModel NoUser => SimpleIoc.Default.GetInstance<NonClientAreaViewModel>();
+
+    public CardDemoViewModel CardDemo => new(SimpleIoc.Default.GetInstance<DataService>());
+
+    public SpriteDemoViewModel SpriteDemo => SimpleIoc.Default.GetInstance<SpriteDemoViewModel>();
+
+    public NotificationDemoViewModel NotificationDemo => SimpleIoc.Default.GetInstance<NotificationDemoViewModel>();
+
+    public SplitButtonDemoViewModel SplitButtonDemo => SimpleIoc.Default.GetInstance<SplitButtonDemoViewModel>();
+
+    public TagDemoViewModel TagDemo => new(SimpleIoc.Default.GetInstance<DataService>());
+
+    public AutoCompleteTextBoxDemoViewModel AutoCompleteTextBoxDemo => new(SimpleIoc.Default.GetInstance<DataService>());
+
+    public InputElementDemoViewModel InputElementDemo => new();
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
index 1cefe8ee..892ced07 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
@@ -1,35 +1,34 @@
 using System.Windows;
 using HandyControlDemo.Tools;
 
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class AboutWindow
 {
-    public partial class AboutWindow
+    public AboutWindow()
     {
-        public AboutWindow()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            DataContext = this;
-            CopyRight = VersionHelper.GetCopyright();
-            Version = VersionHelper.GetVersion();
-        }
-
-        public static readonly DependencyProperty CopyRightProperty = DependencyProperty.Register(
-            "CopyRight", typeof(string), typeof(AboutWindow), new PropertyMetadata(default(string)));
-
-        public string CopyRight
-        {
-            get => (string) GetValue(CopyRightProperty);
-            set => SetValue(CopyRightProperty, value);
-        }
-
-        public static readonly DependencyProperty VersionProperty = DependencyProperty.Register(
-            "Version", typeof(string), typeof(AboutWindow), new PropertyMetadata(default(string)));
-
-        public string Version
-        {
-            get => (string) GetValue(VersionProperty);
-            set => SetValue(VersionProperty, value);
-        }
+        DataContext = this;
+        CopyRight = VersionHelper.GetCopyright();
+        Version = VersionHelper.GetVersion();
     }
-}
+
+    public static readonly DependencyProperty CopyRightProperty = DependencyProperty.Register(
+        "CopyRight", typeof(string), typeof(AboutWindow), new PropertyMetadata(default(string)));
+
+    public string CopyRight
+    {
+        get => (string) GetValue(CopyRightProperty);
+        set => SetValue(CopyRightProperty, value);
+    }
+
+    public static readonly DependencyProperty VersionProperty = DependencyProperty.Register(
+        "Version", typeof(string), typeof(AboutWindow), new PropertyMetadata(default(string)));
+
+    public string Version
+    {
+        get => (string) GetValue(VersionProperty);
+        set => SetValue(VersionProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
index 5bcc358d..a15f0882 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class BlurWindow
 {
-    public partial class BlurWindow
+    public BlurWindow()
     {
-        public BlurWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
index 66e426b1..06dbfe90 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class CommonWindow
 {
-    public partial class CommonWindow
+    public CommonWindow()
     {
-        public CommonWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
index ef4f2919..0c1641f4 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class CustomNonClientAreaWindow
 {
-    public partial class CustomNonClientAreaWindow
+    public CustomNonClientAreaWindow()
     {
-        public CustomNonClientAreaWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
index bcc0c62e..79e9d734 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
@@ -3,26 +3,25 @@ using System.Windows;
 using HandyControl.Controls;
 using HandyControlDemo.Data;
 
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class DialogDemoWindow
 {
-    public partial class DialogDemoWindow
+    public DialogDemoWindow()
     {
-        public DialogDemoWindow()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            var dialogToken = $"{MessageToken.DialogDemoWindow}+{DateTime.Now:yyyyMMddHHmmssfff}";
-            DialogToken = dialogToken;
-            Dialog.SetToken(this, dialogToken);
-        }
-
-        public static readonly DependencyProperty DialogTokenProperty = DependencyProperty.Register(
-            "DialogToken", typeof(string), typeof(DialogDemoWindow), new PropertyMetadata(default(string)));
-
-        public string DialogToken
-        {
-            get => (string) GetValue(DialogTokenProperty);
-            set => SetValue(DialogTokenProperty, value);
-        }
+        var dialogToken = $"{MessageToken.DialogDemoWindow}+{DateTime.Now:yyyyMMddHHmmssfff}";
+        DialogToken = dialogToken;
+        Dialog.SetToken(this, dialogToken);
     }
-}
+
+    public static readonly DependencyProperty DialogTokenProperty = DependencyProperty.Register(
+        "DialogToken", typeof(string), typeof(DialogDemoWindow), new PropertyMetadata(default(string)));
+
+    public string DialogToken
+    {
+        get => (string) GetValue(DialogTokenProperty);
+        set => SetValue(DialogTokenProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
index a58d408f..81501c45 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class GlowWindow
 {
-    public partial class GlowWindow
+    public GlowWindow()
     {
-        public GlowWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
index 3aa9d38c..59646aa1 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class GrowlDemoWindow
 {
-    public partial class GrowlDemoWindow
+    public GrowlDemoWindow()
     {
-        public GrowlDemoWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
index 3ffa3f70..eb7bdb61 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
@@ -1,10 +1,9 @@
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class NativeCommonWindow
 {
-    public partial class NativeCommonWindow
+    public NativeCommonWindow()
     {
-        public NativeCommonWindow()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
index 3b3fcfd0..d5a46d82 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
@@ -4,53 +4,52 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using HandyControl.Tools.Extension;
 
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class NavigationWindow
 {
-    public partial class NavigationWindow
+    private readonly List<Page> _pageList;
+
+    public NavigationWindow()
     {
-        private readonly List<Page> _pageList;
+        InitializeComponent();
 
-        public NavigationWindow()
+        AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Button_Click));
+
+        _pageList = new List<Page>();
+        for (var i = 0; i < 5; i++)
         {
-            InitializeComponent();
-
-            AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Button_Click));
-
-            _pageList = new List<Page>();
-            for (var i = 0; i < 5; i++)
-            {
-                _pageList.Add(CreatePage(i));
-            }
-
-            Navigate(_pageList[0]);
+            _pageList.Add(CreatePage(i));
         }
 
-        private Page CreatePage(int index)
-        {
-            var indexStr = index.ToString();
-            var button = new Button
-            {
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Content = indexStr,
-                Width = 320,
-                Tag = indexStr
-            };
+        Navigate(_pageList[0]);
+    }
 
-            return new Page
-            {
-                Title = indexStr,
-                Content = button
-            };
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
+    private Page CreatePage(int index)
+    {
+        var indexStr = index.ToString();
+        var button = new Button
         {
-            if (e.OriginalSource is Button button && button.Tag is string tag)
-            {
-                var index = tag.Value<int>() + 1;
-                Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
-            }
+            HorizontalAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Content = indexStr,
+            Width = 320,
+            Tag = indexStr
+        };
+
+        return new Page
+        {
+            Title = indexStr,
+            Content = button
+        };
+    }
+
+    private void Button_Click(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Button button && button.Tag is string tag)
+        {
+            var index = tag.Value<int>() + 1;
+            Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
index 5fc11285..79103871 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
@@ -1,14 +1,13 @@
 using System.Windows;
 
-namespace HandyControlDemo.Window
-{
-    public partial class NoNonClientAreaDragableWindow
-    {
-        public NoNonClientAreaDragableWindow()
-        {
-            InitializeComponent();
-        }
+namespace HandyControlDemo.Window;
 
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
+public partial class NoNonClientAreaDragableWindow
+{
+    public NoNonClientAreaDragableWindow()
+    {
+        InitializeComponent();
     }
-}
+
+    private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
index 0bdd46a9..42b1606b 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
@@ -1,32 +1,31 @@
 using System.Windows.Input;
 using HandyControl.Tools;
 
-namespace HandyControlDemo.Window
+namespace HandyControlDemo.Window;
+
+public partial class TouchDragMoveWindow
 {
-    public partial class TouchDragMoveWindow
+    private int _currentTouchCount;
+
+    public TouchDragMoveWindow()
     {
-        private int _currentTouchCount;
+        InitializeComponent();
 
-        public TouchDragMoveWindow()
-        {
-            InitializeComponent();
-
-            TouchDown += MainWindow_TouchDown;
-            TouchUp += MainWindow_TouchUp;
-        }
-
-        private void MainWindow_TouchUp(object sender, TouchEventArgs e)
-        {
-            _currentTouchCount--;
-        }
-
-        private void MainWindow_TouchDown(object sender, TouchEventArgs e)
-        {
-            CaptureTouch(e.TouchDevice);
-
-            if (_currentTouchCount == 0) this.TouchDragMove();
-
-            _currentTouchCount++;
-        }
+        TouchDown += MainWindow_TouchDown;
+        TouchUp += MainWindow_TouchUp;
     }
-}
+
+    private void MainWindow_TouchUp(object sender, TouchEventArgs e)
+    {
+        _currentTouchCount--;
+    }
+
+    private void MainWindow_TouchDown(object sender, TouchEventArgs e)
+    {
+        CaptureTouch(e.TouchDevice);
+
+        if (_currentTouchCount == 0) this.TouchDragMove();
+
+        _currentTouchCount++;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs b/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
index dfa6b549..b4133ee5 100644
--- a/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
@@ -4,82 +4,81 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 
-namespace HandyControl.Collections
+namespace HandyControl.Collections;
+
+[Serializable]
+public class ManualObservableCollection<T> : ObservableCollection<T>
 {
-    [Serializable]
-    public class ManualObservableCollection<T> : ObservableCollection<T>
+    private const string CountString = "Count";
+
+    private const string IndexerName = "Item[]";
+
+    private int _oldCount;
+
+    private bool _canNotify = true;
+
+    public bool CanNotify
     {
-        private const string CountString = "Count";
-
-        private const string IndexerName = "Item[]";
-
-        private int _oldCount;
-
-        private bool _canNotify = true;
-
-        public bool CanNotify
+        get => _canNotify;
+        set
         {
-            get => _canNotify;
-            set
+            _canNotify = value;
+
+            if (value)
             {
-                _canNotify = value;
-
-                if (value)
+                if (_oldCount != Count)
                 {
-                    if (_oldCount != Count)
-                    {
-                        OnPropertyChanged(new PropertyChangedEventArgs(CountString));
-                    }
-
-                    OnPropertyChanged(new PropertyChangedEventArgs(IndexerName));
-                    OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-
-                }
-                else
-                {
-                    _oldCount = Count;
+                    OnPropertyChanged(new PropertyChangedEventArgs(CountString));
                 }
+
+                OnPropertyChanged(new PropertyChangedEventArgs(IndexerName));
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+
             }
-        }
-
-        public ManualObservableCollection()
-        {
-
-        }
-
-        public ManualObservableCollection(List<T> list) : base(list != null ? new List<T>(list.Count) : list) => CopyFrom(list);
-
-        public ManualObservableCollection(IEnumerable<T> collection)
-        {
-            if (collection == null) throw new ArgumentNullException(nameof(collection));
-            CopyFrom(collection);
-        }
-
-        protected override void OnPropertyChanged(PropertyChangedEventArgs e)
-        {
-            if (!CanNotify) return;
-
-            base.OnPropertyChanged(e);
-        }
-
-        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (!CanNotify) return;
-
-            base.OnCollectionChanged(e);
-        }
-
-        private void CopyFrom(IEnumerable<T> collection)
-        {
-            var items = Items;
-            if (collection != null)
+            else
             {
-                using var enumerator = collection.GetEnumerator();
-                while (enumerator.MoveNext())
-                {
-                    items.Add(enumerator.Current);
-                }
+                _oldCount = Count;
             }
         }
     }
-}
+
+    public ManualObservableCollection()
+    {
+
+    }
+
+    public ManualObservableCollection(List<T> list) : base(list != null ? new List<T>(list.Count) : list) => CopyFrom(list);
+
+    public ManualObservableCollection(IEnumerable<T> collection)
+    {
+        if (collection == null) throw new ArgumentNullException(nameof(collection));
+        CopyFrom(collection);
+    }
+
+    protected override void OnPropertyChanged(PropertyChangedEventArgs e)
+    {
+        if (!CanNotify) return;
+
+        base.OnPropertyChanged(e);
+    }
+
+    protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+    {
+        if (!CanNotify) return;
+
+        base.OnCollectionChanged(e);
+    }
+
+    private void CopyFrom(IEnumerable<T> collection)
+    {
+        var items = Items;
+        if (collection != null)
+        {
+            using var enumerator = collection.GetEnumerator();
+            while (enumerator.MoveNext())
+            {
+                items.Add(enumerator.Current);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
index f3d9f9f6..a43eb0af 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Collections
-{
-    public interface IPool<T>
-    {
-        T Acquire();
+namespace HandyControl.Collections;
 
-        bool Release(T instance);
-    }
-}
+public interface IPool<T>
+{
+    T Acquire();
+
+    bool Release(T instance);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
index b751b379..835b8408 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
@@ -2,63 +2,62 @@
 
 using System;
 
-namespace HandyControl.Collections
+namespace HandyControl.Collections;
+
+public class SimplePool<T> : IPool<T>
 {
-    public class SimplePool<T> : IPool<T>
+    private readonly object[] _pool;
+
+    private int _poolSize;
+
+    public SimplePool(int maxPoolSize)
     {
-        private readonly object[] _pool;
-
-        private int _poolSize;
-
-        public SimplePool(int maxPoolSize)
+        if (maxPoolSize <= 0)
         {
-            if (maxPoolSize <= 0)
-            {
-                throw new ArgumentException("The max pool size must be > 0");
-            }
-            _pool = new object[maxPoolSize];
+            throw new ArgumentException("The max pool size must be > 0");
+        }
+        _pool = new object[maxPoolSize];
+    }
+
+    public virtual T Acquire()
+    {
+        if (_poolSize > 0)
+        {
+            var lastPooledIndex = _poolSize - 1;
+            var instance = (T) _pool[lastPooledIndex];
+            _pool[lastPooledIndex] = null;
+            _poolSize--;
+            return instance;
+        }
+        return default;
+    }
+
+    public virtual bool Release(T instance)
+    {
+        if (IsInPool(instance))
+        {
+            throw new Exception("Already in the pool!");
         }
 
-        public virtual T Acquire()
+        if (_poolSize < _pool.Length)
         {
-            if (_poolSize > 0)
-            {
-                var lastPooledIndex = _poolSize - 1;
-                var instance = (T) _pool[lastPooledIndex];
-                _pool[lastPooledIndex] = null;
-                _poolSize--;
-                return instance;
-            }
-            return default;
+            _pool[_poolSize] = instance;
+            _poolSize++;
+            return true;
         }
 
-        public virtual bool Release(T instance)
-        {
-            if (IsInPool(instance))
-            {
-                throw new Exception("Already in the pool!");
-            }
+        return false;
+    }
 
-            if (_poolSize < _pool.Length)
+    private bool IsInPool(T instance)
+    {
+        for (var i = 0; i < _poolSize; i++)
+        {
+            if (Equals(_pool[i], instance))
             {
-                _pool[_poolSize] = instance;
-                _poolSize++;
                 return true;
             }
-
-            return false;
-        }
-
-        private bool IsInPool(T instance)
-        {
-            for (var i = 0; i < _poolSize; i++)
-            {
-                if (Equals(_pool[i], instance))
-                {
-                    return true;
-                }
-            }
-            return false;
         }
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
index 39376efb..907acdd6 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
@@ -1,28 +1,27 @@
-namespace HandyControl.Collections
+namespace HandyControl.Collections;
+
+public class SynchronizedPool<T> : SimplePool<T>
 {
-    public class SynchronizedPool<T> : SimplePool<T>
+    private readonly object _lockObj = new();
+
+    public SynchronizedPool(int maxPoolSize) : base(maxPoolSize)
     {
-        private readonly object _lockObj = new();
 
-        public SynchronizedPool(int maxPoolSize) : base(maxPoolSize)
+    }
+
+    public override T Acquire()
+    {
+        lock (_lockObj)
         {
-
-        }
-
-        public override T Acquire()
-        {
-            lock (_lockObj)
-            {
-                return base.Acquire();
-            }
-        }
-
-        public override bool Release(T element)
-        {
-            lock (_lockObj)
-            {
-                return base.Release(element);
-            }
+            return base.Acquire();
         }
     }
-}
+
+    public override bool Release(T element)
+    {
+        lock (_lockObj)
+        {
+            return base.Release(element);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs b/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
index fa179c63..1ff655c9 100644
--- a/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
@@ -5,332 +5,331 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 
-namespace HandyControl.Collections
+namespace HandyControl.Collections;
+
+[Serializable]
+public class Deque<T> : IEnumerable<T>, ICollection
 {
-    [Serializable]
-    public class Deque<T> : IEnumerable<T>, ICollection
+    [NonSerialized]
+    private object _syncRoot;
+
+    private List<T> _front;
+
+    private List<T> _back;
+
+    private int _frontDeleted;
+
+    private int _backDeleted;
+
+    public int Capacity => _front.Capacity + _back.Capacity;
+
+    public int Count => _front.Count + _back.Count - _frontDeleted - _backDeleted;
+
+    public bool IsEmpty => Count == 0;
+
+    public IEnumerable<T> Reversed
     {
-        [NonSerialized]
-        private object _syncRoot;
-
-        private List<T> _front;
-
-        private List<T> _back;
-
-        private int _frontDeleted;
-
-        private int _backDeleted;
-
-        public int Capacity => _front.Capacity + _back.Capacity;
-
-        public int Count => _front.Count + _back.Count - _frontDeleted - _backDeleted;
-
-        public bool IsEmpty => Count == 0;
-
-        public IEnumerable<T> Reversed
+        get
         {
-            get
+            if (_back.Count - _backDeleted > 0)
             {
-                if (_back.Count - _backDeleted > 0)
-                {
-                    for (var i = _back.Count - 1; i >= _backDeleted; i--) yield return _back[i];
-                }
-
-                if (_front.Count - _frontDeleted > 0)
-                {
-                    for (var i = _frontDeleted; i < _front.Count; i++) yield return _front[i];
-                }
-            }
-        }
-
-        public Deque()
-        {
-            _front = new List<T>();
-            _back = new List<T>();
-        }
-
-        public Deque(int capacity)
-        {
-            if (capacity < 0) throw new ArgumentException("Capacity cannot be negative");
-            var temp = capacity / 2;
-            var temp2 = capacity - temp;
-            _front = new List<T>(temp);
-            _back = new List<T>(temp2);
-        }
-
-        public Deque(IEnumerable<T> backCollection) : this(backCollection, null)
-        {
-
-        }
-
-        public Deque(IEnumerable<T> backCollection, IEnumerable<T> frontCollection)
-        {
-            if (backCollection == null && frontCollection == null) throw new ArgumentException("Collections cannot both be null");
-
-            _front = frontCollection != null ? new List<T>(frontCollection) : new List<T>();
-            _back = backCollection != null ? new List<T>(backCollection) : new List<T>();
-        }
-
-        public void AddFirst(T item)
-        {
-            if (_frontDeleted > 0 && _front.Count == _front.Capacity)
-            {
-                _front.RemoveRange(0, _frontDeleted);
-                _frontDeleted = 0;
+                for (var i = _back.Count - 1; i >= _backDeleted; i--) yield return _back[i];
             }
 
-            _front.Add(item);
-        }
-
-        public void AddLast(T item)
-        {
-            if (_backDeleted > 0 && _back.Count == _back.Capacity)
+            if (_front.Count - _frontDeleted > 0)
             {
-                _back.RemoveRange(0, _backDeleted);
-                _backDeleted = 0;
+                for (var i = _frontDeleted; i < _front.Count; i++) yield return _front[i];
             }
-
-            _back.Add(item);
         }
+    }
 
-        public void AddRangeFirst(IEnumerable<T> range)
+    public Deque()
+    {
+        _front = new List<T>();
+        _back = new List<T>();
+    }
+
+    public Deque(int capacity)
+    {
+        if (capacity < 0) throw new ArgumentException("Capacity cannot be negative");
+        var temp = capacity / 2;
+        var temp2 = capacity - temp;
+        _front = new List<T>(temp);
+        _back = new List<T>(temp2);
+    }
+
+    public Deque(IEnumerable<T> backCollection) : this(backCollection, null)
+    {
+
+    }
+
+    public Deque(IEnumerable<T> backCollection, IEnumerable<T> frontCollection)
+    {
+        if (backCollection == null && frontCollection == null) throw new ArgumentException("Collections cannot both be null");
+
+        _front = frontCollection != null ? new List<T>(frontCollection) : new List<T>();
+        _back = backCollection != null ? new List<T>(backCollection) : new List<T>();
+    }
+
+    public void AddFirst(T item)
+    {
+        if (_frontDeleted > 0 && _front.Count == _front.Capacity)
         {
-            if (range == null) return;
-
-            foreach (var item in range) AddFirst(item);
-        }
-
-        public void AddRangeLast(IEnumerable<T> range)
-        {
-            if (range == null) return;
-
-            foreach (var item in range) AddLast(item);
-        }
-
-        public void Clear()
-        {
-            _front.Clear();
-            _back.Clear();
+            _front.RemoveRange(0, _frontDeleted);
             _frontDeleted = 0;
+        }
+
+        _front.Add(item);
+    }
+
+    public void AddLast(T item)
+    {
+        if (_backDeleted > 0 && _back.Count == _back.Capacity)
+        {
+            _back.RemoveRange(0, _backDeleted);
             _backDeleted = 0;
         }
 
-        public bool Contains(T item)
-        {
-            for (var i = _frontDeleted; i < _front.Count; i++)
-            {
-                if (Equals(_front[i], item)) return true;
-            }
-
-            for (var i = _backDeleted; i < _back.Count; i++)
-            {
-                if (Equals(_back[i], item)) return true;
-            }
-
-            return false;
-        }
-
-        public void CopyTo(T[] array, int index)
-        {
-            if (array == null) throw new ArgumentNullException("Array cannot be null");
-            if (index < 0) throw new ArgumentOutOfRangeException("Index cannot be negative");
-            if (array.Length < index + Count) throw new ArgumentException("Index is invalid");
-            var i = index;
-
-            foreach (var item in this)
-            {
-                array[i++] = item;
-            }
-        }
-
-        public IEnumerator<T> GetEnumerator()
-        {
-            if (_front.Count - _frontDeleted > 0)
-            {
-                for (var i = _front.Count - 1; i >= _frontDeleted; i--) yield return _front[i];
-            }
-
-            if (_back.Count - _backDeleted > 0)
-            {
-                for (var i = _backDeleted; i < _back.Count; i++) yield return _back[i];
-            }
-        }
-
-        public T PeekFirst()
-        {
-            if (_front.Count > _frontDeleted)
-            {
-                return _front[_front.Count - 1];
-            }
-
-            if (_back.Count > _backDeleted)
-            {
-                return _back[_backDeleted];
-            }
-
-            throw new InvalidOperationException("Can't peek at empty Deque");
-        }
-
-        public T PeekLast()
-        {
-            if (_back.Count > _backDeleted)
-            {
-                return _back[_back.Count - 1];
-            }
-
-            if (_front.Count > _frontDeleted)
-            {
-                return _front[_frontDeleted];
-            }
-
-            throw new InvalidOperationException("Can't peek at empty Deque");
-        }
-
-        public T PopFirst()
-        {
-            T result;
-
-            if (_front.Count > _frontDeleted)
-            {
-                result = _front[_front.Count - 1];
-                _front.RemoveAt(_front.Count - 1);
-            }
-            else if (_back.Count > _backDeleted)
-            {
-                result = _back[_backDeleted];
-                _backDeleted++;
-            }
-            else
-            {
-                throw new InvalidOperationException("Can't pop empty Deque");
-            }
-
-            return result;
-        }
-
-
-        public T PopLast()
-        {
-            T result;
-
-            if (_back.Count > _backDeleted)
-            {
-                result = _back[_back.Count - 1];
-                _back.RemoveAt(_back.Count - 1);
-            }
-            else if (_front.Count > _frontDeleted)
-            {
-                result = _front[_frontDeleted];
-                _frontDeleted++;
-            }
-            else
-            {
-                throw new InvalidOperationException("Can't pop empty Deque");
-            }
-
-            return result;
-        }
-
-        public void Reverse()
-        {
-            var temp = _front;
-            _front = _back;
-            _back = temp;
-            var temp2 = _frontDeleted;
-            _frontDeleted = _backDeleted;
-            _backDeleted = temp2;
-        }
-
-        public T[] ToArray()
-        {
-            if (Count == 0) return new T[0];
-            var result = new T[Count];
-            CopyTo(result, 0);
-            return result;
-        }
-
-        public void TrimExcess()
-        {
-            if (_frontDeleted > 0)
-            {
-                _front.RemoveRange(0, _frontDeleted);
-                _frontDeleted = 0;
-            }
-
-            if (_backDeleted > 0)
-            {
-                _back.RemoveRange(0, _backDeleted);
-                _backDeleted = 0;
-            }
-
-            _front.TrimExcess();
-            _back.TrimExcess();
-        }
-
-        public bool TryPeekFirst(out T item)
-        {
-            if (!IsEmpty)
-            {
-                item = PeekFirst();
-                return true;
-            }
-
-            item = default;
-            return false;
-        }
-
-        public bool TryPeekLast(out T item)
-        {
-            if (!IsEmpty)
-            {
-                item = PeekLast();
-                return true;
-            }
-
-            item = default;
-            return false;
-        }
-
-        public bool TryPopFirst(out T item)
-        {
-            if (!IsEmpty)
-            {
-                item = PopFirst();
-                return true;
-            }
-
-            item = default;
-            return false;
-        }
-
-        public bool TryPopLast(out T item)
-        {
-            if (!IsEmpty)
-            {
-                item = PopLast();
-                return true;
-            }
-
-            item = default;
-            return false;
-        }
-
-        bool ICollection.IsSynchronized => false;
-
-        object ICollection.SyncRoot
-        {
-            get
-            {
-                if (_syncRoot == null)
-                {
-                    Interlocked.CompareExchange<object>(ref _syncRoot, new object(), null);
-                }
-                return _syncRoot;
-            }
-        }
-
-        void ICollection.CopyTo(Array array, int index) => CopyTo((T[]) array, index);
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        _back.Add(item);
     }
-}
+
+    public void AddRangeFirst(IEnumerable<T> range)
+    {
+        if (range == null) return;
+
+        foreach (var item in range) AddFirst(item);
+    }
+
+    public void AddRangeLast(IEnumerable<T> range)
+    {
+        if (range == null) return;
+
+        foreach (var item in range) AddLast(item);
+    }
+
+    public void Clear()
+    {
+        _front.Clear();
+        _back.Clear();
+        _frontDeleted = 0;
+        _backDeleted = 0;
+    }
+
+    public bool Contains(T item)
+    {
+        for (var i = _frontDeleted; i < _front.Count; i++)
+        {
+            if (Equals(_front[i], item)) return true;
+        }
+
+        for (var i = _backDeleted; i < _back.Count; i++)
+        {
+            if (Equals(_back[i], item)) return true;
+        }
+
+        return false;
+    }
+
+    public void CopyTo(T[] array, int index)
+    {
+        if (array == null) throw new ArgumentNullException("Array cannot be null");
+        if (index < 0) throw new ArgumentOutOfRangeException("Index cannot be negative");
+        if (array.Length < index + Count) throw new ArgumentException("Index is invalid");
+        var i = index;
+
+        foreach (var item in this)
+        {
+            array[i++] = item;
+        }
+    }
+
+    public IEnumerator<T> GetEnumerator()
+    {
+        if (_front.Count - _frontDeleted > 0)
+        {
+            for (var i = _front.Count - 1; i >= _frontDeleted; i--) yield return _front[i];
+        }
+
+        if (_back.Count - _backDeleted > 0)
+        {
+            for (var i = _backDeleted; i < _back.Count; i++) yield return _back[i];
+        }
+    }
+
+    public T PeekFirst()
+    {
+        if (_front.Count > _frontDeleted)
+        {
+            return _front[_front.Count - 1];
+        }
+
+        if (_back.Count > _backDeleted)
+        {
+            return _back[_backDeleted];
+        }
+
+        throw new InvalidOperationException("Can't peek at empty Deque");
+    }
+
+    public T PeekLast()
+    {
+        if (_back.Count > _backDeleted)
+        {
+            return _back[_back.Count - 1];
+        }
+
+        if (_front.Count > _frontDeleted)
+        {
+            return _front[_frontDeleted];
+        }
+
+        throw new InvalidOperationException("Can't peek at empty Deque");
+    }
+
+    public T PopFirst()
+    {
+        T result;
+
+        if (_front.Count > _frontDeleted)
+        {
+            result = _front[_front.Count - 1];
+            _front.RemoveAt(_front.Count - 1);
+        }
+        else if (_back.Count > _backDeleted)
+        {
+            result = _back[_backDeleted];
+            _backDeleted++;
+        }
+        else
+        {
+            throw new InvalidOperationException("Can't pop empty Deque");
+        }
+
+        return result;
+    }
+
+
+    public T PopLast()
+    {
+        T result;
+
+        if (_back.Count > _backDeleted)
+        {
+            result = _back[_back.Count - 1];
+            _back.RemoveAt(_back.Count - 1);
+        }
+        else if (_front.Count > _frontDeleted)
+        {
+            result = _front[_frontDeleted];
+            _frontDeleted++;
+        }
+        else
+        {
+            throw new InvalidOperationException("Can't pop empty Deque");
+        }
+
+        return result;
+    }
+
+    public void Reverse()
+    {
+        var temp = _front;
+        _front = _back;
+        _back = temp;
+        var temp2 = _frontDeleted;
+        _frontDeleted = _backDeleted;
+        _backDeleted = temp2;
+    }
+
+    public T[] ToArray()
+    {
+        if (Count == 0) return new T[0];
+        var result = new T[Count];
+        CopyTo(result, 0);
+        return result;
+    }
+
+    public void TrimExcess()
+    {
+        if (_frontDeleted > 0)
+        {
+            _front.RemoveRange(0, _frontDeleted);
+            _frontDeleted = 0;
+        }
+
+        if (_backDeleted > 0)
+        {
+            _back.RemoveRange(0, _backDeleted);
+            _backDeleted = 0;
+        }
+
+        _front.TrimExcess();
+        _back.TrimExcess();
+    }
+
+    public bool TryPeekFirst(out T item)
+    {
+        if (!IsEmpty)
+        {
+            item = PeekFirst();
+            return true;
+        }
+
+        item = default;
+        return false;
+    }
+
+    public bool TryPeekLast(out T item)
+    {
+        if (!IsEmpty)
+        {
+            item = PeekLast();
+            return true;
+        }
+
+        item = default;
+        return false;
+    }
+
+    public bool TryPopFirst(out T item)
+    {
+        if (!IsEmpty)
+        {
+            item = PopFirst();
+            return true;
+        }
+
+        item = default;
+        return false;
+    }
+
+    public bool TryPopLast(out T item)
+    {
+        if (!IsEmpty)
+        {
+            item = PopLast();
+            return true;
+        }
+
+        item = default;
+        return false;
+    }
+
+    bool ICollection.IsSynchronized => false;
+
+    object ICollection.SyncRoot
+    {
+        get
+        {
+            if (_syncRoot == null)
+            {
+                Interlocked.CompareExchange<object>(ref _syncRoot, new object(), null);
+            }
+            return _syncRoot;
+        }
+    }
+
+    void ICollection.CopyTo(Array array, int index) => CopyTo((T[]) array, index);
+
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
index 4da28b36..3084a2be 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
@@ -1,22 +1,21 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class BackgroundSwitchElement
 {
-    public class BackgroundSwitchElement
-    {
-        public static readonly DependencyProperty MouseHoverBackgroundProperty = DependencyProperty.RegisterAttached(
-            "MouseHoverBackground", typeof(Brush), typeof(BackgroundSwitchElement), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty MouseHoverBackgroundProperty = DependencyProperty.RegisterAttached(
+        "MouseHoverBackground", typeof(Brush), typeof(BackgroundSwitchElement), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetMouseHoverBackground(DependencyObject element, Brush value) => element.SetValue(MouseHoverBackgroundProperty, value);
+    public static void SetMouseHoverBackground(DependencyObject element, Brush value) => element.SetValue(MouseHoverBackgroundProperty, value);
 
-        public static Brush GetMouseHoverBackground(DependencyObject element) => (Brush) element.GetValue(MouseHoverBackgroundProperty);
+    public static Brush GetMouseHoverBackground(DependencyObject element) => (Brush) element.GetValue(MouseHoverBackgroundProperty);
 
-        public static readonly DependencyProperty MouseDownBackgroundProperty = DependencyProperty.RegisterAttached(
-            "MouseDownBackground", typeof(Brush), typeof(BackgroundSwitchElement), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty MouseDownBackgroundProperty = DependencyProperty.RegisterAttached(
+        "MouseDownBackground", typeof(Brush), typeof(BackgroundSwitchElement), new FrameworkPropertyMetadata(Brushes.Transparent, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetMouseDownBackground(DependencyObject element, Brush value) => element.SetValue(MouseDownBackgroundProperty, value);
+    public static void SetMouseDownBackground(DependencyObject element, Brush value) => element.SetValue(MouseDownBackgroundProperty, value);
 
-        public static Brush GetMouseDownBackground(DependencyObject element) => (Brush) element.GetValue(MouseDownBackgroundProperty);
-    }
-}
+    public static Brush GetMouseDownBackground(DependencyObject element) => (Brush) element.GetValue(MouseDownBackgroundProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
index f4ff6451..15cc91b8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
@@ -4,47 +4,46 @@ using System.Windows.Data;
 using HandyControl.Data;
 using HandyControl.Tools.Converter;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class BorderElement
 {
-    public class BorderElement
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.RegisterAttached(
+        "CornerRadius", typeof(CornerRadius), typeof(BorderElement), new FrameworkPropertyMetadata(default(CornerRadius), FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetCornerRadius(DependencyObject element, CornerRadius value) => element.SetValue(CornerRadiusProperty, value);
+
+    public static CornerRadius GetCornerRadius(DependencyObject element) => (CornerRadius) element.GetValue(CornerRadiusProperty);
+
+    public static readonly DependencyProperty CircularProperty = DependencyProperty.RegisterAttached(
+        "Circular", typeof(bool), typeof(BorderElement), new PropertyMetadata(ValueBoxes.FalseBox, OnCircularChanged));
+
+    private static void OnCircularChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.RegisterAttached(
-            "CornerRadius", typeof(CornerRadius), typeof(BorderElement), new FrameworkPropertyMetadata(default(CornerRadius), FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetCornerRadius(DependencyObject element, CornerRadius value) => element.SetValue(CornerRadiusProperty, value);
-
-        public static CornerRadius GetCornerRadius(DependencyObject element) => (CornerRadius) element.GetValue(CornerRadiusProperty);
-
-        public static readonly DependencyProperty CircularProperty = DependencyProperty.RegisterAttached(
-            "Circular", typeof(bool), typeof(BorderElement), new PropertyMetadata(ValueBoxes.FalseBox, OnCircularChanged));
-
-        private static void OnCircularChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is Border border)
         {
-            if (d is Border border)
+            if ((bool) e.NewValue)
             {
-                if ((bool) e.NewValue)
+                var binding = new MultiBinding
                 {
-                    var binding = new MultiBinding
-                    {
-                        Converter = new BorderCircularConverter()
-                    };
-                    binding.Bindings.Add(new Binding(FrameworkElement.ActualWidthProperty.Name) { Source = border });
-                    binding.Bindings.Add(new Binding(FrameworkElement.ActualHeightProperty.Name) { Source = border });
-                    border.SetBinding(Border.CornerRadiusProperty, binding);
-                }
-                else
-                {
-                    BindingOperations.ClearBinding(border, FrameworkElement.ActualWidthProperty);
-                    BindingOperations.ClearBinding(border, FrameworkElement.ActualHeightProperty);
-                    BindingOperations.ClearBinding(border, Border.CornerRadiusProperty);
-                }
+                    Converter = new BorderCircularConverter()
+                };
+                binding.Bindings.Add(new Binding(FrameworkElement.ActualWidthProperty.Name) { Source = border });
+                binding.Bindings.Add(new Binding(FrameworkElement.ActualHeightProperty.Name) { Source = border });
+                border.SetBinding(Border.CornerRadiusProperty, binding);
+            }
+            else
+            {
+                BindingOperations.ClearBinding(border, FrameworkElement.ActualWidthProperty);
+                BindingOperations.ClearBinding(border, FrameworkElement.ActualHeightProperty);
+                BindingOperations.ClearBinding(border, Border.CornerRadiusProperty);
             }
         }
-
-        public static void SetCircular(DependencyObject element, bool value)
-            => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetCircular(DependencyObject element)
-            => (bool) element.GetValue(CircularProperty);
     }
-}
+
+    public static void SetCircular(DependencyObject element, bool value)
+        => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetCircular(DependencyObject element)
+        => (bool) element.GetValue(CircularProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
index 301cc8e1..b5de3463 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
@@ -5,345 +5,344 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class DataGridAttach
 {
-    public class DataGridAttach
+    public static readonly DependencyProperty ApplyDefaultStyleProperty = DependencyProperty.RegisterAttached(
+        "ApplyDefaultStyle", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnApplyDefaultStyleChanged));
+
+    private static void OnApplyDefaultStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty ApplyDefaultStyleProperty = DependencyProperty.RegisterAttached(
-            "ApplyDefaultStyle", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnApplyDefaultStyleChanged));
-
-        private static void OnApplyDefaultStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        var grid = (DataGrid) d;
+        if ((bool) e.NewValue)
         {
-            var grid = (DataGrid) d;
-            if ((bool) e.NewValue)
+            if (grid.AutoGenerateColumns)
             {
-                if (grid.AutoGenerateColumns)
-                {
-                    grid.AutoGeneratedColumns += Grid_AutoGeneratedColumns;
-                    return;
-                }
-
-                UpdateTextColumnStyles(grid);
-                UpdateComboBoxColumnStyles(grid);
-                UpdateCheckBoxColumnStyles(grid);
+                grid.AutoGeneratedColumns += Grid_AutoGeneratedColumns;
+                return;
             }
-            else
-            {
-                grid.AutoGeneratedColumns -= Grid_AutoGeneratedColumns;
-            }
-        }
 
-        private static void Grid_AutoGeneratedColumns(object sender, System.EventArgs e)
-        {
-            var grid = (DataGrid) sender;
             UpdateTextColumnStyles(grid);
             UpdateComboBoxColumnStyles(grid);
             UpdateCheckBoxColumnStyles(grid);
         }
-
-        public static void SetApplyDefaultStyle(DependencyObject element, bool value)
-            => element.SetValue(ApplyDefaultStyleProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetApplyDefaultStyle(DependencyObject element)
-            => (bool) element.GetValue(ApplyDefaultStyleProperty);
-
-        public static readonly DependencyProperty TextColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "TextColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnTextColumnStyleChanged));
-
-        private static void OnTextColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else
         {
-            var grid = (DataGrid) d;
-            if (e.OldValue == null && e.NewValue != null)
+            grid.AutoGeneratedColumns -= Grid_AutoGeneratedColumns;
+        }
+    }
+
+    private static void Grid_AutoGeneratedColumns(object sender, System.EventArgs e)
+    {
+        var grid = (DataGrid) sender;
+        UpdateTextColumnStyles(grid);
+        UpdateComboBoxColumnStyles(grid);
+        UpdateCheckBoxColumnStyles(grid);
+    }
+
+    public static void SetApplyDefaultStyle(DependencyObject element, bool value)
+        => element.SetValue(ApplyDefaultStyleProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetApplyDefaultStyle(DependencyObject element)
+        => (bool) element.GetValue(ApplyDefaultStyleProperty);
+
+    public static readonly DependencyProperty TextColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "TextColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnTextColumnStyleChanged));
+
+    private static void OnTextColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var grid = (DataGrid) d;
+        if (e.OldValue == null && e.NewValue != null)
+        {
+            UpdateTextColumnStyles(grid);
+        }
+    }
+
+    public static void SetTextColumnStyle(DependencyObject element, Style value) => element.SetValue(TextColumnStyleProperty, value);
+
+    public static Style GetTextColumnStyle(DependencyObject element) => (Style) element.GetValue(TextColumnStyleProperty);
+
+    public static readonly DependencyProperty EditingTextColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "EditingTextColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnTextColumnStyleChanged));
+
+    public static void SetEditingTextColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingTextColumnStyleProperty, value);
+
+    public static Style GetEditingTextColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingTextColumnStyleProperty);
+
+    private static void UpdateTextColumnStyles(DataGrid grid)
+    {
+        var textColumnStyle = GetTextColumnStyle(grid);
+        var editingTextColumnStyle = GetEditingTextColumnStyle(grid);
+
+        if (textColumnStyle != null)
+        {
+            foreach (var column in grid.Columns.OfType<DataGridTextColumn>())
             {
-                UpdateTextColumnStyles(grid);
+                var elementStyle = new Style
+                {
+                    BasedOn = column.ElementStyle,
+                    TargetType = textColumnStyle.TargetType
+                };
+
+                foreach (var setter in textColumnStyle.Setters.OfType<Setter>())
+                {
+                    elementStyle.Setters.Add(setter);
+                }
+
+                column.ElementStyle = elementStyle;
             }
         }
 
-        public static void SetTextColumnStyle(DependencyObject element, Style value) => element.SetValue(TextColumnStyleProperty, value);
-
-        public static Style GetTextColumnStyle(DependencyObject element) => (Style) element.GetValue(TextColumnStyleProperty);
-
-        public static readonly DependencyProperty EditingTextColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "EditingTextColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnTextColumnStyleChanged));
-
-        public static void SetEditingTextColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingTextColumnStyleProperty, value);
-
-        public static Style GetEditingTextColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingTextColumnStyleProperty);
-
-        private static void UpdateTextColumnStyles(DataGrid grid)
+        if (editingTextColumnStyle != null)
         {
-            var textColumnStyle = GetTextColumnStyle(grid);
-            var editingTextColumnStyle = GetEditingTextColumnStyle(grid);
-
-            if (textColumnStyle != null)
+            foreach (var column in grid.Columns.OfType<DataGridTextColumn>())
             {
-                foreach (var column in grid.Columns.OfType<DataGridTextColumn>())
+                var editingElementStyle = new Style
                 {
-                    var elementStyle = new Style
-                    {
-                        BasedOn = column.ElementStyle,
-                        TargetType = textColumnStyle.TargetType
-                    };
+                    BasedOn = column.EditingElementStyle,
+                    TargetType = editingTextColumnStyle.TargetType
+                };
 
-                    foreach (var setter in textColumnStyle.Setters.OfType<Setter>())
-                    {
-                        elementStyle.Setters.Add(setter);
-                    }
-
-                    column.ElementStyle = elementStyle;
+                foreach (var setter in editingTextColumnStyle.Setters.OfType<Setter>())
+                {
+                    editingElementStyle.Setters.Add(setter);
                 }
+
+                column.EditingElementStyle = editingElementStyle;
             }
+        }
+    }
 
-            if (editingTextColumnStyle != null)
+    public static readonly DependencyProperty ComboBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "ComboBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnComboBoxColumnStyleChanged));
+
+    private static void OnComboBoxColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var grid = (DataGrid) d;
+        if (e.OldValue == null && e.NewValue != null)
+        {
+            UpdateComboBoxColumnStyles(grid);
+        }
+    }
+
+    public static void SetComboBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(ComboBoxColumnStyleProperty, value);
+
+    public static Style GetComboBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(ComboBoxColumnStyleProperty);
+
+    public static readonly DependencyProperty EditingComboBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "EditingComboBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnComboBoxColumnStyleChanged));
+
+    public static void SetEditingComboBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingComboBoxColumnStyleProperty, value);
+
+    public static Style GetEditingComboBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingComboBoxColumnStyleProperty);
+
+    private static void UpdateComboBoxColumnStyles(DataGrid grid)
+    {
+        var comboBoxColumnStyle = GetComboBoxColumnStyle(grid);
+        var editingComboBoxColumnStyle = GetEditingComboBoxColumnStyle(grid);
+
+        if (comboBoxColumnStyle != null)
+        {
+            foreach (var column in grid.Columns.OfType<DataGridComboBoxColumn>())
             {
-                foreach (var column in grid.Columns.OfType<DataGridTextColumn>())
+                var elementStyle = new Style
                 {
-                    var editingElementStyle = new Style
-                    {
-                        BasedOn = column.EditingElementStyle,
-                        TargetType = editingTextColumnStyle.TargetType
-                    };
+                    BasedOn = column.ElementStyle,
+                    TargetType = comboBoxColumnStyle.TargetType
+                };
 
-                    foreach (var setter in editingTextColumnStyle.Setters.OfType<Setter>())
-                    {
-                        editingElementStyle.Setters.Add(setter);
-                    }
-
-                    column.EditingElementStyle = editingElementStyle;
+                foreach (var setter in comboBoxColumnStyle.Setters.OfType<Setter>())
+                {
+                    elementStyle.Setters.Add(setter);
                 }
+
+                column.ElementStyle = elementStyle;
             }
         }
 
-        public static readonly DependencyProperty ComboBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "ComboBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnComboBoxColumnStyleChanged));
-
-        private static void OnComboBoxColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (editingComboBoxColumnStyle != null)
         {
-            var grid = (DataGrid) d;
-            if (e.OldValue == null && e.NewValue != null)
+            foreach (var column in grid.Columns.OfType<DataGridComboBoxColumn>())
             {
-                UpdateComboBoxColumnStyles(grid);
+                var editingElementStyle = new Style
+                {
+                    BasedOn = column.EditingElementStyle,
+                    TargetType = editingComboBoxColumnStyle.TargetType
+                };
+
+                foreach (var setter in editingComboBoxColumnStyle.Setters.OfType<Setter>())
+                {
+                    editingElementStyle.Setters.Add(setter);
+                }
+
+                column.EditingElementStyle = editingElementStyle;
+            }
+        }
+    }
+
+    public static readonly DependencyProperty CheckBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "CheckBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnCheckBoxColumnStyleChanged));
+
+    private static void OnCheckBoxColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var grid = (DataGrid) d;
+        if (e.OldValue == null && e.NewValue != null)
+        {
+            UpdateCheckBoxColumnStyles(grid);
+        }
+    }
+
+    public static void SetCheckBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(CheckBoxColumnStyleProperty, value);
+
+    public static Style GetCheckBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(CheckBoxColumnStyleProperty);
+
+    public static readonly DependencyProperty EditingCheckBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
+        "EditingCheckBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnCheckBoxColumnStyleChanged));
+
+    public static void SetEditingCheckBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingCheckBoxColumnStyleProperty, value);
+
+    public static Style GetEditingCheckBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingCheckBoxColumnStyleProperty);
+
+    private static void UpdateCheckBoxColumnStyles(DataGrid grid)
+    {
+        var checkBoxColumnStyle = GetCheckBoxColumnStyle(grid);
+        var editingCheckBoxColumnStyle = GetEditingCheckBoxColumnStyle(grid);
+
+        if (checkBoxColumnStyle != null)
+        {
+            foreach (var column in grid.Columns.OfType<DataGridCheckBoxColumn>())
+            {
+                var elementStyle = new Style
+                {
+                    BasedOn = column.ElementStyle,
+                    TargetType = checkBoxColumnStyle.TargetType
+                };
+
+                foreach (var setter in checkBoxColumnStyle.Setters.OfType<Setter>())
+                {
+                    elementStyle.Setters.Add(setter);
+                }
+
+                column.ElementStyle = elementStyle;
             }
         }
 
-        public static void SetComboBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(ComboBoxColumnStyleProperty, value);
-
-        public static Style GetComboBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(ComboBoxColumnStyleProperty);
-
-        public static readonly DependencyProperty EditingComboBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "EditingComboBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnComboBoxColumnStyleChanged));
-
-        public static void SetEditingComboBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingComboBoxColumnStyleProperty, value);
-
-        public static Style GetEditingComboBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingComboBoxColumnStyleProperty);
-
-        private static void UpdateComboBoxColumnStyles(DataGrid grid)
+        if (editingCheckBoxColumnStyle != null)
         {
-            var comboBoxColumnStyle = GetComboBoxColumnStyle(grid);
-            var editingComboBoxColumnStyle = GetEditingComboBoxColumnStyle(grid);
-
-            if (comboBoxColumnStyle != null)
+            foreach (var column in grid.Columns.OfType<DataGridCheckBoxColumn>())
             {
-                foreach (var column in grid.Columns.OfType<DataGridComboBoxColumn>())
+                var editingElementStyle = new Style
                 {
-                    var elementStyle = new Style
-                    {
-                        BasedOn = column.ElementStyle,
-                        TargetType = comboBoxColumnStyle.TargetType
-                    };
+                    BasedOn = column.EditingElementStyle,
+                    TargetType = editingCheckBoxColumnStyle.TargetType
+                };
 
-                    foreach (var setter in comboBoxColumnStyle.Setters.OfType<Setter>())
-                    {
-                        elementStyle.Setters.Add(setter);
-                    }
-
-                    column.ElementStyle = elementStyle;
-                }
-            }
-
-            if (editingComboBoxColumnStyle != null)
-            {
-                foreach (var column in grid.Columns.OfType<DataGridComboBoxColumn>())
+                foreach (var setter in editingCheckBoxColumnStyle.Setters.OfType<Setter>())
                 {
-                    var editingElementStyle = new Style
-                    {
-                        BasedOn = column.EditingElementStyle,
-                        TargetType = editingComboBoxColumnStyle.TargetType
-                    };
-
-                    foreach (var setter in editingComboBoxColumnStyle.Setters.OfType<Setter>())
-                    {
-                        editingElementStyle.Setters.Add(setter);
-                    }
-
-                    column.EditingElementStyle = editingElementStyle;
+                    editingElementStyle.Setters.Add(setter);
                 }
+
+                column.EditingElementStyle = editingElementStyle;
             }
         }
+    }
 
-        public static readonly DependencyProperty CheckBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "CheckBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnCheckBoxColumnStyleChanged));
+    public static DependencyProperty ShowRowNumberProperty = DependencyProperty.RegisterAttached("ShowRowNumber",
+        typeof(bool), typeof(DataGridAttach),
+        new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnShowRowNumberChanged));
 
-        private static void OnCheckBoxColumnStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    public static bool GetShowRowNumber(DependencyObject target) => (bool) target.GetValue(ShowRowNumberProperty);
+
+    public static void SetShowRowNumber(DependencyObject target, bool value) => target.SetValue(ShowRowNumberProperty, ValueBoxes.BooleanBox(value));
+
+    private static void OnShowRowNumberChanged(DependencyObject target, DependencyPropertyChangedEventArgs e)
+    {
+        if (target is not DataGrid dataGrid) return;
+        var show = (bool) e.NewValue;
+
+        if (show)
         {
-            var grid = (DataGrid) d;
-            if (e.OldValue == null && e.NewValue != null)
-            {
-                UpdateCheckBoxColumnStyles(grid);
-            }
+            dataGrid.LoadingRow += DataGrid_LoadingRow;
+            dataGrid.ItemContainerGenerator.ItemsChanged += ItemContainerGeneratorItemsChanged;
+        }
+        else
+        {
+            dataGrid.LoadingRow -= DataGrid_LoadingRow;
+            dataGrid.ItemContainerGenerator.ItemsChanged -= ItemContainerGeneratorItemsChanged;
         }
 
-        public static void SetCheckBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(CheckBoxColumnStyleProperty, value);
-
-        public static Style GetCheckBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(CheckBoxColumnStyleProperty);
-
-        public static readonly DependencyProperty EditingCheckBoxColumnStyleProperty = DependencyProperty.RegisterAttached(
-            "EditingCheckBoxColumnStyle", typeof(Style), typeof(DataGridAttach), new PropertyMetadata(default(Style), OnCheckBoxColumnStyleChanged));
-
-        public static void SetEditingCheckBoxColumnStyle(DependencyObject element, Style value) => element.SetValue(EditingCheckBoxColumnStyleProperty, value);
-
-        public static Style GetEditingCheckBoxColumnStyle(DependencyObject element) => (Style) element.GetValue(EditingCheckBoxColumnStyleProperty);
-
-        private static void UpdateCheckBoxColumnStyles(DataGrid grid)
+        void ItemContainerGeneratorItemsChanged(object sender, ItemsChangedEventArgs e)
         {
-            var checkBoxColumnStyle = GetCheckBoxColumnStyle(grid);
-            var editingCheckBoxColumnStyle = GetEditingCheckBoxColumnStyle(grid);
-
-            if (checkBoxColumnStyle != null)
-            {
-                foreach (var column in grid.Columns.OfType<DataGridCheckBoxColumn>())
-                {
-                    var elementStyle = new Style
-                    {
-                        BasedOn = column.ElementStyle,
-                        TargetType = checkBoxColumnStyle.TargetType
-                    };
-
-                    foreach (var setter in checkBoxColumnStyle.Setters.OfType<Setter>())
-                    {
-                        elementStyle.Setters.Add(setter);
-                    }
-
-                    column.ElementStyle = elementStyle;
-                }
-            }
-
-            if (editingCheckBoxColumnStyle != null)
-            {
-                foreach (var column in grid.Columns.OfType<DataGridCheckBoxColumn>())
-                {
-                    var editingElementStyle = new Style
-                    {
-                        BasedOn = column.EditingElementStyle,
-                        TargetType = editingCheckBoxColumnStyle.TargetType
-                    };
-
-                    foreach (var setter in editingCheckBoxColumnStyle.Setters.OfType<Setter>())
-                    {
-                        editingElementStyle.Setters.Add(setter);
-                    }
-
-                    column.EditingElementStyle = editingElementStyle;
-                }
-            }
-        }
-
-        public static DependencyProperty ShowRowNumberProperty = DependencyProperty.RegisterAttached("ShowRowNumber",
-            typeof(bool), typeof(DataGridAttach),
-            new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnShowRowNumberChanged));
-
-        public static bool GetShowRowNumber(DependencyObject target) => (bool) target.GetValue(ShowRowNumberProperty);
-
-        public static void SetShowRowNumber(DependencyObject target, bool value) => target.SetValue(ShowRowNumberProperty, ValueBoxes.BooleanBox(value));
-
-        private static void OnShowRowNumberChanged(DependencyObject target, DependencyPropertyChangedEventArgs e)
-        {
-            if (target is not DataGrid dataGrid) return;
-            var show = (bool) e.NewValue;
+            var generator = dataGrid.ItemContainerGenerator;
+            var itemsCount = dataGrid.Items.Count;
 
             if (show)
             {
-                dataGrid.LoadingRow += DataGrid_LoadingRow;
-                dataGrid.ItemContainerGenerator.ItemsChanged += ItemContainerGeneratorItemsChanged;
+                for (var i = 0; i < itemsCount; i++)
+                {
+                    var row = (DataGridRow) generator.ContainerFromIndex(i);
+                    if (row != null)
+                    {
+                        row.Header = (i + 1).ToString();
+                    }
+                }
             }
             else
             {
-                dataGrid.LoadingRow -= DataGrid_LoadingRow;
-                dataGrid.ItemContainerGenerator.ItemsChanged -= ItemContainerGeneratorItemsChanged;
-            }
-
-            void ItemContainerGeneratorItemsChanged(object sender, ItemsChangedEventArgs e)
-            {
-                var generator = dataGrid.ItemContainerGenerator;
-                var itemsCount = dataGrid.Items.Count;
-
-                if (show)
+                for (var i = 0; i < itemsCount; i++)
                 {
-                    for (var i = 0; i < itemsCount; i++)
+                    var row = (DataGridRow) generator.ContainerFromIndex(i);
+                    if (row != null)
                     {
-                        var row = (DataGridRow) generator.ContainerFromIndex(i);
-                        if (row != null)
-                        {
-                            row.Header = (i + 1).ToString();
-                        }
-                    }
-                }
-                else
-                {
-                    for (var i = 0; i < itemsCount; i++)
-                    {
-                        var row = (DataGridRow) generator.ContainerFromIndex(i);
-                        if (row != null)
-                        {
-                            row.Header = null;
-                        }
+                        row.Header = null;
                     }
                 }
             }
         }
-
-        private static void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e) => e.Row.Header = (e.Row.GetIndex() + 1).ToString();
-
-        public static readonly DependencyProperty CanUnselectAllWithBlankAreaProperty = DependencyProperty.RegisterAttached(
-            "CanUnselectAllWithBlankArea", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnCanUnselectAllWithBlankAreaChanged));
-
-        private static void OnCanUnselectAllWithBlankAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is DataGrid dataGrid)
-            {
-                if ((bool) e.NewValue)
-                {
-                    dataGrid.PreviewMouseDown += DataGrid_PreviewMouseDown;
-                }
-                else
-                {
-                    dataGrid.PreviewMouseDown -= DataGrid_PreviewMouseDown;
-                }
-            }
-        }
-
-        private static void DataGrid_PreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is DataGrid dataGrid && e.OriginalSource is System.Windows.Controls.ScrollViewer)
-            {
-                dataGrid.CommitEdit();
-                dataGrid.UnselectAll();
-            }
-        }
-
-        public static void SetCanUnselectAllWithBlankArea(DependencyObject element, bool value)
-            => element.SetValue(CanUnselectAllWithBlankAreaProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetCanUnselectAllWithBlankArea(DependencyObject element)
-            => (bool) element.GetValue(CanUnselectAllWithBlankAreaProperty);
-
-        public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.RegisterAttached(
-            "ShowSelectAllButton", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static void SetShowSelectAllButton(DependencyObject element, bool value)
-            => element.SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowSelectAllButton(DependencyObject element)
-            => (bool) element.GetValue(ShowSelectAllButtonProperty);
     }
-}
+
+    private static void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e) => e.Row.Header = (e.Row.GetIndex() + 1).ToString();
+
+    public static readonly DependencyProperty CanUnselectAllWithBlankAreaProperty = DependencyProperty.RegisterAttached(
+        "CanUnselectAllWithBlankArea", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnCanUnselectAllWithBlankAreaChanged));
+
+    private static void OnCanUnselectAllWithBlankAreaChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DataGrid dataGrid)
+        {
+            if ((bool) e.NewValue)
+            {
+                dataGrid.PreviewMouseDown += DataGrid_PreviewMouseDown;
+            }
+            else
+            {
+                dataGrid.PreviewMouseDown -= DataGrid_PreviewMouseDown;
+            }
+        }
+    }
+
+    private static void DataGrid_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is DataGrid dataGrid && e.OriginalSource is System.Windows.Controls.ScrollViewer)
+        {
+            dataGrid.CommitEdit();
+            dataGrid.UnselectAll();
+        }
+    }
+
+    public static void SetCanUnselectAllWithBlankArea(DependencyObject element, bool value)
+        => element.SetValue(CanUnselectAllWithBlankAreaProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetCanUnselectAllWithBlankArea(DependencyObject element)
+        => (bool) element.GetValue(CanUnselectAllWithBlankAreaProperty);
+
+    public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.RegisterAttached(
+        "ShowSelectAllButton", typeof(bool), typeof(DataGridAttach), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public static void SetShowSelectAllButton(DependencyObject element, bool value)
+        => element.SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowSelectAllButton(DependencyObject element)
+        => (bool) element.GetValue(ShowSelectAllButtonProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
index 7a8561f2..67b11a60 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
@@ -1,28 +1,27 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class DropDownElement
 {
-    public class DropDownElement
-    {
-        public static readonly DependencyProperty ConsistentWidthProperty = DependencyProperty.RegisterAttached(
-            "ConsistentWidth", typeof(bool), typeof(DropDownElement),
-            new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty ConsistentWidthProperty = DependencyProperty.RegisterAttached(
+        "ConsistentWidth", typeof(bool), typeof(DropDownElement),
+        new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetConsistentWidth(DependencyObject element, bool value)
-            => element.SetValue(ConsistentWidthProperty, ValueBoxes.BooleanBox(value));
+    public static void SetConsistentWidth(DependencyObject element, bool value)
+        => element.SetValue(ConsistentWidthProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetConsistentWidth(DependencyObject element)
-            => (bool) element.GetValue(ConsistentWidthProperty);
+    public static bool GetConsistentWidth(DependencyObject element)
+        => (bool) element.GetValue(ConsistentWidthProperty);
 
-        public static readonly DependencyProperty AutoWidthProperty = DependencyProperty.RegisterAttached(
-            "AutoWidth", typeof(bool), typeof(DropDownElement),
-            new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty AutoWidthProperty = DependencyProperty.RegisterAttached(
+        "AutoWidth", typeof(bool), typeof(DropDownElement),
+        new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetAutoWidth(DependencyObject element, bool value)
-            => element.SetValue(AutoWidthProperty, ValueBoxes.BooleanBox(value));
+    public static void SetAutoWidth(DependencyObject element, bool value)
+        => element.SetValue(AutoWidthProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetAutoWidth(DependencyObject element)
-            => (bool) element.GetValue(AutoWidthProperty);
-    }
-}
+    public static bool GetAutoWidth(DependencyObject element)
+        => (bool) element.GetValue(AutoWidthProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
index 87df83c2..b99261de 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
@@ -1,47 +1,46 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class EdgeElement
 {
-    public class EdgeElement
-    {
-        public static readonly DependencyProperty LeftContentProperty = DependencyProperty.RegisterAttached(
-            "LeftContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
+    public static readonly DependencyProperty LeftContentProperty = DependencyProperty.RegisterAttached(
+        "LeftContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
 
-        public static void SetLeftContent(DependencyObject element, object value) => element.SetValue(LeftContentProperty, value);
+    public static void SetLeftContent(DependencyObject element, object value) => element.SetValue(LeftContentProperty, value);
 
-        public static object GetLeftContent(DependencyObject element) => element.GetValue(LeftContentProperty);
+    public static object GetLeftContent(DependencyObject element) => element.GetValue(LeftContentProperty);
 
-        public static readonly DependencyProperty TopContentProperty = DependencyProperty.RegisterAttached(
-            "TopContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
+    public static readonly DependencyProperty TopContentProperty = DependencyProperty.RegisterAttached(
+        "TopContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
 
-        public static void SetTopContent(DependencyObject element, object value) => element.SetValue(TopContentProperty, value);
+    public static void SetTopContent(DependencyObject element, object value) => element.SetValue(TopContentProperty, value);
 
-        public static object GetTopContent(DependencyObject element) => element.GetValue(TopContentProperty);
+    public static object GetTopContent(DependencyObject element) => element.GetValue(TopContentProperty);
 
-        public static readonly DependencyProperty RightContentProperty = DependencyProperty.RegisterAttached(
-            "RightContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
+    public static readonly DependencyProperty RightContentProperty = DependencyProperty.RegisterAttached(
+        "RightContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
 
-        public static void SetRightContent(DependencyObject element, object value) => element.SetValue(RightContentProperty, value);
+    public static void SetRightContent(DependencyObject element, object value) => element.SetValue(RightContentProperty, value);
 
-        public static object GetRightContent(DependencyObject element) => element.GetValue(RightContentProperty);
+    public static object GetRightContent(DependencyObject element) => element.GetValue(RightContentProperty);
 
-        public static readonly DependencyProperty BottomContentProperty = DependencyProperty.RegisterAttached(
-            "BottomContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
+    public static readonly DependencyProperty BottomContentProperty = DependencyProperty.RegisterAttached(
+        "BottomContent", typeof(object), typeof(EdgeElement), new PropertyMetadata(default(object), OnEdgeContentChanged));
 
-        public static void SetBottomContent(DependencyObject element, object value) => element.SetValue(BottomContentProperty, value);
+    public static void SetBottomContent(DependencyObject element, object value) => element.SetValue(BottomContentProperty, value);
 
-        public static object GetBottomContent(DependencyObject element) => element.GetValue(BottomContentProperty);
+    public static object GetBottomContent(DependencyObject element) => element.GetValue(BottomContentProperty);
 
-        public static readonly DependencyProperty ShowEdgeContentProperty = DependencyProperty.RegisterAttached(
-            "ShowEdgeContent", typeof(bool), typeof(EdgeElement), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowEdgeContentProperty = DependencyProperty.RegisterAttached(
+        "ShowEdgeContent", typeof(bool), typeof(EdgeElement), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static void SetShowEdgeContent(DependencyObject element, bool value) => element.SetValue(ShowEdgeContentProperty, ValueBoxes.BooleanBox(value));
+    public static void SetShowEdgeContent(DependencyObject element, bool value) => element.SetValue(ShowEdgeContentProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetShowEdgeContent(DependencyObject element) => (bool) element.GetValue(ShowEdgeContentProperty);
+    public static bool GetShowEdgeContent(DependencyObject element) => (bool) element.GetValue(ShowEdgeContentProperty);
 
-        private static void OnEdgeContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            SetShowEdgeContent(d, !(GetLeftContent(d) == null && GetTopContent(d) == null &&
-                                    GetRightContent(d) == null && GetBottomContent(d) == null));
-    }
-}
+    private static void OnEdgeContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        SetShowEdgeContent(d, !(GetLeftContent(d) == null && GetTopContent(d) == null &&
+                                GetRightContent(d) == null && GetBottomContent(d) == null));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
index 95b24af5..24690922 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
@@ -2,95 +2,94 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class GridAttach
 {
-    public class GridAttach
+    public static readonly DependencyProperty NameProperty = DependencyProperty.RegisterAttached(
+        "Name", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string)));
+
+    public static void SetName(DependencyObject element, string value)
+        => element.SetValue(NameProperty, value);
+
+    public static string GetName(DependencyObject element)
+        => (string) element.GetValue(NameProperty);
+
+    public static readonly DependencyProperty RowNameProperty = DependencyProperty.RegisterAttached(
+        "RowName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnRowNameChanged));
+
+    private static void OnRowNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty NameProperty = DependencyProperty.RegisterAttached(
-            "Name", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string)));
-
-        public static void SetName(DependencyObject element, string value)
-            => element.SetValue(NameProperty, value);
-
-        public static string GetName(DependencyObject element)
-            => (string) element.GetValue(NameProperty);
-
-        public static readonly DependencyProperty RowNameProperty = DependencyProperty.RegisterAttached(
-            "RowName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnRowNameChanged));
-
-        private static void OnRowNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is FrameworkElement frameworkElement)
         {
-            if (d is FrameworkElement frameworkElement)
+            if (e.NewValue is string rowName)
             {
-                if (e.NewValue is string rowName)
+                if (string.IsNullOrEmpty(rowName))
                 {
-                    if (string.IsNullOrEmpty(rowName))
-                    {
-                        return;
-                    }
+                    return;
+                }
 
-                    if (frameworkElement.Parent is Grid grid)
+                if (frameworkElement.Parent is Grid grid)
+                {
+                    for (var i = 0; i < grid.RowDefinitions.Count; i++)
                     {
-                        for (var i = 0; i < grid.RowDefinitions.Count; i++)
+                        var gridRowDefinition = grid.RowDefinitions[i];
+                        var gridRowName = GetName(gridRowDefinition);
+
+                        if (!string.IsNullOrEmpty(gridRowName) &&
+                            gridRowName.Equals(rowName, StringComparison.Ordinal))
                         {
-                            var gridRowDefinition = grid.RowDefinitions[i];
-                            var gridRowName = GetName(gridRowDefinition);
-
-                            if (!string.IsNullOrEmpty(gridRowName) &&
-                                gridRowName.Equals(rowName, StringComparison.Ordinal))
-                            {
-                                Grid.SetRow(frameworkElement, i);
-                                return;
-                            }
+                            Grid.SetRow(frameworkElement, i);
+                            return;
                         }
                     }
                 }
             }
         }
-
-        public static void SetRowName(DependencyObject element, string value)
-            => element.SetValue(RowNameProperty, value);
-
-        public static string GetRowName(DependencyObject element)
-            => (string) element.GetValue(RowNameProperty);
-
-        public static readonly DependencyProperty ColumnNameProperty = DependencyProperty.RegisterAttached(
-            "ColumnName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnColumnNameChanged));
-
-        private static void OnColumnNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is FrameworkElement frameworkElement)
-            {
-                if (e.NewValue is string columnName)
-                {
-                    if (string.IsNullOrEmpty(columnName))
-                    {
-                        return;
-                    }
-
-                    if (frameworkElement.Parent is Grid grid)
-                    {
-                        for (var i = 0; i < grid.ColumnDefinitions.Count; i++)
-                        {
-                            var gridColumnDefinition = grid.ColumnDefinitions[i];
-                            var gridColumnName = GetName(gridColumnDefinition);
-
-                            if (!string.IsNullOrEmpty(gridColumnName) &&
-                                gridColumnName.Equals(columnName, StringComparison.Ordinal))
-                            {
-                                Grid.SetColumn(frameworkElement, i);
-                                return;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        public static void SetColumnName(DependencyObject element, string value)
-            => element.SetValue(ColumnNameProperty, value);
-
-        public static string GetColumnName(DependencyObject element)
-            => (string) element.GetValue(ColumnNameProperty);
     }
-}
+
+    public static void SetRowName(DependencyObject element, string value)
+        => element.SetValue(RowNameProperty, value);
+
+    public static string GetRowName(DependencyObject element)
+        => (string) element.GetValue(RowNameProperty);
+
+    public static readonly DependencyProperty ColumnNameProperty = DependencyProperty.RegisterAttached(
+        "ColumnName", typeof(string), typeof(GridAttach), new PropertyMetadata(default(string), OnColumnNameChanged));
+
+    private static void OnColumnNameChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is FrameworkElement frameworkElement)
+        {
+            if (e.NewValue is string columnName)
+            {
+                if (string.IsNullOrEmpty(columnName))
+                {
+                    return;
+                }
+
+                if (frameworkElement.Parent is Grid grid)
+                {
+                    for (var i = 0; i < grid.ColumnDefinitions.Count; i++)
+                    {
+                        var gridColumnDefinition = grid.ColumnDefinitions[i];
+                        var gridColumnName = GetName(gridColumnDefinition);
+
+                        if (!string.IsNullOrEmpty(gridColumnName) &&
+                            gridColumnName.Equals(columnName, StringComparison.Ordinal))
+                        {
+                            Grid.SetColumn(frameworkElement, i);
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static void SetColumnName(DependencyObject element, string value)
+        => element.SetValue(ColumnNameProperty, value);
+
+    public static string GetColumnName(DependencyObject element)
+        => (string) element.GetValue(ColumnNameProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
index c700fad9..3a7d9223 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
@@ -1,35 +1,34 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class IconElement
 {
-    public class IconElement
-    {
-        public static readonly DependencyProperty GeometryProperty = DependencyProperty.RegisterAttached(
-            "Geometry", typeof(Geometry), typeof(IconElement), new PropertyMetadata(default(Geometry)));
+    public static readonly DependencyProperty GeometryProperty = DependencyProperty.RegisterAttached(
+        "Geometry", typeof(Geometry), typeof(IconElement), new PropertyMetadata(default(Geometry)));
 
-        public static void SetGeometry(DependencyObject element, Geometry value)
-            => element.SetValue(GeometryProperty, value);
+    public static void SetGeometry(DependencyObject element, Geometry value)
+        => element.SetValue(GeometryProperty, value);
 
-        public static Geometry GetGeometry(DependencyObject element)
-            => (Geometry) element.GetValue(GeometryProperty);
+    public static Geometry GetGeometry(DependencyObject element)
+        => (Geometry) element.GetValue(GeometryProperty);
 
-        public static readonly DependencyProperty WidthProperty = DependencyProperty.RegisterAttached(
-            "Width", typeof(double), typeof(IconElement), new PropertyMetadata(double.NaN));
+    public static readonly DependencyProperty WidthProperty = DependencyProperty.RegisterAttached(
+        "Width", typeof(double), typeof(IconElement), new PropertyMetadata(double.NaN));
 
-        public static void SetWidth(DependencyObject element, double value)
-            => element.SetValue(WidthProperty, value);
+    public static void SetWidth(DependencyObject element, double value)
+        => element.SetValue(WidthProperty, value);
 
-        public static double GetWidth(DependencyObject element)
-            => (double) element.GetValue(WidthProperty);
+    public static double GetWidth(DependencyObject element)
+        => (double) element.GetValue(WidthProperty);
 
-        public static readonly DependencyProperty HeightProperty = DependencyProperty.RegisterAttached(
-            "Height", typeof(double), typeof(IconElement), new PropertyMetadata(double.NaN));
+    public static readonly DependencyProperty HeightProperty = DependencyProperty.RegisterAttached(
+        "Height", typeof(double), typeof(IconElement), new PropertyMetadata(double.NaN));
 
-        public static void SetHeight(DependencyObject element, double value)
-            => element.SetValue(HeightProperty, value);
+    public static void SetHeight(DependencyObject element, double value)
+        => element.SetValue(HeightProperty, value);
 
-        public static double GetHeight(DependencyObject element)
-            => (double) element.GetValue(HeightProperty);
-    }
-}
+    public static double GetHeight(DependencyObject element)
+        => (double) element.GetValue(HeightProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
index 913cbd40..f286b985 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
@@ -1,21 +1,20 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class IconSwitchElement : IconElement
 {
-    public class IconSwitchElement : IconElement
+    public static readonly DependencyProperty GeometrySelectedProperty = DependencyProperty.RegisterAttached(
+        "GeometrySelected", typeof(Geometry), typeof(IconSwitchElement), new PropertyMetadata(default(Geometry)));
+
+    public static void SetGeometrySelected(DependencyObject element, Geometry value)
     {
-        public static readonly DependencyProperty GeometrySelectedProperty = DependencyProperty.RegisterAttached(
-            "GeometrySelected", typeof(Geometry), typeof(IconSwitchElement), new PropertyMetadata(default(Geometry)));
-
-        public static void SetGeometrySelected(DependencyObject element, Geometry value)
-        {
-            element.SetValue(GeometrySelectedProperty, value);
-        }
-
-        public static Geometry GetGeometrySelected(DependencyObject element)
-        {
-            return (Geometry) element.GetValue(GeometrySelectedProperty);
-        }
+        element.SetValue(GeometrySelectedProperty, value);
     }
-}
+
+    public static Geometry GetGeometrySelected(DependencyObject element)
+    {
+        return (Geometry) element.GetValue(GeometrySelectedProperty);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
index 0e6582ca..da6cce4e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
@@ -2,41 +2,40 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ImageAttach
 {
-    public class ImageAttach
+    public static readonly DependencyProperty SourceFailedProperty = DependencyProperty.RegisterAttached(
+        "SourceFailed", typeof(ImageSource), typeof(ImageAttach), new FrameworkPropertyMetadata(default(ImageSource), FrameworkPropertyMetadataOptions.Inherits, OnSourceFailedChanged));
+
+    private static void OnSourceFailedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty SourceFailedProperty = DependencyProperty.RegisterAttached(
-            "SourceFailed", typeof(ImageSource), typeof(ImageAttach), new FrameworkPropertyMetadata(default(ImageSource), FrameworkPropertyMetadataOptions.Inherits, OnSourceFailedChanged));
-
-        private static void OnSourceFailedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is Image image)
         {
-            if (d is Image image)
+            if (e.NewValue is ImageSource)
             {
-                if (e.NewValue is ImageSource)
-                {
-                    image.ImageFailed += Image_ImageFailed;
-                }
-                else
-                {
-                    image.ImageFailed -= Image_ImageFailed;
-                }
+                image.ImageFailed += Image_ImageFailed;
             }
-        }
-
-        private static void Image_ImageFailed(object sender, ExceptionRoutedEventArgs e)
-        {
-            if (sender is Image image)
+            else
             {
-                image.SetCurrentValue(Image.SourceProperty, GetSourceFailed(image));
                 image.ImageFailed -= Image_ImageFailed;
             }
         }
-
-        public static void SetSourceFailed(DependencyObject element, ImageSource value)
-            => element.SetValue(SourceFailedProperty, value);
-
-        public static ImageSource GetSourceFailed(DependencyObject element)
-            => (ImageSource) element.GetValue(SourceFailedProperty);
     }
-}
+
+    private static void Image_ImageFailed(object sender, ExceptionRoutedEventArgs e)
+    {
+        if (sender is Image image)
+        {
+            image.SetCurrentValue(Image.SourceProperty, GetSourceFailed(image));
+            image.ImageFailed -= Image_ImageFailed;
+        }
+    }
+
+    public static void SetSourceFailed(DependencyObject element, ImageSource value)
+        => element.SetValue(SourceFailedProperty, value);
+
+    public static ImageSource GetSourceFailed(DependencyObject element)
+        => (ImageSource) element.GetValue(SourceFailedProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
index 9678149a..e7b3562f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
@@ -1,93 +1,92 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class InfoElement : TitleElement
 {
-    public class InfoElement : TitleElement
-    {
-        /// <summary>
-        ///     占位符
-        /// </summary>
-        public static readonly DependencyProperty PlaceholderProperty = DependencyProperty.RegisterAttached(
-            "Placeholder", typeof(string), typeof(InfoElement), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.Inherits));
+    /// <summary>
+    ///     占位符
+    /// </summary>
+    public static readonly DependencyProperty PlaceholderProperty = DependencyProperty.RegisterAttached(
+        "Placeholder", typeof(string), typeof(InfoElement), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetPlaceholder(DependencyObject element, string value) => element.SetValue(PlaceholderProperty, value);
+    public static void SetPlaceholder(DependencyObject element, string value) => element.SetValue(PlaceholderProperty, value);
 
-        public static string GetPlaceholder(DependencyObject element) => (string) element.GetValue(PlaceholderProperty);
+    public static string GetPlaceholder(DependencyObject element) => (string) element.GetValue(PlaceholderProperty);
 
-        /// <summary>
-        ///     是否必填
-        /// </summary>
-        public static readonly DependencyProperty NecessaryProperty = DependencyProperty.RegisterAttached(
-            "Necessary", typeof(bool), typeof(InfoElement), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+    /// <summary>
+    ///     是否必填
+    /// </summary>
+    public static readonly DependencyProperty NecessaryProperty = DependencyProperty.RegisterAttached(
+        "Necessary", typeof(bool), typeof(InfoElement), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetNecessary(DependencyObject element, bool value) => element.SetValue(NecessaryProperty, ValueBoxes.BooleanBox(value));
+    public static void SetNecessary(DependencyObject element, bool value) => element.SetValue(NecessaryProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetNecessary(DependencyObject element) => (bool) element.GetValue(NecessaryProperty);
+    public static bool GetNecessary(DependencyObject element) => (bool) element.GetValue(NecessaryProperty);
 
-        /// <summary>
-        ///     标记
-        /// </summary>
-        public static readonly DependencyProperty SymbolProperty = DependencyProperty.RegisterAttached(
-            "Symbol", typeof(string), typeof(InfoElement), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.Inherits));
+    /// <summary>
+    ///     标记
+    /// </summary>
+    public static readonly DependencyProperty SymbolProperty = DependencyProperty.RegisterAttached(
+        "Symbol", typeof(string), typeof(InfoElement), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetSymbol(DependencyObject element, string value) => element.SetValue(SymbolProperty, value);
+    public static void SetSymbol(DependencyObject element, string value) => element.SetValue(SymbolProperty, value);
 
-        public static string GetSymbol(DependencyObject element) => (string) element.GetValue(SymbolProperty);
+    public static string GetSymbol(DependencyObject element) => (string) element.GetValue(SymbolProperty);
 
-        /// <summary>
-        ///     内容高度
-        /// </summary>
-        public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.RegisterAttached(
-            "ContentHeight", typeof(double), typeof(InfoElement), new FrameworkPropertyMetadata(30.0, FrameworkPropertyMetadataOptions.Inherits));
+    /// <summary>
+    ///     内容高度
+    /// </summary>
+    public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.RegisterAttached(
+        "ContentHeight", typeof(double), typeof(InfoElement), new FrameworkPropertyMetadata(30.0, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetContentHeight(DependencyObject element, double value) => element.SetValue(ContentHeightProperty, value);
+    public static void SetContentHeight(DependencyObject element, double value) => element.SetValue(ContentHeightProperty, value);
 
-        public static double GetContentHeight(DependencyObject element) => (double) element.GetValue(ContentHeightProperty);
+    public static double GetContentHeight(DependencyObject element) => (double) element.GetValue(ContentHeightProperty);
 
-        /// <summary>
-        ///     最小内容高度
-        /// </summary>
-        public static readonly DependencyProperty MinContentHeightProperty = DependencyProperty.RegisterAttached(
-            "MinContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(30.0));
+    /// <summary>
+    ///     最小内容高度
+    /// </summary>
+    public static readonly DependencyProperty MinContentHeightProperty = DependencyProperty.RegisterAttached(
+        "MinContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(30.0));
 
-        public static void SetMinContentHeight(DependencyObject element, double value)
-            => element.SetValue(MinContentHeightProperty, value);
+    public static void SetMinContentHeight(DependencyObject element, double value)
+        => element.SetValue(MinContentHeightProperty, value);
 
-        public static double GetMinContentHeight(DependencyObject element)
-            => (double) element.GetValue(MinContentHeightProperty);
+    public static double GetMinContentHeight(DependencyObject element)
+        => (double) element.GetValue(MinContentHeightProperty);
 
-        /// <summary>
-        ///     最大内容高度
-        /// </summary>
-        public static readonly DependencyProperty MaxContentHeightProperty = DependencyProperty.RegisterAttached(
-            "MaxContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(double.PositiveInfinity));
+    /// <summary>
+    ///     最大内容高度
+    /// </summary>
+    public static readonly DependencyProperty MaxContentHeightProperty = DependencyProperty.RegisterAttached(
+        "MaxContentHeight", typeof(double), typeof(InfoElement), new PropertyMetadata(double.PositiveInfinity));
 
-        public static void SetMaxContentHeight(DependencyObject element, double value)
-            => element.SetValue(MaxContentHeightProperty, value);
+    public static void SetMaxContentHeight(DependencyObject element, double value)
+        => element.SetValue(MaxContentHeightProperty, value);
 
-        public static double GetMaxContentHeight(DependencyObject element)
-            => (double) element.GetValue(MaxContentHeightProperty);
+    public static double GetMaxContentHeight(DependencyObject element)
+        => (double) element.GetValue(MaxContentHeightProperty);
 
-        /// <summary>
-        ///     正则表达式
-        /// </summary>
-        public static readonly DependencyProperty RegexPatternProperty = DependencyProperty.RegisterAttached(
-            "RegexPattern", typeof(string), typeof(InfoElement), new PropertyMetadata(default(string)));
+    /// <summary>
+    ///     正则表达式
+    /// </summary>
+    public static readonly DependencyProperty RegexPatternProperty = DependencyProperty.RegisterAttached(
+        "RegexPattern", typeof(string), typeof(InfoElement), new PropertyMetadata(default(string)));
 
-        public static void SetRegexPattern(DependencyObject element, string value)
-            => element.SetValue(RegexPatternProperty, value);
+    public static void SetRegexPattern(DependencyObject element, string value)
+        => element.SetValue(RegexPatternProperty, value);
 
-        public static string GetRegexPattern(DependencyObject element)
-            => (string) element.GetValue(RegexPatternProperty);
+    public static string GetRegexPattern(DependencyObject element)
+        => (string) element.GetValue(RegexPatternProperty);
 
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.RegisterAttached(
-            "ShowClearButton", typeof(bool), typeof(InfoElement), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.RegisterAttached(
+        "ShowClearButton", typeof(bool), typeof(InfoElement), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static void SetShowClearButton(DependencyObject element, bool value)
-            => element.SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    public static void SetShowClearButton(DependencyObject element, bool value)
+        => element.SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetShowClearButton(DependencyObject element)
-            => (bool) element.GetValue(ShowClearButtonProperty);
-    }
-}
+    public static bool GetShowClearButton(DependencyObject element)
+        => (bool) element.GetValue(ShowClearButtonProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
index c5c2a255..042100d5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
@@ -5,103 +5,102 @@ using System.Windows.Controls.Primitives;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class MenuTopLineAttach
 {
-    public class MenuTopLineAttach
+    public static readonly DependencyProperty PopupProperty = DependencyProperty.RegisterAttached(
+        "Popup", typeof(Popup), typeof(MenuTopLineAttach), new PropertyMetadata(default(Popup), OnPopupChanged));
+
+    private static void OnPopupChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty PopupProperty = DependencyProperty.RegisterAttached(
-            "Popup", typeof(Popup), typeof(MenuTopLineAttach), new PropertyMetadata(default(Popup), OnPopupChanged));
+        var topLine = (FrameworkElement) d;
 
-        private static void OnPopupChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (e.NewValue is Popup { TemplatedParent: MenuItem menuItem })
         {
-            var topLine = (FrameworkElement) d;
-
-            if (e.NewValue is Popup { TemplatedParent: MenuItem menuItem })
-            {
-                SetTopLine(menuItem, topLine);
-                menuItem.Loaded += MenuItem_Loaded;
-            }
+            SetTopLine(menuItem, topLine);
+            menuItem.Loaded += MenuItem_Loaded;
         }
-
-        private static void MenuItem_Loaded(object sender, RoutedEventArgs e)
-        {
-            var menuItem = (FrameworkElement) sender;
-            menuItem.Unloaded += MenuItem_Unloaded;
-            var topLine = GetTopLine(menuItem);
-            var popup = GetPopup(topLine);
-            if (popup != null)
-            {
-                popup.Opened += Popup_Opened;
-            }
-        }
-
-        private static void MenuItem_Unloaded(object sender, RoutedEventArgs e)
-        {
-            var menuItem = (FrameworkElement) sender;
-            menuItem.Unloaded -= MenuItem_Unloaded;
-            var topLine = GetTopLine(menuItem);
-            var popup = GetPopup(topLine);
-            if (popup != null)
-            {
-                popup.Opened -= Popup_Opened;
-            }
-        }
-
-        private static void Popup_Opened(object sender, EventArgs e)
-        {
-            var popup = (Popup) sender;
-            if (popup.TemplatedParent is MenuItem menuItem)
-            {
-                var topLine = GetTopLine(menuItem);
-                if (topLine == null) return;
-
-                topLine.HorizontalAlignment = HorizontalAlignment.Left;
-                topLine.Width = menuItem.ActualWidth;
-                topLine.Margin = new Thickness();
-
-                var positionLeftTop = menuItem.PointToScreen(new Point());
-                var positionRightBottom = menuItem.PointToScreen(new Point(menuItem.ActualWidth, menuItem.ActualHeight));
-                ScreenHelper.FindMonitorRectsFromPoint(InteropMethods.GetCursorPos(), out _, out var workAreaRect);
-                var panel = VisualHelper.GetParent<Panel>(topLine);
-
-                if (positionLeftTop.X < 0)
-                {
-
-                    topLine.Margin = new Thickness(positionLeftTop.X - panel.Margin.Left, 0, 0, 0);
-                }
-                else if (positionLeftTop.X + panel.ActualWidth > workAreaRect.Right)
-                {
-                    var overflowWidth = positionRightBottom.X - workAreaRect.Right;
-                    if (overflowWidth > 0)
-                    {
-                        topLine.Width -= overflowWidth + panel.Margin.Right;
-                    }
-                    topLine.HorizontalAlignment = HorizontalAlignment.Left;
-                    topLine.Margin = new Thickness(positionLeftTop.X + panel.ActualWidth - workAreaRect.Right + panel.Margin.Right, 0, 0, 0);
-                }
-
-                if (positionRightBottom.Y > workAreaRect.Bottom)
-                {
-                    topLine.Width = 0;
-                    topLine.HorizontalAlignment = HorizontalAlignment.Stretch;
-                    topLine.Margin = new Thickness();
-                }
-            }
-        }
-
-        public static void SetPopup(DependencyObject element, Popup value)
-            => element.SetValue(PopupProperty, value);
-
-        public static Popup GetPopup(DependencyObject element)
-            => (Popup) element.GetValue(PopupProperty);
-
-        internal static readonly DependencyProperty TopLineProperty = DependencyProperty.RegisterAttached(
-            "TopLine", typeof(FrameworkElement), typeof(MenuTopLineAttach), new PropertyMetadata(default(FrameworkElement)));
-
-        internal static void SetTopLine(DependencyObject element, FrameworkElement value)
-            => element.SetValue(TopLineProperty, value);
-
-        internal static FrameworkElement GetTopLine(DependencyObject element)
-            => (FrameworkElement) element.GetValue(TopLineProperty);
     }
-}
+
+    private static void MenuItem_Loaded(object sender, RoutedEventArgs e)
+    {
+        var menuItem = (FrameworkElement) sender;
+        menuItem.Unloaded += MenuItem_Unloaded;
+        var topLine = GetTopLine(menuItem);
+        var popup = GetPopup(topLine);
+        if (popup != null)
+        {
+            popup.Opened += Popup_Opened;
+        }
+    }
+
+    private static void MenuItem_Unloaded(object sender, RoutedEventArgs e)
+    {
+        var menuItem = (FrameworkElement) sender;
+        menuItem.Unloaded -= MenuItem_Unloaded;
+        var topLine = GetTopLine(menuItem);
+        var popup = GetPopup(topLine);
+        if (popup != null)
+        {
+            popup.Opened -= Popup_Opened;
+        }
+    }
+
+    private static void Popup_Opened(object sender, EventArgs e)
+    {
+        var popup = (Popup) sender;
+        if (popup.TemplatedParent is MenuItem menuItem)
+        {
+            var topLine = GetTopLine(menuItem);
+            if (topLine == null) return;
+
+            topLine.HorizontalAlignment = HorizontalAlignment.Left;
+            topLine.Width = menuItem.ActualWidth;
+            topLine.Margin = new Thickness();
+
+            var positionLeftTop = menuItem.PointToScreen(new Point());
+            var positionRightBottom = menuItem.PointToScreen(new Point(menuItem.ActualWidth, menuItem.ActualHeight));
+            ScreenHelper.FindMonitorRectsFromPoint(InteropMethods.GetCursorPos(), out _, out var workAreaRect);
+            var panel = VisualHelper.GetParent<Panel>(topLine);
+
+            if (positionLeftTop.X < 0)
+            {
+
+                topLine.Margin = new Thickness(positionLeftTop.X - panel.Margin.Left, 0, 0, 0);
+            }
+            else if (positionLeftTop.X + panel.ActualWidth > workAreaRect.Right)
+            {
+                var overflowWidth = positionRightBottom.X - workAreaRect.Right;
+                if (overflowWidth > 0)
+                {
+                    topLine.Width -= overflowWidth + panel.Margin.Right;
+                }
+                topLine.HorizontalAlignment = HorizontalAlignment.Left;
+                topLine.Margin = new Thickness(positionLeftTop.X + panel.ActualWidth - workAreaRect.Right + panel.Margin.Right, 0, 0, 0);
+            }
+
+            if (positionRightBottom.Y > workAreaRect.Bottom)
+            {
+                topLine.Width = 0;
+                topLine.HorizontalAlignment = HorizontalAlignment.Stretch;
+                topLine.Margin = new Thickness();
+            }
+        }
+    }
+
+    public static void SetPopup(DependencyObject element, Popup value)
+        => element.SetValue(PopupProperty, value);
+
+    public static Popup GetPopup(DependencyObject element)
+        => (Popup) element.GetValue(PopupProperty);
+
+    internal static readonly DependencyProperty TopLineProperty = DependencyProperty.RegisterAttached(
+        "TopLine", typeof(FrameworkElement), typeof(MenuTopLineAttach), new PropertyMetadata(default(FrameworkElement)));
+
+    internal static void SetTopLine(DependencyObject element, FrameworkElement value)
+        => element.SetValue(TopLineProperty, value);
+
+    internal static FrameworkElement GetTopLine(DependencyObject element)
+        => (FrameworkElement) element.GetValue(TopLineProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
index c69b5cf1..3ad90a89 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
@@ -2,43 +2,42 @@
 using System.Windows.Controls;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class PanelElement
 {
-    public class PanelElement
+    public static readonly DependencyProperty FluidMoveBehaviorProperty = DependencyProperty.RegisterAttached(
+        "FluidMoveBehavior", typeof(FluidMoveBehavior), typeof(PanelElement), new PropertyMetadata(default(FluidMoveBehavior), OnFluidMoveBehaviorChanged));
+
+    private static void OnFluidMoveBehaviorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty FluidMoveBehaviorProperty = DependencyProperty.RegisterAttached(
-            "FluidMoveBehavior", typeof(FluidMoveBehavior), typeof(PanelElement), new PropertyMetadata(default(FluidMoveBehavior), OnFluidMoveBehaviorChanged));
-
-        private static void OnFluidMoveBehaviorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is Panel panel)
         {
-            if (d is Panel panel)
-            {
-                var collection = Interaction.GetBehaviors(panel);
-                var oldBehavior = GetTempFluidMoveBehavior(panel);
-                collection.ItemRemoved(oldBehavior);
-                panel.SetCurrentValue(TempFluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
+            var collection = Interaction.GetBehaviors(panel);
+            var oldBehavior = GetTempFluidMoveBehavior(panel);
+            collection.ItemRemoved(oldBehavior);
+            panel.SetCurrentValue(TempFluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
 
-                if (e.NewValue is FluidMoveBehavior behavior)
-                {
-                    collection.ItemAdded(behavior);
-                    SetTempFluidMoveBehavior(panel, behavior);
-                }
+            if (e.NewValue is FluidMoveBehavior behavior)
+            {
+                collection.ItemAdded(behavior);
+                SetTempFluidMoveBehavior(panel, behavior);
             }
         }
-
-        public static void SetFluidMoveBehavior(DependencyObject element, FluidMoveBehavior value)
-            => element.SetValue(FluidMoveBehaviorProperty, value);
-
-        public static FluidMoveBehavior GetFluidMoveBehavior(DependencyObject element)
-            => (FluidMoveBehavior) element.GetValue(FluidMoveBehaviorProperty);
-
-        private static readonly DependencyProperty TempFluidMoveBehaviorProperty = DependencyProperty.RegisterAttached(
-            "TempFluidMoveBehavior", typeof(FluidMoveBehavior), typeof(PanelElement), new PropertyMetadata(default(FluidMoveBehavior)));
-
-        private static void SetTempFluidMoveBehavior(DependencyObject element, FluidMoveBehavior value)
-            => element.SetValue(TempFluidMoveBehaviorProperty, value);
-
-        private static FluidMoveBehavior GetTempFluidMoveBehavior(DependencyObject element)
-            => (FluidMoveBehavior) element.GetValue(TempFluidMoveBehaviorProperty);
     }
-}
+
+    public static void SetFluidMoveBehavior(DependencyObject element, FluidMoveBehavior value)
+        => element.SetValue(FluidMoveBehaviorProperty, value);
+
+    public static FluidMoveBehavior GetFluidMoveBehavior(DependencyObject element)
+        => (FluidMoveBehavior) element.GetValue(FluidMoveBehaviorProperty);
+
+    private static readonly DependencyProperty TempFluidMoveBehaviorProperty = DependencyProperty.RegisterAttached(
+        "TempFluidMoveBehavior", typeof(FluidMoveBehavior), typeof(PanelElement), new PropertyMetadata(default(FluidMoveBehavior)));
+
+    private static void SetTempFluidMoveBehavior(DependencyObject element, FluidMoveBehavior value)
+        => element.SetValue(TempFluidMoveBehaviorProperty, value);
+
+    private static FluidMoveBehavior GetTempFluidMoveBehavior(DependencyObject element)
+        => (FluidMoveBehavior) element.GetValue(TempFluidMoveBehaviorProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
index 7141df7c..b1df3a4c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
@@ -1,54 +1,53 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class PasswordBoxAttach
 {
-    public class PasswordBoxAttach
+    /// <summary>
+    ///     密码长度
+    /// </summary>
+    public static readonly DependencyProperty PasswordLengthProperty = DependencyProperty.RegisterAttached(
+        "PasswordLength", typeof(int), typeof(PasswordBoxAttach), new PropertyMetadata(ValueBoxes.Int0Box));
+
+    public static void SetPasswordLength(DependencyObject element, int value) => element.SetValue(PasswordLengthProperty, value);
+
+    public static int GetPasswordLength(DependencyObject element) => (int) element.GetValue(PasswordLengthProperty);
+
+    /// <summary>
+    ///     是否监测
+    /// </summary>
+    public static readonly DependencyProperty IsMonitoringProperty = DependencyProperty.RegisterAttached(
+        "IsMonitoring", typeof(bool), typeof(PasswordBoxAttach), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnIsMonitoringChanged));
+
+    private static void OnIsMonitoringChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        /// <summary>
-        ///     密码长度
-        /// </summary>
-        public static readonly DependencyProperty PasswordLengthProperty = DependencyProperty.RegisterAttached(
-            "PasswordLength", typeof(int), typeof(PasswordBoxAttach), new PropertyMetadata(ValueBoxes.Int0Box));
-
-        public static void SetPasswordLength(DependencyObject element, int value) => element.SetValue(PasswordLengthProperty, value);
-
-        public static int GetPasswordLength(DependencyObject element) => (int) element.GetValue(PasswordLengthProperty);
-
-        /// <summary>
-        ///     是否监测
-        /// </summary>
-        public static readonly DependencyProperty IsMonitoringProperty = DependencyProperty.RegisterAttached(
-            "IsMonitoring", typeof(bool), typeof(PasswordBoxAttach), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits, OnIsMonitoringChanged));
-
-        private static void OnIsMonitoringChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is System.Windows.Controls.PasswordBox passwordBox)
         {
-            if (d is System.Windows.Controls.PasswordBox passwordBox)
+            if (e.NewValue is bool boolValue)
             {
-                if (e.NewValue is bool boolValue)
+                if (boolValue)
                 {
-                    if (boolValue)
-                    {
-                        passwordBox.PasswordChanged += PasswordChanged;
-                    }
-                    else
-                    {
-                        passwordBox.PasswordChanged -= PasswordChanged;
-                    }
+                    passwordBox.PasswordChanged += PasswordChanged;
+                }
+                else
+                {
+                    passwordBox.PasswordChanged -= PasswordChanged;
                 }
             }
         }
+    }
 
-        public static void SetIsMonitoring(DependencyObject element, bool value) => element.SetValue(IsMonitoringProperty, ValueBoxes.BooleanBox(value));
+    public static void SetIsMonitoring(DependencyObject element, bool value) => element.SetValue(IsMonitoringProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetIsMonitoring(DependencyObject element) => (bool) element.GetValue(IsMonitoringProperty);
+    public static bool GetIsMonitoring(DependencyObject element) => (bool) element.GetValue(IsMonitoringProperty);
 
-        private static void PasswordChanged(object sender, RoutedEventArgs e)
+    private static void PasswordChanged(object sender, RoutedEventArgs e)
+    {
+        if (sender is System.Windows.Controls.PasswordBox passwordBox)
         {
-            if (sender is System.Windows.Controls.PasswordBox passwordBox)
-            {
-                SetPasswordLength(passwordBox, passwordBox.Password.Length);
-            }
+            SetPasswordLength(passwordBox, passwordBox.Password.Length);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
index 9030953f..1e4e1dbd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
@@ -4,42 +4,41 @@ using System.Windows.Shapes;
 using HandyControl.Data;
 using HandyControl.Tools.Converter;
 
-namespace HandyControl.Controls
-{
-    public class RectangleAttach
-    {
-        public static readonly DependencyProperty CircularProperty = DependencyProperty.RegisterAttached(
-            "Circular", typeof(bool), typeof(RectangleAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnCircularChanged));
+namespace HandyControl.Controls;
 
-        private static void OnCircularChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+public class RectangleAttach
+{
+    public static readonly DependencyProperty CircularProperty = DependencyProperty.RegisterAttached(
+        "Circular", typeof(bool), typeof(RectangleAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnCircularChanged));
+
+    private static void OnCircularChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Rectangle rectangle)
         {
-            if (d is Rectangle rectangle)
+            if ((bool) e.NewValue)
             {
-                if ((bool) e.NewValue)
+                var binding = new MultiBinding
                 {
-                    var binding = new MultiBinding
-                    {
-                        Converter = new RectangleCircularConverter()
-                    };
-                    binding.Bindings.Add(new Binding(FrameworkElement.ActualWidthProperty.Name) { Source = rectangle });
-                    binding.Bindings.Add(new Binding(FrameworkElement.ActualHeightProperty.Name) { Source = rectangle });
-                    rectangle.SetBinding(Rectangle.RadiusXProperty, binding);
-                    rectangle.SetBinding(Rectangle.RadiusYProperty, binding);
-                }
-                else
-                {
-                    BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualWidthProperty);
-                    BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualHeightProperty);
-                    BindingOperations.ClearBinding(rectangle, Rectangle.RadiusXProperty);
-                    BindingOperations.ClearBinding(rectangle, Rectangle.RadiusYProperty);
-                }
+                    Converter = new RectangleCircularConverter()
+                };
+                binding.Bindings.Add(new Binding(FrameworkElement.ActualWidthProperty.Name) { Source = rectangle });
+                binding.Bindings.Add(new Binding(FrameworkElement.ActualHeightProperty.Name) { Source = rectangle });
+                rectangle.SetBinding(Rectangle.RadiusXProperty, binding);
+                rectangle.SetBinding(Rectangle.RadiusYProperty, binding);
+            }
+            else
+            {
+                BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualWidthProperty);
+                BindingOperations.ClearBinding(rectangle, FrameworkElement.ActualHeightProperty);
+                BindingOperations.ClearBinding(rectangle, Rectangle.RadiusXProperty);
+                BindingOperations.ClearBinding(rectangle, Rectangle.RadiusYProperty);
             }
         }
-
-        public static void SetCircular(DependencyObject element, bool value)
-            => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetCircular(DependencyObject element)
-            => (bool) element.GetValue(CircularProperty);
     }
-}
+
+    public static void SetCircular(DependencyObject element, bool value)
+        => element.SetValue(CircularProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetCircular(DependencyObject element)
+        => (bool) element.GetValue(CircularProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
index 67306295..76fb78b6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
@@ -3,54 +3,53 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ScrollViewerAttach
 {
-    public class ScrollViewerAttach
+    public static readonly DependencyProperty AutoHideProperty = DependencyProperty.RegisterAttached(
+        "AutoHide", typeof(bool), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetAutoHide(DependencyObject element, bool value)
+        => element.SetValue(AutoHideProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAutoHide(DependencyObject element)
+        => (bool) element.GetValue(AutoHideProperty);
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.RegisterAttached(
+        "Orientation", typeof(Orientation), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.VerticalBox, FrameworkPropertyMetadataOptions.Inherits, OnOrientationChanged));
+
+    private static void OnOrientationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty AutoHideProperty = DependencyProperty.RegisterAttached(
-            "AutoHide", typeof(bool), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetAutoHide(DependencyObject element, bool value)
-            => element.SetValue(AutoHideProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAutoHide(DependencyObject element)
-            => (bool) element.GetValue(AutoHideProperty);
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.RegisterAttached(
-            "Orientation", typeof(Orientation), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.VerticalBox, FrameworkPropertyMetadataOptions.Inherits, OnOrientationChanged));
-
-        private static void OnOrientationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is ScrollViewer)
         {
-            if (d is ScrollViewer)
-            {
-                return;
-            }
-
-            if (d is System.Windows.Controls.ScrollViewer scrollViewer)
-            {
-                if ((Orientation) e.NewValue == Orientation.Horizontal)
-                {
-                    scrollViewer.PreviewMouseWheel += ScrollViewer_PreviewMouseWheel;
-                }
-                else
-                {
-                    scrollViewer.PreviewMouseWheel -= ScrollViewer_PreviewMouseWheel;
-                }
-            }
+            return;
         }
 
-        private static void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        if (d is System.Windows.Controls.ScrollViewer scrollViewer)
         {
-            var scrollViewer = (System.Windows.Controls.ScrollViewer) sender;
-            scrollViewer.ScrollToHorizontalOffset(Math.Min(Math.Max(0, scrollViewer.HorizontalOffset - e.Delta), scrollViewer.ScrollableWidth));
-
-            e.Handled = true;
+            if ((Orientation) e.NewValue == Orientation.Horizontal)
+            {
+                scrollViewer.PreviewMouseWheel += ScrollViewer_PreviewMouseWheel;
+            }
+            else
+            {
+                scrollViewer.PreviewMouseWheel -= ScrollViewer_PreviewMouseWheel;
+            }
         }
-
-        public static void SetOrientation(DependencyObject element, Orientation value)
-            => element.SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
-
-        public static Orientation GetOrientation(DependencyObject element)
-            => (Orientation) element.GetValue(OrientationProperty);
     }
-}
+
+    private static void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+    {
+        var scrollViewer = (System.Windows.Controls.ScrollViewer) sender;
+        scrollViewer.ScrollToHorizontalOffset(Math.Min(Math.Max(0, scrollViewer.HorizontalOffset - e.Delta), scrollViewer.ScrollableWidth));
+
+        e.Handled = true;
+    }
+
+    public static void SetOrientation(DependencyObject element, Orientation value)
+        => element.SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
+
+    public static Orientation GetOrientation(DependencyObject element)
+        => (Orientation) element.GetValue(OrientationProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
index e47f90f9..1d3aba30 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
@@ -1,28 +1,27 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class StatusSwitchElement
 {
-    public class StatusSwitchElement
-    {
-        /// <summary>
-        ///     选中时展示的元素
-        /// </summary>
-        public static readonly DependencyProperty CheckedElementProperty = DependencyProperty.RegisterAttached(
-            "CheckedElement", typeof(object), typeof(StatusSwitchElement), new PropertyMetadata(default(object)));
+    /// <summary>
+    ///     选中时展示的元素
+    /// </summary>
+    public static readonly DependencyProperty CheckedElementProperty = DependencyProperty.RegisterAttached(
+        "CheckedElement", typeof(object), typeof(StatusSwitchElement), new PropertyMetadata(default(object)));
 
-        public static void SetCheckedElement(DependencyObject element, object value) => element.SetValue(CheckedElementProperty, value);
+    public static void SetCheckedElement(DependencyObject element, object value) => element.SetValue(CheckedElementProperty, value);
 
-        public static object GetCheckedElement(DependencyObject element) => element.GetValue(CheckedElementProperty);
+    public static object GetCheckedElement(DependencyObject element) => element.GetValue(CheckedElementProperty);
 
-        /// <summary>
-        ///     是否隐藏元素
-        /// </summary>
-        public static readonly DependencyProperty HideUncheckedElementProperty = DependencyProperty.RegisterAttached(
-            "HideUncheckedElement", typeof(bool), typeof(StatusSwitchElement), new PropertyMetadata(ValueBoxes.FalseBox));
+    /// <summary>
+    ///     是否隐藏元素
+    /// </summary>
+    public static readonly DependencyProperty HideUncheckedElementProperty = DependencyProperty.RegisterAttached(
+        "HideUncheckedElement", typeof(bool), typeof(StatusSwitchElement), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static void SetHideUncheckedElement(DependencyObject element, bool value) => element.SetValue(HideUncheckedElementProperty, ValueBoxes.BooleanBox(value));
+    public static void SetHideUncheckedElement(DependencyObject element, bool value) => element.SetValue(HideUncheckedElementProperty, ValueBoxes.BooleanBox(value));
 
-        public static bool GetHideUncheckedElement(DependencyObject element) => (bool) element.GetValue(HideUncheckedElementProperty);
-    }
-}
+    public static bool GetHideUncheckedElement(DependencyObject element) => (bool) element.GetValue(HideUncheckedElementProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
index 3e5236db..44cd3a53 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
@@ -5,67 +5,66 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools.Helper;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TextBlockAttach
 {
-    public class TextBlockAttach
+    public static readonly DependencyProperty AutoTooltipProperty = DependencyProperty.RegisterAttached(
+        "AutoTooltip", typeof(bool), typeof(TextBlockAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnAutoTooltipChanged));
+
+    private static void OnAutoTooltipChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty AutoTooltipProperty = DependencyProperty.RegisterAttached(
-            "AutoTooltip", typeof(bool), typeof(TextBlockAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnAutoTooltipChanged));
-
-        private static void OnAutoTooltipChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is TextBlock ctl)
         {
-            if (d is TextBlock ctl)
+            if ((bool) e.NewValue)
             {
-                if ((bool) e.NewValue)
-                {
-                    UpdateTooltip(ctl);
-                    ctl.SizeChanged += TextBlock_SizeChanged;
-                }
-                else
-                {
-                    ctl.SizeChanged -= TextBlock_SizeChanged;
-                }
-            }
-        }
-
-        public static void SetAutoTooltip(DependencyObject element, bool value)
-            => element.SetValue(AutoTooltipProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAutoTooltip(DependencyObject element)
-            => (bool) element.GetValue(AutoTooltipProperty);
-
-        private static void TextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (sender is TextBlock textBlock)
-            {
-                UpdateTooltip(textBlock);
-            }
-        }
-
-        private static void UpdateTooltip(TextBlock textBlock)
-        {
-            textBlock.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            var width = textBlock.DesiredSize.Width - textBlock.Margin.Left - textBlock.Margin.Right;
-
-            // the code Math.Abs(CalcTextWidth(textBlock) - width) > 1 is not elegant end even bugly,
-            // while it does solve the problem of Tooltip failure in some cases
-            if (textBlock.RenderSize.Width > width || textBlock.ActualWidth < width || Math.Abs(CalcTextWidth(textBlock) - width) > 1)
-            {
-                ToolTipService.SetToolTip(textBlock, textBlock.Text);
+                UpdateTooltip(ctl);
+                ctl.SizeChanged += TextBlock_SizeChanged;
             }
             else
             {
-                ToolTipService.SetToolTip(textBlock, null);
+                ctl.SizeChanged -= TextBlock_SizeChanged;
             }
         }
+    }
 
-        private static double CalcTextWidth(TextBlock textBlock)
+    public static void SetAutoTooltip(DependencyObject element, bool value)
+        => element.SetValue(AutoTooltipProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAutoTooltip(DependencyObject element)
+        => (bool) element.GetValue(AutoTooltipProperty);
+
+    private static void TextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        if (sender is TextBlock textBlock)
         {
-            var formattedText = TextHelper.CreateFormattedText(textBlock.Text, textBlock.FlowDirection,
-                new Typeface(textBlock.FontFamily, textBlock.FontStyle, textBlock.FontWeight, textBlock.FontStretch),
-                textBlock.FontSize);
-
-            return formattedText.WidthIncludingTrailingWhitespace;
+            UpdateTooltip(textBlock);
         }
     }
-}
+
+    private static void UpdateTooltip(TextBlock textBlock)
+    {
+        textBlock.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        var width = textBlock.DesiredSize.Width - textBlock.Margin.Left - textBlock.Margin.Right;
+
+        // the code Math.Abs(CalcTextWidth(textBlock) - width) > 1 is not elegant end even bugly,
+        // while it does solve the problem of Tooltip failure in some cases
+        if (textBlock.RenderSize.Width > width || textBlock.ActualWidth < width || Math.Abs(CalcTextWidth(textBlock) - width) > 1)
+        {
+            ToolTipService.SetToolTip(textBlock, textBlock.Text);
+        }
+        else
+        {
+            ToolTipService.SetToolTip(textBlock, null);
+        }
+    }
+
+    private static double CalcTextWidth(TextBlock textBlock)
+    {
+        var formattedText = TextHelper.CreateFormattedText(textBlock.Text, textBlock.FlowDirection,
+            new Typeface(textBlock.FontFamily, textBlock.FontStyle, textBlock.FontWeight, textBlock.FontStretch),
+            textBlock.FontSize);
+
+        return formattedText.WidthIncludingTrailingWhitespace;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
index 734357b9..eac798fd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
@@ -1,31 +1,30 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TipElement
 {
-    public class TipElement
-    {
-        public static readonly DependencyProperty VisibilityProperty = DependencyProperty.RegisterAttached(
-            "Visibility", typeof(Visibility), typeof(TipElement), new PropertyMetadata(Visibility.Collapsed));
+    public static readonly DependencyProperty VisibilityProperty = DependencyProperty.RegisterAttached(
+        "Visibility", typeof(Visibility), typeof(TipElement), new PropertyMetadata(Visibility.Collapsed));
 
-        public static void SetVisibility(DependencyObject element, Visibility value) => element.SetValue(VisibilityProperty, value);
+    public static void SetVisibility(DependencyObject element, Visibility value) => element.SetValue(VisibilityProperty, value);
 
-        public static Visibility GetVisibility(DependencyObject element) => (Visibility) element.GetValue(VisibilityProperty);
+    public static Visibility GetVisibility(DependencyObject element) => (Visibility) element.GetValue(VisibilityProperty);
 
-        public static readonly DependencyProperty PlacementProperty = DependencyProperty.RegisterAttached(
-            "Placement", typeof(PlacementType), typeof(TipElement), new PropertyMetadata(default(PlacementType)));
+    public static readonly DependencyProperty PlacementProperty = DependencyProperty.RegisterAttached(
+        "Placement", typeof(PlacementType), typeof(TipElement), new PropertyMetadata(default(PlacementType)));
 
-        public static void SetPlacement(DependencyObject element, PlacementType value) => element.SetValue(PlacementProperty, value);
+    public static void SetPlacement(DependencyObject element, PlacementType value) => element.SetValue(PlacementProperty, value);
 
-        public static PlacementType GetPlacement(DependencyObject element) => (PlacementType) element.GetValue(PlacementProperty);
+    public static PlacementType GetPlacement(DependencyObject element) => (PlacementType) element.GetValue(PlacementProperty);
 
-        public static readonly DependencyProperty StringFormatProperty = DependencyProperty.RegisterAttached(
-            "StringFormat", typeof(string), typeof(TipElement), new PropertyMetadata("#0.0"));
+    public static readonly DependencyProperty StringFormatProperty = DependencyProperty.RegisterAttached(
+        "StringFormat", typeof(string), typeof(TipElement), new PropertyMetadata("#0.0"));
 
-        public static void SetStringFormat(DependencyObject element, string value)
-            => element.SetValue(StringFormatProperty, value);
+    public static void SetStringFormat(DependencyObject element, string value)
+        => element.SetValue(StringFormatProperty, value);
 
-        public static string GetStringFormat(DependencyObject element)
-            => (string) element.GetValue(StringFormatProperty);
-    }
-}
+    public static string GetStringFormat(DependencyObject element)
+        => (string) element.GetValue(StringFormatProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
index 55f9a63d..03bd1b0e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
@@ -2,87 +2,86 @@
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TitleElement
 {
-    public class TitleElement
-    {
-        public static readonly DependencyProperty TitleProperty = DependencyProperty.RegisterAttached(
-            "Title", typeof(string), typeof(TitleElement), new PropertyMetadata(default(string)));
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.RegisterAttached(
+        "Title", typeof(string), typeof(TitleElement), new PropertyMetadata(default(string)));
 
-        public static void SetTitle(DependencyObject element, string value)
-            => element.SetValue(TitleProperty, value);
+    public static void SetTitle(DependencyObject element, string value)
+        => element.SetValue(TitleProperty, value);
 
-        public static string GetTitle(DependencyObject element)
-            => (string) element.GetValue(TitleProperty);
+    public static string GetTitle(DependencyObject element)
+        => (string) element.GetValue(TitleProperty);
 
-        public static readonly DependencyProperty BackgroundProperty = DependencyProperty.RegisterAttached(
-            "Background", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty BackgroundProperty = DependencyProperty.RegisterAttached(
+        "Background", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetBackground(DependencyObject element, Brush value)
-            => element.SetValue(BackgroundProperty, value);
+    public static void SetBackground(DependencyObject element, Brush value)
+        => element.SetValue(BackgroundProperty, value);
 
-        public static Brush GetBackground(DependencyObject element)
-            => (Brush) element.GetValue(BackgroundProperty);
+    public static Brush GetBackground(DependencyObject element)
+        => (Brush) element.GetValue(BackgroundProperty);
 
-        public static readonly DependencyProperty ForegroundProperty = DependencyProperty.RegisterAttached(
-            "Foreground", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty ForegroundProperty = DependencyProperty.RegisterAttached(
+        "Foreground", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetForeground(DependencyObject element, Brush value)
-            => element.SetValue(ForegroundProperty, value);
+    public static void SetForeground(DependencyObject element, Brush value)
+        => element.SetValue(ForegroundProperty, value);
 
-        public static Brush GetForeground(DependencyObject element)
-            => (Brush) element.GetValue(ForegroundProperty);
+    public static Brush GetForeground(DependencyObject element)
+        => (Brush) element.GetValue(ForegroundProperty);
 
-        public static readonly DependencyProperty BorderBrushProperty = DependencyProperty.RegisterAttached(
-            "BorderBrush", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty BorderBrushProperty = DependencyProperty.RegisterAttached(
+        "BorderBrush", typeof(Brush), typeof(TitleElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetBorderBrush(DependencyObject element, Brush value)
-            => element.SetValue(BorderBrushProperty, value);
+    public static void SetBorderBrush(DependencyObject element, Brush value)
+        => element.SetValue(BorderBrushProperty, value);
 
-        public static Brush GetBorderBrush(DependencyObject element)
-            => (Brush) element.GetValue(BorderBrushProperty);
+    public static Brush GetBorderBrush(DependencyObject element)
+        => (Brush) element.GetValue(BorderBrushProperty);
 
-        public static readonly DependencyProperty TitlePlacementProperty = DependencyProperty.RegisterAttached(
-            "TitlePlacement", typeof(TitlePlacementType), typeof(TitleElement), new FrameworkPropertyMetadata(TitlePlacementType.Top, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty TitlePlacementProperty = DependencyProperty.RegisterAttached(
+        "TitlePlacement", typeof(TitlePlacementType), typeof(TitleElement), new FrameworkPropertyMetadata(TitlePlacementType.Top, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetTitlePlacement(DependencyObject element, TitlePlacementType value)
-            => element.SetValue(TitlePlacementProperty, value);
+    public static void SetTitlePlacement(DependencyObject element, TitlePlacementType value)
+        => element.SetValue(TitlePlacementProperty, value);
 
-        public static TitlePlacementType GetTitlePlacement(DependencyObject element)
-            => (TitlePlacementType) element.GetValue(TitlePlacementProperty);
+    public static TitlePlacementType GetTitlePlacement(DependencyObject element)
+        => (TitlePlacementType) element.GetValue(TitlePlacementProperty);
 
-        public static readonly DependencyProperty TitleWidthProperty = DependencyProperty.RegisterAttached(
-            "TitleWidth", typeof(GridLength), typeof(TitleElement), new FrameworkPropertyMetadata(GridLength.Auto, FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty TitleWidthProperty = DependencyProperty.RegisterAttached(
+        "TitleWidth", typeof(GridLength), typeof(TitleElement), new FrameworkPropertyMetadata(GridLength.Auto, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetTitleWidth(DependencyObject element, GridLength value) => element.SetValue(TitleWidthProperty, value);
+    public static void SetTitleWidth(DependencyObject element, GridLength value) => element.SetValue(TitleWidthProperty, value);
 
-        public static GridLength GetTitleWidth(DependencyObject element) => (GridLength) element.GetValue(TitleWidthProperty);
+    public static GridLength GetTitleWidth(DependencyObject element) => (GridLength) element.GetValue(TitleWidthProperty);
 
-        public static readonly DependencyProperty HorizontalAlignmentProperty = DependencyProperty.RegisterAttached(
-            "HorizontalAlignment", typeof(HorizontalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(HorizontalAlignment), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty HorizontalAlignmentProperty = DependencyProperty.RegisterAttached(
+        "HorizontalAlignment", typeof(HorizontalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(HorizontalAlignment), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetHorizontalAlignment(DependencyObject element, HorizontalAlignment value)
-            => element.SetValue(HorizontalAlignmentProperty, value);
+    public static void SetHorizontalAlignment(DependencyObject element, HorizontalAlignment value)
+        => element.SetValue(HorizontalAlignmentProperty, value);
 
-        public static HorizontalAlignment GetHorizontalAlignment(DependencyObject element)
-            => (HorizontalAlignment) element.GetValue(HorizontalAlignmentProperty);
+    public static HorizontalAlignment GetHorizontalAlignment(DependencyObject element)
+        => (HorizontalAlignment) element.GetValue(HorizontalAlignmentProperty);
 
-        public static readonly DependencyProperty VerticalAlignmentProperty = DependencyProperty.RegisterAttached(
-            "VerticalAlignment", typeof(VerticalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(VerticalAlignment), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty VerticalAlignmentProperty = DependencyProperty.RegisterAttached(
+        "VerticalAlignment", typeof(VerticalAlignment), typeof(TitleElement), new FrameworkPropertyMetadata(default(VerticalAlignment), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetVerticalAlignment(DependencyObject element, VerticalAlignment value)
-            => element.SetValue(VerticalAlignmentProperty, value);
+    public static void SetVerticalAlignment(DependencyObject element, VerticalAlignment value)
+        => element.SetValue(VerticalAlignmentProperty, value);
 
-        public static VerticalAlignment GetVerticalAlignment(DependencyObject element)
-            => (VerticalAlignment) element.GetValue(VerticalAlignmentProperty);
+    public static VerticalAlignment GetVerticalAlignment(DependencyObject element)
+        => (VerticalAlignment) element.GetValue(VerticalAlignmentProperty);
 
-        public static readonly DependencyProperty MarginOnTheLeftProperty = DependencyProperty.RegisterAttached(
-            "MarginOnTheLeft", typeof(Thickness), typeof(TitleElement), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty MarginOnTheLeftProperty = DependencyProperty.RegisterAttached(
+        "MarginOnTheLeft", typeof(Thickness), typeof(TitleElement), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetMarginOnTheLeft(DependencyObject element, Thickness value)
-            => element.SetValue(MarginOnTheLeftProperty, value);
+    public static void SetMarginOnTheLeft(DependencyObject element, Thickness value)
+        => element.SetValue(MarginOnTheLeftProperty, value);
 
-        public static Thickness GetMarginOnTheLeft(DependencyObject element)
-            => (Thickness) element.GetValue(MarginOnTheLeftProperty);
-    }
-}
+    public static Thickness GetMarginOnTheLeft(DependencyObject element)
+        => (Thickness) element.GetValue(MarginOnTheLeftProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
index 9e7f9e1a..865303c3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
@@ -1,53 +1,52 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class VisualElement
 {
-    public class VisualElement
-    {
-        public static readonly DependencyProperty HighlightBrushProperty = DependencyProperty.RegisterAttached(
-            "HighlightBrush", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty HighlightBrushProperty = DependencyProperty.RegisterAttached(
+        "HighlightBrush", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetHighlightBrush(DependencyObject element, Brush value)
-            => element.SetValue(HighlightBrushProperty, value);
+    public static void SetHighlightBrush(DependencyObject element, Brush value)
+        => element.SetValue(HighlightBrushProperty, value);
 
-        public static Brush GetHighlightBrush(DependencyObject element)
-            => (Brush) element.GetValue(HighlightBrushProperty);
+    public static Brush GetHighlightBrush(DependencyObject element)
+        => (Brush) element.GetValue(HighlightBrushProperty);
 
-        public static readonly DependencyProperty HighlightBackgroundProperty = DependencyProperty.RegisterAttached(
-            "HighlightBackground", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty HighlightBackgroundProperty = DependencyProperty.RegisterAttached(
+        "HighlightBackground", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetHighlightBackground(DependencyObject element, Brush value)
-            => element.SetValue(HighlightBackgroundProperty, value);
+    public static void SetHighlightBackground(DependencyObject element, Brush value)
+        => element.SetValue(HighlightBackgroundProperty, value);
 
-        public static Brush GetHighlightBackground(DependencyObject element)
-            => (Brush) element.GetValue(HighlightBackgroundProperty);
+    public static Brush GetHighlightBackground(DependencyObject element)
+        => (Brush) element.GetValue(HighlightBackgroundProperty);
 
-        public static readonly DependencyProperty HighlightBorderBrushProperty = DependencyProperty.RegisterAttached(
-            "HighlightBorderBrush", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty HighlightBorderBrushProperty = DependencyProperty.RegisterAttached(
+        "HighlightBorderBrush", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetHighlightBorderBrush(DependencyObject element, Brush value)
-            => element.SetValue(HighlightBorderBrushProperty, value);
+    public static void SetHighlightBorderBrush(DependencyObject element, Brush value)
+        => element.SetValue(HighlightBorderBrushProperty, value);
 
-        public static Brush GetHighlightBorderBrush(DependencyObject element)
-            => (Brush) element.GetValue(HighlightBorderBrushProperty);
+    public static Brush GetHighlightBorderBrush(DependencyObject element)
+        => (Brush) element.GetValue(HighlightBorderBrushProperty);
 
-        public static readonly DependencyProperty HighlightForegroundProperty = DependencyProperty.RegisterAttached(
-            "HighlightForeground", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
+    public static readonly DependencyProperty HighlightForegroundProperty = DependencyProperty.RegisterAttached(
+        "HighlightForeground", typeof(Brush), typeof(VisualElement), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetHighlightForeground(DependencyObject element, Brush value)
-            => element.SetValue(HighlightForegroundProperty, value);
+    public static void SetHighlightForeground(DependencyObject element, Brush value)
+        => element.SetValue(HighlightForegroundProperty, value);
 
-        public static Brush GetHighlightForeground(DependencyObject element)
-            => (Brush) element.GetValue(HighlightForegroundProperty);
+    public static Brush GetHighlightForeground(DependencyObject element)
+        => (Brush) element.GetValue(HighlightForegroundProperty);
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
-            "Text", typeof(string), typeof(VisualElement), new PropertyMetadata(default(string)));
+    public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
+        "Text", typeof(string), typeof(VisualElement), new PropertyMetadata(default(string)));
 
-        public static void SetText(DependencyObject element, string value)
-            => element.SetValue(TextProperty, value);
+    public static void SetText(DependencyObject element, string value)
+        => element.SetValue(TextProperty, value);
 
-        public static string GetText(DependencyObject element)
-            => (string) element.GetValue(TextProperty);
-    }
-}
+    public static string GetText(DependencyObject element)
+        => (string) element.GetValue(TextProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
index 14441d40..02c0c911 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
@@ -6,144 +6,143 @@ using System.Windows.Interop;
 using HandyControl.Data;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public static class WindowAttach
 {
-    public static class WindowAttach
+    public static readonly DependencyProperty IsDragElementProperty = DependencyProperty.RegisterAttached(
+        "IsDragElement", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDragElementChanged));
+
+    public static void SetIsDragElement(DependencyObject element, bool value)
+        => element.SetValue(IsDragElementProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsDragElement(DependencyObject element)
+        => (bool) element.GetValue(IsDragElementProperty);
+
+    private static void OnIsDragElementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty IsDragElementProperty = DependencyProperty.RegisterAttached(
-            "IsDragElement", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDragElementChanged));
-
-        public static void SetIsDragElement(DependencyObject element, bool value)
-            => element.SetValue(IsDragElementProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIsDragElement(DependencyObject element)
-            => (bool) element.GetValue(IsDragElementProperty);
-
-        private static void OnIsDragElementChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is UIElement ctl)
         {
-            if (d is UIElement ctl)
+            if ((bool) e.NewValue)
             {
-                if ((bool) e.NewValue)
-                {
-                    ctl.MouseLeftButtonDown += DragElement_MouseLeftButtonDown;
-                }
-                else
-                {
-                    ctl.MouseLeftButtonDown -= DragElement_MouseLeftButtonDown;
-                }
+                ctl.MouseLeftButtonDown += DragElement_MouseLeftButtonDown;
+            }
+            else
+            {
+                ctl.MouseLeftButtonDown -= DragElement_MouseLeftButtonDown;
             }
         }
-
-        private static void DragElement_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is DependencyObject obj && e.ButtonState == MouseButtonState.Pressed)
-            {
-                System.Windows.Window.GetWindow(obj)?.DragMove();
-            }
-        }
-
-        public static readonly DependencyProperty IgnoreAltF4Property = DependencyProperty.RegisterAttached(
-            "IgnoreAltF4", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIgnoreAltF4Changed));
-
-        private static void OnIgnoreAltF4Changed(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is System.Windows.Window window)
-            {
-                if ((bool) e.NewValue)
-                {
-                    window.PreviewKeyDown += Window_PreviewKeyDown;
-                }
-                else
-                {
-                    window.PreviewKeyDown -= Window_PreviewKeyDown;
-                }
-            }
-        }
-
-        private static void Window_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.System && e.SystemKey == Key.F4)
-            {
-                e.Handled = true;
-            }
-        }
-
-        public static void SetIgnoreAltF4(DependencyObject element, bool value)
-            => element.SetValue(IgnoreAltF4Property, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIgnoreAltF4(DependencyObject element)
-            => (bool) element.GetValue(IgnoreAltF4Property);
-
-        public static readonly DependencyProperty ShowInTaskManagerProperty = DependencyProperty.RegisterAttached(
-            "ShowInTaskManager", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.TrueBox, OnShowInTaskManagerChanged));
-
-        private static void OnShowInTaskManagerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is System.Windows.Window window)
-            {
-                var v = (bool) e.NewValue;
-                window.SetCurrentValue(System.Windows.Window.ShowInTaskbarProperty, v);
-
-                if (v)
-                {
-                    window.SourceInitialized -= Window_SourceInitialized;
-                }
-                else
-                {
-                    window.SourceInitialized += Window_SourceInitialized;
-                }
-            }
-        }
-
-        private static void Window_SourceInitialized(object sender, EventArgs e)
-        {
-            if (sender is System.Windows.Window window)
-            {
-                var _ = new WindowInteropHelper(window)
-                {
-                    Owner = InteropMethods.GetDesktopWindow()
-                };
-            }
-        }
-
-        public static void SetShowInTaskManager(DependencyObject element, bool value)
-            => element.SetValue(ShowInTaskManagerProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowInTaskManager(DependencyObject element)
-            => (bool) element.GetValue(ShowInTaskManagerProperty);
-
-        public static readonly DependencyProperty HideWhenClosingProperty = DependencyProperty.RegisterAttached(
-            "HideWhenClosing", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnHideWhenClosingChanged));
-
-        private static void OnHideWhenClosingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is System.Windows.Window window)
-            {
-                var v = (bool) e.NewValue;
-                if (v)
-                {
-                    window.Closing += Window_Closing;
-                }
-                else
-                {
-                    window.Closing -= Window_Closing;
-                }
-            }
-        }
-
-        private static void Window_Closing(object sender, CancelEventArgs e)
-        {
-            if (sender is System.Windows.Window window)
-            {
-                window.Hide();
-                e.Cancel = true;
-            }
-        }
-
-        public static void SetHideWhenClosing(DependencyObject element, bool value)
-            => element.SetValue(HideWhenClosingProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetHideWhenClosing(DependencyObject element)
-            => (bool) element.GetValue(HideWhenClosingProperty);
     }
-}
+
+    private static void DragElement_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is DependencyObject obj && e.ButtonState == MouseButtonState.Pressed)
+        {
+            System.Windows.Window.GetWindow(obj)?.DragMove();
+        }
+    }
+
+    public static readonly DependencyProperty IgnoreAltF4Property = DependencyProperty.RegisterAttached(
+        "IgnoreAltF4", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIgnoreAltF4Changed));
+
+    private static void OnIgnoreAltF4Changed(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is System.Windows.Window window)
+        {
+            if ((bool) e.NewValue)
+            {
+                window.PreviewKeyDown += Window_PreviewKeyDown;
+            }
+            else
+            {
+                window.PreviewKeyDown -= Window_PreviewKeyDown;
+            }
+        }
+    }
+
+    private static void Window_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.System && e.SystemKey == Key.F4)
+        {
+            e.Handled = true;
+        }
+    }
+
+    public static void SetIgnoreAltF4(DependencyObject element, bool value)
+        => element.SetValue(IgnoreAltF4Property, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIgnoreAltF4(DependencyObject element)
+        => (bool) element.GetValue(IgnoreAltF4Property);
+
+    public static readonly DependencyProperty ShowInTaskManagerProperty = DependencyProperty.RegisterAttached(
+        "ShowInTaskManager", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.TrueBox, OnShowInTaskManagerChanged));
+
+    private static void OnShowInTaskManagerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is System.Windows.Window window)
+        {
+            var v = (bool) e.NewValue;
+            window.SetCurrentValue(System.Windows.Window.ShowInTaskbarProperty, v);
+
+            if (v)
+            {
+                window.SourceInitialized -= Window_SourceInitialized;
+            }
+            else
+            {
+                window.SourceInitialized += Window_SourceInitialized;
+            }
+        }
+    }
+
+    private static void Window_SourceInitialized(object sender, EventArgs e)
+    {
+        if (sender is System.Windows.Window window)
+        {
+            var _ = new WindowInteropHelper(window)
+            {
+                Owner = InteropMethods.GetDesktopWindow()
+            };
+        }
+    }
+
+    public static void SetShowInTaskManager(DependencyObject element, bool value)
+        => element.SetValue(ShowInTaskManagerProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowInTaskManager(DependencyObject element)
+        => (bool) element.GetValue(ShowInTaskManagerProperty);
+
+    public static readonly DependencyProperty HideWhenClosingProperty = DependencyProperty.RegisterAttached(
+        "HideWhenClosing", typeof(bool), typeof(WindowAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnHideWhenClosingChanged));
+
+    private static void OnHideWhenClosingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is System.Windows.Window window)
+        {
+            var v = (bool) e.NewValue;
+            if (v)
+            {
+                window.Closing += Window_Closing;
+            }
+            else
+            {
+                window.Closing -= Window_Closing;
+            }
+        }
+    }
+
+    private static void Window_Closing(object sender, CancelEventArgs e)
+    {
+        if (sender is System.Windows.Window window)
+        {
+            window.Hide();
+            e.Cancel = true;
+        }
+    }
+
+    public static void SetHideWhenClosing(DependencyObject element, bool value)
+        => element.SetValue(HideWhenClosingProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetHideWhenClosing(DependencyObject element)
+        => (bool) element.GetValue(HideWhenClosingProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
index 90713c9b..788c1fe4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
@@ -4,84 +4,83 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public abstract class AdornerElement : Control, IDisposable
 {
-    public abstract class AdornerElement : Control, IDisposable
+    protected FrameworkElement ElementTarget { get; set; }
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
+        "Target", typeof(FrameworkElement), typeof(AdornerElement), new PropertyMetadata(default(FrameworkElement), OnTargetChanged));
+
+    private static void OnTargetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        protected FrameworkElement ElementTarget { get; set; }
-
-        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
-            "Target", typeof(FrameworkElement), typeof(AdornerElement), new PropertyMetadata(default(FrameworkElement), OnTargetChanged));
-
-        private static void OnTargetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (AdornerElement) d;
-            ctl.OnTargetChanged(ctl.ElementTarget, false);
-            ctl.OnTargetChanged((FrameworkElement) e.NewValue, true);
-        }
-
-        [Bindable(true), Category("Layout")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public FrameworkElement Target
-        {
-            get => (FrameworkElement) GetValue(TargetProperty);
-            set => SetValue(TargetProperty, value);
-        }
-
-        public static readonly DependencyProperty InstanceProperty = DependencyProperty.RegisterAttached(
-            "Instance", typeof(AdornerElement), typeof(AdornerElement), new PropertyMetadata(default(AdornerElement), OnInstanceChanged));
-
-        private static void OnInstanceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is not FrameworkElement target) return;
-            var element = (AdornerElement) e.NewValue;
-            element.OnInstanceChanged(target);
-        }
-
-        protected virtual void OnInstanceChanged(FrameworkElement target) => Target = target;
-
-        public static void SetInstance(DependencyObject element, AdornerElement value)
-            => element.SetValue(InstanceProperty, value);
-
-        public static AdornerElement GetInstance(DependencyObject element)
-            => (AdornerElement) element.GetValue(InstanceProperty);
-
-        public static readonly DependencyProperty IsInstanceProperty = DependencyProperty.RegisterAttached(
-            "IsInstance", typeof(bool), typeof(AdornerElement), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static void SetIsInstance(DependencyObject element, bool value)
-            => element.SetValue(IsInstanceProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIsInstance(DependencyObject element)
-            => (bool) element.GetValue(IsInstanceProperty);
-
-        protected virtual void OnTargetChanged(FrameworkElement element, bool isNew)
-        {
-            if (element == null) return;
-
-            if (!isNew)
-            {
-                element.Unloaded -= TargetElement_Unloaded;
-                ElementTarget = null;
-            }
-            else
-            {
-                element.Unloaded += TargetElement_Unloaded;
-                ElementTarget = element;
-            }
-        }
-
-        private void TargetElement_Unloaded(object sender, RoutedEventArgs e)
-        {
-            if (sender is FrameworkElement element)
-            {
-                element.Unloaded -= TargetElement_Unloaded;
-                Dispose();
-            }
-        }
-
-        protected abstract void Dispose();
-
-        void IDisposable.Dispose() => Dispose();
+        var ctl = (AdornerElement) d;
+        ctl.OnTargetChanged(ctl.ElementTarget, false);
+        ctl.OnTargetChanged((FrameworkElement) e.NewValue, true);
     }
-}
+
+    [Bindable(true), Category("Layout")]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public FrameworkElement Target
+    {
+        get => (FrameworkElement) GetValue(TargetProperty);
+        set => SetValue(TargetProperty, value);
+    }
+
+    public static readonly DependencyProperty InstanceProperty = DependencyProperty.RegisterAttached(
+        "Instance", typeof(AdornerElement), typeof(AdornerElement), new PropertyMetadata(default(AdornerElement), OnInstanceChanged));
+
+    private static void OnInstanceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not FrameworkElement target) return;
+        var element = (AdornerElement) e.NewValue;
+        element.OnInstanceChanged(target);
+    }
+
+    protected virtual void OnInstanceChanged(FrameworkElement target) => Target = target;
+
+    public static void SetInstance(DependencyObject element, AdornerElement value)
+        => element.SetValue(InstanceProperty, value);
+
+    public static AdornerElement GetInstance(DependencyObject element)
+        => (AdornerElement) element.GetValue(InstanceProperty);
+
+    public static readonly DependencyProperty IsInstanceProperty = DependencyProperty.RegisterAttached(
+        "IsInstance", typeof(bool), typeof(AdornerElement), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public static void SetIsInstance(DependencyObject element, bool value)
+        => element.SetValue(IsInstanceProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsInstance(DependencyObject element)
+        => (bool) element.GetValue(IsInstanceProperty);
+
+    protected virtual void OnTargetChanged(FrameworkElement element, bool isNew)
+    {
+        if (element == null) return;
+
+        if (!isNew)
+        {
+            element.Unloaded -= TargetElement_Unloaded;
+            ElementTarget = null;
+        }
+        else
+        {
+            element.Unloaded += TargetElement_Unloaded;
+            ElementTarget = element;
+        }
+    }
+
+    private void TargetElement_Unloaded(object sender, RoutedEventArgs e)
+    {
+        if (sender is FrameworkElement element)
+        {
+            element.Unloaded -= TargetElement_Unloaded;
+            Dispose();
+        }
+    }
+
+    protected abstract void Dispose();
+
+    void IDisposable.Dispose() => Dispose();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
index fa3e178e..4eb968f9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
@@ -1,25 +1,24 @@
 using System.Windows;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class HeaderedSelectableItem : SelectableItem
 {
-    public class HeaderedSelectableItem : SelectableItem
+    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+        "Header", typeof(object), typeof(HeaderedSelectableItem), new PropertyMetadata(default(object)));
+
+    public object Header
     {
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            "Header", typeof(object), typeof(HeaderedSelectableItem), new PropertyMetadata(default(object)));
-
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-            "HeaderTemplate", typeof(DataTemplate), typeof(HeaderedSelectableItem), new PropertyMetadata(default(DataTemplate)));
-
-        public DataTemplate HeaderTemplate
-        {
-            get => (DataTemplate) GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
+        get => GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
     }
-}
+
+    public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+        "HeaderTemplate", typeof(DataTemplate), typeof(HeaderedSelectableItem), new PropertyMetadata(default(DataTemplate)));
+
+    public DataTemplate HeaderTemplate
+    {
+        get => (DataTemplate) GetValue(HeaderTemplateProperty);
+        set => SetValue(HeaderTemplateProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
index 70ff6f00..c732d81e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
@@ -1,16 +1,15 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public class HeaderedSimpleItemsControl : SimpleItemsControl
-    {
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            "Header", typeof(object), typeof(HeaderedSimpleItemsControl), new PropertyMetadata(default(object)));
+namespace HandyControl.Controls;
 
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
+public class HeaderedSimpleItemsControl : SimpleItemsControl
+{
+    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+        "Header", typeof(object), typeof(HeaderedSimpleItemsControl), new PropertyMetadata(default(object)));
+
+    public object Header
+    {
+        get => GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
index bd760ce0..bb1afdd1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
@@ -1,7 +1,6 @@
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public interface IGravatarGenerator
 {
-    public interface IGravatarGenerator
-    {
-        object GetGravatar(string id);
-    }
-}
+    object GetGravatar(string id);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
index cfc33a1a..86eeff68 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
@@ -1,11 +1,10 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public interface ISelectable
-    {
-        event RoutedEventHandler Selected;
+namespace HandyControl.Controls;
 
-        bool IsSelected { get; set; }
-    }
-}
+public interface ISelectable
+{
+    event RoutedEventHandler Selected;
+
+    bool IsSelected { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
index 300188ab..acc656ac 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public interface ISingleOpen : IDisposable
 {
-    public interface ISingleOpen : IDisposable
-    {
-        bool CanDispose { get; }
-    }
-}
+    bool CanDispose { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
index fd4fced0..6c401965 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
@@ -1,41 +1,40 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     规则ItemsControl
+/// </summary>
+/// <remarks>
+///     该类的每一项都具有相同的大小和外边距
+/// </remarks>
+public class RegularItemsControl : SimpleItemsControl
 {
-    /// <summary>
-    ///     规则ItemsControl
-    /// </summary>
-    /// <remarks>
-    ///     该类的每一项都具有相同的大小和外边距
-    /// </remarks>
-    public class RegularItemsControl : SimpleItemsControl
+    public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
+        "ItemWidth", typeof(double), typeof(RegularItemsControl), new PropertyMetadata(ValueBoxes.Double200Box));
+
+    public double ItemWidth
     {
-        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
-            "ItemWidth", typeof(double), typeof(RegularItemsControl), new PropertyMetadata(ValueBoxes.Double200Box));
-
-        public double ItemWidth
-        {
-            get => (double) GetValue(ItemWidthProperty);
-            set => SetValue(ItemWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
-            "ItemHeight", typeof(double), typeof(RegularItemsControl), new PropertyMetadata(ValueBoxes.Double200Box));
-
-        public double ItemHeight
-        {
-            get => (double) GetValue(ItemHeightProperty);
-            set => SetValue(ItemHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
-            "ItemMargin", typeof(Thickness), typeof(RegularItemsControl), new PropertyMetadata(default(Thickness)));
-
-        public Thickness ItemMargin
-        {
-            get => (Thickness) GetValue(ItemMarginProperty);
-            set => SetValue(ItemMarginProperty, value);
-        }
+        get => (double) GetValue(ItemWidthProperty);
+        set => SetValue(ItemWidthProperty, value);
     }
-}
+
+    public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
+        "ItemHeight", typeof(double), typeof(RegularItemsControl), new PropertyMetadata(ValueBoxes.Double200Box));
+
+    public double ItemHeight
+    {
+        get => (double) GetValue(ItemHeightProperty);
+        set => SetValue(ItemHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
+        "ItemMargin", typeof(Thickness), typeof(RegularItemsControl), new PropertyMetadata(default(Thickness)));
+
+    public Thickness ItemMargin
+    {
+        get => (Thickness) GetValue(ItemMarginProperty);
+        set => SetValue(ItemMarginProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
index c9d2603f..8d8bd1fe 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
@@ -3,109 +3,108 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SelectableItem : ContentControl, ISelectable
 {
-    public class SelectableItem : ContentControl, ISelectable
+    private bool _isMouseLeftButtonDown;
+
+    protected override void OnMouseLeave(MouseEventArgs e)
     {
-        private bool _isMouseLeftButtonDown;
+        base.OnMouseLeave(e);
 
-        protected override void OnMouseLeave(MouseEventArgs e)
+        _isMouseLeftButtonDown = false;
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+
+        _isMouseLeftButtonDown = true;
+    }
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+
+        if (_isMouseLeftButtonDown)
         {
-            base.OnMouseLeave(e);
-
-            _isMouseLeftButtonDown = false;
-        }
-
-        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
-
-            _isMouseLeftButtonDown = true;
-        }
-
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonUp(e);
-
-            if (_isMouseLeftButtonDown)
+            if (SelfManage)
             {
-                if (SelfManage)
+                if (!IsSelected)
                 {
-                    if (!IsSelected)
-                    {
-                        IsSelected = true;
-                        OnSelected(new RoutedEventArgs(SelectedEvent, this));
-                    }
-                    else if (CanDeselect)
-                    {
-                        IsSelected = false;
-                        OnSelected(new RoutedEventArgs(DeselectedEvent, this));
-                    }
+                    IsSelected = true;
+                    OnSelected(new RoutedEventArgs(SelectedEvent, this));
+                }
+                else if (CanDeselect)
+                {
+                    IsSelected = false;
+                    OnSelected(new RoutedEventArgs(DeselectedEvent, this));
+                }
+            }
+            else
+            {
+                if (CanDeselect)
+                {
+                    OnSelected(IsSelected
+                        ? new RoutedEventArgs(DeselectedEvent, this)
+                        : new RoutedEventArgs(SelectedEvent, this));
                 }
                 else
                 {
-                    if (CanDeselect)
-                    {
-                        OnSelected(IsSelected
-                            ? new RoutedEventArgs(DeselectedEvent, this)
-                            : new RoutedEventArgs(SelectedEvent, this));
-                    }
-                    else
-                    {
-                        OnSelected(new RoutedEventArgs(SelectedEvent, this));
-                    }
+                    OnSelected(new RoutedEventArgs(SelectedEvent, this));
                 }
-                _isMouseLeftButtonDown = false;
             }
-        }
-
-        protected virtual void OnSelected(RoutedEventArgs e) => RaiseEvent(e);
-
-        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
-            "IsSelected", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsSelected
-        {
-            get => (bool) GetValue(IsSelectedProperty);
-            set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty SelfManageProperty = DependencyProperty.Register(
-            "SelfManage", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool SelfManage
-        {
-            get => (bool) GetValue(SelfManageProperty);
-            set => SetValue(SelfManageProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty CanDeselectProperty = DependencyProperty.Register(
-            "CanDeselect", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool CanDeselect
-        {
-            get => (bool) GetValue(CanDeselectProperty);
-            set => SetValue(CanDeselectProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly RoutedEvent SelectedEvent =
-            EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(SelectableItem));
-
-        public event RoutedEventHandler Selected
-        {
-            add => AddHandler(SelectedEvent, value);
-            remove => RemoveHandler(SelectedEvent, value);
-        }
-
-        public static readonly RoutedEvent DeselectedEvent =
-            EventManager.RegisterRoutedEvent("Deselected", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(SelectableItem));
-
-        public event RoutedEventHandler Deselected
-        {
-            add => AddHandler(DeselectedEvent, value);
-            remove => RemoveHandler(DeselectedEvent, value);
+            _isMouseLeftButtonDown = false;
         }
     }
-}
+
+    protected virtual void OnSelected(RoutedEventArgs e) => RaiseEvent(e);
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
+        "IsSelected", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsSelected
+    {
+        get => (bool) GetValue(IsSelectedProperty);
+        set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty SelfManageProperty = DependencyProperty.Register(
+        "SelfManage", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool SelfManage
+    {
+        get => (bool) GetValue(SelfManageProperty);
+        set => SetValue(SelfManageProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty CanDeselectProperty = DependencyProperty.Register(
+        "CanDeselect", typeof(bool), typeof(SelectableItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool CanDeselect
+    {
+        get => (bool) GetValue(CanDeselectProperty);
+        set => SetValue(CanDeselectProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly RoutedEvent SelectedEvent =
+        EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(SelectableItem));
+
+    public event RoutedEventHandler Selected
+    {
+        add => AddHandler(SelectedEvent, value);
+        remove => RemoveHandler(SelectedEvent, value);
+    }
+
+    public static readonly RoutedEvent DeselectedEvent =
+        EventManager.RegisterRoutedEvent("Deselected", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(SelectableItem));
+
+    public event RoutedEventHandler Deselected
+    {
+        add => AddHandler(DeselectedEvent, value);
+        remove => RemoveHandler(DeselectedEvent, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
index d7339959..c8e68096 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
@@ -7,161 +7,160 @@ using System.Windows.Controls;
 using System.Windows.Markup;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     ItemsControl的轻量级版本
+/// </summary>
+[DefaultProperty("Items")]
+[ContentProperty("Items")]
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+public class SimpleItemsControl : Control
 {
-    /// <summary>
-    ///     ItemsControl的轻量级版本
-    /// </summary>
-    [DefaultProperty("Items")]
-    [ContentProperty("Items")]
-    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
-    public class SimpleItemsControl : Control
+    private const string ElementPanel = "PART_Panel";
+
+    public static readonly DependencyProperty ItemTemplateProperty = DependencyProperty.Register(
+        "ItemTemplate", typeof(DataTemplate), typeof(SimpleItemsControl),
+        new FrameworkPropertyMetadata(default(DataTemplate), OnItemTemplateChanged));
+
+    public static readonly DependencyProperty ItemContainerStyleProperty = DependencyProperty.Register(
+        "ItemContainerStyle", typeof(Style), typeof(SimpleItemsControl),
+        new PropertyMetadata(default(Style), OnItemContainerStyleChanged));
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
+        "ItemsSource", typeof(IEnumerable), typeof(SimpleItemsControl),
+        new PropertyMetadata(default(IEnumerable), OnItemsSourceChanged));
+
+    public SimpleItemsControl()
     {
-        private const string ElementPanel = "PART_Panel";
-
-        public static readonly DependencyProperty ItemTemplateProperty = DependencyProperty.Register(
-            "ItemTemplate", typeof(DataTemplate), typeof(SimpleItemsControl),
-            new FrameworkPropertyMetadata(default(DataTemplate), OnItemTemplateChanged));
-
-        public static readonly DependencyProperty ItemContainerStyleProperty = DependencyProperty.Register(
-            "ItemContainerStyle", typeof(Style), typeof(SimpleItemsControl),
-            new PropertyMetadata(default(Style), OnItemContainerStyleChanged));
-
-        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register(
-            "ItemsSource", typeof(IEnumerable), typeof(SimpleItemsControl),
-            new PropertyMetadata(default(IEnumerable), OnItemsSourceChanged));
-
-        public SimpleItemsControl()
+        var items = new ObservableCollection<object>();
+        items.CollectionChanged += (s, e) =>
         {
-            var items = new ObservableCollection<object>();
-            items.CollectionChanged += (s, e) =>
+            if (e.NewItems != null && e.NewItems.Count > 0)
             {
-                if (e.NewItems != null && e.NewItems.Count > 0)
-                {
-                    SetValue(HasItemsPropertyKey, ValueBoxes.TrueBox);
-                }
-                OnItemsChanged(s, e);
-            };
-            Items = items;
-        }
-
-        public IEnumerable ItemsSource
-        {
-            get => (IEnumerable) GetValue(ItemsSourceProperty);
-            set => SetValue(ItemsSourceProperty, value);
-        }
-
-        [Bindable(true)]
-        [Category("Content")]
-        public Style ItemContainerStyle
-        {
-            get => (Style) GetValue(ItemContainerStyleProperty);
-            set => SetValue(ItemContainerStyleProperty, value);
-        }
-
-        [Bindable(true)]
-        public DataTemplate ItemTemplate
-        {
-            get => (DataTemplate) GetValue(ItemTemplateProperty);
-            set => SetValue(ItemTemplateProperty, value);
-        }
-
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
-        [Bindable(true)]
-        public Collection<object> Items { get; }
-
-        internal Panel ItemsHost { get; set; }
-
-        private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((SimpleItemsControl) d).OnItemsSourceChanged((IEnumerable) e.OldValue, (IEnumerable) e.NewValue);
-        }
-
-        protected virtual void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
-        {
-        }
-
-        public override void OnApplyTemplate()
-        {
-            ItemsHost?.Children.Clear();
-
-            base.OnApplyTemplate();
-
-            ItemsHost = GetTemplateChild(ElementPanel) as Panel;
-            Refresh();
-        }
-
-        protected virtual void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            Refresh();
-            UpdateItems();
-        }
-
-        protected virtual DependencyObject GetContainerForItemOverride() => new ContentPresenter();
-
-        protected virtual bool IsItemItsOwnContainerOverride(object item) => item is ContentPresenter;
-
-        protected virtual void PrepareContainerForItemOverride(DependencyObject element, object item)
-        {
-            switch (element)
-            {
-                case ContentControl contentControl:
-                    contentControl.Content = item;
-                    contentControl.ContentTemplate = ItemTemplate;
-                    break;
-                case ContentPresenter contentPresenter:
-                    contentPresenter.Content = item;
-                    contentPresenter.ContentTemplate = ItemTemplate;
-                    break;
+                SetValue(HasItemsPropertyKey, ValueBoxes.TrueBox);
             }
-        }
+            OnItemsChanged(s, e);
+        };
+        Items = items;
+    }
 
-        private static void OnItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-            => (d as SimpleItemsControl)?.OnItemTemplateChanged(e);
+    public IEnumerable ItemsSource
+    {
+        get => (IEnumerable) GetValue(ItemsSourceProperty);
+        set => SetValue(ItemsSourceProperty, value);
+    }
 
-        protected virtual void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e) => Refresh();
+    [Bindable(true)]
+    [Category("Content")]
+    public Style ItemContainerStyle
+    {
+        get => (Style) GetValue(ItemContainerStyleProperty);
+        set => SetValue(ItemContainerStyleProperty, value);
+    }
 
-        private static void OnItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-            => (d as SimpleItemsControl)?.OnItemContainerStyleChanged(e);
+    [Bindable(true)]
+    public DataTemplate ItemTemplate
+    {
+        get => (DataTemplate) GetValue(ItemTemplateProperty);
+        set => SetValue(ItemTemplateProperty, value);
+    }
 
-        protected virtual void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => Refresh();
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+    [Bindable(true)]
+    public Collection<object> Items { get; }
 
-        internal static readonly DependencyPropertyKey HasItemsPropertyKey =
-            DependencyProperty.RegisterReadOnly(nameof(HasItems), typeof(bool), typeof(SimpleItemsControl),
-                new PropertyMetadata(ValueBoxes.FalseBox));
+    internal Panel ItemsHost { get; set; }
 
-        public static readonly DependencyProperty HasItemsProperty = HasItemsPropertyKey.DependencyProperty;
+    private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((SimpleItemsControl) d).OnItemsSourceChanged((IEnumerable) e.OldValue, (IEnumerable) e.NewValue);
+    }
 
-        public bool HasItems => (bool) GetValue(HasItemsProperty);
+    protected virtual void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+    {
+    }
 
-        protected virtual void Refresh()
-        {
-            if (ItemsHost == null) return;
+    public override void OnApplyTemplate()
+    {
+        ItemsHost?.Children.Clear();
 
-            ItemsHost.Children.Clear();
-            foreach (var item in Items)
-            {
-                DependencyObject container;
-                if (IsItemItsOwnContainerOverride(item))
-                {
-                    container = item as DependencyObject;
-                }
-                else
-                {
-                    container = GetContainerForItemOverride();
-                    PrepareContainerForItemOverride(container, item);
-                }
+        base.OnApplyTemplate();
 
-                if (container is FrameworkElement element)
-                {
-                    element.Style = ItemContainerStyle;
-                    ItemsHost.Children.Add(element);
-                }
-            }
-        }
+        ItemsHost = GetTemplateChild(ElementPanel) as Panel;
+        Refresh();
+    }
 
-        protected virtual void UpdateItems()
+    protected virtual void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        Refresh();
+        UpdateItems();
+    }
+
+    protected virtual DependencyObject GetContainerForItemOverride() => new ContentPresenter();
+
+    protected virtual bool IsItemItsOwnContainerOverride(object item) => item is ContentPresenter;
+
+    protected virtual void PrepareContainerForItemOverride(DependencyObject element, object item)
+    {
+        switch (element)
         {
+            case ContentControl contentControl:
+                contentControl.Content = item;
+                contentControl.ContentTemplate = ItemTemplate;
+                break;
+            case ContentPresenter contentPresenter:
+                contentPresenter.Content = item;
+                contentPresenter.ContentTemplate = ItemTemplate;
+                break;
         }
     }
-}
+
+    private static void OnItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        => (d as SimpleItemsControl)?.OnItemTemplateChanged(e);
+
+    protected virtual void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e) => Refresh();
+
+    private static void OnItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        => (d as SimpleItemsControl)?.OnItemContainerStyleChanged(e);
+
+    protected virtual void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e) => Refresh();
+
+    internal static readonly DependencyPropertyKey HasItemsPropertyKey =
+        DependencyProperty.RegisterReadOnly(nameof(HasItems), typeof(bool), typeof(SimpleItemsControl),
+            new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static readonly DependencyProperty HasItemsProperty = HasItemsPropertyKey.DependencyProperty;
+
+    public bool HasItems => (bool) GetValue(HasItemsProperty);
+
+    protected virtual void Refresh()
+    {
+        if (ItemsHost == null) return;
+
+        ItemsHost.Children.Clear();
+        foreach (var item in Items)
+        {
+            DependencyObject container;
+            if (IsItemItsOwnContainerOverride(item))
+            {
+                container = item as DependencyObject;
+            }
+            else
+            {
+                container = GetContainerForItemOverride();
+                PrepareContainerForItemOverride(container, item);
+            }
+
+            if (container is FrameworkElement element)
+            {
+                element.Style = ItemContainerStyle;
+                ItemsHost.Children.Add(element);
+            }
+        }
+    }
+
+    protected virtual void UpdateItems()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
index 712fdc88..858a5ba7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
@@ -9,187 +9,186 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class FloatingBlock : Control
 {
-    public class FloatingBlock : Control
+    public static readonly DependencyProperty ToXProperty = DependencyProperty.RegisterAttached(
+        "ToX", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static void SetToX(DependencyObject element, double value)
+        => element.SetValue(ToXProperty, value);
+
+    public static double GetToX(DependencyObject element)
+        => (double) element.GetValue(ToXProperty);
+
+    public static readonly DependencyProperty ToYProperty = DependencyProperty.RegisterAttached(
+        "ToY", typeof(double), typeof(FloatingBlock), new PropertyMetadata(-100.0));
+
+    public static void SetToY(DependencyObject element, double value)
+        => element.SetValue(ToYProperty, value);
+
+    public static double GetToY(DependencyObject element)
+        => (double) element.GetValue(ToYProperty);
+
+    public static readonly DependencyProperty DurationProperty = DependencyProperty.RegisterAttached(
+        "Duration", typeof(Duration), typeof(FloatingBlock), new PropertyMetadata(new Duration(TimeSpan.FromSeconds(2))));
+
+    public static void SetDuration(DependencyObject element, Duration value)
+        => element.SetValue(DurationProperty, value);
+
+    public static Duration GetDuration(DependencyObject element)
+        => (Duration) element.GetValue(DurationProperty);
+
+    public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
+        "HorizontalOffset", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static void SetHorizontalOffset(DependencyObject element, double value)
+        => element.SetValue(HorizontalOffsetProperty, value);
+
+    public static double GetHorizontalOffset(DependencyObject element)
+        => (double) element.GetValue(HorizontalOffsetProperty);
+
+    public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
+        "VerticalOffset", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static void SetVerticalOffset(DependencyObject element, double value)
+        => element.SetValue(VerticalOffsetProperty, value);
+
+    public static double GetVerticalOffset(DependencyObject element)
+        => (double) element.GetValue(VerticalOffsetProperty);
+
+    public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.RegisterAttached(
+        "ContentTemplate", typeof(DataTemplate), typeof(FloatingBlock), new PropertyMetadata(default(DataTemplate), OnDataChanged));
+
+    public static void SetContentTemplate(DependencyObject element, DataTemplate value)
+        => element.SetValue(ContentTemplateProperty, value);
+
+    public static DataTemplate GetContentTemplate(DependencyObject element)
+        => (DataTemplate) element.GetValue(ContentTemplateProperty);
+
+    public DataTemplate ContentTemplate
     {
-        public static readonly DependencyProperty ToXProperty = DependencyProperty.RegisterAttached(
-            "ToX", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
+        get => (DataTemplate) GetValue(ContentTemplateProperty);
+        set => SetValue(ContentTemplateProperty, value);
+    }
 
-        public static void SetToX(DependencyObject element, double value)
-            => element.SetValue(ToXProperty, value);
+    private static readonly DependencyProperty ReadyToFloatProperty = DependencyProperty.RegisterAttached(
+        "ReadyToFloat", typeof(bool), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public static double GetToX(DependencyObject element)
-            => (double) element.GetValue(ToXProperty);
+    private static void SetReadyToFloat(DependencyObject element, bool value)
+        => element.SetValue(ReadyToFloatProperty, ValueBoxes.BooleanBox(value));
 
-        public static readonly DependencyProperty ToYProperty = DependencyProperty.RegisterAttached(
-            "ToY", typeof(double), typeof(FloatingBlock), new PropertyMetadata(-100.0));
+    private static bool GetReadyToFloat(DependencyObject element)
+        => (bool) element.GetValue(ReadyToFloatProperty);
 
-        public static void SetToY(DependencyObject element, double value)
-            => element.SetValue(ToYProperty, value);
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached(
+        "Content", typeof(object), typeof(FloatingBlock), new PropertyMetadata(default, OnDataChanged));
 
-        public static double GetToY(DependencyObject element)
-            => (double) element.GetValue(ToYProperty);
+    public static void SetContent(DependencyObject element, object value)
+        => element.SetValue(ContentProperty, value);
 
-        public static readonly DependencyProperty DurationProperty = DependencyProperty.RegisterAttached(
-            "Duration", typeof(Duration), typeof(FloatingBlock), new PropertyMetadata(new Duration(TimeSpan.FromSeconds(2))));
+    public static object GetContent(DependencyObject element)
+        => element.GetValue(ContentProperty);
 
-        public static void SetDuration(DependencyObject element, Duration value)
-            => element.SetValue(DurationProperty, value);
+    public object Content
+    {
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
 
-        public static Duration GetDuration(DependencyObject element)
-            => (Duration) element.GetValue(DurationProperty);
+    private static void OnDataChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not UIElement target) return;
 
-        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
-            "HorizontalOffset", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
+        target.PreviewMouseLeftButtonDown -= Target_PreviewMouseLeftButtonDown;
+        target.PreviewMouseLeftButtonUp -= Target_PreviewMouseLeftButtonUp;
 
-        public static void SetHorizontalOffset(DependencyObject element, double value)
-            => element.SetValue(HorizontalOffsetProperty, value);
-
-        public static double GetHorizontalOffset(DependencyObject element)
-            => (double) element.GetValue(HorizontalOffsetProperty);
-
-        public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
-            "VerticalOffset", typeof(double), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public static void SetVerticalOffset(DependencyObject element, double value)
-            => element.SetValue(VerticalOffsetProperty, value);
-
-        public static double GetVerticalOffset(DependencyObject element)
-            => (double) element.GetValue(VerticalOffsetProperty);
-
-        public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.RegisterAttached(
-            "ContentTemplate", typeof(DataTemplate), typeof(FloatingBlock), new PropertyMetadata(default(DataTemplate), OnDataChanged));
-
-        public static void SetContentTemplate(DependencyObject element, DataTemplate value)
-            => element.SetValue(ContentTemplateProperty, value);
-
-        public static DataTemplate GetContentTemplate(DependencyObject element)
-            => (DataTemplate) element.GetValue(ContentTemplateProperty);
-
-        public DataTemplate ContentTemplate
+        if (e.NewValue != null)
         {
-            get => (DataTemplate) GetValue(ContentTemplateProperty);
-            set => SetValue(ContentTemplateProperty, value);
-        }
-
-        private static readonly DependencyProperty ReadyToFloatProperty = DependencyProperty.RegisterAttached(
-            "ReadyToFloat", typeof(bool), typeof(FloatingBlock), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private static void SetReadyToFloat(DependencyObject element, bool value)
-            => element.SetValue(ReadyToFloatProperty, ValueBoxes.BooleanBox(value));
-
-        private static bool GetReadyToFloat(DependencyObject element)
-            => (bool) element.GetValue(ReadyToFloatProperty);
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached(
-            "Content", typeof(object), typeof(FloatingBlock), new PropertyMetadata(default, OnDataChanged));
-
-        public static void SetContent(DependencyObject element, object value)
-            => element.SetValue(ContentProperty, value);
-
-        public static object GetContent(DependencyObject element)
-            => element.GetValue(ContentProperty);
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        private static void OnDataChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is not UIElement target) return;
-
-            target.PreviewMouseLeftButtonDown -= Target_PreviewMouseLeftButtonDown;
-            target.PreviewMouseLeftButtonUp -= Target_PreviewMouseLeftButtonUp;
-
-            if (e.NewValue != null)
-            {
-                target.PreviewMouseLeftButtonDown += Target_PreviewMouseLeftButtonDown;
-                target.PreviewMouseLeftButtonUp += Target_PreviewMouseLeftButtonUp;
-            }
-        }
-
-        private static void Target_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e) => SetReadyToFloat(sender as DependencyObject, true);
-
-        private static void Target_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is UIElement element && GetReadyToFloat(element))
-            {
-                var layer = AdornerLayer.GetAdornerLayer(element);
-                if (layer != null)
-                {
-                    var adorner = new AdornerContainer(layer)
-                    {
-                        IsHitTestVisible = false
-                    };
-                    var child = CreateBlock(element, adorner);
-                    adorner.Child = child;
-
-                    layer.Add(adorner);
-                }
-                SetReadyToFloat(element, false);
-            }
-        }
-
-        private static FloatingBlock CreateBlock(Visual element, AdornerContainer adorner)
-        {
-            var p = Mouse.GetPosition(adorner.AdornedElement);
-            var transform = new TranslateTransform
-            {
-                X = p.X + GetHorizontalOffset(element),
-                Y = p.Y + GetVerticalOffset(element)
-            };
-
-            var block = new FloatingBlock
-            {
-                Content = GetContent(element),
-                ContentTemplate = GetContentTemplate(element),
-                RenderTransform = new TransformGroup
-                {
-                    Children =
-                    {
-                        transform
-                    }
-                }
-            };
-
-            var milliseconds = GetDuration(element).TimeSpan.TotalMilliseconds;
-
-            var animationX = AnimationHelper.CreateAnimation(GetToX(element) + transform.X, milliseconds);
-            Storyboard.SetTargetProperty(animationX, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)"));
-            Storyboard.SetTarget(animationX, block);
-
-            var animationY = AnimationHelper.CreateAnimation(GetToY(element) + transform.Y, milliseconds);
-            Storyboard.SetTargetProperty(animationY, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)"));
-            Storyboard.SetTarget(animationY, block);
-
-            var animationOpacity = AnimationHelper.CreateAnimation(0, milliseconds);
-            Storyboard.SetTargetProperty(animationOpacity, new PropertyPath("Opacity"));
-            Storyboard.SetTarget(animationOpacity, block);
-
-            var storyboard = new Storyboard();
-            storyboard.Completed += (s, e) =>
-            {
-                var layer = AdornerLayer.GetAdornerLayer(element);
-                if (layer != null)
-                {
-                    layer.Remove(adorner);
-                }
-                else if (adorner.Parent is AdornerLayer parent)
-                {
-                    parent.Remove(adorner);
-                }
-
-                adorner.Child = null;
-            };
-            storyboard.Children.Add(animationX);
-            storyboard.Children.Add(animationY);
-            storyboard.Children.Add(animationOpacity);
-            storyboard.Begin();
-
-            return block;
+            target.PreviewMouseLeftButtonDown += Target_PreviewMouseLeftButtonDown;
+            target.PreviewMouseLeftButtonUp += Target_PreviewMouseLeftButtonUp;
         }
     }
-}
+
+    private static void Target_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e) => SetReadyToFloat(sender as DependencyObject, true);
+
+    private static void Target_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is UIElement element && GetReadyToFloat(element))
+        {
+            var layer = AdornerLayer.GetAdornerLayer(element);
+            if (layer != null)
+            {
+                var adorner = new AdornerContainer(layer)
+                {
+                    IsHitTestVisible = false
+                };
+                var child = CreateBlock(element, adorner);
+                adorner.Child = child;
+
+                layer.Add(adorner);
+            }
+            SetReadyToFloat(element, false);
+        }
+    }
+
+    private static FloatingBlock CreateBlock(Visual element, AdornerContainer adorner)
+    {
+        var p = Mouse.GetPosition(adorner.AdornedElement);
+        var transform = new TranslateTransform
+        {
+            X = p.X + GetHorizontalOffset(element),
+            Y = p.Y + GetVerticalOffset(element)
+        };
+
+        var block = new FloatingBlock
+        {
+            Content = GetContent(element),
+            ContentTemplate = GetContentTemplate(element),
+            RenderTransform = new TransformGroup
+            {
+                Children =
+                {
+                    transform
+                }
+            }
+        };
+
+        var milliseconds = GetDuration(element).TimeSpan.TotalMilliseconds;
+
+        var animationX = AnimationHelper.CreateAnimation(GetToX(element) + transform.X, milliseconds);
+        Storyboard.SetTargetProperty(animationX, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)"));
+        Storyboard.SetTarget(animationX, block);
+
+        var animationY = AnimationHelper.CreateAnimation(GetToY(element) + transform.Y, milliseconds);
+        Storyboard.SetTargetProperty(animationY, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)"));
+        Storyboard.SetTarget(animationY, block);
+
+        var animationOpacity = AnimationHelper.CreateAnimation(0, milliseconds);
+        Storyboard.SetTargetProperty(animationOpacity, new PropertyPath("Opacity"));
+        Storyboard.SetTarget(animationOpacity, block);
+
+        var storyboard = new Storyboard();
+        storyboard.Completed += (s, e) =>
+        {
+            var layer = AdornerLayer.GetAdornerLayer(element);
+            if (layer != null)
+            {
+                layer.Remove(adorner);
+            }
+            else if (adorner.Parent is AdornerLayer parent)
+            {
+                parent.Remove(adorner);
+            }
+
+            adorner.Child = null;
+        };
+        storyboard.Children.Add(animationX);
+        storyboard.Children.Add(animationY);
+        storyboard.Children.Add(animationOpacity);
+        storyboard.Begin();
+
+        return block;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
index 3135ff70..13dc8a4c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
@@ -5,195 +5,194 @@ using System.Windows.Media.Animation;
 using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+public class RunningBlock : ContentControl
 {
-    [TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
-    public class RunningBlock : ContentControl
+    private const string ElementContent = "PART_ContentElement";
+
+    private const string ElementPanel = "PART_Panel";
+
+    protected Storyboard _storyboard;
+
+    private FrameworkElement _elementContent;
+
+    private FrameworkElement _elementPanel;
+
+    public override void OnApplyTemplate()
     {
-        private const string ElementContent = "PART_ContentElement";
-
-        private const string ElementPanel = "PART_Panel";
-
-        protected Storyboard _storyboard;
-
-        private FrameworkElement _elementContent;
-
-        private FrameworkElement _elementPanel;
-
-        public override void OnApplyTemplate()
+        if (_elementPanel != null)
         {
-            if (_elementPanel != null)
+            _elementPanel.SizeChanged -= ElementPanel_SizeChanged;
+        }
+
+        base.OnApplyTemplate();
+
+        _elementContent = GetTemplateChild(ElementContent) as FrameworkElement;
+        _elementPanel = GetTemplateChild(ElementPanel) as Panel;
+
+        if (_elementPanel != null)
+        {
+            _elementPanel.SizeChanged += ElementPanel_SizeChanged;
+        }
+
+        UpdateContent();
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        UpdateContent();
+    }
+
+    private void ElementPanel_SizeChanged(object sender, SizeChangedEventArgs e) => UpdateContent();
+
+    public static readonly DependencyProperty RunawayProperty = DependencyProperty.Register(
+        "Runaway", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public bool Runaway
+    {
+        get => (bool) GetValue(RunawayProperty);
+        set => SetValue(RunawayProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
+        "AutoRun", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public bool AutoRun
+    {
+        get => (bool) GetValue(AutoRunProperty);
+        set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(RunningBlock), new FrameworkPropertyMetadata(default(Orientation), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public static readonly DependencyProperty DurationProperty = DependencyProperty.Register(
+        "Duration", typeof(Duration), typeof(RunningBlock), new FrameworkPropertyMetadata(new Duration(TimeSpan.FromSeconds(5)), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public Duration Duration
+    {
+        get => (Duration) GetValue(DurationProperty);
+        set => SetValue(DurationProperty, value);
+    }
+
+    public static readonly DependencyProperty SpeedProperty = DependencyProperty.Register(
+        "Speed", typeof(double), typeof(RunningBlock), new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double Speed
+    {
+        get => (double) GetValue(SpeedProperty);
+        set => SetValue(SpeedProperty, value);
+    }
+
+    public static readonly DependencyProperty IsRunningProperty = DependencyProperty.Register(
+        "IsRunning", typeof(bool), typeof(RunningBlock), new PropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
+        {
+            var ctl = (RunningBlock) o;
+            var v = (bool) args.NewValue;
+            if (v)
             {
-                _elementPanel.SizeChanged -= ElementPanel_SizeChanged;
-            }
-
-            base.OnApplyTemplate();
-
-            _elementContent = GetTemplateChild(ElementContent) as FrameworkElement;
-            _elementPanel = GetTemplateChild(ElementPanel) as Panel;
-
-            if (_elementPanel != null)
-            {
-                _elementPanel.SizeChanged += ElementPanel_SizeChanged;
-            }
-
-            UpdateContent();
-        }
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            UpdateContent();
-        }
-
-        private void ElementPanel_SizeChanged(object sender, SizeChangedEventArgs e) => UpdateContent();
-
-        public static readonly DependencyProperty RunawayProperty = DependencyProperty.Register(
-            "Runaway", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public bool Runaway
-        {
-            get => (bool) GetValue(RunawayProperty);
-            set => SetValue(RunawayProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
-            "AutoRun", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public bool AutoRun
-        {
-            get => (bool) GetValue(AutoRunProperty);
-            set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(RunningBlock), new FrameworkPropertyMetadata(default(Orientation), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        public static readonly DependencyProperty DurationProperty = DependencyProperty.Register(
-            "Duration", typeof(Duration), typeof(RunningBlock), new FrameworkPropertyMetadata(new Duration(TimeSpan.FromSeconds(5)), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public Duration Duration
-        {
-            get => (Duration) GetValue(DurationProperty);
-            set => SetValue(DurationProperty, value);
-        }
-
-        public static readonly DependencyProperty SpeedProperty = DependencyProperty.Register(
-            "Speed", typeof(double), typeof(RunningBlock), new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public double Speed
-        {
-            get => (double) GetValue(SpeedProperty);
-            set => SetValue(SpeedProperty, value);
-        }
-
-        public static readonly DependencyProperty IsRunningProperty = DependencyProperty.Register(
-            "IsRunning", typeof(bool), typeof(RunningBlock), new PropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
-            {
-                var ctl = (RunningBlock) o;
-                var v = (bool) args.NewValue;
-                if (v)
-                {
-                    ctl._storyboard?.Resume();
-                }
-                else
-                {
-                    ctl._storyboard?.Pause();
-                }
-            }));
-
-        public bool IsRunning
-        {
-            get => (bool) GetValue(IsRunningProperty);
-            set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty AutoReverseProperty = DependencyProperty.Register(
-            "AutoReverse", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public bool AutoReverse
-        {
-            get => (bool) GetValue(AutoReverseProperty);
-            set => SetValue(AutoReverseProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private void UpdateContent()
-        {
-            if (_elementContent == null || _elementPanel == null) return;
-            if (MathHelper.IsZero(_elementPanel.ActualWidth) || MathHelper.IsZero(_elementPanel.ActualHeight)) return;
-
-            _storyboard?.Stop();
-
-            double from;
-            double to;
-            PropertyPath propertyPath;
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                if (AutoRun && _elementPanel.ActualWidth < ActualWidth)
-                {
-                    return;
-                }
-
-                if (Runaway)
-                {
-                    from = -_elementPanel.ActualWidth;
-                    to = ActualWidth;
-                }
-                else
-                {
-                    from = 0;
-                    to = ActualWidth - _elementPanel.ActualWidth;
-                    SetCurrentValue(AutoReverseProperty, ValueBoxes.TrueBox);
-                }
-                propertyPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)");
+                ctl._storyboard?.Resume();
             }
             else
             {
-                if (AutoRun && _elementPanel.ActualHeight < ActualHeight)
-                {
-                    return;
-                }
+                ctl._storyboard?.Pause();
+            }
+        }));
 
-                if (Runaway)
-                {
-                    from = -_elementPanel.ActualHeight;
-                    to = ActualHeight;
-                }
-                else
-                {
-                    from = 0;
-                    to = ActualHeight - _elementPanel.ActualHeight;
-                    SetCurrentValue(AutoReverseProperty, ValueBoxes.TrueBox);
-                }
-                propertyPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)");
+    public bool IsRunning
+    {
+        get => (bool) GetValue(IsRunningProperty);
+        set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty AutoReverseProperty = DependencyProperty.Register(
+        "AutoReverse", typeof(bool), typeof(RunningBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public bool AutoReverse
+    {
+        get => (bool) GetValue(AutoReverseProperty);
+        set => SetValue(AutoReverseProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private void UpdateContent()
+    {
+        if (_elementContent == null || _elementPanel == null) return;
+        if (MathHelper.IsZero(_elementPanel.ActualWidth) || MathHelper.IsZero(_elementPanel.ActualHeight)) return;
+
+        _storyboard?.Stop();
+
+        double from;
+        double to;
+        PropertyPath propertyPath;
+
+        if (Orientation == Orientation.Horizontal)
+        {
+            if (AutoRun && _elementPanel.ActualWidth < ActualWidth)
+            {
+                return;
             }
 
-            var duration = double.IsNaN(Speed)
-                ? Duration
-                : !MathHelper.IsVerySmall(Speed)
-                    ? TimeSpan.FromSeconds(Math.Abs(to - from) / Speed)
-                    : Duration;
-
-            var animation = new DoubleAnimation(from, to, duration)
+            if (Runaway)
             {
-                RepeatBehavior = RepeatBehavior.Forever,
-                AutoReverse = AutoReverse
-            };
-
-            Storyboard.SetTargetProperty(animation, propertyPath);
-            Storyboard.SetTarget(animation, _elementContent);
-
-            _storyboard = new Storyboard();
-            _storyboard.Children.Add(animation);
-            _storyboard.Begin();
+                from = -_elementPanel.ActualWidth;
+                to = ActualWidth;
+            }
+            else
+            {
+                from = 0;
+                to = ActualWidth - _elementPanel.ActualWidth;
+                SetCurrentValue(AutoReverseProperty, ValueBoxes.TrueBox);
+            }
+            propertyPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.X)");
         }
+        else
+        {
+            if (AutoRun && _elementPanel.ActualHeight < ActualHeight)
+            {
+                return;
+            }
+
+            if (Runaway)
+            {
+                from = -_elementPanel.ActualHeight;
+                to = ActualHeight;
+            }
+            else
+            {
+                from = 0;
+                to = ActualHeight - _elementPanel.ActualHeight;
+                SetCurrentValue(AutoReverseProperty, ValueBoxes.TrueBox);
+            }
+            propertyPath = new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(TranslateTransform.Y)");
+        }
+
+        var duration = double.IsNaN(Speed)
+            ? Duration
+            : !MathHelper.IsVerySmall(Speed)
+                ? TimeSpan.FromSeconds(Math.Abs(to - from) / Speed)
+                : Duration;
+
+        var animation = new DoubleAnimation(from, to, duration)
+        {
+            RepeatBehavior = RepeatBehavior.Forever,
+            AutoReverse = AutoReverse
+        };
+
+        Storyboard.SetTargetProperty(animation, propertyPath);
+        Storyboard.SetTarget(animation, _elementContent);
+
+        _storyboard = new Storyboard();
+        _storyboard.Children.Add(animation);
+        _storyboard.Begin();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
index cca37f5e..e282e6a9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
@@ -3,63 +3,62 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class RunningBorder : Border
 {
-    public class RunningBorder : Border
+    private bool _test;
+
+    protected override Size MeasureOverride(Size constraint)
     {
-        private bool _test;
-
-        protected override Size MeasureOverride(Size constraint)
+        if (_test)
         {
-            if (_test)
-            {
-                _test = false;
-                return constraint;
-            }
-
-            var child = Child;
-            var borderThickness = BorderThickness;
-            var padding = Padding;
-
-            if (UseLayoutRounding)
-            {
-                var dpiScaleX = DpiHelper.DeviceDpiX;
-                var dpiScaleY = DpiHelper.DeviceDpiY;
-
-                borderThickness = new Thickness(
-                    DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
-                    DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
-            }
-
-            var borderSize = ConvertThickness2Size(borderThickness);
-            var paddingSize = ConvertThickness2Size(padding);
-            var mySize = new Size();
-
-            if (child != null)
-            {
-                var combined = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
-                var borderConstraint = new Size(Math.Max(0.0, constraint.Width - combined.Width), Math.Max(0.0, constraint.Height - combined.Height));
-                var childConstraint = new Size(Math.Max(0.0, double.PositiveInfinity - combined.Width), Math.Max(0.0, double.PositiveInfinity - combined.Height));
-
-
-                child.Measure(borderConstraint);
-                var childSize = child.DesiredSize;
-
-                mySize.Width = childSize.Width + combined.Width;
-                mySize.Height = childSize.Height + combined.Height;
-
-                child.Measure(childConstraint);
-            }
-            else
-            {
-                mySize = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
-            }
-
-            return mySize;
+            _test = false;
+            return constraint;
         }
 
-        private static Size ConvertThickness2Size(Thickness th) => new(th.Left + th.Right, th.Top + th.Bottom);
+        var child = Child;
+        var borderThickness = BorderThickness;
+        var padding = Padding;
+
+        if (UseLayoutRounding)
+        {
+            var dpiScaleX = DpiHelper.DeviceDpiX;
+            var dpiScaleY = DpiHelper.DeviceDpiY;
+
+            borderThickness = new Thickness(
+                DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
+                DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
+        }
+
+        var borderSize = ConvertThickness2Size(borderThickness);
+        var paddingSize = ConvertThickness2Size(padding);
+        var mySize = new Size();
+
+        if (child != null)
+        {
+            var combined = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
+            var borderConstraint = new Size(Math.Max(0.0, constraint.Width - combined.Width), Math.Max(0.0, constraint.Height - combined.Height));
+            var childConstraint = new Size(Math.Max(0.0, double.PositiveInfinity - combined.Width), Math.Max(0.0, double.PositiveInfinity - combined.Height));
+
+
+            child.Measure(borderConstraint);
+            var childSize = child.DesiredSize;
+
+            mySize.Width = childSize.Width + combined.Width;
+            mySize.Height = childSize.Height + combined.Height;
+
+            child.Measure(childConstraint);
+        }
+        else
+        {
+            mySize = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
+        }
+
+        return mySize;
     }
-}
+
+    private static Size ConvertThickness2Size(Thickness th) => new(th.Left + th.Right, th.Top + th.Bottom);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
index 53facd3e..afc287c9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
@@ -3,57 +3,56 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     切换块
+/// </summary>
+public class ToggleBlock : Control
 {
-    /// <summary>
-    ///     切换块
-    /// </summary>
-    public class ToggleBlock : Control
+    public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
+        "IsChecked", typeof(bool?), typeof(ToggleBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal));
+
+    [Category("Appearance")]
+    [TypeConverter(typeof(NullableBoolConverter))]
+    [Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
+    public bool? IsChecked
     {
-        public static readonly DependencyProperty IsCheckedProperty = DependencyProperty.Register(
-            "IsChecked", typeof(bool?), typeof(ToggleBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal));
-
-        [Category("Appearance")]
-        [TypeConverter(typeof(NullableBoolConverter))]
-        [Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
-        public bool? IsChecked
+        get
         {
-            get
-            {
-                // Because Nullable<bool> unboxing is very slow (uses reflection) first we cast to bool
-                var value = GetValue(IsCheckedProperty);
-                // ReSharper disable once RedundantExplicitNullableCreation
-                return value == null ? new bool?() : new bool?((bool) value);
-            }
-            set => SetValue(IsCheckedProperty, value.HasValue ? ValueBoxes.BooleanBox(value.Value) : null);
-        }
-
-        public static readonly DependencyProperty CheckedContentProperty = DependencyProperty.Register(
-            "CheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
-        public object CheckedContent
-        {
-            get => GetValue(CheckedContentProperty);
-            set => SetValue(CheckedContentProperty, value);
-        }
-
-        public static readonly DependencyProperty UnCheckedContentProperty = DependencyProperty.Register(
-            "UnCheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
-        public object UnCheckedContent
-        {
-            get => GetValue(UnCheckedContentProperty);
-            set => SetValue(UnCheckedContentProperty, value);
-        }
-
-        public static readonly DependencyProperty IndeterminateContentProperty = DependencyProperty.Register(
-            "IndeterminateContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
-
-        public object IndeterminateContent
-        {
-            get => GetValue(IndeterminateContentProperty);
-            set => SetValue(IndeterminateContentProperty, value);
+            // Because Nullable<bool> unboxing is very slow (uses reflection) first we cast to bool
+            var value = GetValue(IsCheckedProperty);
+            // ReSharper disable once RedundantExplicitNullableCreation
+            return value == null ? new bool?() : new bool?((bool) value);
         }
+        set => SetValue(IsCheckedProperty, value.HasValue ? ValueBoxes.BooleanBox(value.Value) : null);
     }
-}
+
+    public static readonly DependencyProperty CheckedContentProperty = DependencyProperty.Register(
+        "CheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+    public object CheckedContent
+    {
+        get => GetValue(CheckedContentProperty);
+        set => SetValue(CheckedContentProperty, value);
+    }
+
+    public static readonly DependencyProperty UnCheckedContentProperty = DependencyProperty.Register(
+        "UnCheckedContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+    public object UnCheckedContent
+    {
+        get => GetValue(UnCheckedContentProperty);
+        set => SetValue(UnCheckedContentProperty, value);
+    }
+
+    public static readonly DependencyProperty IndeterminateContentProperty = DependencyProperty.Register(
+        "IndeterminateContent", typeof(object), typeof(ToggleBlock), new PropertyMetadata(default(object)));
+
+    public object IndeterminateContent
+    {
+        get => GetValue(IndeterminateContentProperty);
+        set => SetValue(IndeterminateContentProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
index 6b938fc7..43613419 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
@@ -4,38 +4,37 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ButtonGroup : ItemsControl
 {
-    public class ButtonGroup : ItemsControl
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is Button or RadioButton or ToggleButton;
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(ButtonGroup), new PropertyMetadata(default(Orientation)));
+
+    public Orientation Orientation
     {
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is Button or RadioButton or ToggleButton;
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
 
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(ButtonGroup), new PropertyMetadata(default(Orientation)));
+    public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+        "Layout", typeof(LinearLayout), typeof(ButtonGroup), new PropertyMetadata(LinearLayout.Uniform));
 
-        public Orientation Orientation
+    public LinearLayout Layout
+    {
+        get => (LinearLayout) GetValue(LayoutProperty);
+        set => SetValue(LayoutProperty, value);
+    }
+
+    protected override void OnRender(DrawingContext drawingContext)
+    {
+        var count = Items.Count;
+        for (var i = 0; i < count; i++)
         {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
-            "Layout", typeof(LinearLayout), typeof(ButtonGroup), new PropertyMetadata(LinearLayout.Uniform));
-
-        public LinearLayout Layout
-        {
-            get => (LinearLayout) GetValue(LayoutProperty);
-            set => SetValue(LayoutProperty, value);
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var count = Items.Count;
-            for (var i = 0; i < count; i++)
-            {
-                var item = (ButtonBase) Items[i];
-                item.Style = ItemContainerStyleSelector?.SelectStyle(item, this);
-            }
+            var item = (ButtonBase) Items[i];
+            item.Style = ItemContainerStyleSelector?.SelectStyle(item, this);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
index 8d362a41..c04a3a5b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
@@ -1,23 +1,22 @@
 using System.Windows.Controls;
 
 
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     带上下文菜单的按钮
-    /// </summary>
-    public class ContextMenuButton : Button
-    {
-        public ContextMenu Menu { get; set; }
+namespace HandyControl.Controls;
 
-        protected override void OnClick()
+/// <summary>
+///     带上下文菜单的按钮
+/// </summary>
+public class ContextMenuButton : Button
+{
+    public ContextMenu Menu { get; set; }
+
+    protected override void OnClick()
+    {
+        base.OnClick();
+        if (Menu != null)
         {
-            base.OnClick();
-            if (Menu != null)
-            {
-                Menu.PlacementTarget = this;
-                Menu.IsOpen = true;
-            }
+            Menu.PlacementTarget = this;
+            Menu.IsOpen = true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
index bf822d9c..6f54616e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
@@ -2,30 +2,29 @@
 using System.Windows.Controls.Primitives;
 
 
-namespace HandyControl.Controls
-{
-    /// <summary>
-    ///     带上下文菜单的切换按钮
-    /// </summary>
-    public class ContextMenuToggleButton : ToggleButton
-    {
-        public ContextMenu Menu { get; set; }
+namespace HandyControl.Controls;
 
-        protected override void OnClick()
+/// <summary>
+///     带上下文菜单的切换按钮
+/// </summary>
+public class ContextMenuToggleButton : ToggleButton
+{
+    public ContextMenu Menu { get; set; }
+
+    protected override void OnClick()
+    {
+        base.OnClick();
+        if (Menu != null)
         {
-            base.OnClick();
-            if (Menu != null)
+            if (IsChecked == true)
             {
-                if (IsChecked == true)
-                {
-                    Menu.PlacementTarget = this;
-                    Menu.IsOpen = true;
-                }
-                else
-                {
-                    Menu.IsOpen = false;
-                }
+                Menu.PlacementTarget = this;
+                Menu.IsOpen = true;
+            }
+            else
+            {
+                Menu.IsOpen = false;
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
index 142d0bcd..2a858866 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
@@ -2,26 +2,25 @@
 using System.Windows.Controls.Primitives;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ProgressButton : ToggleButton
 {
-    public class ProgressButton : ToggleButton
+    public static readonly DependencyProperty ProgressStyleProperty = DependencyProperty.Register(
+        "ProgressStyle", typeof(Style), typeof(ProgressButton), new PropertyMetadata(default(Style)));
+
+    public Style ProgressStyle
     {
-        public static readonly DependencyProperty ProgressStyleProperty = DependencyProperty.Register(
-            "ProgressStyle", typeof(Style), typeof(ProgressButton), new PropertyMetadata(default(Style)));
-
-        public Style ProgressStyle
-        {
-            get => (Style) GetValue(ProgressStyleProperty);
-            set => SetValue(ProgressStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register(
-            "Progress", typeof(double), typeof(ProgressButton), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double Progress
-        {
-            get => (double) GetValue(ProgressProperty);
-            set => SetValue(ProgressProperty, value);
-        }
+        get => (Style) GetValue(ProgressStyleProperty);
+        set => SetValue(ProgressStyleProperty, value);
     }
-}
+
+    public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register(
+        "Progress", typeof(double), typeof(ProgressButton), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double Progress
+    {
+        get => (double) GetValue(ProgressProperty);
+        set => SetValue(ProgressProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
index 36330a30..0488bfc5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
@@ -5,77 +5,76 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Data.Enum;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SplitButton : ButtonBase
 {
-    public class SplitButton : ButtonBase
+    public static readonly DependencyProperty HitModeProperty = DependencyProperty.Register(
+        "HitMode", typeof(HitMode), typeof(SplitButton), new PropertyMetadata(default(HitMode)));
+
+    public HitMode HitMode
     {
-        public static readonly DependencyProperty HitModeProperty = DependencyProperty.Register(
-            "HitMode", typeof(HitMode), typeof(SplitButton), new PropertyMetadata(default(HitMode)));
+        get => (HitMode) GetValue(HitModeProperty);
+        set => SetValue(HitModeProperty, value);
+    }
 
-        public HitMode HitMode
+    public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(
+        "MaxDropDownHeight", typeof(double), typeof(SplitButton), new PropertyMetadata(SystemParameters.PrimaryScreenHeight / 3.0));
+
+    public double MaxDropDownHeight
+    {
+        get => (double) GetValue(MaxDropDownHeightProperty);
+        set => SetValue(MaxDropDownHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
+        "IsDropDownOpen", typeof(bool), typeof(SplitButton), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsDropDownOpen
+    {
+        get => (bool) GetValue(IsDropDownOpenProperty);
+        set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register(
+        "DropDownContent", typeof(object), typeof(SplitButton), new PropertyMetadata(default(object)));
+
+    public object DropDownContent
+    {
+        get => GetValue(DropDownContentProperty);
+        set => SetValue(DropDownContentProperty, value);
+    }
+
+    public SplitButton()
+    {
+        AddHandler(MenuItem.ClickEvent, new RoutedEventHandler(ItemsOnClick));
+    }
+
+    private void ItemsOnClick(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is MenuItem)
         {
-            get => (HitMode) GetValue(HitModeProperty);
-            set => SetValue(HitModeProperty, value);
-        }
-
-        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(
-            "MaxDropDownHeight", typeof(double), typeof(SplitButton), new PropertyMetadata(SystemParameters.PrimaryScreenHeight / 3.0));
-
-        public double MaxDropDownHeight
-        {
-            get => (double) GetValue(MaxDropDownHeightProperty);
-            set => SetValue(MaxDropDownHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-            "IsDropDownOpen", typeof(bool), typeof(SplitButton), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsDropDownOpen
-        {
-            get => (bool) GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register(
-            "DropDownContent", typeof(object), typeof(SplitButton), new PropertyMetadata(default(object)));
-
-        public object DropDownContent
-        {
-            get => GetValue(DropDownContentProperty);
-            set => SetValue(DropDownContentProperty, value);
-        }
-
-        public SplitButton()
-        {
-            AddHandler(MenuItem.ClickEvent, new RoutedEventHandler(ItemsOnClick));
-        }
-
-        private void ItemsOnClick(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is MenuItem)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-            }
-        }
-
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnPreviewMouseLeftButtonDown(e);
-
-            if (HitMode == HitMode.Hover)
-            {
-                e.Handled = true;
-            }
-        }
-
-        protected override void OnMouseEnter(MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-
-            if (HitMode == HitMode.Hover)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
-            }
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
         }
     }
-}
+
+    protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnPreviewMouseLeftButtonDown(e);
+
+        if (HitMode == HitMode.Hover)
+        {
+            e.Handled = true;
+        }
+    }
+
+    protected override void OnMouseEnter(MouseEventArgs e)
+    {
+        base.OnMouseEnter(e);
+
+        if (HitMode == HitMode.Hover)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
index b37a2e62..e7b1dc03 100644
--- a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
@@ -14,443 +14,442 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     轮播控件
+/// </summary>
+[DefaultProperty("Items")]
+[ContentProperty("Items")]
+[TemplatePart(Name = ElementPanelPage, Type = typeof(Panel))]
+public class Carousel : SimpleItemsControl, IDisposable
 {
-    /// <summary>
-    ///     轮播控件
-    /// </summary>
-    [DefaultProperty("Items")]
-    [ContentProperty("Items")]
-    [TemplatePart(Name = ElementPanelPage, Type = typeof(Panel))]
-    public class Carousel : SimpleItemsControl, IDisposable
+    #region Constants
+
+    private const string ElementPanelPage = "PART_PanelPage";
+
+    #endregion Constants
+
+    #region Data
+
+    private bool _isDisposed;
+
+    private Panel _panelPage;
+
+    private bool _appliedTemplate;
+
+    private int _pageIndex = -1;
+
+    private RadioButton _selectedButton;
+
+    private DispatcherTimer _updateTimer;
+
+    private readonly List<double> _widthList = new();
+
+    private readonly Dictionary<object, CarouselItem> _entryDic = new();
+
+    private bool _isRefresh;
+
+    private IEnumerable _itemsSourceInternal;
+
+    #endregion Data
+
+    public override void OnApplyTemplate()
     {
-        #region Constants
+        _appliedTemplate = false;
 
-        private const string ElementPanelPage = "PART_PanelPage";
+        _panelPage?.RemoveHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
 
-        #endregion Constants
+        base.OnApplyTemplate();
 
-        #region Data
+        _panelPage = GetTemplateChild(ElementPanelPage) as Panel;
 
-        private bool _isDisposed;
+        if (!CheckNull()) return;
 
-        private Panel _panelPage;
+        _panelPage.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
+        _appliedTemplate = true;
+        Update();
+    }
 
-        private bool _appliedTemplate;
+    private void Update()
+    {
+        TimerSwitch(AutoRun);
+        UpdatePageButtons(_pageIndex);
+    }
 
-        private int _pageIndex = -1;
+    private bool CheckNull() => _panelPage != null;
 
-        private RadioButton _selectedButton;
-
-        private DispatcherTimer _updateTimer;
-
-        private readonly List<double> _widthList = new();
-
-        private readonly Dictionary<object, CarouselItem> _entryDic = new();
-
-        private bool _isRefresh;
-
-        private IEnumerable _itemsSourceInternal;
-
-        #endregion Data
-
-        public override void OnApplyTemplate()
+    public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
+        "AutoRun", typeof(bool), typeof(Carousel), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
         {
-            _appliedTemplate = false;
+            var ctl = (Carousel) o;
+            ctl.TimerSwitch((bool) args.NewValue);
+        }));
 
-            _panelPage?.RemoveHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
+    public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
+        "Interval", typeof(TimeSpan), typeof(Carousel), new PropertyMetadata(TimeSpan.FromSeconds(2)));
 
-            base.OnApplyTemplate();
+    public static readonly DependencyProperty ExtendWidthProperty = DependencyProperty.Register(
+        "ExtendWidth", typeof(double), typeof(Carousel), new PropertyMetadata(ValueBoxes.Double0Box));
 
-            _panelPage = GetTemplateChild(ElementPanelPage) as Panel;
+    public double ExtendWidth
+    {
+        get => (double) GetValue(ExtendWidthProperty);
+        set => SetValue(ExtendWidthProperty, value);
+    }
 
-            if (!CheckNull()) return;
+    public static readonly DependencyProperty IsCenterProperty = DependencyProperty.Register(
+        "IsCenter", typeof(bool), typeof(Carousel), new PropertyMetadata(ValueBoxes.FalseBox));
 
-            _panelPage.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(ButtonPages_OnClick));
-            _appliedTemplate = true;
-            Update();
-        }
+    public bool IsCenter
+    {
+        get => (bool) GetValue(IsCenterProperty);
+        set => SetValue(IsCenterProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private void Update()
+    public static readonly DependencyProperty PageButtonStyleProperty = DependencyProperty.Register(
+        "PageButtonStyle", typeof(Style), typeof(Carousel), new PropertyMetadata(default(Style)));
+
+    public Style PageButtonStyle
+    {
+        get => (Style) GetValue(PageButtonStyleProperty);
+        set => SetValue(PageButtonStyleProperty, value);
+    }
+
+    public Carousel()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ButtonPages_OnClick));
+
+        Loaded += (s, e) => UpdatePageButtons();
+        IsVisibleChanged += Carousel_IsVisibleChanged;
+    }
+
+    ~Carousel() => Dispose();
+
+    public void Dispose()
+    {
+        if (_isDisposed) return;
+
+        IsVisibleChanged -= Carousel_IsVisibleChanged;
+        _updateTimer?.Stop();
+        _isDisposed = true;
+
+        GC.SuppressFinalize(this);
+    }
+
+    private void Carousel_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (_updateTimer == null) return;
+
+        if (IsVisible)
         {
-            TimerSwitch(AutoRun);
-            UpdatePageButtons(_pageIndex);
-        }
-
-        private bool CheckNull() => _panelPage != null;
-
-        public static readonly DependencyProperty AutoRunProperty = DependencyProperty.Register(
-            "AutoRun", typeof(bool), typeof(Carousel), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                var ctl = (Carousel) o;
-                ctl.TimerSwitch((bool) args.NewValue);
-            }));
-
-        public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
-            "Interval", typeof(TimeSpan), typeof(Carousel), new PropertyMetadata(TimeSpan.FromSeconds(2)));
-
-        public static readonly DependencyProperty ExtendWidthProperty = DependencyProperty.Register(
-            "ExtendWidth", typeof(double), typeof(Carousel), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double ExtendWidth
-        {
-            get => (double) GetValue(ExtendWidthProperty);
-            set => SetValue(ExtendWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty IsCenterProperty = DependencyProperty.Register(
-            "IsCenter", typeof(bool), typeof(Carousel), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsCenter
-        {
-            get => (bool) GetValue(IsCenterProperty);
-            set => SetValue(IsCenterProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty PageButtonStyleProperty = DependencyProperty.Register(
-            "PageButtonStyle", typeof(Style), typeof(Carousel), new PropertyMetadata(default(Style)));
-
-        public Style PageButtonStyle
-        {
-            get => (Style) GetValue(PageButtonStyleProperty);
-            set => SetValue(PageButtonStyleProperty, value);
-        }
-
-        public Carousel()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ButtonPages_OnClick));
-
-            Loaded += (s, e) => UpdatePageButtons();
-            IsVisibleChanged += Carousel_IsVisibleChanged;
-        }
-
-        ~Carousel() => Dispose();
-
-        public void Dispose()
-        {
-            if (_isDisposed) return;
-
-            IsVisibleChanged -= Carousel_IsVisibleChanged;
-            _updateTimer?.Stop();
-            _isDisposed = true;
-
-            GC.SuppressFinalize(this);
-        }
-
-        private void Carousel_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (_updateTimer == null) return;
-
-            if (IsVisible)
-            {
-                _updateTimer.Tick += UpdateTimer_Tick;
-                _updateTimer.Start();
-            }
-            else
-            {
-                _updateTimer.Stop();
-                _updateTimer.Tick -= UpdateTimer_Tick;
-            }
-        }
-
-        /// <summary>
-        ///     是否自动跳转
-        /// </summary>
-        public bool AutoRun
-        {
-            get => (bool) GetValue(AutoRunProperty);
-            set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     跳转时间间隔
-        /// </summary>
-        public TimeSpan Interval
-        {
-            get => (TimeSpan) GetValue(IntervalProperty);
-            set => SetValue(IntervalProperty, value);
-        }
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
-        {
-            get => _pageIndex;
-            set
-            {
-                if (Items.Count == 0) return;
-                if (_pageIndex == value) return;
-                if (value < 0)
-                    _pageIndex = Items.Count - 1;
-                else if (value >= Items.Count)
-                    _pageIndex = 0;
-                else
-                    _pageIndex = value;
-                UpdatePageButtons(_pageIndex);
-            }
-        }
-
-        /// <summary>
-        ///     计时器开关
-        /// </summary>
-        private void TimerSwitch(bool run)
-        {
-            if (!_appliedTemplate) return;
-
-            if (_updateTimer != null)
-            {
-                _updateTimer.Tick -= UpdateTimer_Tick;
-                _updateTimer.Stop();
-                _updateTimer = null;
-            }
-
-            if (!run) return;
-            _updateTimer = new DispatcherTimer
-            {
-                Interval = Interval
-            };
             _updateTimer.Tick += UpdateTimer_Tick;
             _updateTimer.Start();
         }
-
-        private void UpdateTimer_Tick(object sender, EventArgs e)
+        else
         {
-            if (IsMouseOver) return;
-            PageIndex++;
+            _updateTimer.Stop();
+            _updateTimer.Tick -= UpdateTimer_Tick;
         }
+    }
 
-        /// <summary>
-        ///     更新页按钮
-        /// </summary>
-        public void UpdatePageButtons(int index = -1)
+    /// <summary>
+    ///     是否自动跳转
+    /// </summary>
+    public bool AutoRun
+    {
+        get => (bool) GetValue(AutoRunProperty);
+        set => SetValue(AutoRunProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     跳转时间间隔
+    /// </summary>
+    public TimeSpan Interval
+    {
+        get => (TimeSpan) GetValue(IntervalProperty);
+        set => SetValue(IntervalProperty, value);
+    }
+
+    /// <summary>
+    ///     页码
+    /// </summary>
+    public int PageIndex
+    {
+        get => _pageIndex;
+        set
         {
-            if (!CheckNull()) return;
-            if (!_appliedTemplate) return;
-
-            var count = Items.Count;
-            _widthList.Clear();
-            _widthList.Add(0);
-            var width = .0;
-            foreach (FrameworkElement item in ItemsHost.Children)
-            {
-                item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                width += item.DesiredSize.Width;
-                _widthList.Add(width);
-            }
-
-            ItemsHost.Width = _widthList.Last() + ExtendWidth;
-            _panelPage.Children.Clear();
-            for (var i = 0; i < count; i++)
-            {
-                _panelPage.Children.Add(new RadioButton
-                {
-                    Style = PageButtonStyle
-                });
-            }
-
-            if (index == -1 && count > 0) index = 0;
-            if (index >= 0 && index < count)
-            {
-                if (_panelPage.Children[index] is RadioButton button)
-                {
-                    button.IsChecked = true;
-                    button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent, button));
-                    UpdateItemsPosition();
-                }
-            }
-        }
-
-        /// <summary>
-        ///     更新项的位置
-        /// </summary>
-        private void UpdateItemsPosition()
-        {
-            if (!CheckNull()) return;
-            if (!_appliedTemplate) return;
             if (Items.Count == 0) return;
-            if (!IsCenter)
+            if (_pageIndex == value) return;
+            if (value < 0)
+                _pageIndex = Items.Count - 1;
+            else if (value >= Items.Count)
+                _pageIndex = 0;
+            else
+                _pageIndex = value;
+            UpdatePageButtons(_pageIndex);
+        }
+    }
+
+    /// <summary>
+    ///     计时器开关
+    /// </summary>
+    private void TimerSwitch(bool run)
+    {
+        if (!_appliedTemplate) return;
+
+        if (_updateTimer != null)
+        {
+            _updateTimer.Tick -= UpdateTimer_Tick;
+            _updateTimer.Stop();
+            _updateTimer = null;
+        }
+
+        if (!run) return;
+        _updateTimer = new DispatcherTimer
+        {
+            Interval = Interval
+        };
+        _updateTimer.Tick += UpdateTimer_Tick;
+        _updateTimer.Start();
+    }
+
+    private void UpdateTimer_Tick(object sender, EventArgs e)
+    {
+        if (IsMouseOver) return;
+        PageIndex++;
+    }
+
+    /// <summary>
+    ///     更新页按钮
+    /// </summary>
+    public void UpdatePageButtons(int index = -1)
+    {
+        if (!CheckNull()) return;
+        if (!_appliedTemplate) return;
+
+        var count = Items.Count;
+        _widthList.Clear();
+        _widthList.Add(0);
+        var width = .0;
+        foreach (FrameworkElement item in ItemsHost.Children)
+        {
+            item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            width += item.DesiredSize.Width;
+            _widthList.Add(width);
+        }
+
+        ItemsHost.Width = _widthList.Last() + ExtendWidth;
+        _panelPage.Children.Clear();
+        for (var i = 0; i < count; i++)
+        {
+            _panelPage.Children.Add(new RadioButton
             {
-                ItemsHost.BeginAnimation(MarginProperty,
-                    AnimationHelper.CreateAnimation(new Thickness(-_widthList[PageIndex], 0, 0, 0)));
+                Style = PageButtonStyle
+            });
+        }
+
+        if (index == -1 && count > 0) index = 0;
+        if (index >= 0 && index < count)
+        {
+            if (_panelPage.Children[index] is RadioButton button)
+            {
+                button.IsChecked = true;
+                button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent, button));
+                UpdateItemsPosition();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     更新项的位置
+    /// </summary>
+    private void UpdateItemsPosition()
+    {
+        if (!CheckNull()) return;
+        if (!_appliedTemplate) return;
+        if (Items.Count == 0) return;
+        if (!IsCenter)
+        {
+            ItemsHost.BeginAnimation(MarginProperty,
+                AnimationHelper.CreateAnimation(new Thickness(-_widthList[PageIndex], 0, 0, 0)));
+        }
+        else
+        {
+            var ctl = (FrameworkElement) ItemsHost.Children[PageIndex];
+            var ctlWidth = ctl.DesiredSize.Width;
+            ItemsHost.BeginAnimation(MarginProperty,
+                AnimationHelper.CreateAnimation(
+                    new Thickness(-_widthList[PageIndex] + (ActualWidth - ctlWidth) / 2, 0, 0, 0)));
+        }
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        UpdateItemsPosition();
+    }
+
+    private void ButtonPages_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (!CheckNull()) return;
+
+        _selectedButton = e.OriginalSource as RadioButton;
+
+        var index = _panelPage.Children.IndexOf(_selectedButton);
+        if (index != -1)
+        {
+            PageIndex = index;
+        }
+    }
+
+    private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
+
+    private void ButtonNext_OnClick(object sender, RoutedEventArgs e) => PageIndex++;
+
+    protected override DependencyObject GetContainerForItemOverride() => new CarouselItem();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is CarouselItem;
+
+    private void ClearItems()
+    {
+        ItemsHost?.Children.Clear();
+        _entryDic.Clear();
+    }
+
+    private void RemoveItem(object item)
+    {
+        if (_entryDic.TryGetValue(item, out var entry))
+        {
+            ItemsHost.Children.Remove(entry);
+            Items.Remove(item);
+            _entryDic.Remove(item);
+        }
+    }
+
+    protected override void Refresh()
+    {
+        if (ItemsHost == null) return;
+
+        _entryDic.Clear();
+        _isRefresh = true;
+
+        foreach (var item in Items)
+        {
+            AddItem(item);
+        }
+
+        _isRefresh = false;
+    }
+
+    private void AddItem(object item) => InsertItem(_entryDic.Count, item);
+
+    private void InsertItem(int index, object item)
+    {
+        if (ItemsHost == null)
+        {
+            Items.Insert(index, item);
+            _entryDic.Add(item, null);
+        }
+        else
+        {
+            DependencyObject container;
+            if (IsItemItsOwnContainerOverride(item))
+            {
+                container = item as DependencyObject;
             }
             else
             {
-                var ctl = (FrameworkElement) ItemsHost.Children[PageIndex];
-                var ctlWidth = ctl.DesiredSize.Width;
-                ItemsHost.BeginAnimation(MarginProperty,
-                    AnimationHelper.CreateAnimation(
-                        new Thickness(-_widthList[PageIndex] + (ActualWidth - ctlWidth) / 2, 0, 0, 0)));
+                container = GetContainerForItemOverride();
+                PrepareContainerForItemOverride(container, item);
             }
-        }
 
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            UpdateItemsPosition();
-        }
-
-        private void ButtonPages_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (!CheckNull()) return;
-
-            _selectedButton = e.OriginalSource as RadioButton;
-
-            var index = _panelPage.Children.IndexOf(_selectedButton);
-            if (index != -1)
+            if (container is CarouselItem element)
             {
-                PageIndex = index;
+                element.Style = ItemContainerStyle;
+                _entryDic[item] = element;
+                ItemsHost.Children.Insert(index, element);
+
+                if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
+                {
+                    Items.Insert(index, item);
+                }
             }
         }
+    }
 
-        private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
-
-        private void ButtonNext_OnClick(object sender, RoutedEventArgs e) => PageIndex++;
-
-        protected override DependencyObject GetContainerForItemOverride() => new CarouselItem();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is CarouselItem;
-
-        private void ClearItems()
+    protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+    {
+        if (_itemsSourceInternal != null)
         {
-            ItemsHost?.Children.Clear();
-            _entryDic.Clear();
-        }
-
-        private void RemoveItem(object item)
-        {
-            if (_entryDic.TryGetValue(item, out var entry))
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
             {
-                ItemsHost.Children.Remove(entry);
-                Items.Remove(item);
-                _entryDic.Remove(item);
+                s.CollectionChanged -= InternalCollectionChanged;
             }
+
+            Items.Clear();
+            ClearItems();
         }
-
-        protected override void Refresh()
+        _itemsSourceInternal = newValue;
+        if (_itemsSourceInternal != null)
         {
-            if (ItemsHost == null) return;
-
-            _entryDic.Clear();
-            _isRefresh = true;
-
-            foreach (var item in Items)
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
+            {
+                s.CollectionChanged += InternalCollectionChanged;
+            }
+            foreach (var item in _itemsSourceInternal)
             {
                 AddItem(item);
             }
-
-            _isRefresh = false;
-        }
-
-        private void AddItem(object item) => InsertItem(_entryDic.Count, item);
-
-        private void InsertItem(int index, object item)
-        {
-            if (ItemsHost == null)
-            {
-                Items.Insert(index, item);
-                _entryDic.Add(item, null);
-            }
-            else
-            {
-                DependencyObject container;
-                if (IsItemItsOwnContainerOverride(item))
-                {
-                    container = item as DependencyObject;
-                }
-                else
-                {
-                    container = GetContainerForItemOverride();
-                    PrepareContainerForItemOverride(container, item);
-                }
-
-                if (container is CarouselItem element)
-                {
-                    element.Style = ItemContainerStyle;
-                    _entryDic[item] = element;
-                    ItemsHost.Children.Insert(index, element);
-
-                    if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
-                    {
-                        Items.Insert(index, item);
-                    }
-                }
-            }
-        }
-
-        protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
-        {
-            if (_itemsSourceInternal != null)
-            {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged -= InternalCollectionChanged;
-                }
-
-                Items.Clear();
-                ClearItems();
-            }
-            _itemsSourceInternal = newValue;
-            if (_itemsSourceInternal != null)
-            {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged += InternalCollectionChanged;
-                }
-                foreach (var item in _itemsSourceInternal)
-                {
-                    AddItem(item);
-                }
-            }
-        }
-
-        private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (ItemsHost == null) return;
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                if (_entryDic.Count == 0) return;
-                ClearItems();
-                Items.Clear();
-                return;
-            }
-
-            if (e.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
-                {
-                    RemoveItem(item);
-                }
-            }
-            if (e.NewItems != null)
-            {
-                var count = 0;
-                foreach (var item in e.NewItems)
-                {
-                    var index = e.NewStartingIndex + count++;
-                    InsertItem(index, item);
-                }
-            }
-        }
-
-        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (_itemsSourceInternal != null) return;
-
-            InternalCollectionChanged(sender, e);
-        }
-
-        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-
         }
     }
-}
+
+    private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (ItemsHost == null) return;
+
+        if (e.Action == NotifyCollectionChangedAction.Reset)
+        {
+            if (_entryDic.Count == 0) return;
+            ClearItems();
+            Items.Clear();
+            return;
+        }
+
+        if (e.OldItems != null)
+        {
+            foreach (var item in e.OldItems)
+            {
+                RemoveItem(item);
+            }
+        }
+        if (e.NewItems != null)
+        {
+            var count = 0;
+            foreach (var item in e.NewItems)
+            {
+                var index = e.NewStartingIndex + count++;
+                InsertItem(index, item);
+            }
+        }
+    }
+
+    protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (_itemsSourceInternal != null) return;
+
+        InternalCollectionChanged(sender, e);
+    }
+
+    protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs b/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
index 6b256f78..3b1d4aba 100644
--- a/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
@@ -1,9 +1,8 @@
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
-{
-    public class CarouselItem : ContentControl
-    {
+namespace HandyControl.Controls;
 
-    }
-}
+public class CarouselItem : ContentControl
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
index 50bc8bef..2eed1227 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
@@ -6,101 +6,100 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+internal class ColorDropper
 {
-    internal class ColorDropper
+    private bool _cursorIsSetted;
+
+    private Cursor _dropperCursor;
+
+    private readonly ColorPicker _colorPicker;
+
+    public ColorDropper(ColorPicker colorPicker)
     {
-        private bool _cursorIsSetted;
+        _colorPicker = colorPicker;
+    }
 
-        private Cursor _dropperCursor;
-
-        private readonly ColorPicker _colorPicker;
-
-        public ColorDropper(ColorPicker colorPicker)
+    public void Update(bool isShow)
+    {
+        if (isShow)
         {
-            _colorPicker = colorPicker;
-        }
-
-        public void Update(bool isShow)
-        {
-            if (isShow)
+            if (_dropperCursor == null)
             {
-                if (_dropperCursor == null)
+                var info = Application.GetResourceStream(new Uri("pack://application:,,,/HandyControl;Component/Resources/dropper.cur"));
+                if (info != null)
                 {
-                    var info = Application.GetResourceStream(new Uri("pack://application:,,,/HandyControl;Component/Resources/dropper.cur"));
-                    if (info != null)
-                    {
-                        _dropperCursor = new Cursor(info.Stream);
-                    }
-                }
-
-                if (_dropperCursor == null) return;
-
-                MouseHook.Start();
-                MouseHook.StatusChanged += MouseHook_StatusChanged;
-            }
-            else
-            {
-                Mouse.OverrideCursor = Cursors.Arrow;
-                MouseHook.Stop();
-                MouseHook.StatusChanged -= MouseHook_StatusChanged;
-            }
-        }
-
-        private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
-        {
-            var window = System.Windows.Window.GetWindow(_colorPicker);
-            if (window == null)
-            {
-                UpdateCursor(false);
-
-                return;
-            }
-
-            if (!_colorPicker.IsMouseOver && window.IsMouseOver)
-            {
-                UpdateCursor(true);
-                if (e.MessageType == MouseHookMessageType.LeftButtonDown)
-                {
-                    var brush = new SolidColorBrush(GetColorAt(e.Point.X, e.Point.Y));
-                    _colorPicker.SelectedBrush = brush;
+                    _dropperCursor = new Cursor(info.Stream);
                 }
             }
-            else
-            {
-                UpdateCursor(false);
-            }
+
+            if (_dropperCursor == null) return;
+
+            MouseHook.Start();
+            MouseHook.StatusChanged += MouseHook_StatusChanged;
         }
-
-        private void UpdateCursor(bool isDropper)
+        else
         {
-            if (isDropper)
-            {
-                Mouse.Captured?.ReleaseMouseCapture();
-
-                if (!_cursorIsSetted)
-                {
-                    Mouse.OverrideCursor = _dropperCursor;
-                    _cursorIsSetted = true;
-                }
-            }
-            else
-            {
-                if (_cursorIsSetted)
-                {
-                    Mouse.OverrideCursor = Cursors.Arrow;
-                    _cursorIsSetted = false;
-                }
-            }
-        }
-
-        public static Color GetColorAt(int x, int y)
-        {
-            var desk = InteropMethods.GetDesktopWindow();
-            var dc = InteropMethods.GetWindowDC(desk);
-            var a = (int) InteropMethods.GetPixel(dc, x, y);
-            InteropMethods.ReleaseDC(desk, dc);
-            return Color.FromArgb(255, (byte) ((a >> 0) & 0xff), (byte) ((a >> 8) & 0xff), (byte) ((a >> 16) & 0xff));
+            Mouse.OverrideCursor = Cursors.Arrow;
+            MouseHook.Stop();
+            MouseHook.StatusChanged -= MouseHook_StatusChanged;
         }
     }
-}
+
+    private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
+    {
+        var window = System.Windows.Window.GetWindow(_colorPicker);
+        if (window == null)
+        {
+            UpdateCursor(false);
+
+            return;
+        }
+
+        if (!_colorPicker.IsMouseOver && window.IsMouseOver)
+        {
+            UpdateCursor(true);
+            if (e.MessageType == MouseHookMessageType.LeftButtonDown)
+            {
+                var brush = new SolidColorBrush(GetColorAt(e.Point.X, e.Point.Y));
+                _colorPicker.SelectedBrush = brush;
+            }
+        }
+        else
+        {
+            UpdateCursor(false);
+        }
+    }
+
+    private void UpdateCursor(bool isDropper)
+    {
+        if (isDropper)
+        {
+            Mouse.Captured?.ReleaseMouseCapture();
+
+            if (!_cursorIsSetted)
+            {
+                Mouse.OverrideCursor = _dropperCursor;
+                _cursorIsSetted = true;
+            }
+        }
+        else
+        {
+            if (_cursorIsSetted)
+            {
+                Mouse.OverrideCursor = Cursors.Arrow;
+                _cursorIsSetted = false;
+            }
+        }
+    }
+
+    public static Color GetColorAt(int x, int y)
+    {
+        var desk = InteropMethods.GetDesktopWindow();
+        var dc = InteropMethods.GetWindowDC(desk);
+        var a = (int) InteropMethods.GetPixel(dc, x, y);
+        InteropMethods.ReleaseDC(desk, dc);
+        return Color.FromArgb(255, (byte) ((a >> 0) & 0xff), (byte) ((a >> 8) & 0xff), (byte) ((a >> 16) & 0xff));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index 81579542..df7e568f 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -11,733 +11,732 @@ using HandyControl.Interactivity;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     颜色拾取器
+/// </summary>
+[TemplatePart(Name = ElementBorderColor, Type = typeof(Border))]
+[TemplatePart(Name = ElementBorderPicker, Type = typeof(Border))]
+[TemplatePart(Name = ElementBorderDrag, Type = typeof(Border))]
+[TemplatePart(Name = ElementPanelColor, Type = typeof(Panel))]
+[TemplatePart(Name = ElementSliderColor, Type = typeof(Panel))]
+[TemplatePart(Name = ElementSliderOpacity, Type = typeof(Panel))]
+[TemplatePart(Name = ElementPanelRgb, Type = typeof(Panel))]
+[TemplatePart(Name = ElementButtonDropper, Type = typeof(ToggleButton))]
+public class ColorPicker : Control, ISingleOpen
 {
+    #region Constants
+
+    private const string ElementBorderColor = "PART_BorderColor";
+    private const string ElementBorderPicker = "PART_BorderPicker";
+    private const string ElementBorderDrag = "PART_BorderDrag";
+    private const string ElementPanelColor = "PART_PanelColor";
+    private const string ElementSliderColor = "PART_SliderColor";
+    private const string ElementSliderOpacity = "PART_SliderOpacity";
+    private const string ElementPanelRgb = "PART_PanelRgb";
+    private const string ElementButtonDropper = "PART_ButtonDropper";
+
+    #endregion Constants
+
+    #region Data
+
+    private ColorDropper _colorDropper;
+
+    private ToggleButton _toggleButtonDropper;
+
+    private Panel _panelRgb;
+
+    private Border _borderColor;
+
+    private Border _borderPicker;
+
+    private Border _borderDrag;
+
+    private Panel _panelColor;
+
+    private Slider _sliderColor;
+
+    private Slider _sliderOpacity;
+
+    private bool _appliedTemplate;
+
+    private bool _disposed;
+
     /// <summary>
-    ///     颜色拾取器
+    ///     当前显示的颜色类型
     /// </summary>
-    [TemplatePart(Name = ElementBorderColor, Type = typeof(Border))]
-    [TemplatePart(Name = ElementBorderPicker, Type = typeof(Border))]
-    [TemplatePart(Name = ElementBorderDrag, Type = typeof(Border))]
-    [TemplatePart(Name = ElementPanelColor, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementSliderColor, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementSliderOpacity, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementPanelRgb, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementButtonDropper, Type = typeof(ToggleButton))]
-    public class ColorPicker : Control, ISingleOpen
+    private int _colorType;
+
+    /// <summary>
+    ///     是否已经加载控件
+    /// </summary>
+    private bool _isLoaded;
+
+    /// <summary>
+    ///     是否需要更新小球位置
+    /// </summary>
+    private bool _isNeedUpdatePicker = true;
+
+    /// <summary>
+    ///     是否在拖动小球
+    /// </summary>
+    private bool _isOnDragging;
+
+    /// <summary>
+    ///     是否需要更新信息
+    /// </summary>
+    private bool IsNeedUpdateInfo { get; set; } = true;
+
+    /// <summary>
+    ///     颜色选取面板宽度
+    /// </summary>
+    private const double ColorPanelWidth = 230;
+
+    /// <summary>
+    ///     颜色选取面板高度
+    /// </summary>
+    private const double ColorPanelHeight = 122;
+
+    /// <summary>
+    ///     预设的颜色（一共18个，两行）
+    /// </summary>
+    private readonly List<string> _colorPresetList = new()
     {
-        #region Constants
+        "#f44336",
+        "#e91e63",
+        "#9c27b0",
+        "#673ab7",
+        "#3f51b5",
+        "#2196f3",
+        "#03a9f4",
+        "#00bcd4",
+        "#009688",
 
-        private const string ElementBorderColor = "PART_BorderColor";
-        private const string ElementBorderPicker = "PART_BorderPicker";
-        private const string ElementBorderDrag = "PART_BorderDrag";
-        private const string ElementPanelColor = "PART_PanelColor";
-        private const string ElementSliderColor = "PART_SliderColor";
-        private const string ElementSliderOpacity = "PART_SliderOpacity";
-        private const string ElementPanelRgb = "PART_PanelRgb";
-        private const string ElementButtonDropper = "PART_ButtonDropper";
+        "#4caf50",
+        "#8bc34a",
+        "#cddc39",
+        "#ffeb3b",
+        "#ffc107",
+        "#ff9800",
+        "#ff5722",
+        "#795548",
+        "#9e9e9e"
+    };
 
-        #endregion Constants
-
-        #region Data
-
-        private ColorDropper _colorDropper;
-
-        private ToggleButton _toggleButtonDropper;
-
-        private Panel _panelRgb;
-
-        private Border _borderColor;
-
-        private Border _borderPicker;
-
-        private Border _borderDrag;
-
-        private Panel _panelColor;
-
-        private Slider _sliderColor;
-
-        private Slider _sliderOpacity;
-
-        private bool _appliedTemplate;
-
-        private bool _disposed;
-
-        /// <summary>
-        ///     当前显示的颜色类型
-        /// </summary>
-        private int _colorType;
-
-        /// <summary>
-        ///     是否已经加载控件
-        /// </summary>
-        private bool _isLoaded;
-
-        /// <summary>
-        ///     是否需要更新小球位置
-        /// </summary>
-        private bool _isNeedUpdatePicker = true;
-
-        /// <summary>
-        ///     是否在拖动小球
-        /// </summary>
-        private bool _isOnDragging;
-
-        /// <summary>
-        ///     是否需要更新信息
-        /// </summary>
-        private bool IsNeedUpdateInfo { get; set; } = true;
-
-        /// <summary>
-        ///     颜色选取面板宽度
-        /// </summary>
-        private const double ColorPanelWidth = 230;
-
-        /// <summary>
-        ///     颜色选取面板高度
-        /// </summary>
-        private const double ColorPanelHeight = 122;
-
-        /// <summary>
-        ///     预设的颜色（一共18个，两行）
-        /// </summary>
-        private readonly List<string> _colorPresetList = new()
+    /// <summary>
+    ///     颜色范围集合
+    /// </summary>
+    private readonly List<ColorRange> _colorRangeList = new()
+    {
+        new ColorRange
         {
-            "#f44336",
-            "#e91e63",
-            "#9c27b0",
-            "#673ab7",
-            "#3f51b5",
-            "#2196f3",
-            "#03a9f4",
-            "#00bcd4",
-            "#009688",
-
-            "#4caf50",
-            "#8bc34a",
-            "#cddc39",
-            "#ffeb3b",
-            "#ffc107",
-            "#ff9800",
-            "#ff5722",
-            "#795548",
-            "#9e9e9e"
-        };
-
-        /// <summary>
-        ///     颜色范围集合
-        /// </summary>
-        private readonly List<ColorRange> _colorRangeList = new()
+            Start = Color.FromRgb(255, 0, 0),
+            End = Color.FromRgb(255, 0, 255)
+        },
+        new ColorRange
         {
-            new ColorRange
+            Start = Color.FromRgb(255, 0, 255),
+            End = Color.FromRgb(0, 0, 255)
+        },
+        new ColorRange
+        {
+            Start = Color.FromRgb(0, 0, 255),
+            End = Color.FromRgb(0, 255, 255)
+        },
+        new ColorRange
+        {
+            Start = Color.FromRgb(0, 255, 255),
+            End = Color.FromRgb(0, 255, 0)
+        },
+        new ColorRange
+        {
+            Start = Color.FromRgb(0, 255, 0),
+            End = Color.FromRgb(255, 255, 0)
+        },
+        new ColorRange
+        {
+            Start = Color.FromRgb(255, 255, 0),
+            End = Color.FromRgb(255, 0, 0)
+        }
+    };
+
+    /// <summary>
+    ///     颜色分隔集合
+    /// </summary>
+    private readonly List<Color> _colorSeparateList = new()
+    {
+        Color.FromRgb(255, 0, 0),
+        Color.FromRgb(255, 0, 255),
+        Color.FromRgb(0, 0, 255),
+        Color.FromRgb(0, 255, 255),
+        Color.FromRgb(0, 255, 0),
+        Color.FromRgb(255, 255, 0)
+    };
+
+    #endregion Data
+
+    #region Public Events
+
+    public static readonly RoutedEvent SelectedColorChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
+
+    public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
+    {
+        add => AddHandler(SelectedColorChangedEvent, value);
+        remove => RemoveHandler(SelectedColorChangedEvent, value);
+    }
+
+    /// <summary>
+    ///     颜色改变事件
+    /// </summary>
+    public static readonly RoutedEvent ConfirmedEvent =
+        EventManager.RegisterRoutedEvent("Confirmed", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
+
+    /// <summary>
+    ///     颜色改变事件
+    /// </summary>
+    public event EventHandler<FunctionEventArgs<Color>> Confirmed
+    {
+        add => AddHandler(ConfirmedEvent, value);
+        remove => RemoveHandler(ConfirmedEvent, value);
+    }
+
+    /// <summary>
+    ///     取消事件
+    /// </summary>
+    public static readonly RoutedEvent CanceledEvent =
+        EventManager.RegisterRoutedEvent("Canceled", RoutingStrategy.Bubble,
+            typeof(EventHandler), typeof(ColorPicker));
+
+    /// <summary>
+    ///     取消事件
+    /// </summary>
+    public event EventHandler Canceled
+    {
+        add => AddHandler(CanceledEvent, value);
+        remove => RemoveHandler(CanceledEvent, value);
+    }
+
+    #endregion Public Events
+
+    #region Properties
+
+    internal static readonly DependencyProperty ChannelAProperty = DependencyProperty.Register(
+        "ChannelA", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
+
+    internal int ChannelA
+    {
+        get => (int) GetValue(ChannelAProperty);
+        set => SetValue(ChannelAProperty, value);
+    }
+
+    internal static readonly DependencyProperty ChannelRProperty = DependencyProperty.Register(
+        "ChannelR", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
+
+    internal int ChannelR
+    {
+        get => (int) GetValue(ChannelRProperty);
+        set => SetValue(ChannelRProperty, value);
+    }
+
+    internal static readonly DependencyProperty ChannelGProperty = DependencyProperty.Register(
+        "ChannelG", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
+
+    internal int ChannelG
+    {
+        get => (int) GetValue(ChannelGProperty);
+        set => SetValue(ChannelGProperty, value);
+    }
+
+    internal static readonly DependencyProperty ChannelBProperty = DependencyProperty.Register(
+        "ChannelB", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
+
+    internal int ChannelB
+    {
+        get => (int) GetValue(ChannelBProperty);
+        set => SetValue(ChannelBProperty, value);
+    }
+
+    public static readonly DependencyProperty SelectedBrushProperty = DependencyProperty.Register(
+        "SelectedBrush", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.White, OnSelectedBrushChanged, CoerceSelectedBrush));
+
+    private static object CoerceSelectedBrush(DependencyObject d, object basevalue)
+    {
+        return basevalue is SolidColorBrush ? basevalue : Brushes.White;
+    }
+
+    private static void OnSelectedBrushChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ColorPicker) d;
+        var v = (SolidColorBrush) e.NewValue;
+
+        if (ctl.IsNeedUpdateInfo)
+        {
+            ctl.IsNeedUpdateInfo = false;
+            ctl.ChannelR = v.Color.R;
+            ctl.ChannelG = v.Color.G;
+            ctl.ChannelB = v.Color.B;
+            ctl.ChannelA = v.Color.A;
+            ctl.IsNeedUpdateInfo = true;
+        }
+        ctl.UpdateStatus(v.Color);
+        ctl.SelectedBrushWithoutOpacity = new SolidColorBrush(Color.FromRgb(v.Color.R, v.Color.G, v.Color.B));
+        ctl.RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, ctl)
+        {
+            Info = v.Color
+        });
+    }
+
+    /// <summary>
+    ///     当前选中的颜色
+    /// </summary>
+    public SolidColorBrush SelectedBrush
+    {
+        get => (SolidColorBrush) GetValue(SelectedBrushProperty);
+        set => SetValue(SelectedBrushProperty, value);
+    }
+
+    internal static readonly DependencyProperty SelectedBrushWithoutOpacityProperty = DependencyProperty.Register(
+        "SelectedBrushWithoutOpacity", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.White));
+
+    internal SolidColorBrush SelectedBrushWithoutOpacity
+    {
+        get => (SolidColorBrush) GetValue(SelectedBrushWithoutOpacityProperty);
+        set => SetValue(SelectedBrushWithoutOpacityProperty, value);
+    }
+
+    internal static readonly DependencyProperty BackColorProperty = DependencyProperty.Register(
+        "BackColor", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.Red));
+
+    internal SolidColorBrush BackColor
+    {
+        get => (SolidColorBrush) GetValue(BackColorProperty);
+        set => SetValue(BackColorProperty, value);
+    }
+
+    internal static readonly DependencyProperty ShowListProperty = DependencyProperty.Register(
+        "ShowList", typeof(List<bool>), typeof(ColorPicker), new PropertyMetadata(new List<bool>
+        {
+            true, false, false
+        }));
+
+    internal List<bool> ShowList
+    {
+        get => (List<bool>) GetValue(ShowListProperty);
+        set => SetValue(ShowListProperty, value);
+    }
+
+    #endregion Properties
+
+    /// <summary>
+    ///     当前显示的颜色类型
+    /// </summary>
+    private int ColorType
+    {
+        get => _colorType;
+        set
+        {
+            if (value < 0)
             {
-                Start = Color.FromRgb(255, 0, 0),
-                End = Color.FromRgb(255, 0, 255)
-            },
-            new ColorRange
-            {
-                Start = Color.FromRgb(255, 0, 255),
-                End = Color.FromRgb(0, 0, 255)
-            },
-            new ColorRange
-            {
-                Start = Color.FromRgb(0, 0, 255),
-                End = Color.FromRgb(0, 255, 255)
-            },
-            new ColorRange
-            {
-                Start = Color.FromRgb(0, 255, 255),
-                End = Color.FromRgb(0, 255, 0)
-            },
-            new ColorRange
-            {
-                Start = Color.FromRgb(0, 255, 0),
-                End = Color.FromRgb(255, 255, 0)
-            },
-            new ColorRange
-            {
-                Start = Color.FromRgb(255, 255, 0),
-                End = Color.FromRgb(255, 0, 0)
+                _colorType = 1;
             }
-        };
-
-        /// <summary>
-        ///     颜色分隔集合
-        /// </summary>
-        private readonly List<Color> _colorSeparateList = new()
-        {
-            Color.FromRgb(255, 0, 0),
-            Color.FromRgb(255, 0, 255),
-            Color.FromRgb(0, 0, 255),
-            Color.FromRgb(0, 255, 255),
-            Color.FromRgb(0, 255, 0),
-            Color.FromRgb(255, 255, 0)
-        };
-
-        #endregion Data
-
-        #region Public Events
-
-        public static readonly RoutedEvent SelectedColorChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
-
-        public event EventHandler<FunctionEventArgs<Color>> SelectedColorChanged
-        {
-            add => AddHandler(SelectedColorChangedEvent, value);
-            remove => RemoveHandler(SelectedColorChangedEvent, value);
-        }
-
-        /// <summary>
-        ///     颜色改变事件
-        /// </summary>
-        public static readonly RoutedEvent ConfirmedEvent =
-            EventManager.RegisterRoutedEvent("Confirmed", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<Color>>), typeof(ColorPicker));
-
-        /// <summary>
-        ///     颜色改变事件
-        /// </summary>
-        public event EventHandler<FunctionEventArgs<Color>> Confirmed
-        {
-            add => AddHandler(ConfirmedEvent, value);
-            remove => RemoveHandler(ConfirmedEvent, value);
-        }
-
-        /// <summary>
-        ///     取消事件
-        /// </summary>
-        public static readonly RoutedEvent CanceledEvent =
-            EventManager.RegisterRoutedEvent("Canceled", RoutingStrategy.Bubble,
-                typeof(EventHandler), typeof(ColorPicker));
-
-        /// <summary>
-        ///     取消事件
-        /// </summary>
-        public event EventHandler Canceled
-        {
-            add => AddHandler(CanceledEvent, value);
-            remove => RemoveHandler(CanceledEvent, value);
-        }
-
-        #endregion Public Events
-
-        #region Properties
-
-        internal static readonly DependencyProperty ChannelAProperty = DependencyProperty.Register(
-            "ChannelA", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
-
-        internal int ChannelA
-        {
-            get => (int) GetValue(ChannelAProperty);
-            set => SetValue(ChannelAProperty, value);
-        }
-
-        internal static readonly DependencyProperty ChannelRProperty = DependencyProperty.Register(
-            "ChannelR", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
-
-        internal int ChannelR
-        {
-            get => (int) GetValue(ChannelRProperty);
-            set => SetValue(ChannelRProperty, value);
-        }
-
-        internal static readonly DependencyProperty ChannelGProperty = DependencyProperty.Register(
-            "ChannelG", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
-
-        internal int ChannelG
-        {
-            get => (int) GetValue(ChannelGProperty);
-            set => SetValue(ChannelGProperty, value);
-        }
-
-        internal static readonly DependencyProperty ChannelBProperty = DependencyProperty.Register(
-            "ChannelB", typeof(int), typeof(ColorPicker), new PropertyMetadata(255));
-
-        internal int ChannelB
-        {
-            get => (int) GetValue(ChannelBProperty);
-            set => SetValue(ChannelBProperty, value);
-        }
-
-        public static readonly DependencyProperty SelectedBrushProperty = DependencyProperty.Register(
-            "SelectedBrush", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.White, OnSelectedBrushChanged, CoerceSelectedBrush));
-
-        private static object CoerceSelectedBrush(DependencyObject d, object basevalue)
-        {
-            return basevalue is SolidColorBrush ? basevalue : Brushes.White;
-        }
-
-        private static void OnSelectedBrushChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ColorPicker) d;
-            var v = (SolidColorBrush) e.NewValue;
-
-            if (ctl.IsNeedUpdateInfo)
+            else if (value > 1)
             {
-                ctl.IsNeedUpdateInfo = false;
-                ctl.ChannelR = v.Color.R;
-                ctl.ChannelG = v.Color.G;
-                ctl.ChannelB = v.Color.B;
-                ctl.ChannelA = v.Color.A;
-                ctl.IsNeedUpdateInfo = true;
-            }
-            ctl.UpdateStatus(v.Color);
-            ctl.SelectedBrushWithoutOpacity = new SolidColorBrush(Color.FromRgb(v.Color.R, v.Color.G, v.Color.B));
-            ctl.RaiseEvent(new FunctionEventArgs<Color>(SelectedColorChangedEvent, ctl)
-            {
-                Info = v.Color
-            });
-        }
-
-        /// <summary>
-        ///     当前选中的颜色
-        /// </summary>
-        public SolidColorBrush SelectedBrush
-        {
-            get => (SolidColorBrush) GetValue(SelectedBrushProperty);
-            set => SetValue(SelectedBrushProperty, value);
-        }
-
-        internal static readonly DependencyProperty SelectedBrushWithoutOpacityProperty = DependencyProperty.Register(
-            "SelectedBrushWithoutOpacity", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.White));
-
-        internal SolidColorBrush SelectedBrushWithoutOpacity
-        {
-            get => (SolidColorBrush) GetValue(SelectedBrushWithoutOpacityProperty);
-            set => SetValue(SelectedBrushWithoutOpacityProperty, value);
-        }
-
-        internal static readonly DependencyProperty BackColorProperty = DependencyProperty.Register(
-            "BackColor", typeof(SolidColorBrush), typeof(ColorPicker), new PropertyMetadata(Brushes.Red));
-
-        internal SolidColorBrush BackColor
-        {
-            get => (SolidColorBrush) GetValue(BackColorProperty);
-            set => SetValue(BackColorProperty, value);
-        }
-
-        internal static readonly DependencyProperty ShowListProperty = DependencyProperty.Register(
-            "ShowList", typeof(List<bool>), typeof(ColorPicker), new PropertyMetadata(new List<bool>
-            {
-                true, false, false
-            }));
-
-        internal List<bool> ShowList
-        {
-            get => (List<bool>) GetValue(ShowListProperty);
-            set => SetValue(ShowListProperty, value);
-        }
-
-        #endregion Properties
-
-        /// <summary>
-        ///     当前显示的颜色类型
-        /// </summary>
-        private int ColorType
-        {
-            get => _colorType;
-            set
-            {
-                if (value < 0)
-                {
-                    _colorType = 1;
-                }
-                else if (value > 1)
-                {
-                    _colorType = 0;
-                }
-                else
-                {
-                    _colorType = value;
-                }
-
-                var list = new List<bool>();
-                for (var i = 0; i < 2; i++)
-                {
-                    list.Add(false);
-                }
-                list[_colorType] = true;
-                ShowList = list;
-            }
-        }
-
-        ~ColorPicker()
-        {
-            Dispose(false);
-        }
-
-        public ColorPicker()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonConfirm_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Switch, ButtonSwitch_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
-
-            Loaded += (s, e) =>
-            {
-                if (!_isLoaded)
-                {
-                    Init();
-                    _isLoaded = true;
-                }
-            };
-        }
-
-        public override void OnApplyTemplate()
-        {
-            _appliedTemplate = false;
-            if (_sliderColor != null)
-            {
-                _sliderColor.ValueChanged -= SliderColor_OnValueChanged;
-            }
-
-            if (_sliderOpacity != null)
-            {
-                _sliderOpacity.ValueChanged -= SliderOpacity_OnValueChanged;
-            }
-
-            if (_toggleButtonDropper != null)
-            {
-                _toggleButtonDropper.Click -= ToggleButtonDropper_Click;
-            }
-
-            _panelColor?.Children.Clear();
-
-            _panelRgb?.RemoveHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
-
-            base.OnApplyTemplate();
-
-            _borderColor = GetTemplateChild(ElementBorderColor) as Border;
-            _borderDrag = GetTemplateChild(ElementBorderDrag) as Border;
-            _borderPicker = GetTemplateChild(ElementBorderPicker) as Border;
-            _panelColor = GetTemplateChild(ElementPanelColor) as Panel;
-            _sliderColor = GetTemplateChild(ElementSliderColor) as Slider;
-            _sliderOpacity = GetTemplateChild(ElementSliderOpacity) as Slider;
-            _panelRgb = GetTemplateChild(ElementPanelRgb) as Panel;
-            _toggleButtonDropper = GetTemplateChild(ElementButtonDropper) as ToggleButton;
-
-            if (_sliderColor != null)
-            {
-                _sliderColor.ValueChanged += SliderColor_OnValueChanged;
-            }
-
-            if (_sliderOpacity != null)
-            {
-                _sliderOpacity.ValueChanged += SliderOpacity_OnValueChanged;
-            }
-
-            if (_borderDrag != null)
-            {
-                var behavior = new MouseDragElementBehavior();
-                behavior.DragFinished += MouseDragElementBehavior_OnDragFinished;
-                behavior.DragBegun += MouseDragElementBehavior_OnDragging;
-                behavior.Dragging += MouseDragElementBehavior_OnDragging;
-                var collection = Interaction.GetBehaviors(_borderDrag);
-                collection.Add(behavior);
-            }
-
-            if (_toggleButtonDropper != null)
-            {
-                _toggleButtonDropper.Click += ToggleButtonDropper_Click;
-            }
-
-            _appliedTemplate = true;
-            if (_isLoaded)
-            {
-                Init();
-            }
-            _panelRgb?.AddHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
-        }
-
-        /// <summary>
-        ///     初始化
-        /// </summary>
-        private void Init()
-        {
-            if (_panelColor == null) return;
-            UpdateStatus(SelectedBrush.Color);
-            _panelColor.Children.Clear();
-            foreach (var item in _colorPresetList)
-            {
-                _panelColor.Children.Add(CreateColorButton(item));
-            }
-        }
-
-        /// <summary>
-        ///     创建颜色按钮
-        /// </summary>
-        /// <returns></returns>
-        private Button CreateColorButton(string colorStr)
-        {
-            var color = ColorConverter.ConvertFromString(colorStr) ?? default(Color);
-            var brush = new SolidColorBrush((Color) color);
-
-            var button = new Button
-            {
-                Margin = new Thickness(6),
-                Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonCustom),
-                Content = new Border
-                {
-                    Background = brush,
-                    Width = 12,
-                    Height = 12,
-                    CornerRadius = new CornerRadius(2)
-                }
-            };
-
-            button.Click += (s, e) =>
-            {
-                SelectedBrush = brush;
-                ChannelA = byte.MaxValue;
-            };
-
-            return button;
-        }
-
-        /// <summary>
-        ///     内部更新
-        /// </summary>
-        private void UpdateStatus(Color color)
-        {
-            if (_isOnDragging || _sliderColor == null) return;
-
-            var r = color.R;
-            var g = color.G;
-            var b = color.B;
-            var list = new List<byte>
-            {
-                r,
-                g,
-                b
-            };
-
-            var max = list.Max();
-            var min = list.Min();
-
-            if (min == max)
-            {
-                if (!(r == g && b == g))
-                {
-                    BackColor = Brushes.Red;
-                    IsNeedUpdateInfo = false;
-                    if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
-                    {
-                        _sliderColor.Value = 0;
-                    }
-                    IsNeedUpdateInfo = true;
-                }
+                _colorType = 0;
             }
             else
             {
-                var maxIndex = list.IndexOf(max);
-                var minIndex = list.IndexOf(min);
-                var commonIndex = 3 - maxIndex - minIndex;
-                if (commonIndex == 3)
-                {
-                    BackColor = Brushes.Red;
-                    IsNeedUpdateInfo = false;
-                    if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
-                    {
-                        _sliderColor.Value = 0;
-                    }
-                    IsNeedUpdateInfo = true;
-                }
-                else
-                {
-                    var common = list[commonIndex];
-                    list[maxIndex] = 255;
-                    list[minIndex] = 0;
-                    common = (byte) (255 * (min - common) / (double) (min - max));
-                    list[commonIndex] = common;
-                    BackColor = new SolidColorBrush(Color.FromRgb(list[0], list[1], list[2]));
+                _colorType = value;
+            }
 
-                    list[commonIndex] = 0;
-                    var cIndex = _colorSeparateList.IndexOf(Color.FromRgb(list[0], list[1], list[2]));
-                    int sub;
-                    var direc = 0;
-                    if (cIndex is < 5 and > 0)
+            var list = new List<bool>();
+            for (var i = 0; i < 2; i++)
+            {
+                list.Add(false);
+            }
+            list[_colorType] = true;
+            ShowList = list;
+        }
+    }
+
+    ~ColorPicker()
+    {
+        Dispose(false);
+    }
+
+    public ColorPicker()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonConfirm_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Switch, ButtonSwitch_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
+
+        Loaded += (s, e) =>
+        {
+            if (!_isLoaded)
+            {
+                Init();
+                _isLoaded = true;
+            }
+        };
+    }
+
+    public override void OnApplyTemplate()
+    {
+        _appliedTemplate = false;
+        if (_sliderColor != null)
+        {
+            _sliderColor.ValueChanged -= SliderColor_OnValueChanged;
+        }
+
+        if (_sliderOpacity != null)
+        {
+            _sliderOpacity.ValueChanged -= SliderOpacity_OnValueChanged;
+        }
+
+        if (_toggleButtonDropper != null)
+        {
+            _toggleButtonDropper.Click -= ToggleButtonDropper_Click;
+        }
+
+        _panelColor?.Children.Clear();
+
+        _panelRgb?.RemoveHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
+
+        base.OnApplyTemplate();
+
+        _borderColor = GetTemplateChild(ElementBorderColor) as Border;
+        _borderDrag = GetTemplateChild(ElementBorderDrag) as Border;
+        _borderPicker = GetTemplateChild(ElementBorderPicker) as Border;
+        _panelColor = GetTemplateChild(ElementPanelColor) as Panel;
+        _sliderColor = GetTemplateChild(ElementSliderColor) as Slider;
+        _sliderOpacity = GetTemplateChild(ElementSliderOpacity) as Slider;
+        _panelRgb = GetTemplateChild(ElementPanelRgb) as Panel;
+        _toggleButtonDropper = GetTemplateChild(ElementButtonDropper) as ToggleButton;
+
+        if (_sliderColor != null)
+        {
+            _sliderColor.ValueChanged += SliderColor_OnValueChanged;
+        }
+
+        if (_sliderOpacity != null)
+        {
+            _sliderOpacity.ValueChanged += SliderOpacity_OnValueChanged;
+        }
+
+        if (_borderDrag != null)
+        {
+            var behavior = new MouseDragElementBehavior();
+            behavior.DragFinished += MouseDragElementBehavior_OnDragFinished;
+            behavior.DragBegun += MouseDragElementBehavior_OnDragging;
+            behavior.Dragging += MouseDragElementBehavior_OnDragging;
+            var collection = Interaction.GetBehaviors(_borderDrag);
+            collection.Add(behavior);
+        }
+
+        if (_toggleButtonDropper != null)
+        {
+            _toggleButtonDropper.Click += ToggleButtonDropper_Click;
+        }
+
+        _appliedTemplate = true;
+        if (_isLoaded)
+        {
+            Init();
+        }
+        _panelRgb?.AddHandler(NumericUpDown.ValueChangedEvent, new EventHandler<FunctionEventArgs<double>>(NumericUpDownRgb_OnValueChanged));
+    }
+
+    /// <summary>
+    ///     初始化
+    /// </summary>
+    private void Init()
+    {
+        if (_panelColor == null) return;
+        UpdateStatus(SelectedBrush.Color);
+        _panelColor.Children.Clear();
+        foreach (var item in _colorPresetList)
+        {
+            _panelColor.Children.Add(CreateColorButton(item));
+        }
+    }
+
+    /// <summary>
+    ///     创建颜色按钮
+    /// </summary>
+    /// <returns></returns>
+    private Button CreateColorButton(string colorStr)
+    {
+        var color = ColorConverter.ConvertFromString(colorStr) ?? default(Color);
+        var brush = new SolidColorBrush((Color) color);
+
+        var button = new Button
+        {
+            Margin = new Thickness(6),
+            Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonCustom),
+            Content = new Border
+            {
+                Background = brush,
+                Width = 12,
+                Height = 12,
+                CornerRadius = new CornerRadius(2)
+            }
+        };
+
+        button.Click += (s, e) =>
+        {
+            SelectedBrush = brush;
+            ChannelA = byte.MaxValue;
+        };
+
+        return button;
+    }
+
+    /// <summary>
+    ///     内部更新
+    /// </summary>
+    private void UpdateStatus(Color color)
+    {
+        if (_isOnDragging || _sliderColor == null) return;
+
+        var r = color.R;
+        var g = color.G;
+        var b = color.B;
+        var list = new List<byte>
+        {
+            r,
+            g,
+            b
+        };
+
+        var max = list.Max();
+        var min = list.Min();
+
+        if (min == max)
+        {
+            if (!(r == g && b == g))
+            {
+                BackColor = Brushes.Red;
+                IsNeedUpdateInfo = false;
+                if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
+                {
+                    _sliderColor.Value = 0;
+                }
+                IsNeedUpdateInfo = true;
+            }
+        }
+        else
+        {
+            var maxIndex = list.IndexOf(max);
+            var minIndex = list.IndexOf(min);
+            var commonIndex = 3 - maxIndex - minIndex;
+            if (commonIndex == 3)
+            {
+                BackColor = Brushes.Red;
+                IsNeedUpdateInfo = false;
+                if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
+                {
+                    _sliderColor.Value = 0;
+                }
+                IsNeedUpdateInfo = true;
+            }
+            else
+            {
+                var common = list[commonIndex];
+                list[maxIndex] = 255;
+                list[minIndex] = 0;
+                common = (byte) (255 * (min - common) / (double) (min - max));
+                list[commonIndex] = common;
+                BackColor = new SolidColorBrush(Color.FromRgb(list[0], list[1], list[2]));
+
+                list[commonIndex] = 0;
+                var cIndex = _colorSeparateList.IndexOf(Color.FromRgb(list[0], list[1], list[2]));
+                int sub;
+                var direc = 0;
+                if (cIndex is < 5 and > 0)
+                {
+                    var nextColorList = _colorSeparateList[cIndex + 1].ToList();
+                    var prevColorList = _colorSeparateList[cIndex - 1].ToList();
+                    if (nextColorList[minIndex] > 0)
                     {
-                        var nextColorList = _colorSeparateList[cIndex + 1].ToList();
-                        var prevColorList = _colorSeparateList[cIndex - 1].ToList();
-                        if (nextColorList[minIndex] > 0)
-                        {
-                            var target = prevColorList[commonIndex];
-                            direc = 1;
-                            sub = target - common;
-                        }
-                        else
-                        {
-                            sub = common;
-                        }
-                    }
-                    else if (cIndex == 0)
-                    {
-                        sub = common;
-                        if (minIndex == 2)
-                        {
-                            sub = 255 - common;
-                            direc = -5;
-                        }
+                        var target = prevColorList[commonIndex];
+                        direc = 1;
+                        sub = target - common;
                     }
                     else
                     {
-                        sub = 255 - common;
+                        sub = common;
                     }
-                    var scale = sub / 255.0;
-                    var scaleTotal = cIndex - direc + scale;
-                    IsNeedUpdateInfo = false;
-                    if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
-                    {
-                        _sliderColor.Value = scaleTotal;
-                    }
-                    IsNeedUpdateInfo = true;
                 }
-            }
-
-            var matrix = _borderPicker.RenderTransform.Value;
-            var x = max == 0 ? 0 : (1 - min / (double) max) * ColorPanelWidth;
-            var y = (1 - max / 255.0) * ColorPanelHeight;
-            if (_isNeedUpdatePicker)
-            {
-                _borderPicker.RenderTransform = new MatrixTransform(matrix.M11, matrix.M12, matrix.M21, matrix.M22, x, y);
-            }
-        }
-
-        private void SliderColor_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (!_appliedTemplate || !IsNeedUpdateInfo) return;
-            var index = Math.Min(5, (int) Math.Floor(e.NewValue));
-            var sub = e.NewValue - index;
-            var range = _colorRangeList[index];
-
-            var color = range.GetColor(sub);
-            BackColor = new SolidColorBrush(color);
-            var matrix = _borderPicker.RenderTransform.Value;
-            _isNeedUpdatePicker = false;
-            UpdateColorWhenDrag(new Point(matrix.OffsetX, matrix.OffsetY));
-            _isNeedUpdatePicker = true;
-        }
-
-        private void SliderOpacity_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
-        {
-            if (!_appliedTemplate || !IsNeedUpdateInfo) return;
-            var color = SelectedBrush.Color;
-            SelectedBrush = new SolidColorBrush(Color.FromArgb((byte) _sliderOpacity.Value, color.R, color.G, color.B));
-        }
-
-        private void MouseDragElementBehavior_OnDragging(object sender, MouseEventArgs e)
-        {
-            var p = e.GetPosition(_borderColor);
-            _isOnDragging = true;
-            UpdateColorWhenDrag(p);
-            _isOnDragging = false;
-        }
-
-        /// <summary>
-        ///     拖动时更新颜色
-        /// </summary>
-        private void UpdateColorWhenDrag(Point p)
-        {
-            var matrix = _borderPicker.RenderTransform.Value;
-
-            if (p.X < 0)
-            {
-                p.X = 0;
-            }
-            else if (p.X > ColorPanelWidth)
-            {
-                p.X = ColorPanelWidth;
-            }
-
-            if (p.Y < 0)
-            {
-                p.Y = 0;
-            }
-            else if (p.Y > ColorPanelHeight)
-            {
-                p.Y = ColorPanelHeight;
-            }
-
-            if (_isNeedUpdatePicker)
-            {
-                _borderPicker.RenderTransform = new MatrixTransform(matrix.M11, matrix.M12, matrix.M21, matrix.M22, p.X, p.Y);
-            }
-
-            var scaleX = p.X / ColorPanelWidth;
-            var scaleY = 1 - p.Y / ColorPanelHeight;
-
-            var colorYLeft = Color.FromRgb((byte) (255 * scaleY), (byte) (255 * scaleY), (byte) (255 * scaleY));
-            var colorYRight = Color.FromRgb((byte) (BackColor.Color.R * scaleY), (byte) (BackColor.Color.G * scaleY), (byte) (BackColor.Color.B * scaleY));
-
-            var subR = colorYLeft.R - colorYRight.R;
-            var subG = colorYLeft.G - colorYRight.G;
-            var subB = colorYLeft.B - colorYRight.B;
-
-            var color = Color.FromArgb((byte) _sliderOpacity.Value, (byte) (colorYLeft.R - subR * scaleX),
-                (byte) (colorYLeft.G - subG * scaleX), (byte) (colorYLeft.B - subB * scaleX));
-            SelectedBrush = new SolidColorBrush(color);
-        }
-
-        private void MouseDragElementBehavior_OnDragFinished(object sender, MouseEventArgs e) => _borderDrag.RenderTransform = new MatrixTransform();
-
-        private void ButtonSwitch_OnClick(object sender, RoutedEventArgs e) => ColorType++;
-
-        // ReSharper disable once UnusedParameter.Local
-        private void NumericUpDownRgb_OnValueChanged(object sender, FunctionEventArgs<double> e)
-        {
-            if (!_appliedTemplate || !IsNeedUpdateInfo) return;
-            if (e.OriginalSource is NumericUpDown { Tag: string tag })
-            {
-                var color = SelectedBrush.Color;
-                IsNeedUpdateInfo = false;
-
-                SelectedBrush = tag switch
+                else if (cIndex == 0)
                 {
-                    "R" => new SolidColorBrush(Color.FromArgb(color.A, (byte) e.Info, color.G, color.B)),
-                    "G" => new SolidColorBrush(Color.FromArgb(color.A, color.R, (byte) e.Info, color.B)),
-                    "B" => new SolidColorBrush(Color.FromArgb(color.A, color.R, color.G, (byte) e.Info)),
-                    _ => SelectedBrush
-                };
-
+                    sub = common;
+                    if (minIndex == 2)
+                    {
+                        sub = 255 - common;
+                        direc = -5;
+                    }
+                }
+                else
+                {
+                    sub = 255 - common;
+                }
+                var scale = sub / 255.0;
+                var scaleTotal = cIndex - direc + scale;
+                IsNeedUpdateInfo = false;
+                if (!_sliderColor.IsMouseOver && !_sliderOpacity.IsMouseOver)
+                {
+                    _sliderColor.Value = scaleTotal;
+                }
                 IsNeedUpdateInfo = true;
             }
         }
 
-        private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
+        var matrix = _borderPicker.RenderTransform.Value;
+        var x = max == 0 ? 0 : (1 - min / (double) max) * ColorPanelWidth;
+        var y = (1 - max / 255.0) * ColorPanelHeight;
+        if (_isNeedUpdatePicker)
         {
-            RaiseEvent(new FunctionEventArgs<Color>(ConfirmedEvent, this)
-            {
-                Info = SelectedBrush.Color
-            });
+            _borderPicker.RenderTransform = new MatrixTransform(matrix.M11, matrix.M12, matrix.M21, matrix.M22, x, y);
         }
-
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));
-
-        private void ToggleButtonDropper_Click(object sender, RoutedEventArgs e)
-        {
-            _colorDropper ??= new ColorDropper(this);
-            // ReSharper disable once PossibleInvalidOperationException
-            _colorDropper.Update(_toggleButtonDropper.IsChecked.Value);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed) return;
-
-            Dispatcher.BeginInvoke(new Action(() =>
-            {
-                _colorDropper?.Update(false);
-                System.Windows.Window.GetWindow(this)?.Close();
-            }));
-            _disposed = true;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public bool CanDispose => true;
     }
-}
+
+    private void SliderColor_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    {
+        if (!_appliedTemplate || !IsNeedUpdateInfo) return;
+        var index = Math.Min(5, (int) Math.Floor(e.NewValue));
+        var sub = e.NewValue - index;
+        var range = _colorRangeList[index];
+
+        var color = range.GetColor(sub);
+        BackColor = new SolidColorBrush(color);
+        var matrix = _borderPicker.RenderTransform.Value;
+        _isNeedUpdatePicker = false;
+        UpdateColorWhenDrag(new Point(matrix.OffsetX, matrix.OffsetY));
+        _isNeedUpdatePicker = true;
+    }
+
+    private void SliderOpacity_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    {
+        if (!_appliedTemplate || !IsNeedUpdateInfo) return;
+        var color = SelectedBrush.Color;
+        SelectedBrush = new SolidColorBrush(Color.FromArgb((byte) _sliderOpacity.Value, color.R, color.G, color.B));
+    }
+
+    private void MouseDragElementBehavior_OnDragging(object sender, MouseEventArgs e)
+    {
+        var p = e.GetPosition(_borderColor);
+        _isOnDragging = true;
+        UpdateColorWhenDrag(p);
+        _isOnDragging = false;
+    }
+
+    /// <summary>
+    ///     拖动时更新颜色
+    /// </summary>
+    private void UpdateColorWhenDrag(Point p)
+    {
+        var matrix = _borderPicker.RenderTransform.Value;
+
+        if (p.X < 0)
+        {
+            p.X = 0;
+        }
+        else if (p.X > ColorPanelWidth)
+        {
+            p.X = ColorPanelWidth;
+        }
+
+        if (p.Y < 0)
+        {
+            p.Y = 0;
+        }
+        else if (p.Y > ColorPanelHeight)
+        {
+            p.Y = ColorPanelHeight;
+        }
+
+        if (_isNeedUpdatePicker)
+        {
+            _borderPicker.RenderTransform = new MatrixTransform(matrix.M11, matrix.M12, matrix.M21, matrix.M22, p.X, p.Y);
+        }
+
+        var scaleX = p.X / ColorPanelWidth;
+        var scaleY = 1 - p.Y / ColorPanelHeight;
+
+        var colorYLeft = Color.FromRgb((byte) (255 * scaleY), (byte) (255 * scaleY), (byte) (255 * scaleY));
+        var colorYRight = Color.FromRgb((byte) (BackColor.Color.R * scaleY), (byte) (BackColor.Color.G * scaleY), (byte) (BackColor.Color.B * scaleY));
+
+        var subR = colorYLeft.R - colorYRight.R;
+        var subG = colorYLeft.G - colorYRight.G;
+        var subB = colorYLeft.B - colorYRight.B;
+
+        var color = Color.FromArgb((byte) _sliderOpacity.Value, (byte) (colorYLeft.R - subR * scaleX),
+            (byte) (colorYLeft.G - subG * scaleX), (byte) (colorYLeft.B - subB * scaleX));
+        SelectedBrush = new SolidColorBrush(color);
+    }
+
+    private void MouseDragElementBehavior_OnDragFinished(object sender, MouseEventArgs e) => _borderDrag.RenderTransform = new MatrixTransform();
+
+    private void ButtonSwitch_OnClick(object sender, RoutedEventArgs e) => ColorType++;
+
+    // ReSharper disable once UnusedParameter.Local
+    private void NumericUpDownRgb_OnValueChanged(object sender, FunctionEventArgs<double> e)
+    {
+        if (!_appliedTemplate || !IsNeedUpdateInfo) return;
+        if (e.OriginalSource is NumericUpDown { Tag: string tag })
+        {
+            var color = SelectedBrush.Color;
+            IsNeedUpdateInfo = false;
+
+            SelectedBrush = tag switch
+            {
+                "R" => new SolidColorBrush(Color.FromArgb(color.A, (byte) e.Info, color.G, color.B)),
+                "G" => new SolidColorBrush(Color.FromArgb(color.A, color.R, (byte) e.Info, color.B)),
+                "B" => new SolidColorBrush(Color.FromArgb(color.A, color.R, color.G, (byte) e.Info)),
+                _ => SelectedBrush
+            };
+
+            IsNeedUpdateInfo = true;
+        }
+    }
+
+    private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
+    {
+        RaiseEvent(new FunctionEventArgs<Color>(ConfirmedEvent, this)
+        {
+            Info = SelectedBrush.Color
+        });
+    }
+
+    private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => RaiseEvent(new RoutedEventArgs(CanceledEvent));
+
+    private void ToggleButtonDropper_Click(object sender, RoutedEventArgs e)
+    {
+        _colorDropper ??= new ColorDropper(this);
+        // ReSharper disable once PossibleInvalidOperationException
+        _colorDropper.Update(_toggleButtonDropper.IsChecked.Value);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (_disposed) return;
+
+        Dispatcher.BeginInvoke(new Action(() =>
+        {
+            _colorDropper?.Update(false);
+            System.Windows.Window.GetWindow(this)?.Close();
+        }));
+        _disposed = true;
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    public bool CanDispose => true;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
index b5581bfc..3162c61a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
@@ -10,289 +10,288 @@ using System.Windows.Media.Media3D;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     封面流
+/// </summary>
+[TemplatePart(Name = ElementViewport3D, Type = typeof(Viewport3D))]
+[TemplatePart(Name = ElementCamera, Type = typeof(ProjectionCamera))]
+[TemplatePart(Name = ElementVisualParent, Type = typeof(ModelVisual3D))]
+public class CoverFlow : Control
 {
+    private const string ElementViewport3D = "PART_Viewport3D";
+
+    private const string ElementCamera = "PART_Camera";
+
+    private const string ElementVisualParent = "PART_VisualParent";
+
     /// <summary>
-    ///     封面流
+    ///     最大显示数量的一半
     /// </summary>
-    [TemplatePart(Name = ElementViewport3D, Type = typeof(Viewport3D))]
-    [TemplatePart(Name = ElementCamera, Type = typeof(ProjectionCamera))]
-    [TemplatePart(Name = ElementVisualParent, Type = typeof(ModelVisual3D))]
-    public class CoverFlow : Control
+    private const int MaxShowCountHalf = 3;
+
+    /// <summary>
+    ///     页码
+    /// </summary>
+    public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
+        "PageIndex", typeof(int), typeof(CoverFlow),
+        new PropertyMetadata(ValueBoxes.Int0Box, OnPageIndexChanged, CoercePageIndex));
+
+    private static object CoercePageIndex(DependencyObject d, object baseValue)
     {
-        private const string ElementViewport3D = "PART_Viewport3D";
+        var ctl = (CoverFlow) d;
+        var v = (int) baseValue;
 
-        private const string ElementCamera = "PART_Camera";
-
-        private const string ElementVisualParent = "PART_VisualParent";
-
-        /// <summary>
-        ///     最大显示数量的一半
-        /// </summary>
-        private const int MaxShowCountHalf = 3;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
-            "PageIndex", typeof(int), typeof(CoverFlow),
-            new PropertyMetadata(ValueBoxes.Int0Box, OnPageIndexChanged, CoercePageIndex));
-
-        private static object CoercePageIndex(DependencyObject d, object baseValue)
+        if (v < 0)
         {
-            var ctl = (CoverFlow) d;
-            var v = (int) baseValue;
+            return 0;
+        }
+        if (v >= ctl._contentDic.Count)
+        {
+            return ctl._contentDic.Count - 1;
+        }
+        return v;
+    }
 
-            if (v < 0)
-            {
-                return 0;
-            }
-            if (v >= ctl._contentDic.Count)
-            {
-                return ctl._contentDic.Count - 1;
-            }
-            return v;
+    private static void OnPageIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (CoverFlow) d;
+        ctl.UpdateIndex((int) e.NewValue);
+    }
+
+    /// <summary>
+    ///     是否循环
+    /// </summary>
+    public static readonly DependencyProperty LoopProperty = DependencyProperty.Register(
+        "Loop", typeof(bool), typeof(CoverFlow), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     存储所有的内容
+    /// </summary>
+    private readonly Dictionary<int, object> _contentDic = new();
+
+    /// <summary>
+    ///     当前在显示范围内的项
+    /// </summary>
+    private readonly Dictionary<int, CoverFlowItem> _itemShowDic = new();
+
+    /// <summary>
+    ///     相机
+    /// </summary>
+    private ProjectionCamera _camera;
+
+    private Point3DAnimation _point3DAnimation;
+
+    /// <summary>
+    ///     3d画布
+    /// </summary>
+    private Viewport3D _viewport3D;
+
+    /// <summary>
+    ///     项容器
+    /// </summary>
+    private ModelVisual3D _visualParent;
+
+    /// <summary>
+    ///     显示范围内第一个项的编号
+    /// </summary>
+    private int _firstShowIndex;
+
+    /// <summary>
+    ///     显示范围内最后一个项的编号
+    /// </summary>
+    private int _lastShowIndex;
+
+    /// <summary>
+    ///     页码
+    /// </summary>
+    public int PageIndex
+    {
+        get => (int) GetValue(PageIndexProperty);
+        set => SetValue(PageIndexProperty, value);
+    }
+
+    /// <summary>
+    ///     是否循环
+    /// </summary>
+    public bool Loop
+    {
+        get => (bool) GetValue(LoopProperty);
+        set => SetValue(LoopProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_viewport3D != null)
+        {
+            _viewport3D.Children.Clear();
+            _itemShowDic.Clear();
+            _viewport3D.MouseLeftButtonDown -= Viewport3D_MouseLeftButtonDown;
         }
 
-        private static void OnPageIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        base.OnApplyTemplate();
+
+        _viewport3D = GetTemplateChild(ElementViewport3D) as Viewport3D;
+        if (_viewport3D != null)
         {
-            var ctl = (CoverFlow) d;
-            ctl.UpdateIndex((int) e.NewValue);
+            _viewport3D.MouseLeftButtonDown += Viewport3D_MouseLeftButtonDown;
         }
 
-        /// <summary>
-        ///     是否循环
-        /// </summary>
-        public static readonly DependencyProperty LoopProperty = DependencyProperty.Register(
-            "Loop", typeof(bool), typeof(CoverFlow), new PropertyMetadata(ValueBoxes.FalseBox));
+        _camera = GetTemplateChild(ElementCamera) as ProjectionCamera;
+        _visualParent = GetTemplateChild(ElementVisualParent) as ModelVisual3D;
 
-        /// <summary>
-        ///     存储所有的内容
-        /// </summary>
-        private readonly Dictionary<int, object> _contentDic = new();
+        UpdateShowRange();
 
-        /// <summary>
-        ///     当前在显示范围内的项
-        /// </summary>
-        private readonly Dictionary<int, CoverFlowItem> _itemShowDic = new();
+        _point3DAnimation = new Point3DAnimation(new Point3D(CoverFlowItem.Interval * PageIndex, _camera.Position.Y, _camera.Position.Z), new Duration(TimeSpan.FromMilliseconds(200)));
+        _camera.BeginAnimation(ProjectionCamera.PositionProperty, _point3DAnimation);
+    }
 
-        /// <summary>
-        ///     相机
-        /// </summary>
-        private ProjectionCamera _camera;
-
-        private Point3DAnimation _point3DAnimation;
-
-        /// <summary>
-        ///     3d画布
-        /// </summary>
-        private Viewport3D _viewport3D;
-
-        /// <summary>
-        ///     项容器
-        /// </summary>
-        private ModelVisual3D _visualParent;
-
-        /// <summary>
-        ///     显示范围内第一个项的编号
-        /// </summary>
-        private int _firstShowIndex;
-
-        /// <summary>
-        ///     显示范围内最后一个项的编号
-        /// </summary>
-        private int _lastShowIndex;
-
-        /// <summary>
-        ///     页码
-        /// </summary>
-        public int PageIndex
+    /// <summary>
+    ///     批量添加资源
+    /// </summary>
+    /// <param name="contentList"></param>
+    public void AddRange(IEnumerable<object> contentList)
+    {
+        foreach (var content in contentList)
         {
-            get => (int) GetValue(PageIndexProperty);
-            set => SetValue(PageIndexProperty, value);
+            _contentDic.Add(_contentDic.Count, content);
+        }
+    }
+
+    /// <summary>
+    ///     添加一项资源
+    /// </summary>
+    /// <param name="uriString"></param>
+    public void Add(string uriString) => _contentDic.Add(_contentDic.Count, new Uri(uriString));
+
+    /// <summary>
+    ///     添加一项资源
+    /// </summary>
+    /// <param name="uri"></param>
+    public void Add(Uri uri) => _contentDic.Add(_contentDic.Count, uri);
+
+    public void Next() => PageIndex++;
+
+    public void Prev() => PageIndex--;
+
+    protected override void OnMouseWheel(MouseWheelEventArgs e)
+    {
+        base.OnMouseWheel(e);
+
+        if (e.Delta < 0)
+        {
+            var index = PageIndex + 1;
+            PageIndex = index >= _contentDic.Count ? Loop ? 0 : _contentDic.Count - 1 : index;
+        }
+        else
+        {
+            var index = PageIndex - 1;
+            PageIndex = index < 0 ? Loop ? _contentDic.Count - 1 : 0 : index;
         }
 
-        /// <summary>
-        ///     是否循环
-        /// </summary>
-        public bool Loop
-        {
-            get => (bool) GetValue(LoopProperty);
-            set => SetValue(LoopProperty, ValueBoxes.BooleanBox(value));
-        }
+        e.Handled = true;
+    }
 
-        public override void OnApplyTemplate()
+    /// <summary>
+    ///     删除指定位置的项
+    /// </summary>
+    /// <param name="pos"></param>
+    private void Remove(int pos)
+    {
+        if (!_itemShowDic.TryGetValue(pos, out var item)) return;
+        _visualParent.Children.Remove(item);
+        _itemShowDic.Remove(pos);
+    }
+
+    private void Viewport3D_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        var result = (RayMeshGeometry3DHitTestResult) VisualTreeHelper.HitTest(_viewport3D, e.GetPosition(_viewport3D));
+        if (result != null)
         {
-            if (_viewport3D != null)
+            foreach (var item in _itemShowDic.Values)
             {
-                _viewport3D.Children.Clear();
-                _itemShowDic.Clear();
-                _viewport3D.MouseLeftButtonDown -= Viewport3D_MouseLeftButtonDown;
-            }
-
-            base.OnApplyTemplate();
-
-            _viewport3D = GetTemplateChild(ElementViewport3D) as Viewport3D;
-            if (_viewport3D != null)
-            {
-                _viewport3D.MouseLeftButtonDown += Viewport3D_MouseLeftButtonDown;
-            }
-
-            _camera = GetTemplateChild(ElementCamera) as ProjectionCamera;
-            _visualParent = GetTemplateChild(ElementVisualParent) as ModelVisual3D;
-
-            UpdateShowRange();
-
-            _point3DAnimation = new Point3DAnimation(new Point3D(CoverFlowItem.Interval * PageIndex, _camera.Position.Y, _camera.Position.Z), new Duration(TimeSpan.FromMilliseconds(200)));
-            _camera.BeginAnimation(ProjectionCamera.PositionProperty, _point3DAnimation);
-        }
-
-        /// <summary>
-        ///     批量添加资源
-        /// </summary>
-        /// <param name="contentList"></param>
-        public void AddRange(IEnumerable<object> contentList)
-        {
-            foreach (var content in contentList)
-            {
-                _contentDic.Add(_contentDic.Count, content);
+                if (item.HitTest(result.MeshHit))
+                {
+                    PageIndex = item.Index;
+                    break;
+                }
             }
         }
+    }
 
-        /// <summary>
-        ///     添加一项资源
-        /// </summary>
-        /// <param name="uriString"></param>
-        public void Add(string uriString) => _contentDic.Add(_contentDic.Count, new Uri(uriString));
-
-        /// <summary>
-        ///     添加一项资源
-        /// </summary>
-        /// <param name="uri"></param>
-        public void Add(Uri uri) => _contentDic.Add(_contentDic.Count, uri);
-
-        public void Next() => PageIndex++;
-
-        public void Prev() => PageIndex--;
-
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
+    /// <summary>
+    ///     更新项的位置
+    /// </summary>
+    /// <param name="newIndex"></param>
+    private void UpdateIndex(int newIndex)
+    {
+        if (!IsLoaded)
         {
-            base.OnMouseWheel(e);
+            return;
+        }
 
-            if (e.Delta < 0)
+        UpdateShowRange();
+        _itemShowDic.Do(item =>
+        {
+            if (item.Value.Index < _firstShowIndex || item.Value.Index > _lastShowIndex)
             {
-                var index = PageIndex + 1;
-                PageIndex = index >= _contentDic.Count ? Loop ? 0 : _contentDic.Count - 1 : index;
+                Remove(item.Value.Index);
             }
             else
             {
-                var index = PageIndex - 1;
-                PageIndex = index < 0 ? Loop ? _contentDic.Count - 1 : 0 : index;
+                item.Value.Move(PageIndex);
             }
+        });
 
-            e.Handled = true;
-        }
+        _point3DAnimation = new Point3DAnimation(new Point3D(CoverFlowItem.Interval * newIndex, _camera.Position.Y,
+            _camera.Position.Z), new Duration(TimeSpan.FromMilliseconds(200)));
 
-        /// <summary>
-        ///     删除指定位置的项
-        /// </summary>
-        /// <param name="pos"></param>
-        private void Remove(int pos)
-        {
-            if (!_itemShowDic.TryGetValue(pos, out var item)) return;
-            _visualParent.Children.Remove(item);
-            _itemShowDic.Remove(pos);
-        }
-
-        private void Viewport3D_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var result = (RayMeshGeometry3DHitTestResult) VisualTreeHelper.HitTest(_viewport3D, e.GetPosition(_viewport3D));
-            if (result != null)
-            {
-                foreach (var item in _itemShowDic.Values)
-                {
-                    if (item.HitTest(result.MeshHit))
-                    {
-                        PageIndex = item.Index;
-                        break;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        ///     更新项的位置
-        /// </summary>
-        /// <param name="newIndex"></param>
-        private void UpdateIndex(int newIndex)
-        {
-            if (!IsLoaded)
-            {
-                return;
-            }
-
-            UpdateShowRange();
-            _itemShowDic.Do(item =>
-            {
-                if (item.Value.Index < _firstShowIndex || item.Value.Index > _lastShowIndex)
-                {
-                    Remove(item.Value.Index);
-                }
-                else
-                {
-                    item.Value.Move(PageIndex);
-                }
-            });
-
-            _point3DAnimation = new Point3DAnimation(new Point3D(CoverFlowItem.Interval * newIndex, _camera.Position.Y,
-                _camera.Position.Z), new Duration(TimeSpan.FromMilliseconds(200)));
-
-            _camera.BeginAnimation(ProjectionCamera.PositionProperty, _point3DAnimation);
-        }
-
-        /// <summary>
-        ///     更新显示范围
-        /// </summary>
-        private void UpdateShowRange()
-        {
-            var newFirstShowIndex = Math.Max(PageIndex - MaxShowCountHalf, 0);
-            var newLastShowIndex = Math.Min(PageIndex + MaxShowCountHalf, _contentDic.Count - 1);
-
-            for (var i = newFirstShowIndex; i <= newLastShowIndex; i++)
-            {
-                if (!_itemShowDic.ContainsKey(i))
-                {
-                    var cover = CreateCoverFlowItem(i, _contentDic[i]);
-                    _itemShowDic[i] = cover;
-                    _visualParent.Children.Add(cover);
-                }
-            }
-
-            _firstShowIndex = newFirstShowIndex;
-            _lastShowIndex = newLastShowIndex;
-        }
-
-        private CoverFlowItem CreateCoverFlowItem(int index, object content)
-        {
-            if (content is Uri uri)
-            {
-                try
-                {
-                    return new CoverFlowItem(index, PageIndex, new Image
-                    {
-                        Source = BitmapFrame.Create(uri, BitmapCreateOptions.DelayCreation, BitmapCacheOption.OnDemand)
-                    });
-                }
-                catch
-                {
-                    return new CoverFlowItem(index, PageIndex, new ContentControl());
-                }
-            }
-
-            return new CoverFlowItem(index, PageIndex, new ContentControl
-            {
-                Content = content
-            });
-        }
+        _camera.BeginAnimation(ProjectionCamera.PositionProperty, _point3DAnimation);
     }
-}
+
+    /// <summary>
+    ///     更新显示范围
+    /// </summary>
+    private void UpdateShowRange()
+    {
+        var newFirstShowIndex = Math.Max(PageIndex - MaxShowCountHalf, 0);
+        var newLastShowIndex = Math.Min(PageIndex + MaxShowCountHalf, _contentDic.Count - 1);
+
+        for (var i = newFirstShowIndex; i <= newLastShowIndex; i++)
+        {
+            if (!_itemShowDic.ContainsKey(i))
+            {
+                var cover = CreateCoverFlowItem(i, _contentDic[i]);
+                _itemShowDic[i] = cover;
+                _visualParent.Children.Add(cover);
+            }
+        }
+
+        _firstShowIndex = newFirstShowIndex;
+        _lastShowIndex = newLastShowIndex;
+    }
+
+    private CoverFlowItem CreateCoverFlowItem(int index, object content)
+    {
+        if (content is Uri uri)
+        {
+            try
+            {
+                return new CoverFlowItem(index, PageIndex, new Image
+                {
+                    Source = BitmapFrame.Create(uri, BitmapCreateOptions.DelayCreation, BitmapCacheOption.OnDemand)
+                });
+            }
+            catch
+            {
+                return new CoverFlowItem(index, PageIndex, new ContentControl());
+            }
+        }
+
+        return new CoverFlowItem(index, PageIndex, new ContentControl
+        {
+            Content = content
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
index 7ede6d5b..9d0ab657 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
@@ -4,154 +4,153 @@ using System.Windows.Media;
 using System.Windows.Media.Media3D;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CoverFlowItem : ModelVisual3D
 {
-    public class CoverFlowItem : ModelVisual3D
+    internal static readonly double Interval = .2;
+
+    internal static readonly double AnimationSpeed = 400;
+
+    private readonly AxisAngleRotation3D _rotation3D;
+
+    private readonly TranslateTransform3D _transform3D;
+
+    private readonly Model3DGroup _model3DGroup;
+
+    private readonly UIElement _uiElement;
+
+    internal int Index { get; set; }
+
+    public CoverFlowItem(int itemIndex, int currentIndex, UIElement element)
     {
-        internal static readonly double Interval = .2;
+        Index = itemIndex;
+        _uiElement = element;
+        _uiElement.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
 
-        internal static readonly double AnimationSpeed = 400;
+        _rotation3D = new AxisAngleRotation3D(new Vector3D(0, 1, 0), GetAngleByPos(currentIndex));
+        _transform3D = new TranslateTransform3D(GetXByPos(currentIndex), 0, GetZByPos(currentIndex));
 
-        private readonly AxisAngleRotation3D _rotation3D;
+        var transformGroup = new Transform3DGroup();
+        transformGroup.Children.Add(new RotateTransform3D(_rotation3D));
+        transformGroup.Children.Add(_transform3D);
 
-        private readonly TranslateTransform3D _transform3D;
+        _model3DGroup = new Model3DGroup();
+        _model3DGroup.Children.Add(new GeometryModel3D(CreateItemGeometry(), new DiffuseMaterial(new VisualBrush(element))));
+        _model3DGroup.Transform = transformGroup;
 
-        private readonly Model3DGroup _model3DGroup;
+        Content = _model3DGroup;
+    }
 
-        private readonly UIElement _uiElement;
-
-        internal int Index { get; set; }
-
-        public CoverFlowItem(int itemIndex, int currentIndex, UIElement element)
+    /// <summary>
+    ///     创建网格形状
+    /// </summary>
+    /// <param name="p0"></param>
+    /// <param name="p1"></param>
+    /// <param name="p2"></param>
+    /// <param name="p3"></param>
+    /// <returns></returns>
+    private static MeshGeometry3D CreateMeshGeometry(Point3D p0, Point3D p1, Point3D p2, Point3D p3)
+    {
+        var positions = new Point3DCollection
         {
-            Index = itemIndex;
-            _uiElement = element;
-            _uiElement.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            p0,
+            p1,
+            p2,
+            p3
+        };
 
-            _rotation3D = new AxisAngleRotation3D(new Vector3D(0, 1, 0), GetAngleByPos(currentIndex));
-            _transform3D = new TranslateTransform3D(GetXByPos(currentIndex), 0, GetZByPos(currentIndex));
-
-            var transformGroup = new Transform3DGroup();
-            transformGroup.Children.Add(new RotateTransform3D(_rotation3D));
-            transformGroup.Children.Add(_transform3D);
-
-            _model3DGroup = new Model3DGroup();
-            _model3DGroup.Children.Add(new GeometryModel3D(CreateItemGeometry(), new DiffuseMaterial(new VisualBrush(element))));
-            _model3DGroup.Transform = transformGroup;
-
-            Content = _model3DGroup;
-        }
-
-        /// <summary>
-        ///     创建网格形状
-        /// </summary>
-        /// <param name="p0"></param>
-        /// <param name="p1"></param>
-        /// <param name="p2"></param>
-        /// <param name="p3"></param>
-        /// <returns></returns>
-        private static MeshGeometry3D CreateMeshGeometry(Point3D p0, Point3D p1, Point3D p2, Point3D p3)
+        var triangleIndices = new Int32Collection
         {
-            var positions = new Point3DCollection
-            {
-                p0,
-                p1,
-                p2,
-                p3
-            };
+            0,
+            1,
+            2,
+            2,
+            3,
+            0
+        };
 
-            var triangleIndices = new Int32Collection
-            {
-                0,
-                1,
-                2,
-                2,
-                3,
-                0
-            };
-
-            var textureCoordinates = new PointCollection
-            {
-                new(0, 1),
-                new(1, 1),
-                new(1, 0),
-                new(0, 0),
-                new(1, 0),
-                new(1, 1)
-            };
-
-            var normals = new Vector3DCollection
-            {
-                ArithmeticHelper.CalNormal(p0, p1, p2),
-                ArithmeticHelper.CalNormal(p2, p3, p0)
-            };
-
-            var geometry3D = new MeshGeometry3D
-            {
-                Positions = positions,
-                TriangleIndices = triangleIndices,
-                TextureCoordinates = textureCoordinates,
-                Normals = normals
-            };
-
-            geometry3D.Freeze();
-            return geometry3D;
-        }
-
-        /// <summary>
-        ///     创建内容形状
-        /// </summary>
-        /// <returns></returns>
-        private Geometry3D CreateItemGeometry()
+        var textureCoordinates = new PointCollection
         {
-            var sx = _uiElement.DesiredSize.Width > _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Width / _uiElement.DesiredSize.Height;
-            var sy = _uiElement.DesiredSize.Width < _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Height / _uiElement.DesiredSize.Width;
+            new(0, 1),
+            new(1, 1),
+            new(1, 0),
+            new(0, 0),
+            new(1, 0),
+            new(1, 1)
+        };
 
-            var p0 = new Point3D(-1 + sx, -1 + sy, 0);
-            var p1 = new Point3D(1 - sx, -1 + sy, 0);
-            var p2 = new Point3D(1 - sx, 1 - sy, 0);
-            var p3 = new Point3D(-1 + sx, 1 - sy, 0);
-
-            return CreateMeshGeometry(p0, p1, p2, p3);
-        }
-
-        private double GetAngleByPos(int index) => Math.Sign(Index - index) * -90;
-
-        private double GetXByPos(int index) => Index * Interval + Math.Sign(Index - index) * 1.5;
-
-        private double GetZByPos(int index) => Index == index ? 1 : 0;
-
-        /// <summary>
-        ///     移动
-        /// </summary>
-        internal void Move(int currentIndex)
+        var normals = new Vector3DCollection
         {
-            _rotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty,
-                AnimationHelper.CreateAnimation(GetAngleByPos(currentIndex), AnimationSpeed));
-            _transform3D.BeginAnimation(TranslateTransform3D.OffsetXProperty,
-                AnimationHelper.CreateAnimation(GetXByPos(currentIndex), AnimationSpeed));
-            _transform3D.BeginAnimation(TranslateTransform3D.OffsetZProperty,
-                AnimationHelper.CreateAnimation(GetZByPos(currentIndex), AnimationSpeed));
-        }
+            ArithmeticHelper.CalNormal(p0, p1, p2),
+            ArithmeticHelper.CalNormal(p2, p3, p0)
+        };
 
-        /// <summary>
-        ///     命中测试
-        /// </summary>
-        /// <param name="mesh"></param>
-        /// <returns></returns>
-        internal bool HitTest(MeshGeometry3D mesh)
+        var geometry3D = new MeshGeometry3D
         {
-            foreach (var item in _model3DGroup.Children)
+            Positions = positions,
+            TriangleIndices = triangleIndices,
+            TextureCoordinates = textureCoordinates,
+            Normals = normals
+        };
+
+        geometry3D.Freeze();
+        return geometry3D;
+    }
+
+    /// <summary>
+    ///     创建内容形状
+    /// </summary>
+    /// <returns></returns>
+    private Geometry3D CreateItemGeometry()
+    {
+        var sx = _uiElement.DesiredSize.Width > _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Width / _uiElement.DesiredSize.Height;
+        var sy = _uiElement.DesiredSize.Width < _uiElement.DesiredSize.Height ? 0 : 1 - _uiElement.DesiredSize.Height / _uiElement.DesiredSize.Width;
+
+        var p0 = new Point3D(-1 + sx, -1 + sy, 0);
+        var p1 = new Point3D(1 - sx, -1 + sy, 0);
+        var p2 = new Point3D(1 - sx, 1 - sy, 0);
+        var p3 = new Point3D(-1 + sx, 1 - sy, 0);
+
+        return CreateMeshGeometry(p0, p1, p2, p3);
+    }
+
+    private double GetAngleByPos(int index) => Math.Sign(Index - index) * -90;
+
+    private double GetXByPos(int index) => Index * Interval + Math.Sign(Index - index) * 1.5;
+
+    private double GetZByPos(int index) => Index == index ? 1 : 0;
+
+    /// <summary>
+    ///     移动
+    /// </summary>
+    internal void Move(int currentIndex)
+    {
+        _rotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty,
+            AnimationHelper.CreateAnimation(GetAngleByPos(currentIndex), AnimationSpeed));
+        _transform3D.BeginAnimation(TranslateTransform3D.OffsetXProperty,
+            AnimationHelper.CreateAnimation(GetXByPos(currentIndex), AnimationSpeed));
+        _transform3D.BeginAnimation(TranslateTransform3D.OffsetZProperty,
+            AnimationHelper.CreateAnimation(GetZByPos(currentIndex), AnimationSpeed));
+    }
+
+    /// <summary>
+    ///     命中测试
+    /// </summary>
+    /// <param name="mesh"></param>
+    /// <returns></returns>
+    internal bool HitTest(MeshGeometry3D mesh)
+    {
+        foreach (var item in _model3DGroup.Children)
+        {
+            if (item is GeometryModel3D geometryModel3D)
             {
-                if (item is GeometryModel3D geometryModel3D)
+                if (Equals(geometryModel3D.Geometry, mesh))
                 {
-                    if (Equals(geometryModel3D.Geometry, mesh))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
-            return false;
         }
+        return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
index 6f255395..d0a3b70d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
@@ -6,419 +6,418 @@ using System.Windows.Data;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CoverView : RegularItemsControl
 {
-    public class CoverView : RegularItemsControl
+    private readonly CoverViewContent _viewContent;
+
+    private CoverViewItem _selectedItem;
+
+    private IEnumerable _itemsSourceInternal;
+
+    private readonly Dictionary<object, CoverViewItem> _entryDic = new();
+
+    private bool _isRefresh;
+
+    public CoverView()
     {
-        private readonly CoverViewContent _viewContent;
+        _viewContent = new CoverViewContent();
 
-        private CoverViewItem _selectedItem;
+        AddHandler(SelectableItem.SelectedEvent, new RoutedEventHandler(CoverViewItem_OnSelected));
+        _viewContent.SetBinding(CoverViewContent.ContentHeightProperty, new Binding(ItemContentHeightProperty.Name) { Source = this });
+        _viewContent.SetBinding(WidthProperty, new Binding(ActualWidthProperty.Name) { Source = this });
+    }
 
-        private IEnumerable _itemsSourceInternal;
-
-        private readonly Dictionary<object, CoverViewItem> _entryDic = new();
-
-        private bool _isRefresh;
-
-        public CoverView()
+    private void CoverViewItem_OnSelected(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is CoverViewItem item)
         {
-            _viewContent = new CoverViewContent();
-
-            AddHandler(SelectableItem.SelectedEvent, new RoutedEventHandler(CoverViewItem_OnSelected));
-            _viewContent.SetBinding(CoverViewContent.ContentHeightProperty, new Binding(ItemContentHeightProperty.Name) { Source = this });
-            _viewContent.SetBinding(WidthProperty, new Binding(ActualWidthProperty.Name) { Source = this });
-        }
-
-        private void CoverViewItem_OnSelected(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is CoverViewItem item)
-            {
-                if (_selectedItem == null)
-                {
-                    item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
-                    _selectedItem = item;
-                    if (_viewContent != null)
-                    {
-                        _viewContent.Content = item.Content;
-                        _viewContent.ContentTemplate = ItemTemplate;
-                        UpdateCoverViewContent(true);
-                    }
-
-                    return;
-                }
-
-                if (!Equals(_selectedItem, item))
-                {
-                    _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
-                    item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
-                    _selectedItem = item;
-                    if (_viewContent != null)
-                    {
-                        _viewContent.Content = item.Content;
-                        UpdateCoverViewContent(true);
-                    }
-
-                    return;
-                }
-
-                if (_viewContent != null)
-                {
-                    _viewContent.Content = null;
-                    _viewContent.ContentTemplate = null;
-                    UpdateCoverViewContent(false);
-                }
-                _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
-                _selectedItem = null;
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _viewContent.Style ??= CoverViewContentStyle;
-
-            if (_selectedItem != null)
-            {
-                UpdateCoverViewContent(_selectedItem != null);
-            }
-        }
-
-        protected override DependencyObject GetContainerForItemOverride() => new CoverViewItem();
-
-        private void SetBindingForItem(FrameworkElement item)
-        {
-            item.SetBinding(MarginProperty, new Binding(ItemMarginProperty.Name) { Source = this });
-            item.SetBinding(WidthProperty, new Binding(ItemWidthProperty.Name) { Source = this });
-            item.SetBinding(HeightProperty, new Binding(ItemHeightProperty.Name) { Source = this });
-            item.SetBinding(HeaderedSelectableItem.HeaderTemplateProperty, new Binding(ItemHeaderTemplateProperty.Name) { Source = this });
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is CoverViewItem;
-
-        public static readonly DependencyProperty CoverViewContentStyleProperty = DependencyProperty.Register(
-            "CoverViewContentStyle", typeof(Style), typeof(CoverView), new PropertyMetadata(default(Style)));
-
-        public Style CoverViewContentStyle
-        {
-            get => (Style) GetValue(CoverViewContentStyleProperty);
-            set => SetValue(CoverViewContentStyleProperty, value);
-        }
-
-        internal static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
-            "Groups", typeof(int), typeof(CoverView),
-            new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsMeasure,
-                OnGroupsChanged), IsGroupsValid);
-
-        internal static void OnGroupsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is CoverView ctl)
-            {
-                ctl.UpdateCoverViewContent(ctl._viewContent.IsOpen);
-            }
-        }
-
-        private static bool IsGroupsValid(object value)
-        {
-            var v = (int) value;
-            return v >= 1;
-        }
-
-        public int Groups
-        {
-            get => (int) GetValue(GroupsProperty);
-            set => SetValue(GroupsProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemContentHeightProperty = DependencyProperty.Register(
-            "ItemContentHeight", typeof(double), typeof(CoverView), new PropertyMetadata(ValueBoxes.Double300Box),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public double ItemContentHeight
-        {
-            get => (double) GetValue(ItemContentHeightProperty);
-            set => SetValue(ItemContentHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemContentHeightFixedProperty = DependencyProperty.Register(
-            "ItemContentHeightFixed", typeof(bool), typeof(CoverView), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ItemContentHeightFixed
-        {
-            get => (bool) GetValue(ItemContentHeightFixedProperty);
-            set => SetValue(ItemContentHeightFixedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ItemHeaderTemplateProperty = DependencyProperty.Register(
-            "ItemHeaderTemplate", typeof(DataTemplate), typeof(CoverView), new PropertyMetadata(default(DataTemplate)));
-
-        public DataTemplate ItemHeaderTemplate
-        {
-            get => (DataTemplate) GetValue(ItemHeaderTemplateProperty);
-            set => SetValue(ItemHeaderTemplateProperty, value);
-        }
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-
-            Groups = (int) (sizeInfo.NewSize.Width / (ItemWidth + ItemMargin.Left + ItemMargin.Right));
-        }
-
-        protected override void Refresh()
-        {
-            if (ItemsHost == null) return;
-
-            _entryDic.Clear();
-            _isRefresh = true;
-
-            foreach (var item in Items)
-            {
-                AddItem(item);
-            }
-
-            _isRefresh = false;
-            GenerateIndex();
-            UpdateCoverViewContent(_viewContent.IsOpen);
-        }
-
-        /// <summary>
-        ///     更新内容视图
-        /// </summary>
-        private void UpdateCoverViewContent(bool isOpen)
-        {
-            if (_selectedItem == null) return;
-
-            ItemsHost.Children.Remove(_viewContent);
-
-            if (!ItemContentHeightFixed)
-            {
-                _viewContent.ManualHeight = 0;
-                if (_viewContent.Content is FrameworkElement element)
-                {
-                    element.VerticalAlignment = VerticalAlignment.Top;
-                    element.Arrange(new Rect(new Size(double.MaxValue, double.MaxValue)));
-                    _viewContent.ManualHeight = element.ActualHeight;
-                }
-            }
-
-            UpdateCoverViewContentPosition();
-            if (_viewContent.CanSwitch)
-            {
-                _viewContent.IsOpen = isOpen;
-            }
-        }
-
-        /// <summary>
-        ///     更新内容视图位置
-        /// </summary>
-        private void UpdateCoverViewContentPosition()
-        {
-            if (_viewContent.Parent != null)
-            {
-                ItemsHost.Children.Remove(_viewContent);
-            }
-
             if (_selectedItem == null)
             {
+                item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
+                _selectedItem = item;
+                if (_viewContent != null)
+                {
+                    _viewContent.Content = item.Content;
+                    _viewContent.ContentTemplate = ItemTemplate;
+                    UpdateCoverViewContent(true);
+                }
+
                 return;
             }
 
-            var total = _entryDic.Count + 1;
-            var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
-            if (total <= Groups)
+            if (!Equals(_selectedItem, item))
+            {
+                _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
+                item.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.TrueBox);
+                _selectedItem = item;
+                if (_viewContent != null)
+                {
+                    _viewContent.Content = item.Content;
+                    UpdateCoverViewContent(true);
+                }
+
+                return;
+            }
+
+            if (_viewContent != null)
+            {
+                _viewContent.Content = null;
+                _viewContent.ContentTemplate = null;
+                UpdateCoverViewContent(false);
+            }
+            _selectedItem.SetCurrentValue(SelectableItem.IsSelectedProperty, ValueBoxes.FalseBox);
+            _selectedItem = null;
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _viewContent.Style ??= CoverViewContentStyle;
+
+        if (_selectedItem != null)
+        {
+            UpdateCoverViewContent(_selectedItem != null);
+        }
+    }
+
+    protected override DependencyObject GetContainerForItemOverride() => new CoverViewItem();
+
+    private void SetBindingForItem(FrameworkElement item)
+    {
+        item.SetBinding(MarginProperty, new Binding(ItemMarginProperty.Name) { Source = this });
+        item.SetBinding(WidthProperty, new Binding(ItemWidthProperty.Name) { Source = this });
+        item.SetBinding(HeightProperty, new Binding(ItemHeightProperty.Name) { Source = this });
+        item.SetBinding(HeaderedSelectableItem.HeaderTemplateProperty, new Binding(ItemHeaderTemplateProperty.Name) { Source = this });
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is CoverViewItem;
+
+    public static readonly DependencyProperty CoverViewContentStyleProperty = DependencyProperty.Register(
+        "CoverViewContentStyle", typeof(Style), typeof(CoverView), new PropertyMetadata(default(Style)));
+
+    public Style CoverViewContentStyle
+    {
+        get => (Style) GetValue(CoverViewContentStyleProperty);
+        set => SetValue(CoverViewContentStyleProperty, value);
+    }
+
+    internal static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
+        "Groups", typeof(int), typeof(CoverView),
+        new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsMeasure,
+            OnGroupsChanged), IsGroupsValid);
+
+    internal static void OnGroupsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is CoverView ctl)
+        {
+            ctl.UpdateCoverViewContent(ctl._viewContent.IsOpen);
+        }
+    }
+
+    private static bool IsGroupsValid(object value)
+    {
+        var v = (int) value;
+        return v >= 1;
+    }
+
+    public int Groups
+    {
+        get => (int) GetValue(GroupsProperty);
+        set => SetValue(GroupsProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemContentHeightProperty = DependencyProperty.Register(
+        "ItemContentHeight", typeof(double), typeof(CoverView), new PropertyMetadata(ValueBoxes.Double300Box),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double ItemContentHeight
+    {
+        get => (double) GetValue(ItemContentHeightProperty);
+        set => SetValue(ItemContentHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemContentHeightFixedProperty = DependencyProperty.Register(
+        "ItemContentHeightFixed", typeof(bool), typeof(CoverView), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ItemContentHeightFixed
+    {
+        get => (bool) GetValue(ItemContentHeightFixedProperty);
+        set => SetValue(ItemContentHeightFixedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ItemHeaderTemplateProperty = DependencyProperty.Register(
+        "ItemHeaderTemplate", typeof(DataTemplate), typeof(CoverView), new PropertyMetadata(default(DataTemplate)));
+
+    public DataTemplate ItemHeaderTemplate
+    {
+        get => (DataTemplate) GetValue(ItemHeaderTemplateProperty);
+        set => SetValue(ItemHeaderTemplateProperty, value);
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+
+        Groups = (int) (sizeInfo.NewSize.Width / (ItemWidth + ItemMargin.Left + ItemMargin.Right));
+    }
+
+    protected override void Refresh()
+    {
+        if (ItemsHost == null) return;
+
+        _entryDic.Clear();
+        _isRefresh = true;
+
+        foreach (var item in Items)
+        {
+            AddItem(item);
+        }
+
+        _isRefresh = false;
+        GenerateIndex();
+        UpdateCoverViewContent(_viewContent.IsOpen);
+    }
+
+    /// <summary>
+    ///     更新内容视图
+    /// </summary>
+    private void UpdateCoverViewContent(bool isOpen)
+    {
+        if (_selectedItem == null) return;
+
+        ItemsHost.Children.Remove(_viewContent);
+
+        if (!ItemContentHeightFixed)
+        {
+            _viewContent.ManualHeight = 0;
+            if (_viewContent.Content is FrameworkElement element)
+            {
+                element.VerticalAlignment = VerticalAlignment.Top;
+                element.Arrange(new Rect(new Size(double.MaxValue, double.MaxValue)));
+                _viewContent.ManualHeight = element.ActualHeight;
+            }
+        }
+
+        UpdateCoverViewContentPosition();
+        if (_viewContent.CanSwitch)
+        {
+            _viewContent.IsOpen = isOpen;
+        }
+    }
+
+    /// <summary>
+    ///     更新内容视图位置
+    /// </summary>
+    private void UpdateCoverViewContentPosition()
+    {
+        if (_viewContent.Parent != null)
+        {
+            ItemsHost.Children.Remove(_viewContent);
+        }
+
+        if (_selectedItem == null)
+        {
+            return;
+        }
+
+        var total = _entryDic.Count + 1;
+        var totalRow = total / Groups + (total % Groups > 0 ? 1 : 0);
+        if (total <= Groups)
+        {
+            ItemsHost.Children.Add(_viewContent);
+        }
+        else
+        {
+            var row = _selectedItem.Index / Groups + 1;
+            if (row == totalRow)
             {
                 ItemsHost.Children.Add(_viewContent);
             }
             else
             {
-                var row = _selectedItem.Index / Groups + 1;
-                if (row == totalRow)
-                {
-                    ItemsHost.Children.Add(_viewContent);
-                }
-                else
-                {
-                    ItemsHost.Children.Insert(row * Groups, _viewContent);
-                }
-            }
-
-            _viewContent.UpdatePosition(_selectedItem.Index, Groups, _selectedItem.DesiredSize.Width);
-        }
-
-        protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
-        {
-            if (_itemsSourceInternal != null)
-            {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged -= InternalCollectionChanged;
-                }
-
-                Items.Clear();
-                ClearItems();
-            }
-            _itemsSourceInternal = newValue;
-            if (_itemsSourceInternal != null)
-            {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged += InternalCollectionChanged;
-                }
-                foreach (var item in _itemsSourceInternal)
-                {
-                    AddItem(item);
-                }
-            }
-
-            if (ItemsHost != null)
-            {
-                GenerateIndex();
+                ItemsHost.Children.Insert(row * Groups, _viewContent);
             }
         }
 
-        private void ClearItems()
-        {
-            _selectedItem = null;
-            _viewContent.Content = null;
-            _viewContent.ContentTemplate = null;
+        _viewContent.UpdatePosition(_selectedItem.Index, Groups, _selectedItem.DesiredSize.Width);
+    }
 
-            if (ItemsHost != null)
+    protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+    {
+        if (_itemsSourceInternal != null)
+        {
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
             {
-                ItemsHost.Children.Remove(_viewContent);
-                ItemsHost.Children.Clear();
+                s.CollectionChanged -= InternalCollectionChanged;
             }
 
-            _entryDic.Clear();
+            Items.Clear();
+            ClearItems();
+        }
+        _itemsSourceInternal = newValue;
+        if (_itemsSourceInternal != null)
+        {
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
+            {
+                s.CollectionChanged += InternalCollectionChanged;
+            }
+            foreach (var item in _itemsSourceInternal)
+            {
+                AddItem(item);
+            }
         }
 
-        private void RemoveItem(object item)
+        if (ItemsHost != null)
         {
-            if (_entryDic.TryGetValue(item, out var entry))
+            GenerateIndex();
+        }
+    }
+
+    private void ClearItems()
+    {
+        _selectedItem = null;
+        _viewContent.Content = null;
+        _viewContent.ContentTemplate = null;
+
+        if (ItemsHost != null)
+        {
+            ItemsHost.Children.Remove(_viewContent);
+            ItemsHost.Children.Clear();
+        }
+
+        _entryDic.Clear();
+    }
+
+    private void RemoveItem(object item)
+    {
+        if (_entryDic.TryGetValue(item, out var entry))
+        {
+            if (ReferenceEquals(entry, _selectedItem))
             {
-                if (ReferenceEquals(entry, _selectedItem))
+                _selectedItem = null;
+                if (_viewContent != null)
                 {
-                    _selectedItem = null;
-                    if (_viewContent != null)
-                    {
-                        _viewContent.Content = null;
-                        _viewContent.IsOpen = false;
-                        ItemsHost.Children.Remove(_viewContent);
-                    }
+                    _viewContent.Content = null;
+                    _viewContent.IsOpen = false;
+                    ItemsHost.Children.Remove(_viewContent);
                 }
-
-                ItemsHost.Children.Remove(entry);
-                Items.Remove(item);
-                _entryDic.Remove(item);
             }
+
+            ItemsHost.Children.Remove(entry);
+            Items.Remove(item);
+            _entryDic.Remove(item);
         }
+    }
 
-        private void AddItem(object item) => InsertItem(_entryDic.Count, item);
+    private void AddItem(object item) => InsertItem(_entryDic.Count, item);
 
-        private void InsertItem(int index, object item)
+    private void InsertItem(int index, object item)
+    {
+        if (ItemsHost == null)
         {
-            if (ItemsHost == null)
+            Items.Insert(index, item);
+            _entryDic.Add(item, null);
+        }
+        else
+        {
+            DependencyObject container;
+            if (IsItemItsOwnContainerOverride(item))
             {
-                Items.Insert(index, item);
-                _entryDic.Add(item, null);
+                container = item as DependencyObject;
             }
             else
             {
-                DependencyObject container;
-                if (IsItemItsOwnContainerOverride(item))
-                {
-                    container = item as DependencyObject;
-                }
-                else
-                {
-                    container = GetContainerForItemOverride();
-                    PrepareContainerForItemOverride(container, item);
-                }
-
-                if (container is CoverViewItem element)
-                {
-                    SetBindingForItem(element);
-                    element.Style = ItemContainerStyle;
-                    element.Header ??= item;
-                    _entryDic[item] = element;
-                    ItemsHost.Children.Insert(index, element);
-
-                    if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
-                    {
-                        Items.Insert(index, item);
-                    }
-                }
+                container = GetContainerForItemOverride();
+                PrepareContainerForItemOverride(container, item);
             }
-        }
 
-        /// <summary>
-        ///     生成序号
-        /// </summary>
-        private void GenerateIndex()
-        {
-            var index = 0;
-            foreach (var item in _entryDic.Values)
+            if (container is CoverViewItem element)
             {
-                item.Index = index++;
-            }
-        }
+                SetBindingForItem(element);
+                element.Style = ItemContainerStyle;
+                element.Header ??= item;
+                _entryDic[item] = element;
+                ItemsHost.Children.Insert(index, element);
 
-        private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (ItemsHost == null) return;
-
-            if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                if (_entryDic.Count == 0) return;
-                ClearItems();
-                Items.Clear();
-                return;
-            }
-
-            if (e.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
+                if (IsLoaded && !_isRefresh && _itemsSourceInternal != null)
                 {
-                    RemoveItem(item);
+                    Items.Insert(index, item);
                 }
             }
-            if (e.NewItems != null)
-            {
-                if (_viewContent.IsOpen)
-                {
-                    ItemsHost.Children.Remove(_viewContent);
-                }
-
-                var count = 0;
-                foreach (var item in e.NewItems)
-                {
-                    var index = e.NewStartingIndex + count++;
-                    InsertItem(index, item);
-                }
-            }
-
-            GenerateIndex();
-            if (_viewContent.IsOpen)
-            {
-                UpdateCoverViewContentPosition();
-            }
-        }
-
-        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (_itemsSourceInternal != null) return;
-
-            InternalCollectionChanged(sender, e);
-        }
-
-        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-
         }
     }
-}
+
+    /// <summary>
+    ///     生成序号
+    /// </summary>
+    private void GenerateIndex()
+    {
+        var index = 0;
+        foreach (var item in _entryDic.Values)
+        {
+            item.Index = index++;
+        }
+    }
+
+    private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (ItemsHost == null) return;
+
+        if (e.Action == NotifyCollectionChangedAction.Reset)
+        {
+            if (_entryDic.Count == 0) return;
+            ClearItems();
+            Items.Clear();
+            return;
+        }
+
+        if (e.OldItems != null)
+        {
+            foreach (var item in e.OldItems)
+            {
+                RemoveItem(item);
+            }
+        }
+        if (e.NewItems != null)
+        {
+            if (_viewContent.IsOpen)
+            {
+                ItemsHost.Children.Remove(_viewContent);
+            }
+
+            var count = 0;
+            foreach (var item in e.NewItems)
+            {
+                var index = e.NewStartingIndex + count++;
+                InsertItem(index, item);
+            }
+        }
+
+        GenerateIndex();
+        if (_viewContent.IsOpen)
+        {
+            UpdateCoverViewContentPosition();
+        }
+    }
+
+    protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (_itemsSourceInternal != null) return;
+
+        InternalCollectionChanged(sender, e);
+    }
+
+    protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
index 626d682f..9bed6cae 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
@@ -5,118 +5,117 @@ using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementTriangle, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
+public class CoverViewContent : ContentControl
 {
-    [TemplatePart(Name = ElementTriangle, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementContent, Type = typeof(FrameworkElement))]
-    public class CoverViewContent : ContentControl
+    private const string ElementTriangle = "PART_Triangle";
+
+    private const string ElementContent = "PART_Content";
+
+    private FrameworkElement _triangle;
+
+    private FrameworkElement _content;
+
+    internal bool WaitForUpdate { get; set; }
+
+    private int _index;
+
+    private int _groups;
+
+    private double _itemWidth;
+
+    internal bool CanSwitch { get; set; } = true;
+
+    private bool _isOpen;
+
+    internal bool IsOpen
     {
-        private const string ElementTriangle = "PART_Triangle";
-
-        private const string ElementContent = "PART_Content";
-
-        private FrameworkElement _triangle;
-
-        private FrameworkElement _content;
-
-        internal bool WaitForUpdate { get; set; }
-
-        private int _index;
-
-        private int _groups;
-
-        private double _itemWidth;
-
-        internal bool CanSwitch { get; set; } = true;
-
-        private bool _isOpen;
-
-        internal bool IsOpen
+        get => _isOpen;
+        set
         {
-            get => _isOpen;
-            set
-            {
-                if (_isOpen == value) return;
-                _isOpen = value;
-                OpenSwitch(value);
-            }
-        }
-
-        internal static readonly DependencyProperty ManualHeightProperty = DependencyProperty.Register(
-            "ManualHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(ValueBoxes.Double0Box), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        internal double ManualHeight
-        {
-            get => (double) GetValue(ManualHeightProperty);
-            set => SetValue(ManualHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.Register(
-            "ContentHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(ValueBoxes.Double300Box),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public double ContentHeight
-        {
-            get => (double) GetValue(ContentHeightProperty);
-            set => SetValue(ContentHeightProperty, value);
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _triangle = GetTemplateChild(ElementTriangle) as FrameworkElement;
-            _content = GetTemplateChild(ElementContent) as FrameworkElement;
-
-            if (WaitForUpdate)
-            {
-                _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((_index % _groups + .5) * _itemWidth - _triangle.Width / 2, 0, 0, 0)));
-                OpenSwitch(_isOpen);
-                WaitForUpdate = false;
-            }
-        }
-
-        internal void UpdatePosition(int index, int groups, double itemWidth)
-        {
-            if (_triangle == null)
-            {
-                _index = index;
-                _groups = groups;
-                _itemWidth = itemWidth;
-                WaitForUpdate = true;
-                return;
-            }
-            _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((index % groups + .5) * itemWidth - _triangle.Width / 2, 0, 0, 0)));
-            if (IsOpen)
-            {
-                if (ManualHeight > 0 && !MathHelper.AreClose(ManualHeight, ContentHeight))
-                {
-                    _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ManualHeight));
-                }
-                else
-                {
-                    _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ContentHeight));
-                }
-            }
-        }
-
-        private void OpenSwitch(bool isOpen)
-        {
-            if (_content == null) return;
-            var animation = AnimationHelper.CreateAnimation(isOpen ? ManualHeight > 0 ? ManualHeight : ContentHeight : 0);
-            _triangle.Show(false);
-            this.Show(true);
-            animation.Completed += (s, e) =>
-            {
-                CanSwitch = true;
-                this.Show(IsOpen);
-                if (IsOpen)
-                {
-                    _triangle.Show(true);
-                }
-            };
-            CanSwitch = false;
-            _content.BeginAnimation(HeightProperty, animation);
+            if (_isOpen == value) return;
+            _isOpen = value;
+            OpenSwitch(value);
         }
     }
-}
+
+    internal static readonly DependencyProperty ManualHeightProperty = DependencyProperty.Register(
+        "ManualHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(ValueBoxes.Double0Box), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    internal double ManualHeight
+    {
+        get => (double) GetValue(ManualHeightProperty);
+        set => SetValue(ManualHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentHeightProperty = DependencyProperty.Register(
+        "ContentHeight", typeof(double), typeof(CoverViewContent), new PropertyMetadata(ValueBoxes.Double300Box),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double ContentHeight
+    {
+        get => (double) GetValue(ContentHeightProperty);
+        set => SetValue(ContentHeightProperty, value);
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _triangle = GetTemplateChild(ElementTriangle) as FrameworkElement;
+        _content = GetTemplateChild(ElementContent) as FrameworkElement;
+
+        if (WaitForUpdate)
+        {
+            _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((_index % _groups + .5) * _itemWidth - _triangle.Width / 2, 0, 0, 0)));
+            OpenSwitch(_isOpen);
+            WaitForUpdate = false;
+        }
+    }
+
+    internal void UpdatePosition(int index, int groups, double itemWidth)
+    {
+        if (_triangle == null)
+        {
+            _index = index;
+            _groups = groups;
+            _itemWidth = itemWidth;
+            WaitForUpdate = true;
+            return;
+        }
+        _triangle.BeginAnimation(MarginProperty, AnimationHelper.CreateAnimation(new Thickness((index % groups + .5) * itemWidth - _triangle.Width / 2, 0, 0, 0)));
+        if (IsOpen)
+        {
+            if (ManualHeight > 0 && !MathHelper.AreClose(ManualHeight, ContentHeight))
+            {
+                _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ManualHeight));
+            }
+            else
+            {
+                _content.BeginAnimation(HeightProperty, AnimationHelper.CreateAnimation(ContentHeight));
+            }
+        }
+    }
+
+    private void OpenSwitch(bool isOpen)
+    {
+        if (_content == null) return;
+        var animation = AnimationHelper.CreateAnimation(isOpen ? ManualHeight > 0 ? ManualHeight : ContentHeight : 0);
+        _triangle.Show(false);
+        this.Show(true);
+        animation.Completed += (s, e) =>
+        {
+            CanSwitch = true;
+            this.Show(IsOpen);
+            if (IsOpen)
+            {
+                _triangle.Show(true);
+            }
+        };
+        CanSwitch = false;
+        _content.BeginAnimation(HeightProperty, animation);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
index 51f8d397..3b9d8ed3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
@@ -1,7 +1,6 @@
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CoverViewItem : HeaderedSelectableItem
 {
-    public class CoverViewItem : HeaderedSelectableItem
-    {
-        internal int Index { get; set; }
-    }
-}
+    internal int Index { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
index 59c3bce8..01982ad2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
@@ -8,169 +8,168 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Dialog : ContentControl
 {
-    public class Dialog : ContentControl
+    private string _token;
+
+    private AdornerContainer _container;
+
+    private static readonly Dictionary<string, FrameworkElement> ContainerDic = new();
+
+    public static readonly DependencyProperty IsClosedProperty = DependencyProperty.Register(
+        "IsClosed", typeof(bool), typeof(Dialog), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsClosed
     {
-        private string _token;
+        get => (bool) GetValue(IsClosedProperty);
+        internal set => SetValue(IsClosedProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private AdornerContainer _container;
+    public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
+        "Token", typeof(string), typeof(Dialog), new PropertyMetadata(default(string), OnTokenChanged));
 
-        private static readonly Dictionary<string, FrameworkElement> ContainerDic = new();
-
-        public static readonly DependencyProperty IsClosedProperty = DependencyProperty.Register(
-            "IsClosed", typeof(bool), typeof(Dialog), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsClosed
+    private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is FrameworkElement element)
         {
-            get => (bool) GetValue(IsClosedProperty);
-            internal set => SetValue(IsClosedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
-            "Token", typeof(string), typeof(Dialog), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is FrameworkElement element)
+            if (e.NewValue == null)
             {
-                if (e.NewValue == null)
-                {
-                    Unregister(element);
-                }
-                else
-                {
-                    Register(e.NewValue.ToString(), element);
-                }
+                Unregister(element);
+            }
+            else
+            {
+                Register(e.NewValue.ToString(), element);
             }
         }
+    }
 
-        public static void SetToken(DependencyObject element, string value)
-            => element.SetValue(TokenProperty, value);
+    public static void SetToken(DependencyObject element, string value)
+        => element.SetValue(TokenProperty, value);
 
-        public static string GetToken(DependencyObject element)
-            => (string) element.GetValue(TokenProperty);
+    public static string GetToken(DependencyObject element)
+        => (string) element.GetValue(TokenProperty);
 
-        public Dialog()
+    public Dialog()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
+    }
+
+    public static void Register(string token, FrameworkElement element)
+    {
+        if (string.IsNullOrEmpty(token) || element == null) return;
+        ContainerDic[token] = element;
+    }
+
+    public static void Unregister(string token, FrameworkElement element)
+    {
+        if (string.IsNullOrEmpty(token) || element == null) return;
+
+        if (ContainerDic.ContainsKey(token))
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
-        }
-
-        public static void Register(string token, FrameworkElement element)
-        {
-            if (string.IsNullOrEmpty(token) || element == null) return;
-            ContainerDic[token] = element;
-        }
-
-        public static void Unregister(string token, FrameworkElement element)
-        {
-            if (string.IsNullOrEmpty(token) || element == null) return;
-
-            if (ContainerDic.ContainsKey(token))
-            {
-                if (ReferenceEquals(ContainerDic[token], element))
-                {
-                    ContainerDic.Remove(token);
-                }
-            }
-        }
-
-        public static void Unregister(FrameworkElement element)
-        {
-            if (element == null) return;
-            var first = ContainerDic.FirstOrDefault(item => ReferenceEquals(element, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                ContainerDic.Remove(first.Key);
-            }
-        }
-
-        public static void Unregister(string token)
-        {
-            if (string.IsNullOrEmpty(token)) return;
-
-            if (ContainerDic.ContainsKey(token))
+            if (ReferenceEquals(ContainerDic[token], element))
             {
                 ContainerDic.Remove(token);
             }
         }
+    }
 
-        public static Dialog Show<T>(string token = "") where T : new() => Show(new T(), token);
-
-        public static Dialog Show(object content, string token = "")
+    public static void Unregister(FrameworkElement element)
+    {
+        if (element == null) return;
+        var first = ContainerDic.FirstOrDefault(item => ReferenceEquals(element, item.Value));
+        if (!string.IsNullOrEmpty(first.Key))
         {
-            var dialog = new Dialog
-            {
-                _token = token,
-                Content = content
-            };
+            ContainerDic.Remove(first.Key);
+        }
+    }
 
-            FrameworkElement element;
+    public static void Unregister(string token)
+    {
+        if (string.IsNullOrEmpty(token)) return;
 
-            AdornerDecorator decorator;
-            if (string.IsNullOrEmpty(token))
+        if (ContainerDic.ContainsKey(token))
+        {
+            ContainerDic.Remove(token);
+        }
+    }
+
+    public static Dialog Show<T>(string token = "") where T : new() => Show(new T(), token);
+
+    public static Dialog Show(object content, string token = "")
+    {
+        var dialog = new Dialog
+        {
+            _token = token,
+            Content = content
+        };
+
+        FrameworkElement element;
+
+        AdornerDecorator decorator;
+        if (string.IsNullOrEmpty(token))
+        {
+            element = WindowHelper.GetActiveWindow();
+            decorator = VisualHelper.GetChild<AdornerDecorator>(element);
+        }
+        else
+        {
+            ContainerDic.TryGetValue(token, out element);
+            decorator = element is System.Windows.Window ?
+                VisualHelper.GetChild<AdornerDecorator>(element) :
+                VisualHelper.GetChild<DialogContainer>(element);
+        }
+
+        if (decorator != null)
+        {
+            if (decorator.Child != null)
             {
-                element = WindowHelper.GetActiveWindow();
-                decorator = VisualHelper.GetChild<AdornerDecorator>(element);
+                decorator.Child.IsEnabled = false;
             }
-            else
+            var layer = decorator.AdornerLayer;
+            if (layer != null)
             {
-                ContainerDic.TryGetValue(token, out element);
-                decorator = element is System.Windows.Window ?
-                    VisualHelper.GetChild<AdornerDecorator>(element) :
-                    VisualHelper.GetChild<DialogContainer>(element);
+                var container = new AdornerContainer(layer)
+                {
+                    Child = dialog
+                };
+                dialog._container = container;
+                dialog.IsClosed = false;
+                layer.Add(container);
             }
+        }
 
+        return dialog;
+    }
+
+    public void Close()
+    {
+        if (string.IsNullOrEmpty(_token))
+        {
+            Close(WindowHelper.GetActiveWindow());
+        }
+        else if (ContainerDic.TryGetValue(_token, out var element))
+        {
+            Close(element);
+        }
+    }
+
+    private void Close(DependencyObject element)
+    {
+        if (element != null && _container != null)
+        {
+            var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
             if (decorator != null)
             {
                 if (decorator.Child != null)
                 {
-                    decorator.Child.IsEnabled = false;
+                    decorator.Child.IsEnabled = true;
                 }
                 var layer = decorator.AdornerLayer;
-                if (layer != null)
-                {
-                    var container = new AdornerContainer(layer)
-                    {
-                        Child = dialog
-                    };
-                    dialog._container = container;
-                    dialog.IsClosed = false;
-                    layer.Add(container);
-                }
-            }
-
-            return dialog;
-        }
-
-        public void Close()
-        {
-            if (string.IsNullOrEmpty(_token))
-            {
-                Close(WindowHelper.GetActiveWindow());
-            }
-            else if (ContainerDic.TryGetValue(_token, out var element))
-            {
-                Close(element);
-            }
-        }
-
-        private void Close(DependencyObject element)
-        {
-            if (element != null && _container != null)
-            {
-                var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
-                if (decorator != null)
-                {
-                    if (decorator.Child != null)
-                    {
-                        decorator.Child.IsEnabled = true;
-                    }
-                    var layer = decorator.AdornerLayer;
-                    layer?.Remove(_container);
-                    IsClosed = true;
-                }
+                layer?.Remove(_container);
+                IsClosed = true;
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
index 58f365f6..e12b7215 100644
--- a/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
@@ -1,9 +1,8 @@
 using System.Windows.Documents;
 
-namespace HandyControl.Controls
-{
-    public class DialogContainer : AdornerDecorator
-    {
+namespace HandyControl.Controls;
 
-    }
-}
+public class DialogContainer : AdornerDecorator
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs b/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
index da0f3aa2..72283303 100644
--- a/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
@@ -11,419 +11,418 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[ContentProperty("Content")]
+public class Drawer : FrameworkElement
 {
-    [ContentProperty("Content")]
-    public class Drawer : FrameworkElement
+    private Storyboard _storyboard;
+
+    private AdornerContainer _container;
+
+    private ContentControl _animationControl;
+
+    private TranslateTransform _translateTransform;
+
+    private double _animationLength;
+
+    private string _animationPropertyName;
+
+    private FrameworkElement _maskElement;
+
+    private AdornerLayer _layer;
+
+    private UIElement _contentElement;
+
+    private Point _contentRenderTransformOrigin;
+
+    static Drawer()
     {
-        private Storyboard _storyboard;
+        DataContextProperty.OverrideMetadata(typeof(Drawer), new FrameworkPropertyMetadata(DataContextPropertyChanged));
+    }
 
-        private AdornerContainer _container;
+    public Drawer()
+    {
+        Loaded += Drawer_Loaded;
+        Unloaded += Drawer_Unloaded;
+    }
 
-        private ContentControl _animationControl;
-
-        private TranslateTransform _translateTransform;
-
-        private double _animationLength;
-
-        private string _animationPropertyName;
-
-        private FrameworkElement _maskElement;
-
-        private AdornerLayer _layer;
-
-        private UIElement _contentElement;
-
-        private Point _contentRenderTransformOrigin;
-
-        static Drawer()
+    private void Drawer_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (IsOpen)
         {
-            DataContextProperty.OverrideMetadata(typeof(Drawer), new FrameworkPropertyMetadata(DataContextPropertyChanged));
-        }
-
-        public Drawer()
-        {
-            Loaded += Drawer_Loaded;
-            Unloaded += Drawer_Unloaded;
-        }
-
-        private void Drawer_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (IsOpen)
-            {
-                OnIsOpenChanged(true);
-            }
-        }
-
-        private void Drawer_Unloaded(object sender, RoutedEventArgs e)
-        {
-            Loaded -= Drawer_Loaded;
-
-            if (_maskElement != null)
-            {
-                _maskElement.PreviewMouseLeftButtonDown -= MaskElement_PreviewMouseLeftButtonDown;
-            }
-
-            if (_storyboard != null)
-            {
-                _storyboard.Completed -= Storyboard_Completed;
-            }
-
-            _container = null;
-        }
-
-        private static void DataContextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((Drawer) d).OnDataContextPropertyChanged(e);
-
-        private void OnDataContextPropertyChanged(DependencyPropertyChangedEventArgs e) => UpdateDataContext(_animationControl, e.OldValue, e.NewValue);
-
-        public static readonly RoutedEvent OpenedEvent =
-            EventManager.RegisterRoutedEvent("Opened", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(Drawer));
-
-        public event RoutedEventHandler Opened
-        {
-            add => AddHandler(OpenedEvent, value);
-            remove => RemoveHandler(OpenedEvent, value);
-        }
-
-        public static readonly RoutedEvent ClosedEvent =
-            EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(Drawer));
-
-        public event RoutedEventHandler Closed
-        {
-            add => AddHandler(ClosedEvent, value);
-            remove => RemoveHandler(ClosedEvent, value);
-        }
-
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register(
-            "IsOpen", typeof(bool), typeof(Drawer), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsOpenChanged));
-
-        private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Drawer) d;
-            ctl.OnIsOpenChanged((bool) e.NewValue);
-        }
-
-        public bool IsOpen
-        {
-            get => (bool) GetValue(IsOpenProperty);
-            set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty MaskCanCloseProperty = DependencyProperty.Register(
-            "MaskCanClose", typeof(bool), typeof(Drawer), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool MaskCanClose
-        {
-            get => (bool) GetValue(MaskCanCloseProperty);
-            set => SetValue(MaskCanCloseProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ShowMaskProperty = DependencyProperty.Register(
-            "ShowMask", typeof(bool), typeof(Drawer), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ShowMask
-        {
-            get => (bool) GetValue(ShowMaskProperty);
-            set => SetValue(ShowMaskProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty DockProperty = DependencyProperty.Register(
-            "Dock", typeof(Dock), typeof(Drawer), new PropertyMetadata(default(Dock)));
-
-        public Dock Dock
-        {
-            get => (Dock) GetValue(DockProperty);
-            set => SetValue(DockProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowModeProperty = DependencyProperty.Register(
-            "ShowMode", typeof(DrawerShowMode), typeof(Drawer), new PropertyMetadata(default(DrawerShowMode)));
-
-        public DrawerShowMode ShowMode
-        {
-            get => (DrawerShowMode) GetValue(ShowModeProperty);
-            set => SetValue(ShowModeProperty, value);
-        }
-
-        public static readonly DependencyProperty MaskBrushProperty = DependencyProperty.Register(
-            "MaskBrush", typeof(Brush), typeof(Drawer), new PropertyMetadata(default(Brush)));
-
-        public Brush MaskBrush
-        {
-            get => (Brush) GetValue(MaskBrushProperty);
-            set => SetValue(MaskBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
-            "Content", typeof(object), typeof(Drawer), new PropertyMetadata(default(object)));
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        private void CreateContainer()
-        {
-            _storyboard = new Storyboard();
-            _storyboard.Completed += Storyboard_Completed;
-
-            _translateTransform = new TranslateTransform();
-            _animationControl = new ContentControl
-            {
-                Content = Content,
-                RenderTransform = _translateTransform,
-                DataContext = this
-            };
-
-            var panel = new SimplePanel
-            {
-                ClipToBounds = true
-            };
-
-            if (ShowMask)
-            {
-                _maskElement = new Border
-                {
-                    Background = MaskBrush,
-                    Opacity = 0
-                };
-                _maskElement.PreviewMouseLeftButtonDown += MaskElement_PreviewMouseLeftButtonDown;
-                panel.Children.Add(_maskElement);
-            }
-
-            _animationControl.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            var size = _animationControl.DesiredSize;
-
-            switch (Dock)
-            {
-                case Dock.Left:
-                    _animationControl.HorizontalAlignment = HorizontalAlignment.Left;
-                    _animationControl.VerticalAlignment = VerticalAlignment.Stretch;
-                    _translateTransform.X = -size.Width;
-                    _animationLength = -size.Width;
-                    _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
-                    break;
-                case Dock.Top:
-                    _animationControl.HorizontalAlignment = HorizontalAlignment.Stretch;
-                    _animationControl.VerticalAlignment = VerticalAlignment.Top;
-                    _translateTransform.Y = -size.Height;
-                    _animationLength = -size.Height;
-                    _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
-                    break;
-                case Dock.Right:
-                    _animationControl.HorizontalAlignment = HorizontalAlignment.Right;
-                    _animationControl.VerticalAlignment = VerticalAlignment.Stretch;
-                    _translateTransform.X = size.Width;
-                    _animationLength = size.Width;
-                    _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
-                    break;
-                case Dock.Bottom:
-                    _animationControl.HorizontalAlignment = HorizontalAlignment.Stretch;
-                    _animationControl.VerticalAlignment = VerticalAlignment.Bottom;
-                    _translateTransform.Y = size.Height;
-                    _animationLength = size.Height;
-                    _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            _animationControl.DataContext = DataContext;
-            _animationControl.CommandBindings.Clear();
-            _animationControl.CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => SetCurrentValue(IsOpenProperty, ValueBoxes.FalseBox)));
-            panel.Children.Add(_animationControl);
-            _container = new AdornerContainer(_layer)
-            {
-                Child = panel,
-                ClipToBounds = true
-            };
-        }
-
-        private void Storyboard_Completed(object sender, EventArgs e)
-        {
-            if (!IsOpen)
-            {
-                _contentElement.SetCurrentValue(RenderTransformOriginProperty, _contentRenderTransformOrigin);
-                _layer.Remove(_container);
-                RaiseEvent(new RoutedEventArgs(ClosedEvent, this));
-            }
-            else
-            {
-                RaiseEvent(new RoutedEventArgs(OpenedEvent, this));
-            }
-        }
-
-        private void OnIsOpenChanged(bool isOpen)
-        {
-            if (Content == null || DesignerHelper.IsInDesignMode)
-            {
-                return;
-            }
-
-            AdornerDecorator decorator;
-            var parent = VisualHelper.GetParent<DrawerContainer>(this);
-            if (parent != null)
-            {
-                _contentElement = parent.Child;
-                decorator = parent;
-            }
-            else
-            {
-                var window = WindowHelper.GetActiveWindow();
-                if (window == null)
-                {
-                    return;
-                }
-
-                decorator = VisualHelper.GetChild<AdornerDecorator>(window);
-                _contentElement = window.Content as UIElement;
-            }
-
-            if (_contentElement == null)
-            {
-                return;
-            }
-
-            _layer = decorator?.AdornerLayer;
-            if (_layer == null)
-            {
-                return;
-            }
-
-            _contentRenderTransformOrigin = _contentElement.RenderTransformOrigin;
-
-            if (_container == null)
-            {
-                CreateContainer();
-            }
-
-            switch (ShowMode)
-            {
-                case DrawerShowMode.Push:
-                    ShowByPush(isOpen);
-                    break;
-                case DrawerShowMode.Press:
-                    _contentElement.SetCurrentValue(RenderTransformOriginProperty, new Point(0.5, 0.5));
-                    ShowByPress(isOpen);
-                    break;
-            }
-
-            if (isOpen)
-            {
-                if (_maskElement != null)
-                {
-                    var maskAnimation = AnimationHelper.CreateAnimation(1);
-                    Storyboard.SetTarget(maskAnimation, _maskElement);
-                    Storyboard.SetTargetProperty(maskAnimation, new PropertyPath(OpacityProperty.Name));
-                    _storyboard.Children.Add(maskAnimation);
-                }
-
-                var drawerAnimation = AnimationHelper.CreateAnimation(0);
-                Storyboard.SetTarget(drawerAnimation, _animationControl);
-                Storyboard.SetTargetProperty(drawerAnimation, new PropertyPath(_animationPropertyName));
-                _storyboard.Children.Add(drawerAnimation);
-                _layer.Remove(_container);
-                _layer.Add(_container);
-            }
-            else
-            {
-                if (_maskElement != null)
-                {
-                    var maskAnimation = AnimationHelper.CreateAnimation(0);
-                    Storyboard.SetTarget(maskAnimation, _maskElement);
-                    Storyboard.SetTargetProperty(maskAnimation, new PropertyPath(OpacityProperty.Name));
-                    _storyboard.Children.Add(maskAnimation);
-                }
-
-                var drawerAnimation = AnimationHelper.CreateAnimation(_animationLength);
-                Storyboard.SetTarget(drawerAnimation, _animationControl);
-                Storyboard.SetTargetProperty(drawerAnimation, new PropertyPath(_animationPropertyName));
-                _storyboard.Children.Add(drawerAnimation);
-            }
-            _storyboard.Begin();
-        }
-
-        private void ShowByPush(bool isOpen)
-        {
-            string animationPropertyName;
-
-            switch (Dock)
-            {
-                case Dock.Left:
-                case Dock.Right:
-                    animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
-                    _contentElement.RenderTransform = new TranslateTransform
-                    {
-                        X = isOpen ? 0 : -_animationLength
-                    };
-                    break;
-                case Dock.Top:
-                case Dock.Bottom:
-                    animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
-                    _contentElement.RenderTransform = new TranslateTransform
-                    {
-                        Y = isOpen ? 0 : -_animationLength
-                    };
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            var animation = isOpen
-                ? AnimationHelper.CreateAnimation(-_animationLength)
-                : AnimationHelper.CreateAnimation(0);
-            Storyboard.SetTarget(animation, _contentElement);
-            Storyboard.SetTargetProperty(animation, new PropertyPath(animationPropertyName));
-
-            _storyboard.Children.Add(animation);
-        }
-
-        private void ShowByPress(bool isOpen)
-        {
-            _contentElement.RenderTransform = isOpen
-                ? new ScaleTransform()
-                : new ScaleTransform
-                {
-                    ScaleX = 0.9,
-                    ScaleY = 0.9
-                };
-
-            var animationX = isOpen
-                ? AnimationHelper.CreateAnimation(.9)
-                : AnimationHelper.CreateAnimation(1);
-            Storyboard.SetTarget(animationX, _contentElement);
-            Storyboard.SetTargetProperty(animationX, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)"));
-
-            _storyboard.Children.Add(animationX);
-
-            var animationY = isOpen
-                ? AnimationHelper.CreateAnimation(.9)
-                : AnimationHelper.CreateAnimation(1);
-            Storyboard.SetTarget(animationY, _contentElement);
-            Storyboard.SetTargetProperty(animationY, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)"));
-
-            _storyboard.Children.Add(animationY);
-        }
-
-        private void MaskElement_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (MaskCanClose)
-            {
-                SetCurrentValue(IsOpenProperty, ValueBoxes.FalseBox);
-            }
-        }
-
-        private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)
-        {
-            if (target == null || BindingOperations.GetBindingExpression(target, DataContextProperty) != null) return;
-            if (ReferenceEquals(this, target.DataContext) || Equals(oldValue, target.DataContext))
-            {
-                target.DataContext = newValue ?? this;
-            }
+            OnIsOpenChanged(true);
         }
     }
-}
+
+    private void Drawer_Unloaded(object sender, RoutedEventArgs e)
+    {
+        Loaded -= Drawer_Loaded;
+
+        if (_maskElement != null)
+        {
+            _maskElement.PreviewMouseLeftButtonDown -= MaskElement_PreviewMouseLeftButtonDown;
+        }
+
+        if (_storyboard != null)
+        {
+            _storyboard.Completed -= Storyboard_Completed;
+        }
+
+        _container = null;
+    }
+
+    private static void DataContextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((Drawer) d).OnDataContextPropertyChanged(e);
+
+    private void OnDataContextPropertyChanged(DependencyPropertyChangedEventArgs e) => UpdateDataContext(_animationControl, e.OldValue, e.NewValue);
+
+    public static readonly RoutedEvent OpenedEvent =
+        EventManager.RegisterRoutedEvent("Opened", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(Drawer));
+
+    public event RoutedEventHandler Opened
+    {
+        add => AddHandler(OpenedEvent, value);
+        remove => RemoveHandler(OpenedEvent, value);
+    }
+
+    public static readonly RoutedEvent ClosedEvent =
+        EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(Drawer));
+
+    public event RoutedEventHandler Closed
+    {
+        add => AddHandler(ClosedEvent, value);
+        remove => RemoveHandler(ClosedEvent, value);
+    }
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register(
+        "IsOpen", typeof(bool), typeof(Drawer), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsOpenChanged));
+
+    private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (Drawer) d;
+        ctl.OnIsOpenChanged((bool) e.NewValue);
+    }
+
+    public bool IsOpen
+    {
+        get => (bool) GetValue(IsOpenProperty);
+        set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty MaskCanCloseProperty = DependencyProperty.Register(
+        "MaskCanClose", typeof(bool), typeof(Drawer), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool MaskCanClose
+    {
+        get => (bool) GetValue(MaskCanCloseProperty);
+        set => SetValue(MaskCanCloseProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ShowMaskProperty = DependencyProperty.Register(
+        "ShowMask", typeof(bool), typeof(Drawer), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ShowMask
+    {
+        get => (bool) GetValue(ShowMaskProperty);
+        set => SetValue(ShowMaskProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty DockProperty = DependencyProperty.Register(
+        "Dock", typeof(Dock), typeof(Drawer), new PropertyMetadata(default(Dock)));
+
+    public Dock Dock
+    {
+        get => (Dock) GetValue(DockProperty);
+        set => SetValue(DockProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowModeProperty = DependencyProperty.Register(
+        "ShowMode", typeof(DrawerShowMode), typeof(Drawer), new PropertyMetadata(default(DrawerShowMode)));
+
+    public DrawerShowMode ShowMode
+    {
+        get => (DrawerShowMode) GetValue(ShowModeProperty);
+        set => SetValue(ShowModeProperty, value);
+    }
+
+    public static readonly DependencyProperty MaskBrushProperty = DependencyProperty.Register(
+        "MaskBrush", typeof(Brush), typeof(Drawer), new PropertyMetadata(default(Brush)));
+
+    public Brush MaskBrush
+    {
+        get => (Brush) GetValue(MaskBrushProperty);
+        set => SetValue(MaskBrushProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+        "Content", typeof(object), typeof(Drawer), new PropertyMetadata(default(object)));
+
+    public object Content
+    {
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    private void CreateContainer()
+    {
+        _storyboard = new Storyboard();
+        _storyboard.Completed += Storyboard_Completed;
+
+        _translateTransform = new TranslateTransform();
+        _animationControl = new ContentControl
+        {
+            Content = Content,
+            RenderTransform = _translateTransform,
+            DataContext = this
+        };
+
+        var panel = new SimplePanel
+        {
+            ClipToBounds = true
+        };
+
+        if (ShowMask)
+        {
+            _maskElement = new Border
+            {
+                Background = MaskBrush,
+                Opacity = 0
+            };
+            _maskElement.PreviewMouseLeftButtonDown += MaskElement_PreviewMouseLeftButtonDown;
+            panel.Children.Add(_maskElement);
+        }
+
+        _animationControl.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        var size = _animationControl.DesiredSize;
+
+        switch (Dock)
+        {
+            case Dock.Left:
+                _animationControl.HorizontalAlignment = HorizontalAlignment.Left;
+                _animationControl.VerticalAlignment = VerticalAlignment.Stretch;
+                _translateTransform.X = -size.Width;
+                _animationLength = -size.Width;
+                _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
+                break;
+            case Dock.Top:
+                _animationControl.HorizontalAlignment = HorizontalAlignment.Stretch;
+                _animationControl.VerticalAlignment = VerticalAlignment.Top;
+                _translateTransform.Y = -size.Height;
+                _animationLength = -size.Height;
+                _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
+                break;
+            case Dock.Right:
+                _animationControl.HorizontalAlignment = HorizontalAlignment.Right;
+                _animationControl.VerticalAlignment = VerticalAlignment.Stretch;
+                _translateTransform.X = size.Width;
+                _animationLength = size.Width;
+                _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
+                break;
+            case Dock.Bottom:
+                _animationControl.HorizontalAlignment = HorizontalAlignment.Stretch;
+                _animationControl.VerticalAlignment = VerticalAlignment.Bottom;
+                _translateTransform.Y = size.Height;
+                _animationLength = size.Height;
+                _animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        _animationControl.DataContext = DataContext;
+        _animationControl.CommandBindings.Clear();
+        _animationControl.CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => SetCurrentValue(IsOpenProperty, ValueBoxes.FalseBox)));
+        panel.Children.Add(_animationControl);
+        _container = new AdornerContainer(_layer)
+        {
+            Child = panel,
+            ClipToBounds = true
+        };
+    }
+
+    private void Storyboard_Completed(object sender, EventArgs e)
+    {
+        if (!IsOpen)
+        {
+            _contentElement.SetCurrentValue(RenderTransformOriginProperty, _contentRenderTransformOrigin);
+            _layer.Remove(_container);
+            RaiseEvent(new RoutedEventArgs(ClosedEvent, this));
+        }
+        else
+        {
+            RaiseEvent(new RoutedEventArgs(OpenedEvent, this));
+        }
+    }
+
+    private void OnIsOpenChanged(bool isOpen)
+    {
+        if (Content == null || DesignerHelper.IsInDesignMode)
+        {
+            return;
+        }
+
+        AdornerDecorator decorator;
+        var parent = VisualHelper.GetParent<DrawerContainer>(this);
+        if (parent != null)
+        {
+            _contentElement = parent.Child;
+            decorator = parent;
+        }
+        else
+        {
+            var window = WindowHelper.GetActiveWindow();
+            if (window == null)
+            {
+                return;
+            }
+
+            decorator = VisualHelper.GetChild<AdornerDecorator>(window);
+            _contentElement = window.Content as UIElement;
+        }
+
+        if (_contentElement == null)
+        {
+            return;
+        }
+
+        _layer = decorator?.AdornerLayer;
+        if (_layer == null)
+        {
+            return;
+        }
+
+        _contentRenderTransformOrigin = _contentElement.RenderTransformOrigin;
+
+        if (_container == null)
+        {
+            CreateContainer();
+        }
+
+        switch (ShowMode)
+        {
+            case DrawerShowMode.Push:
+                ShowByPush(isOpen);
+                break;
+            case DrawerShowMode.Press:
+                _contentElement.SetCurrentValue(RenderTransformOriginProperty, new Point(0.5, 0.5));
+                ShowByPress(isOpen);
+                break;
+        }
+
+        if (isOpen)
+        {
+            if (_maskElement != null)
+            {
+                var maskAnimation = AnimationHelper.CreateAnimation(1);
+                Storyboard.SetTarget(maskAnimation, _maskElement);
+                Storyboard.SetTargetProperty(maskAnimation, new PropertyPath(OpacityProperty.Name));
+                _storyboard.Children.Add(maskAnimation);
+            }
+
+            var drawerAnimation = AnimationHelper.CreateAnimation(0);
+            Storyboard.SetTarget(drawerAnimation, _animationControl);
+            Storyboard.SetTargetProperty(drawerAnimation, new PropertyPath(_animationPropertyName));
+            _storyboard.Children.Add(drawerAnimation);
+            _layer.Remove(_container);
+            _layer.Add(_container);
+        }
+        else
+        {
+            if (_maskElement != null)
+            {
+                var maskAnimation = AnimationHelper.CreateAnimation(0);
+                Storyboard.SetTarget(maskAnimation, _maskElement);
+                Storyboard.SetTargetProperty(maskAnimation, new PropertyPath(OpacityProperty.Name));
+                _storyboard.Children.Add(maskAnimation);
+            }
+
+            var drawerAnimation = AnimationHelper.CreateAnimation(_animationLength);
+            Storyboard.SetTarget(drawerAnimation, _animationControl);
+            Storyboard.SetTargetProperty(drawerAnimation, new PropertyPath(_animationPropertyName));
+            _storyboard.Children.Add(drawerAnimation);
+        }
+        _storyboard.Begin();
+    }
+
+    private void ShowByPush(bool isOpen)
+    {
+        string animationPropertyName;
+
+        switch (Dock)
+        {
+            case Dock.Left:
+            case Dock.Right:
+                animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.X)";
+                _contentElement.RenderTransform = new TranslateTransform
+                {
+                    X = isOpen ? 0 : -_animationLength
+                };
+                break;
+            case Dock.Top:
+            case Dock.Bottom:
+                animationPropertyName = "(UIElement.RenderTransform).(TranslateTransform.Y)";
+                _contentElement.RenderTransform = new TranslateTransform
+                {
+                    Y = isOpen ? 0 : -_animationLength
+                };
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        var animation = isOpen
+            ? AnimationHelper.CreateAnimation(-_animationLength)
+            : AnimationHelper.CreateAnimation(0);
+        Storyboard.SetTarget(animation, _contentElement);
+        Storyboard.SetTargetProperty(animation, new PropertyPath(animationPropertyName));
+
+        _storyboard.Children.Add(animation);
+    }
+
+    private void ShowByPress(bool isOpen)
+    {
+        _contentElement.RenderTransform = isOpen
+            ? new ScaleTransform()
+            : new ScaleTransform
+            {
+                ScaleX = 0.9,
+                ScaleY = 0.9
+            };
+
+        var animationX = isOpen
+            ? AnimationHelper.CreateAnimation(.9)
+            : AnimationHelper.CreateAnimation(1);
+        Storyboard.SetTarget(animationX, _contentElement);
+        Storyboard.SetTargetProperty(animationX, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleX)"));
+
+        _storyboard.Children.Add(animationX);
+
+        var animationY = isOpen
+            ? AnimationHelper.CreateAnimation(.9)
+            : AnimationHelper.CreateAnimation(1);
+        Storyboard.SetTarget(animationY, _contentElement);
+        Storyboard.SetTargetProperty(animationY, new PropertyPath("(UIElement.RenderTransform).(ScaleTransform.ScaleY)"));
+
+        _storyboard.Children.Add(animationY);
+    }
+
+    private void MaskElement_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (MaskCanClose)
+        {
+            SetCurrentValue(IsOpenProperty, ValueBoxes.FalseBox);
+        }
+    }
+
+    private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)
+    {
+        if (target == null || BindingOperations.GetBindingExpression(target, DataContextProperty) != null) return;
+        if (ReferenceEquals(this, target.DataContext) || Equals(oldValue, target.DataContext))
+        {
+            target.DataContext = newValue ?? this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs b/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
index 3cf91308..89381a86 100644
--- a/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
@@ -1,9 +1,8 @@
 using System.Windows.Documents;
 
-namespace HandyControl.Controls
-{
-    public class DrawerContainer : AdornerDecorator
-    {
+namespace HandyControl.Controls;
 
-    }
-}
+public class DrawerContainer : AdornerDecorator
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index 6c4a3c89..e5af6f77 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -13,909 +13,908 @@ using HandyControl.Properties.Langs;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     消息提醒
+/// </summary>
+[TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))]
+[TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
+[TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
+public class Growl : Control
 {
+    #region Constants
+
+    private const string ElementPanelMore = "PART_PanelMore";
+
+    private const string ElementGridMain = "PART_GridMain";
+
+    private const string ElementButtonClose = "PART_ButtonClose";
+
+    #endregion Constants
+
+    #region Data
+
+    private static GrowlWindow GrowlWindow;
+
+    private Panel _panelMore;
+
+    private Grid _gridMain;
+
+    private Button _buttonClose;
+
+    private bool _showCloseButton;
+
+    private bool _staysOpen;
+
+    private int _waitTime = 6;
+
     /// <summary>
-    ///     消息提醒
+    ///     计数
     /// </summary>
-    [TemplatePart(Name = ElementPanelMore, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementGridMain, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
-    public class Growl : Control
+    private int _tickCount;
+
+    /// <summary>
+    ///     关闭计时器
+    /// </summary>
+    private DispatcherTimer _timerClose;
+
+    private static readonly Dictionary<string, Panel> PanelDic = new();
+
+    #endregion Data
+
+    public Growl()
     {
-        #region Constants
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
+    }
 
-        private const string ElementPanelMore = "PART_PanelMore";
+    public static void Register(string token, Panel panel)
+    {
+        if (string.IsNullOrEmpty(token) || panel == null) return;
+        PanelDic[token] = panel;
+        InitGrowlPanel(panel);
+    }
 
-        private const string ElementGridMain = "PART_GridMain";
+    public static void Unregister(string token, Panel panel)
+    {
+        if (string.IsNullOrEmpty(token) || panel == null) return;
 
-        private const string ElementButtonClose = "PART_ButtonClose";
-
-        #endregion Constants
-
-        #region Data
-
-        private static GrowlWindow GrowlWindow;
-
-        private Panel _panelMore;
-
-        private Grid _gridMain;
-
-        private Button _buttonClose;
-
-        private bool _showCloseButton;
-
-        private bool _staysOpen;
-
-        private int _waitTime = 6;
-
-        /// <summary>
-        ///     计数
-        /// </summary>
-        private int _tickCount;
-
-        /// <summary>
-        ///     关闭计时器
-        /// </summary>
-        private DispatcherTimer _timerClose;
-
-        private static readonly Dictionary<string, Panel> PanelDic = new();
-
-        #endregion Data
-
-        public Growl()
+        if (PanelDic.ContainsKey(token))
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancel_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
-        }
-
-        public static void Register(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-            PanelDic[token] = panel;
-            InitGrowlPanel(panel);
-        }
-
-        public static void Unregister(string token, Panel panel)
-        {
-            if (string.IsNullOrEmpty(token) || panel == null) return;
-
-            if (PanelDic.ContainsKey(token))
+            if (ReferenceEquals(PanelDic[token], panel))
             {
-                if (ReferenceEquals(PanelDic[token], panel))
-                {
-                    PanelDic.Remove(token);
-                    panel.ContextMenu = null;
-                    panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-                }
-            }
-        }
-
-        public static void Unregister(Panel panel)
-        {
-            if (panel == null) return;
-            var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                PanelDic.Remove(first.Key);
-                panel.ContextMenu = null;
-                panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
-            }
-        }
-
-        public static void Unregister(string token)
-        {
-            if (string.IsNullOrEmpty(token)) return;
-
-            if (PanelDic.ContainsKey(token))
-            {
-                var panel = PanelDic[token];
                 PanelDic.Remove(token);
                 panel.ContextMenu = null;
                 panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
             }
         }
+    }
 
-        protected override void OnMouseEnter(MouseEventArgs e)
+    public static void Unregister(Panel panel)
+    {
+        if (panel == null) return;
+        var first = PanelDic.FirstOrDefault(item => ReferenceEquals(panel, item.Value));
+        if (!string.IsNullOrEmpty(first.Key))
         {
-            base.OnMouseEnter(e);
-
-            _buttonClose.Show(_showCloseButton);
+            PanelDic.Remove(first.Key);
+            panel.ContextMenu = null;
+            panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
         }
+    }
 
-        protected override void OnMouseLeave(MouseEventArgs e)
+    public static void Unregister(string token)
+    {
+        if (string.IsNullOrEmpty(token)) return;
+
+        if (PanelDic.ContainsKey(token))
         {
-            base.OnMouseLeave(e);
-
-            _buttonClose.Collapse();
+            var panel = PanelDic[token];
+            PanelDic.Remove(token);
+            panel.ContextMenu = null;
+            panel.SetCurrentValue(PanelElement.FluidMoveBehaviorProperty, DependencyProperty.UnsetValue);
         }
+    }
 
-        public override void OnApplyTemplate()
+    protected override void OnMouseEnter(MouseEventArgs e)
+    {
+        base.OnMouseEnter(e);
+
+        _buttonClose.Show(_showCloseButton);
+    }
+
+    protected override void OnMouseLeave(MouseEventArgs e)
+    {
+        base.OnMouseLeave(e);
+
+        _buttonClose.Collapse();
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _panelMore = GetTemplateChild(ElementPanelMore) as Panel;
+        _gridMain = GetTemplateChild(ElementGridMain) as Grid;
+        _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
+
+        CheckNull();
+        Update();
+    }
+
+    private void CheckNull()
+    {
+        if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception();
+    }
+
+    private Func<bool, bool> ActionBeforeClose { get; set; }
+
+    /// <summary>
+    ///     消息容器
+    /// </summary>
+    public static Panel GrowlPanel { get; set; }
+
+    internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register(
+        "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
+
+    internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register(
+        "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
+
+    public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register(
+        "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
+        "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
+
+    public static readonly DependencyProperty TimeProperty = DependencyProperty.Register(
+        "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime)));
+
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+        "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry)));
+
+    public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register(
+        "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush)));
+
+    public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
+        "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType)));
+
+    public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
+        "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged));
+
+    private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Panel panel)
         {
-            base.OnApplyTemplate();
-
-            _panelMore = GetTemplateChild(ElementPanelMore) as Panel;
-            _gridMain = GetTemplateChild(ElementGridMain) as Grid;
-            _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
-
-            CheckNull();
-            Update();
-        }
-
-        private void CheckNull()
-        {
-            if (_panelMore == null || _gridMain == null || _buttonClose == null) throw new Exception();
-        }
-
-        private Func<bool, bool> ActionBeforeClose { get; set; }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        public static Panel GrowlPanel { get; set; }
-
-        internal static readonly DependencyProperty CancelStrProperty = DependencyProperty.Register(
-            "CancelStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        internal static readonly DependencyProperty ConfirmStrProperty = DependencyProperty.Register(
-            "ConfirmStr", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty ShowDateTimeProperty = DependencyProperty.Register(
-            "ShowDateTime", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(Growl), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty TimeProperty = DependencyProperty.Register(
-            "Time", typeof(DateTime), typeof(Growl), new PropertyMetadata(default(DateTime)));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Growl), new PropertyMetadata(default(Geometry)));
-
-        public static readonly DependencyProperty IconBrushProperty = DependencyProperty.Register(
-            "IconBrush", typeof(Brush), typeof(Growl), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
-            "Type", typeof(InfoType), typeof(Growl), new PropertyMetadata(default(InfoType)));
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.RegisterAttached(
-            "Token", typeof(string), typeof(Growl), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Panel panel)
+            if (e.NewValue == null)
             {
-                if (e.NewValue == null)
-                {
-                    Unregister(panel);
-                }
-                else
-                {
-                    Register(e.NewValue.ToString(), panel);
-                }
-            }
-        }
-
-        public static void SetToken(DependencyObject element, string value)
-            => element.SetValue(TokenProperty, value);
-
-        public static string GetToken(DependencyObject element)
-            => (string) element.GetValue(TokenProperty);
-
-        public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached(
-            "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                if ((bool) args.NewValue && o is Panel panel)
-                {
-                    SetGrowlPanel(panel);
-                }
-            }));
-
-        public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetGrowlParent(DependencyObject element) => (bool) element.GetValue(GrowlParentProperty);
-
-        private static readonly DependencyProperty IsCreatedAutomaticallyProperty = DependencyProperty.RegisterAttached(
-            "IsCreatedAutomatically", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private static void SetIsCreatedAutomatically(DependencyObject element, bool value)
-            => element.SetValue(IsCreatedAutomaticallyProperty, ValueBoxes.BooleanBox(value));
-
-        private static bool GetIsCreatedAutomatically(DependencyObject element)
-            => (bool) element.GetValue(IsCreatedAutomaticallyProperty);
-
-        public InfoType Type
-        {
-            get => (InfoType) GetValue(TypeProperty);
-            set => SetValue(TypeProperty, value);
-        }
-
-        internal string CancelStr
-        {
-            get => (string) GetValue(CancelStrProperty);
-            set => SetValue(CancelStrProperty, value);
-        }
-
-        internal string ConfirmStr
-        {
-            get => (string) GetValue(ConfirmStrProperty);
-            set => SetValue(ConfirmStrProperty, value);
-        }
-
-        public bool ShowDateTime
-        {
-            get => (bool) GetValue(ShowDateTimeProperty);
-            set => SetValue(ShowDateTimeProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public string Message
-        {
-            get => (string) GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public DateTime Time
-        {
-            get => (DateTime) GetValue(TimeProperty);
-            set => SetValue(TimeProperty, value);
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry) GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public Brush IconBrush
-        {
-            get => (Brush) GetValue(IconBrushProperty);
-            set => SetValue(IconBrushProperty, value);
-        }
-
-        /// <summary>
-        ///     开始计时器
-        /// </summary>
-        private void StartTimer()
-        {
-            _timerClose = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromSeconds(1)
-            };
-            _timerClose.Tick += delegate
-            {
-                if (IsMouseOver)
-                {
-                    _tickCount = 0;
-                    return;
-                }
-
-                _tickCount++;
-                if (_tickCount >= _waitTime)
-                {
-                    Close(true);
-                }
-            };
-            _timerClose.Start();
-        }
-
-        /// <summary>
-        ///     消息容器
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void SetGrowlPanel(Panel panel)
-        {
-            GrowlPanel = panel;
-            InitGrowlPanel(panel);
-        }
-
-        private static void InitGrowlPanel(Panel panel)
-        {
-            if (panel == null) return;
-
-            var menuItem = new MenuItem();
-            LangProvider.SetLang(menuItem, HeaderedItemsControl.HeaderProperty, LangKeys.Clear);
-
-            menuItem.Click += (s, e) =>
-            {
-                foreach (var item in panel.Children.OfType<Growl>())
-                {
-                    item.Close(false);
-                }
-            };
-            panel.ContextMenu = new ContextMenu
-            {
-                Items =
-                {
-                    menuItem
-                }
-            };
-
-            PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResourceInternal<FluidMoveBehavior>(ResourceToken.BehaviorXY400));
-        }
-
-        private void Update()
-        {
-            if (DesignerHelper.IsInDesignMode) return;
-
-            if (Type == InfoType.Ask)
-            {
-                _panelMore.IsEnabled = true;
-                _panelMore.Show();
-            }
-
-            var transform = new TranslateTransform
-            {
-                X = FlowDirection == FlowDirection.LeftToRight ? MaxWidth : -MaxWidth
-            };
-            _gridMain.RenderTransform = transform;
-            transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0));
-            if (!_staysOpen) StartTimer();
-        }
-
-        private static void ShowGlobal(GrowlInfo growlInfo)
-        {
-            Application.Current.Dispatcher?.Invoke(
-#if NET40
-                new Action(
-#endif
-                    () =>
-                    {
-                        if (GrowlWindow == null)
-                        {
-                            GrowlWindow = new GrowlWindow();
-                            GrowlWindow.Show();
-                            InitGrowlPanel(GrowlWindow.GrowlPanel);
-                            GrowlWindow.Init();
-                        }
-
-                        GrowlWindow.Show(true);
-
-                        var ctl = new Growl
-                        {
-                            Message = growlInfo.Message,
-                            Time = DateTime.Now,
-                            Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey) ?? growlInfo.Icon,
-                            IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey) ?? growlInfo.IconBrush,
-                            _showCloseButton = growlInfo.ShowCloseButton,
-                            ActionBeforeClose = growlInfo.ActionBeforeClose,
-                            _staysOpen = growlInfo.StaysOpen,
-                            ShowDateTime = growlInfo.ShowDateTime,
-                            ConfirmStr = growlInfo.ConfirmStr,
-                            CancelStr = growlInfo.CancelStr,
-                            Type = growlInfo.Type,
-                            _waitTime = Math.Max(growlInfo.WaitTime, 2),
-                            FlowDirection = growlInfo.FlowDirection
-                        };
-                        GrowlWindow.GrowlPanel.Children.Insert(0, ctl);
-                    }
-#if NET40
-                )
-#endif
-            );
-        }
-
-        /// <summary>
-        ///     显示信息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        private static void Show(GrowlInfo growlInfo)
-        {
-            Application.Current.Dispatcher?.Invoke(
-#if NET40
-                new Action(
-#endif
-                    () =>
-                    {
-                        var ctl = new Growl
-                        {
-                            Message = growlInfo.Message,
-                            Time = DateTime.Now,
-                            Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey) ?? growlInfo.Icon,
-                            IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey) ?? growlInfo.IconBrush,
-                            _showCloseButton = growlInfo.ShowCloseButton,
-                            ActionBeforeClose = growlInfo.ActionBeforeClose,
-                            _staysOpen = growlInfo.StaysOpen,
-                            ShowDateTime = growlInfo.ShowDateTime,
-                            ConfirmStr = growlInfo.ConfirmStr,
-                            CancelStr = growlInfo.CancelStr,
-                            Type = growlInfo.Type,
-                            _waitTime = Math.Max(growlInfo.WaitTime, 2)
-                        };
-
-                        if (!string.IsNullOrEmpty(growlInfo.Token))
-                        {
-                            if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
-                            {
-                                panel?.Children.Insert(0, ctl);
-                            }
-                        }
-                        else
-                        {
-                            // GrowlPanel is null, we create it automatically
-                            GrowlPanel ??= CreateDefaultPanel();
-                            GrowlPanel?.Children.Insert(0, ctl);
-                        }
-                    }
-#if NET40
-                )
-#endif
-            );
-        }
-
-        private static Panel CreateDefaultPanel()
-        {
-            FrameworkElement element = WindowHelper.GetActiveWindow();
-            var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
-
-            if (decorator != null)
-            {
-                var layer = decorator.AdornerLayer;
-                if (layer != null)
-                {
-                    var panel = new StackPanel
-                    {
-                        VerticalAlignment = VerticalAlignment.Top
-                    };
-
-                    InitGrowlPanel(panel);
-                    SetIsCreatedAutomatically(panel, true);
-
-                    var scrollViewer = new ScrollViewer
-                    {
-                        HorizontalAlignment = HorizontalAlignment.Right,
-                        VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
-                        IsInertiaEnabled = true,
-                        IsPenetrating = true,
-                        Content = panel
-                    };
-
-                    var container = new AdornerContainer(layer)
-                    {
-                        Child = scrollViewer
-                    };
-
-                    layer.Add(container);
-
-                    return panel;
-                }
-            }
-
-            return null;
-        }
-
-        private static void RemoveDefaultPanel(Panel panel)
-        {
-            FrameworkElement element = WindowHelper.GetActiveWindow();
-            var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
-
-            if (decorator != null)
-            {
-                var layer = decorator.AdornerLayer;
-                var adorner = VisualHelper.GetParent<Adorner>(panel);
-
-                if (adorner != null)
-                {
-                    layer?.Remove(adorner);
-                }
-            }
-        }
-
-        private static void InitGrowlInfo(ref GrowlInfo growlInfo, InfoType infoType)
-        {
-            if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
-            growlInfo.Type = infoType;
-
-            switch (infoType)
-            {
-                case InfoType.Success:
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.SuccessGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.SuccessGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.SuccessBrush;
-                    }
-                    break;
-                case InfoType.Info:
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.InfoGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.InfoBrush;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.InfoGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.InfoBrush;
-                    }
-                    break;
-                case InfoType.Warning:
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.WarningGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.WarningBrush;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.WarningGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.WarningBrush;
-                    }
-                    break;
-                case InfoType.Error:
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.ErrorGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.DangerBrush;
-                        growlInfo.StaysOpen = true;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.ErrorGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.DangerBrush;
-                    }
-                    break;
-                case InfoType.Fatal:
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.FatalGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
-                        growlInfo.StaysOpen = true;
-                        growlInfo.ShowCloseButton = false;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.FatalGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.PrimaryTextBrush;
-                    }
-                    break;
-                case InfoType.Ask:
-                    growlInfo.StaysOpen = true;
-                    growlInfo.ShowCloseButton = false;
-                    if (!growlInfo.IsCustom)
-                    {
-                        growlInfo.IconKey = ResourceToken.AskGeometry;
-                        growlInfo.IconBrushKey = ResourceToken.AccentBrush;
-                    }
-                    else
-                    {
-                        growlInfo.IconKey ??= ResourceToken.AskGeometry;
-                        growlInfo.IconBrushKey ??= ResourceToken.AccentBrush;
-                    }
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(infoType), infoType, null);
-            }
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Success(string message, string token = "") => Success(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Success(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Success);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="message"></param>
-        public static void SuccessGlobal(string message) => SuccessGlobal(new GrowlInfo
-        {
-            Message = message
-        });
-
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void SuccessGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Success);
-            ShowGlobal(growlInfo);
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Info(string message, string token = "") => Info(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Info(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Info);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="message"></param>
-        public static void InfoGlobal(string message) => InfoGlobal(new GrowlInfo
-        {
-            Message = message
-        });
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void InfoGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Info);
-            ShowGlobal(growlInfo);
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Warning(string message, string token = "") => Warning(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Warning(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Warning);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="message"></param>
-        public static void WarningGlobal(string message) => WarningGlobal(new GrowlInfo
-        {
-            Message = message
-        });
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void WarningGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Warning);
-            ShowGlobal(growlInfo);
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Error(string message, string token = "") => Error(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Error(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Error);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="message"></param>
-        public static void ErrorGlobal(string message) => ErrorGlobal(new GrowlInfo
-        {
-            Message = message
-        });
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void ErrorGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Error);
-            ShowGlobal(growlInfo);
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="token"></param>
-        public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo
-        {
-            Message = message,
-            Token = token
-        });
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Fatal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Fatal);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="message"></param>
-        public static void FatalGlobal(string message) => FatalGlobal(new GrowlInfo
-        {
-            Message = message
-        });
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void FatalGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Fatal);
-            ShowGlobal(growlInfo);
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="actionBeforeClose"></param>
-        /// <param name="token"></param>
-        public static void Ask(string message, Func<bool, bool> actionBeforeClose, string token = "") => Ask(new GrowlInfo
-        {
-            Message = message,
-            ActionBeforeClose = actionBeforeClose,
-            Token = token
-        });
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void Ask(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Ask);
-            Show(growlInfo);
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="actionBeforeClose"></param>
-        public static void AskGlobal(string message, Func<bool, bool> actionBeforeClose) => AskGlobal(new GrowlInfo
-        {
-            Message = message,
-            ActionBeforeClose = actionBeforeClose
-        });
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="growlInfo"></param>
-        public static void AskGlobal(GrowlInfo growlInfo)
-        {
-            InitGrowlInfo(ref growlInfo, InfoType.Ask);
-            ShowGlobal(growlInfo);
-        }
-
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(false);
-
-        /// <summary>
-        ///     关闭
-        /// </summary>
-        private void Close(bool invokeParam)
-        {
-            if (ActionBeforeClose?.Invoke(invokeParam) == false)
-            {
-                return;
-            }
-
-            _timerClose?.Stop();
-            var transform = new TranslateTransform();
-            _gridMain.RenderTransform = transform;
-            var animation = AnimationHelper.CreateAnimation(FlowDirection == FlowDirection.LeftToRight ? ActualWidth : -ActualWidth);
-            animation.Completed += (s, e) =>
-            {
-                if (Parent is Panel panel)
-                {
-                    panel.Children.Remove(this);
-
-                    if (GrowlWindow != null)
-                    {
-                        if (GrowlWindow.GrowlPanel != null && GrowlWindow.GrowlPanel.Children.Count == 0)
-                        {
-                            GrowlWindow.Close();
-                            GrowlWindow = null;
-                        }
-                    }
-                    else
-                    {
-                        if (GrowlPanel != null && GrowlPanel.Children.Count == 0 && GetIsCreatedAutomatically(GrowlPanel))
-                        {
-                            // If the count of children is zero, we need to remove the panel, provided that the panel was created automatically  
-                            RemoveDefaultPanel(GrowlPanel);
-                            GrowlPanel = null;
-                        }
-                    }
-                }
-            };
-            transform.BeginAnimation(TranslateTransform.XProperty, animation);
-        }
-
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="token"></param>
-        public static void Clear(string token = "")
-        {
-            if (!string.IsNullOrEmpty(token))
-            {
-                if (PanelDic.TryGetValue(token, out var panel))
-                {
-                    Clear(panel);
-                }
+                Unregister(panel);
             }
             else
             {
-                Clear(GrowlPanel);
+                Register(e.NewValue.ToString(), panel);
+            }
+        }
+    }
+
+    public static void SetToken(DependencyObject element, string value)
+        => element.SetValue(TokenProperty, value);
+
+    public static string GetToken(DependencyObject element)
+        => (string) element.GetValue(TokenProperty);
+
+    public static readonly DependencyProperty GrowlParentProperty = DependencyProperty.RegisterAttached(
+        "GrowlParent", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
+        {
+            if ((bool) args.NewValue && o is Panel panel)
+            {
+                SetGrowlPanel(panel);
+            }
+        }));
+
+    public static void SetGrowlParent(DependencyObject element, bool value) => element.SetValue(GrowlParentProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetGrowlParent(DependencyObject element) => (bool) element.GetValue(GrowlParentProperty);
+
+    private static readonly DependencyProperty IsCreatedAutomaticallyProperty = DependencyProperty.RegisterAttached(
+        "IsCreatedAutomatically", typeof(bool), typeof(Growl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private static void SetIsCreatedAutomatically(DependencyObject element, bool value)
+        => element.SetValue(IsCreatedAutomaticallyProperty, ValueBoxes.BooleanBox(value));
+
+    private static bool GetIsCreatedAutomatically(DependencyObject element)
+        => (bool) element.GetValue(IsCreatedAutomaticallyProperty);
+
+    public InfoType Type
+    {
+        get => (InfoType) GetValue(TypeProperty);
+        set => SetValue(TypeProperty, value);
+    }
+
+    internal string CancelStr
+    {
+        get => (string) GetValue(CancelStrProperty);
+        set => SetValue(CancelStrProperty, value);
+    }
+
+    internal string ConfirmStr
+    {
+        get => (string) GetValue(ConfirmStrProperty);
+        set => SetValue(ConfirmStrProperty, value);
+    }
+
+    public bool ShowDateTime
+    {
+        get => (bool) GetValue(ShowDateTimeProperty);
+        set => SetValue(ShowDateTimeProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public string Message
+    {
+        get => (string) GetValue(MessageProperty);
+        set => SetValue(MessageProperty, value);
+    }
+
+    public DateTime Time
+    {
+        get => (DateTime) GetValue(TimeProperty);
+        set => SetValue(TimeProperty, value);
+    }
+
+    public Geometry Icon
+    {
+        get => (Geometry) GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public Brush IconBrush
+    {
+        get => (Brush) GetValue(IconBrushProperty);
+        set => SetValue(IconBrushProperty, value);
+    }
+
+    /// <summary>
+    ///     开始计时器
+    /// </summary>
+    private void StartTimer()
+    {
+        _timerClose = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromSeconds(1)
+        };
+        _timerClose.Tick += delegate
+        {
+            if (IsMouseOver)
+            {
+                _tickCount = 0;
+                return;
+            }
+
+            _tickCount++;
+            if (_tickCount >= _waitTime)
+            {
+                Close(true);
+            }
+        };
+        _timerClose.Start();
+    }
+
+    /// <summary>
+    ///     消息容器
+    /// </summary>
+    /// <param name="panel"></param>
+    private static void SetGrowlPanel(Panel panel)
+    {
+        GrowlPanel = panel;
+        InitGrowlPanel(panel);
+    }
+
+    private static void InitGrowlPanel(Panel panel)
+    {
+        if (panel == null) return;
+
+        var menuItem = new MenuItem();
+        LangProvider.SetLang(menuItem, HeaderedItemsControl.HeaderProperty, LangKeys.Clear);
+
+        menuItem.Click += (s, e) =>
+        {
+            foreach (var item in panel.Children.OfType<Growl>())
+            {
+                item.Close(false);
+            }
+        };
+        panel.ContextMenu = new ContextMenu
+        {
+            Items =
+            {
+                menuItem
+            }
+        };
+
+        PanelElement.SetFluidMoveBehavior(panel, ResourceHelper.GetResourceInternal<FluidMoveBehavior>(ResourceToken.BehaviorXY400));
+    }
+
+    private void Update()
+    {
+        if (DesignerHelper.IsInDesignMode) return;
+
+        if (Type == InfoType.Ask)
+        {
+            _panelMore.IsEnabled = true;
+            _panelMore.Show();
+        }
+
+        var transform = new TranslateTransform
+        {
+            X = FlowDirection == FlowDirection.LeftToRight ? MaxWidth : -MaxWidth
+        };
+        _gridMain.RenderTransform = transform;
+        transform.BeginAnimation(TranslateTransform.XProperty, AnimationHelper.CreateAnimation(0));
+        if (!_staysOpen) StartTimer();
+    }
+
+    private static void ShowGlobal(GrowlInfo growlInfo)
+    {
+        Application.Current.Dispatcher?.Invoke(
+#if NET40
+            new Action(
+#endif
+                () =>
+                {
+                    if (GrowlWindow == null)
+                    {
+                        GrowlWindow = new GrowlWindow();
+                        GrowlWindow.Show();
+                        InitGrowlPanel(GrowlWindow.GrowlPanel);
+                        GrowlWindow.Init();
+                    }
+
+                    GrowlWindow.Show(true);
+
+                    var ctl = new Growl
+                    {
+                        Message = growlInfo.Message,
+                        Time = DateTime.Now,
+                        Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey) ?? growlInfo.Icon,
+                        IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey) ?? growlInfo.IconBrush,
+                        _showCloseButton = growlInfo.ShowCloseButton,
+                        ActionBeforeClose = growlInfo.ActionBeforeClose,
+                        _staysOpen = growlInfo.StaysOpen,
+                        ShowDateTime = growlInfo.ShowDateTime,
+                        ConfirmStr = growlInfo.ConfirmStr,
+                        CancelStr = growlInfo.CancelStr,
+                        Type = growlInfo.Type,
+                        _waitTime = Math.Max(growlInfo.WaitTime, 2),
+                        FlowDirection = growlInfo.FlowDirection
+                    };
+                    GrowlWindow.GrowlPanel.Children.Insert(0, ctl);
+                }
+#if NET40
+            )
+#endif
+        );
+    }
+
+    /// <summary>
+    ///     显示信息
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    private static void Show(GrowlInfo growlInfo)
+    {
+        Application.Current.Dispatcher?.Invoke(
+#if NET40
+            new Action(
+#endif
+                () =>
+                {
+                    var ctl = new Growl
+                    {
+                        Message = growlInfo.Message,
+                        Time = DateTime.Now,
+                        Icon = ResourceHelper.GetResource<Geometry>(growlInfo.IconKey) ?? growlInfo.Icon,
+                        IconBrush = ResourceHelper.GetResource<Brush>(growlInfo.IconBrushKey) ?? growlInfo.IconBrush,
+                        _showCloseButton = growlInfo.ShowCloseButton,
+                        ActionBeforeClose = growlInfo.ActionBeforeClose,
+                        _staysOpen = growlInfo.StaysOpen,
+                        ShowDateTime = growlInfo.ShowDateTime,
+                        ConfirmStr = growlInfo.ConfirmStr,
+                        CancelStr = growlInfo.CancelStr,
+                        Type = growlInfo.Type,
+                        _waitTime = Math.Max(growlInfo.WaitTime, 2)
+                    };
+
+                    if (!string.IsNullOrEmpty(growlInfo.Token))
+                    {
+                        if (PanelDic.TryGetValue(growlInfo.Token, out var panel))
+                        {
+                            panel?.Children.Insert(0, ctl);
+                        }
+                    }
+                    else
+                    {
+                        // GrowlPanel is null, we create it automatically
+                        GrowlPanel ??= CreateDefaultPanel();
+                        GrowlPanel?.Children.Insert(0, ctl);
+                    }
+                }
+#if NET40
+            )
+#endif
+        );
+    }
+
+    private static Panel CreateDefaultPanel()
+    {
+        FrameworkElement element = WindowHelper.GetActiveWindow();
+        var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
+
+        if (decorator != null)
+        {
+            var layer = decorator.AdornerLayer;
+            if (layer != null)
+            {
+                var panel = new StackPanel
+                {
+                    VerticalAlignment = VerticalAlignment.Top
+                };
+
+                InitGrowlPanel(panel);
+                SetIsCreatedAutomatically(panel, true);
+
+                var scrollViewer = new ScrollViewer
+                {
+                    HorizontalAlignment = HorizontalAlignment.Right,
+                    VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
+                    IsInertiaEnabled = true,
+                    IsPenetrating = true,
+                    Content = panel
+                };
+
+                var container = new AdornerContainer(layer)
+                {
+                    Child = scrollViewer
+                };
+
+                layer.Add(container);
+
+                return panel;
             }
         }
 
-        /// <summary>
-        ///     清除
-        /// </summary>
-        /// <param name="panel"></param>
-        private static void Clear(Panel panel) => panel?.Children.Clear();
+        return null;
+    }
 
-        /// <summary>
-        ///     清除
-        /// </summary>
-        public static void ClearGlobal()
+    private static void RemoveDefaultPanel(Panel panel)
+    {
+        FrameworkElement element = WindowHelper.GetActiveWindow();
+        var decorator = VisualHelper.GetChild<AdornerDecorator>(element);
+
+        if (decorator != null)
         {
-            if (GrowlWindow == null) return;
-            Clear(GrowlWindow.GrowlPanel);
-            GrowlWindow.Close();
-            GrowlWindow = null;
+            var layer = decorator.AdornerLayer;
+            var adorner = VisualHelper.GetParent<Adorner>(panel);
+
+            if (adorner != null)
+            {
+                layer?.Remove(adorner);
+            }
+        }
+    }
+
+    private static void InitGrowlInfo(ref GrowlInfo growlInfo, InfoType infoType)
+    {
+        if (growlInfo == null) throw new ArgumentNullException(nameof(growlInfo));
+        growlInfo.Type = infoType;
+
+        switch (infoType)
+        {
+            case InfoType.Success:
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.SuccessGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.SuccessBrush;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.SuccessGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.SuccessBrush;
+                }
+                break;
+            case InfoType.Info:
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.InfoGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.InfoBrush;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.InfoGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.InfoBrush;
+                }
+                break;
+            case InfoType.Warning:
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.WarningGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.WarningBrush;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.WarningGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.WarningBrush;
+                }
+                break;
+            case InfoType.Error:
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.ErrorGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.DangerBrush;
+                    growlInfo.StaysOpen = true;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.ErrorGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.DangerBrush;
+                }
+                break;
+            case InfoType.Fatal:
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.FatalGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.PrimaryTextBrush;
+                    growlInfo.StaysOpen = true;
+                    growlInfo.ShowCloseButton = false;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.FatalGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.PrimaryTextBrush;
+                }
+                break;
+            case InfoType.Ask:
+                growlInfo.StaysOpen = true;
+                growlInfo.ShowCloseButton = false;
+                if (!growlInfo.IsCustom)
+                {
+                    growlInfo.IconKey = ResourceToken.AskGeometry;
+                    growlInfo.IconBrushKey = ResourceToken.AccentBrush;
+                }
+                else
+                {
+                    growlInfo.IconKey ??= ResourceToken.AskGeometry;
+                    growlInfo.IconBrushKey ??= ResourceToken.AccentBrush;
+                }
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(infoType), infoType, null);
+        }
+    }
+
+    /// <summary>
+    ///     成功
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="token"></param>
+    public static void Success(string message, string token = "") => Success(new GrowlInfo
+    {
+        Message = message,
+        Token = token
+    });
+
+    /// <summary>
+    ///     成功
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Success(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Success);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     成功
+    /// </summary>
+    /// <param name="message"></param>
+    public static void SuccessGlobal(string message) => SuccessGlobal(new GrowlInfo
+    {
+        Message = message
+    });
+
+    /// <summary>
+    ///     成功
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void SuccessGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Success);
+        ShowGlobal(growlInfo);
+    }
+
+    /// <summary>
+    ///     消息
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="token"></param>
+    public static void Info(string message, string token = "") => Info(new GrowlInfo
+    {
+        Message = message,
+        Token = token
+    });
+
+    /// <summary>
+    ///     消息
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Info(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Info);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     消息
+    /// </summary>
+    /// <param name="message"></param>
+    public static void InfoGlobal(string message) => InfoGlobal(new GrowlInfo
+    {
+        Message = message
+    });
+
+    /// <summary>
+    ///     消息
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void InfoGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Info);
+        ShowGlobal(growlInfo);
+    }
+
+    /// <summary>
+    ///     警告
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="token"></param>
+    public static void Warning(string message, string token = "") => Warning(new GrowlInfo
+    {
+        Message = message,
+        Token = token
+    });
+
+    /// <summary>
+    ///     警告
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Warning(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Warning);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     警告
+    /// </summary>
+    /// <param name="message"></param>
+    public static void WarningGlobal(string message) => WarningGlobal(new GrowlInfo
+    {
+        Message = message
+    });
+
+    /// <summary>
+    ///     警告
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void WarningGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Warning);
+        ShowGlobal(growlInfo);
+    }
+
+    /// <summary>
+    ///     错误
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="token"></param>
+    public static void Error(string message, string token = "") => Error(new GrowlInfo
+    {
+        Message = message,
+        Token = token
+    });
+
+    /// <summary>
+    ///     错误
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Error(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Error);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     错误
+    /// </summary>
+    /// <param name="message"></param>
+    public static void ErrorGlobal(string message) => ErrorGlobal(new GrowlInfo
+    {
+        Message = message
+    });
+
+    /// <summary>
+    ///     错误
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void ErrorGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Error);
+        ShowGlobal(growlInfo);
+    }
+
+    /// <summary>
+    ///     严重
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="token"></param>
+    public static void Fatal(string message, string token = "") => Fatal(new GrowlInfo
+    {
+        Message = message,
+        Token = token
+    });
+
+    /// <summary>
+    ///     严重
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Fatal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Fatal);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     严重
+    /// </summary>
+    /// <param name="message"></param>
+    public static void FatalGlobal(string message) => FatalGlobal(new GrowlInfo
+    {
+        Message = message
+    });
+
+    /// <summary>
+    ///     严重
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void FatalGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Fatal);
+        ShowGlobal(growlInfo);
+    }
+
+    /// <summary>
+    ///     询问
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="actionBeforeClose"></param>
+    /// <param name="token"></param>
+    public static void Ask(string message, Func<bool, bool> actionBeforeClose, string token = "") => Ask(new GrowlInfo
+    {
+        Message = message,
+        ActionBeforeClose = actionBeforeClose,
+        Token = token
+    });
+
+    /// <summary>
+    ///     询问
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void Ask(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Ask);
+        Show(growlInfo);
+    }
+
+    /// <summary>
+    ///     询问
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="actionBeforeClose"></param>
+    public static void AskGlobal(string message, Func<bool, bool> actionBeforeClose) => AskGlobal(new GrowlInfo
+    {
+        Message = message,
+        ActionBeforeClose = actionBeforeClose
+    });
+
+    /// <summary>
+    ///     询问
+    /// </summary>
+    /// <param name="growlInfo"></param>
+    public static void AskGlobal(GrowlInfo growlInfo)
+    {
+        InitGrowlInfo(ref growlInfo, InfoType.Ask);
+        ShowGlobal(growlInfo);
+    }
+
+    private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close(false);
+
+    /// <summary>
+    ///     关闭
+    /// </summary>
+    private void Close(bool invokeParam)
+    {
+        if (ActionBeforeClose?.Invoke(invokeParam) == false)
+        {
+            return;
         }
 
-        private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(false);
+        _timerClose?.Stop();
+        var transform = new TranslateTransform();
+        _gridMain.RenderTransform = transform;
+        var animation = AnimationHelper.CreateAnimation(FlowDirection == FlowDirection.LeftToRight ? ActualWidth : -ActualWidth);
+        animation.Completed += (s, e) =>
+        {
+            if (Parent is Panel panel)
+            {
+                panel.Children.Remove(this);
 
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
+                if (GrowlWindow != null)
+                {
+                    if (GrowlWindow.GrowlPanel != null && GrowlWindow.GrowlPanel.Children.Count == 0)
+                    {
+                        GrowlWindow.Close();
+                        GrowlWindow = null;
+                    }
+                }
+                else
+                {
+                    if (GrowlPanel != null && GrowlPanel.Children.Count == 0 && GetIsCreatedAutomatically(GrowlPanel))
+                    {
+                        // If the count of children is zero, we need to remove the panel, provided that the panel was created automatically  
+                        RemoveDefaultPanel(GrowlPanel);
+                        GrowlPanel = null;
+                    }
+                }
+            }
+        };
+        transform.BeginAnimation(TranslateTransform.XProperty, animation);
     }
-}
+
+    /// <summary>
+    ///     清除
+    /// </summary>
+    /// <param name="token"></param>
+    public static void Clear(string token = "")
+    {
+        if (!string.IsNullOrEmpty(token))
+        {
+            if (PanelDic.TryGetValue(token, out var panel))
+            {
+                Clear(panel);
+            }
+        }
+        else
+        {
+            Clear(GrowlPanel);
+        }
+    }
+
+    /// <summary>
+    ///     清除
+    /// </summary>
+    /// <param name="panel"></param>
+    private static void Clear(Panel panel) => panel?.Children.Clear();
+
+    /// <summary>
+    ///     清除
+    /// </summary>
+    public static void ClearGlobal()
+    {
+        if (GrowlWindow == null) return;
+        Clear(GrowlWindow.GrowlPanel);
+        GrowlWindow.Close();
+        GrowlWindow = null;
+    }
+
+    private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(false);
+
+    private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
index 9514bb2f..b7deb68e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -4,39 +4,38 @@ using System.Windows.Controls;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public sealed class GrowlWindow : Window
 {
-    public sealed class GrowlWindow : Window
+    internal Panel GrowlPanel { get; set; }
+
+    internal GrowlWindow()
     {
-        internal Panel GrowlPanel { get; set; }
+        WindowStyle = WindowStyle.None;
+        AllowsTransparency = true;
 
-        internal GrowlWindow()
+        GrowlPanel = new StackPanel
         {
-            WindowStyle = WindowStyle.None;
-            AllowsTransparency = true;
+            VerticalAlignment = VerticalAlignment.Top
+        };
 
-            GrowlPanel = new StackPanel
-            {
-                VerticalAlignment = VerticalAlignment.Top
-            };
-
-            Content = new ScrollViewer
-            {
-                VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
-                IsInertiaEnabled = true,
-                Content = GrowlPanel
-            };
-        }
-
-        internal void Init()
+        Content = new ScrollViewer
         {
-            var desktopWorkingArea = SystemParameters.WorkArea;
-            Height = desktopWorkingArea.Height;
-            Left = desktopWorkingArea.Right - Width;
-            Top = 0;
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-            => InteropMethods.IntDestroyMenu(this.GetHwndSource().CreateHandleRef());
+            VerticalScrollBarVisibility = ScrollBarVisibility.Hidden,
+            IsInertiaEnabled = true,
+            Content = GrowlPanel
+        };
     }
-}
+
+    internal void Init()
+    {
+        var desktopWorkingArea = SystemParameters.WorkArea;
+        Height = desktopWorkingArea.Height;
+        Left = desktopWorkingArea.Right - Width;
+        Top = 0;
+    }
+
+    protected override void OnSourceInitialized(EventArgs e)
+        => InteropMethods.IntDestroyMenu(this.GetHwndSource().CreateHandleRef());
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index 715a38b3..318246a5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -15,504 +15,503 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class GifImage : Image, IDisposable
 {
-    public class GifImage : Image, IDisposable
+    private static readonly Guid GifGuid = new("{b96b3caa-0728-11d3-9d7b-0000f81ef32e}");
+
+    private static readonly Guid GifSingleFrameGuid = new("{b96b3cb0-0728-11d3-9d7b-0000f81ef32e}");
+
+    internal IntPtr NativeImage;
+
+    private byte[] _rawData;
+
+    private bool _isStart;
+
+    private bool _isLoaded;
+
+    static GifImage()
     {
-        private static readonly Guid GifGuid = new("{b96b3caa-0728-11d3-9d7b-0000f81ef32e}");
+        VisibilityProperty.OverrideMetadata(typeof(GifImage), new PropertyMetadata(default(Visibility), OnVisibilityChanged));
+    }
 
-        private static readonly Guid GifSingleFrameGuid = new("{b96b3cb0-0728-11d3-9d7b-0000f81ef32e}");
+    public static readonly DependencyProperty UriProperty = DependencyProperty.Register(
+        "Uri", typeof(Uri), typeof(GifImage), new PropertyMetadata(default(Uri), OnUriChanged));
 
-        internal IntPtr NativeImage;
+    private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (GifImage) d;
+        ctl.StopAnimate();
 
-        private byte[] _rawData;
-
-        private bool _isStart;
-
-        private bool _isLoaded;
-
-        static GifImage()
+        if (e.NewValue != null)
         {
-            VisibilityProperty.OverrideMetadata(typeof(GifImage), new PropertyMetadata(default(Visibility), OnVisibilityChanged));
+            var v = (Uri) e.NewValue;
+            ctl.GetGifStreamFromPack(v);
+            ctl.StartAnimate();
+        }
+        else
+        {
+            ctl.Source = null;
+        }
+    }
+
+    public Uri Uri
+    {
+        get => (Uri) GetValue(UriProperty);
+        set => SetValue(UriProperty, value);
+    }
+
+    private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (GifImage) s;
+        if (ctl.NativeImage == IntPtr.Zero) return;
+
+        var v = (Visibility) e.NewValue;
+        if (v != Visibility.Visible)
+        {
+            ctl.StopAnimate();
+        }
+        else if (!ctl._isStart)
+        {
+            ctl.StartAnimate();
+        }
+    }
+
+    ~GifImage() => Dispose(false);
+
+    public GifImage()
+    {
+        Loaded += (s, e) =>
+        {
+            if (DesignerProperties.GetIsInDesignMode(this)) return;
+            if (_isLoaded) return;
+            _isLoaded = true;
+            if (Uri != null)
+            {
+                GetGifStreamFromPack(Uri);
+                StartAnimate();
+            }
+            else if (Source is BitmapImage image)
+            {
+                GetGifStreamFromPack(image.UriSource);
+                StartAnimate();
+            }
+        };
+
+        Unloaded += (s, e) => Dispose();
+    }
+
+    public GifImage(string filename)
+    {
+        Source = null;
+        CreateSourceFromFile(filename);
+        StartAnimate();
+    }
+
+    public GifImage(Stream stream)
+    {
+        Source = null;
+        CreateSourceFromStream(stream);
+        StartAnimate();
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (NativeImage == IntPtr.Zero) return;
+        try
+        {
+            StopAnimate();
+            InteropMethods.Gdip.GdipDisposeImage(new HandleRef(this, NativeImage));
+        }
+        catch
+        {
+            // ignored
+        }
+        finally
+        {
+            NativeImage = IntPtr.Zero;
+        }
+    }
+
+    private void CreateSourceFromFile(string filename)
+    {
+        filename = Path.GetFullPath(filename);
+
+        var status = InteropMethods.Gdip.GdipCreateBitmapFromFile(filename, out var bitmap);
+
+        if (status != InteropMethods.Gdip.Ok)
+            throw InteropMethods.Gdip.StatusException(status);
+
+        status = InteropMethods.Gdip.GdipImageForceValidation(new HandleRef(null, bitmap));
+
+        if (status != InteropMethods.Gdip.Ok)
+        {
+            InteropMethods.Gdip.GdipDisposeImage(new HandleRef(null, bitmap));
+            throw InteropMethods.Gdip.StatusException(status);
         }
 
-        public static readonly DependencyProperty UriProperty = DependencyProperty.Register(
-            "Uri", typeof(Uri), typeof(GifImage), new PropertyMetadata(default(Uri), OnUriChanged));
+        SetNativeImage(bitmap);
 
-        private static void OnUriChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        EnsureSave(this, filename, null);
+    }
+
+    private void CreateSourceFromStream(Stream stream)
+    {
+        if (stream == null)
+            throw new ArgumentException("stream null");
+
+        var status = InteropMethods.Gdip.GdipCreateBitmapFromStream(new GPStream(stream), out var bitmap);
+
+        if (status != InteropMethods.Gdip.Ok)
+            throw InteropMethods.Gdip.StatusException(status);
+
+        status = InteropMethods.Gdip.GdipImageForceValidation(new HandleRef(null, bitmap));
+
+        if (status != InteropMethods.Gdip.Ok)
         {
-            var ctl = (GifImage) d;
-            ctl.StopAnimate();
+            InteropMethods.Gdip.GdipDisposeImage(new HandleRef(null, bitmap));
+            throw InteropMethods.Gdip.StatusException(status);
+        }
 
-            if (e.NewValue != null)
+        SetNativeImage(bitmap);
+
+        EnsureSave(this, null, stream);
+    }
+
+    private void GetGifStreamFromPack(Uri uri)
+    {
+        try
+        {
+            StreamResourceInfo streamInfo;
+
+            if (!uri.IsAbsoluteUri)
             {
-                var v = (Uri) e.NewValue;
-                ctl.GetGifStreamFromPack(v);
-                ctl.StartAnimate();
+                streamInfo = Application.GetContentStream(uri) ?? Application.GetResourceStream(uri);
             }
             else
             {
-                ctl.Source = null;
-            }
-        }
-
-        public Uri Uri
-        {
-            get => (Uri) GetValue(UriProperty);
-            set => SetValue(UriProperty, value);
-        }
-
-        private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (GifImage) s;
-            if (ctl.NativeImage == IntPtr.Zero) return;
-
-            var v = (Visibility) e.NewValue;
-            if (v != Visibility.Visible)
-            {
-                ctl.StopAnimate();
-            }
-            else if (!ctl._isStart)
-            {
-                ctl.StartAnimate();
-            }
-        }
-
-        ~GifImage() => Dispose(false);
-
-        public GifImage()
-        {
-            Loaded += (s, e) =>
-            {
-                if (DesignerProperties.GetIsInDesignMode(this)) return;
-                if (_isLoaded) return;
-                _isLoaded = true;
-                if (Uri != null)
+                if (uri.GetLeftPart(UriPartial.Authority).Contains("siteoforigin"))
                 {
-                    GetGifStreamFromPack(Uri);
-                    StartAnimate();
-                }
-                else if (Source is BitmapImage image)
-                {
-                    GetGifStreamFromPack(image.UriSource);
-                    StartAnimate();
-                }
-            };
-
-            Unloaded += (s, e) => Dispose();
-        }
-
-        public GifImage(string filename)
-        {
-            Source = null;
-            CreateSourceFromFile(filename);
-            StartAnimate();
-        }
-
-        public GifImage(Stream stream)
-        {
-            Source = null;
-            CreateSourceFromStream(stream);
-            StartAnimate();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (NativeImage == IntPtr.Zero) return;
-            try
-            {
-                StopAnimate();
-                InteropMethods.Gdip.GdipDisposeImage(new HandleRef(this, NativeImage));
-            }
-            catch
-            {
-                // ignored
-            }
-            finally
-            {
-                NativeImage = IntPtr.Zero;
-            }
-        }
-
-        private void CreateSourceFromFile(string filename)
-        {
-            filename = Path.GetFullPath(filename);
-
-            var status = InteropMethods.Gdip.GdipCreateBitmapFromFile(filename, out var bitmap);
-
-            if (status != InteropMethods.Gdip.Ok)
-                throw InteropMethods.Gdip.StatusException(status);
-
-            status = InteropMethods.Gdip.GdipImageForceValidation(new HandleRef(null, bitmap));
-
-            if (status != InteropMethods.Gdip.Ok)
-            {
-                InteropMethods.Gdip.GdipDisposeImage(new HandleRef(null, bitmap));
-                throw InteropMethods.Gdip.StatusException(status);
-            }
-
-            SetNativeImage(bitmap);
-
-            EnsureSave(this, filename, null);
-        }
-
-        private void CreateSourceFromStream(Stream stream)
-        {
-            if (stream == null)
-                throw new ArgumentException("stream null");
-
-            var status = InteropMethods.Gdip.GdipCreateBitmapFromStream(new GPStream(stream), out var bitmap);
-
-            if (status != InteropMethods.Gdip.Ok)
-                throw InteropMethods.Gdip.StatusException(status);
-
-            status = InteropMethods.Gdip.GdipImageForceValidation(new HandleRef(null, bitmap));
-
-            if (status != InteropMethods.Gdip.Ok)
-            {
-                InteropMethods.Gdip.GdipDisposeImage(new HandleRef(null, bitmap));
-                throw InteropMethods.Gdip.StatusException(status);
-            }
-
-            SetNativeImage(bitmap);
-
-            EnsureSave(this, null, stream);
-        }
-
-        private void GetGifStreamFromPack(Uri uri)
-        {
-            try
-            {
-                StreamResourceInfo streamInfo;
-
-                if (!uri.IsAbsoluteUri)
-                {
-                    streamInfo = Application.GetContentStream(uri) ?? Application.GetResourceStream(uri);
+                    streamInfo = Application.GetRemoteStream(uri);
                 }
                 else
                 {
-                    if (uri.GetLeftPart(UriPartial.Authority).Contains("siteoforigin"))
-                    {
-                        streamInfo = Application.GetRemoteStream(uri);
-                    }
-                    else
-                    {
-                        streamInfo = Application.GetContentStream(uri) ?? Application.GetResourceStream(uri);
-                    }
-                }
-
-                if (streamInfo == null)
-                {
-                    throw new FileNotFoundException("Resource not found.", uri.ToString());
-                }
-
-                CreateSourceFromStream(streamInfo.Stream);
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        private void SwitchToCommonImage()
-        {
-            if (Source == null && Uri != null)
-            {
-                SetCurrentValue(SourceProperty, new BitmapImage(Uri));
-            }
-        }
-
-        [ResourceExposure(ResourceScope.None)]
-        [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
-        internal static void EnsureSave(GifImage image, string filename, Stream dataStream)
-        {
-            if (!image.RawGuid.Equals(GifGuid) && !image.RawGuid.Equals(GifSingleFrameGuid))
-            {
-                image.SwitchToCommonImage();
-                return;
-            }
-
-            var animatedGif = false;
-            var dimensions = image.FrameDimensionsList;
-            if (dimensions.Select(guid => new GifFrameDimension(guid)).Contains(GifFrameDimension.Time))
-            {
-                animatedGif = image.GetFrameCount(GifFrameDimension.Time) > 1;
-            }
-
-            if (!animatedGif)
-            {
-                image.SwitchToCommonImage();
-                return;
-            }
-
-            try
-            {
-                Stream created = null;
-                long lastPos = 0;
-                if (dataStream != null)
-                {
-                    lastPos = dataStream.Position;
-                    dataStream.Position = 0;
-                }
-
-                try
-                {
-                    if (dataStream == null)
-                    {
-                        created = dataStream = File.OpenRead(filename);
-                    }
-
-                    image._rawData = new byte[(int) dataStream.Length];
-                    dataStream.Read(image._rawData, 0, (int) dataStream.Length);
-                }
-                finally
-                {
-                    if (created != null)
-                    {
-                        created.Close();
-                    }
-                    else
-                    {
-                        // ReSharper disable once PossibleNullReferenceException
-                        dataStream.Position = lastPos;
-                    }
+                    streamInfo = Application.GetContentStream(uri) ?? Application.GetResourceStream(uri);
                 }
             }
-            // possible exceptions for reading the filename
-            catch (UnauthorizedAccessException)
-            {
-            }
-            catch (DirectoryNotFoundException)
-            {
-            }
-            catch (IOException)
-            {
-            }
-            // possible exceptions for setting/getting the position inside dataStream
-            catch (NotSupportedException)
-            {
-            }
-            catch (ObjectDisposedException)
-            {
-            }
-            // possible exception when reading stuff into dataStream
-            catch (ArgumentException)
+
+            if (streamInfo == null)
             {
+                throw new FileNotFoundException("Resource not found.", uri.ToString());
             }
+
+            CreateSourceFromStream(streamInfo.Stream);
         }
-
-        internal void SetNativeImage(IntPtr handle)
+        catch
         {
-            if (handle == IntPtr.Zero)
-                throw new ArgumentException("NativeHandle0");
-
-            NativeImage = handle;
-        }
-
-        internal Guid RawGuid
-        {
-            get
-            {
-                var guid = new Guid();
-
-                var status = InteropMethods.Gdip.GdipGetImageRawFormat(new HandleRef(this, NativeImage), ref guid);
-
-                if (status != InteropMethods.Gdip.Ok)
-                    throw InteropMethods.Gdip.StatusException(status);
-
-                return guid;
-            }
-        }
-
-        internal void StartAnimate()
-        {
-            ImageAnimator.Animate(this, OnFrameChanged);
-            _isStart = true;
-        }
-
-        internal void StopAnimate()
-        {
-            ImageAnimator.StopAnimate(this, OnFrameChanged);
-            _isStart = false;
-        }
-
-        internal Guid[] FrameDimensionsList
-        {
-            get
-            {
-                var status = InteropMethods.Gdip.GdipImageGetFrameDimensionsCount(new HandleRef(this, NativeImage), out var count);
-
-                if (status != InteropMethods.Gdip.Ok)
-                {
-                    throw InteropMethods.Gdip.StatusException(status);
-                }
-
-                if (count <= 0)
-                {
-                    return new Guid[0];
-                }
-
-                var size = Marshal.SizeOf(typeof(Guid));
-
-                var buffer = Marshal.AllocHGlobal(checked(size * count));
-                if (buffer == IntPtr.Zero)
-                {
-                    throw InteropMethods.Gdip.StatusException(InteropMethods.Gdip.OutOfMemory);
-                }
-
-                status = InteropMethods.Gdip.GdipImageGetFrameDimensionsList(new HandleRef(this, NativeImage), buffer, count);
-
-                if (status != InteropMethods.Gdip.Ok)
-                {
-                    Marshal.FreeHGlobal(buffer);
-                    throw InteropMethods.Gdip.StatusException(status);
-                }
-
-                var guids = new Guid[count];
-
-                try
-                {
-                    for (var i = 0; i < count; i++)
-                    {
-                        guids[i] = (Guid) InteropMethods.PtrToStructure((IntPtr) ((long) buffer + size * i), typeof(Guid));
-                    }
-                }
-                finally
-                {
-                    Marshal.FreeHGlobal(buffer);
-                }
-
-                return guids;
-            }
-        }
-
-        internal int GetFrameCount(GifFrameDimension dimension)
-        {
-            var count = new[] { 0 };
-
-            var dimensionId = dimension.Guid;
-            var status = InteropMethods.Gdip.GdipImageGetFrameCount(new HandleRef(this, NativeImage), ref dimensionId, count);
-
-            if (status != InteropMethods.Gdip.Ok)
-                throw InteropMethods.Gdip.StatusException(status);
-
-            return count[0];
-        }
-
-        internal GifPropertyItem GetPropertyItem(int propid)
-        {
-            GifPropertyItem propitem;
-
-            var status = InteropMethods.Gdip.GdipGetPropertyItemSize(new HandleRef(this, NativeImage), propid, out var size);
-
-            if (status != InteropMethods.Gdip.Ok)
-                throw InteropMethods.Gdip.StatusException(status);
-
-            if (size == 0)
-                return null;
-
-            var propdata = Marshal.AllocHGlobal(size);
-
-            if (propdata == IntPtr.Zero)
-                throw InteropMethods.Gdip.StatusException(InteropMethods.Gdip.OutOfMemory);
-
-            status = InteropMethods.Gdip.GdipGetPropertyItem(new HandleRef(this, NativeImage), propid, size, propdata);
-
-            try
-            {
-                if (status != InteropMethods.Gdip.Ok)
-                {
-                    throw InteropMethods.Gdip.StatusException(status);
-                }
-
-                propitem = GifPropertyItemInternal.ConvertFromMemory(propdata, 1)[0];
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(propdata);
-            }
-
-            return propitem;
-        }
-
-        internal int SelectActiveFrame(GifFrameDimension dimension, int frameIndex)
-        {
-            var count = new[] { 0 };
-
-            var dimensionId = dimension.Guid;
-            var status = InteropMethods.Gdip.GdipImageSelectActiveFrame(new HandleRef(this, NativeImage), ref dimensionId, frameIndex);
-
-            if (status != InteropMethods.Gdip.Ok)
-                throw InteropMethods.Gdip.StatusException(status);
-
-            return count[0];
-        }
-
-        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
-        internal IntPtr GetHbitmap() => GetHbitmap(Colors.LightGray);
-
-        [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        [ResourceExposure(ResourceScope.Machine)]
-        [ResourceConsumption(ResourceScope.Machine)]
-        internal IntPtr GetHbitmap(Color background)
-        {
-            var status = InteropMethods.Gdip.GdipCreateHBITMAPFromBitmap(new HandleRef(this, NativeImage), out var hBitmap,
-                ColorHelper.ToWin32(background));
-            if (status == 2 && (Width >= short.MaxValue || Height >= short.MaxValue))
-            {
-                throw new ArgumentException("GdiplusInvalidSize");
-            }
-
-            if (status != InteropMethods.Gdip.Ok && NativeImage != IntPtr.Zero)
-            {
-                throw InteropMethods.Gdip.StatusException(status);
-            }
-
-            return hBitmap;
-        }
-
-        private void GetBitmapSource()
-        {
-            var handle = IntPtr.Zero;
-
-            try
-            {
-                handle = GetHbitmap();
-                Source = Imaging.CreateBitmapSourceFromHBitmap(handle, IntPtr.Zero, Int32Rect.Empty,
-                    BitmapSizeOptions.FromEmptyOptions());
-            }
-            catch
-            {
-                // ignored
-            }
-            finally
-            {
-                if (handle != IntPtr.Zero)
-                {
-                    InteropMethods.DeleteObject(handle);
-                }
-            }
-        }
-
-        private void OnFrameChanged(object sender, EventArgs e)
-        {
-            Dispatcher.BeginInvoke(new Action(() =>
-            {
-                ImageAnimator.UpdateFrames();
-                Source?.Freeze();
-                GetBitmapSource();
-                InvalidateVisual();
-            }));
+            // ignored
         }
     }
-}
+
+    private void SwitchToCommonImage()
+    {
+        if (Source == null && Uri != null)
+        {
+            SetCurrentValue(SourceProperty, new BitmapImage(Uri));
+        }
+    }
+
+    [ResourceExposure(ResourceScope.None)]
+    [ResourceConsumption(ResourceScope.Machine, ResourceScope.Machine)]
+    internal static void EnsureSave(GifImage image, string filename, Stream dataStream)
+    {
+        if (!image.RawGuid.Equals(GifGuid) && !image.RawGuid.Equals(GifSingleFrameGuid))
+        {
+            image.SwitchToCommonImage();
+            return;
+        }
+
+        var animatedGif = false;
+        var dimensions = image.FrameDimensionsList;
+        if (dimensions.Select(guid => new GifFrameDimension(guid)).Contains(GifFrameDimension.Time))
+        {
+            animatedGif = image.GetFrameCount(GifFrameDimension.Time) > 1;
+        }
+
+        if (!animatedGif)
+        {
+            image.SwitchToCommonImage();
+            return;
+        }
+
+        try
+        {
+            Stream created = null;
+            long lastPos = 0;
+            if (dataStream != null)
+            {
+                lastPos = dataStream.Position;
+                dataStream.Position = 0;
+            }
+
+            try
+            {
+                if (dataStream == null)
+                {
+                    created = dataStream = File.OpenRead(filename);
+                }
+
+                image._rawData = new byte[(int) dataStream.Length];
+                dataStream.Read(image._rawData, 0, (int) dataStream.Length);
+            }
+            finally
+            {
+                if (created != null)
+                {
+                    created.Close();
+                }
+                else
+                {
+                    // ReSharper disable once PossibleNullReferenceException
+                    dataStream.Position = lastPos;
+                }
+            }
+        }
+        // possible exceptions for reading the filename
+        catch (UnauthorizedAccessException)
+        {
+        }
+        catch (DirectoryNotFoundException)
+        {
+        }
+        catch (IOException)
+        {
+        }
+        // possible exceptions for setting/getting the position inside dataStream
+        catch (NotSupportedException)
+        {
+        }
+        catch (ObjectDisposedException)
+        {
+        }
+        // possible exception when reading stuff into dataStream
+        catch (ArgumentException)
+        {
+        }
+    }
+
+    internal void SetNativeImage(IntPtr handle)
+    {
+        if (handle == IntPtr.Zero)
+            throw new ArgumentException("NativeHandle0");
+
+        NativeImage = handle;
+    }
+
+    internal Guid RawGuid
+    {
+        get
+        {
+            var guid = new Guid();
+
+            var status = InteropMethods.Gdip.GdipGetImageRawFormat(new HandleRef(this, NativeImage), ref guid);
+
+            if (status != InteropMethods.Gdip.Ok)
+                throw InteropMethods.Gdip.StatusException(status);
+
+            return guid;
+        }
+    }
+
+    internal void StartAnimate()
+    {
+        ImageAnimator.Animate(this, OnFrameChanged);
+        _isStart = true;
+    }
+
+    internal void StopAnimate()
+    {
+        ImageAnimator.StopAnimate(this, OnFrameChanged);
+        _isStart = false;
+    }
+
+    internal Guid[] FrameDimensionsList
+    {
+        get
+        {
+            var status = InteropMethods.Gdip.GdipImageGetFrameDimensionsCount(new HandleRef(this, NativeImage), out var count);
+
+            if (status != InteropMethods.Gdip.Ok)
+            {
+                throw InteropMethods.Gdip.StatusException(status);
+            }
+
+            if (count <= 0)
+            {
+                return new Guid[0];
+            }
+
+            var size = Marshal.SizeOf(typeof(Guid));
+
+            var buffer = Marshal.AllocHGlobal(checked(size * count));
+            if (buffer == IntPtr.Zero)
+            {
+                throw InteropMethods.Gdip.StatusException(InteropMethods.Gdip.OutOfMemory);
+            }
+
+            status = InteropMethods.Gdip.GdipImageGetFrameDimensionsList(new HandleRef(this, NativeImage), buffer, count);
+
+            if (status != InteropMethods.Gdip.Ok)
+            {
+                Marshal.FreeHGlobal(buffer);
+                throw InteropMethods.Gdip.StatusException(status);
+            }
+
+            var guids = new Guid[count];
+
+            try
+            {
+                for (var i = 0; i < count; i++)
+                {
+                    guids[i] = (Guid) InteropMethods.PtrToStructure((IntPtr) ((long) buffer + size * i), typeof(Guid));
+                }
+            }
+            finally
+            {
+                Marshal.FreeHGlobal(buffer);
+            }
+
+            return guids;
+        }
+    }
+
+    internal int GetFrameCount(GifFrameDimension dimension)
+    {
+        var count = new[] { 0 };
+
+        var dimensionId = dimension.Guid;
+        var status = InteropMethods.Gdip.GdipImageGetFrameCount(new HandleRef(this, NativeImage), ref dimensionId, count);
+
+        if (status != InteropMethods.Gdip.Ok)
+            throw InteropMethods.Gdip.StatusException(status);
+
+        return count[0];
+    }
+
+    internal GifPropertyItem GetPropertyItem(int propid)
+    {
+        GifPropertyItem propitem;
+
+        var status = InteropMethods.Gdip.GdipGetPropertyItemSize(new HandleRef(this, NativeImage), propid, out var size);
+
+        if (status != InteropMethods.Gdip.Ok)
+            throw InteropMethods.Gdip.StatusException(status);
+
+        if (size == 0)
+            return null;
+
+        var propdata = Marshal.AllocHGlobal(size);
+
+        if (propdata == IntPtr.Zero)
+            throw InteropMethods.Gdip.StatusException(InteropMethods.Gdip.OutOfMemory);
+
+        status = InteropMethods.Gdip.GdipGetPropertyItem(new HandleRef(this, NativeImage), propid, size, propdata);
+
+        try
+        {
+            if (status != InteropMethods.Gdip.Ok)
+            {
+                throw InteropMethods.Gdip.StatusException(status);
+            }
+
+            propitem = GifPropertyItemInternal.ConvertFromMemory(propdata, 1)[0];
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(propdata);
+        }
+
+        return propitem;
+    }
+
+    internal int SelectActiveFrame(GifFrameDimension dimension, int frameIndex)
+    {
+        var count = new[] { 0 };
+
+        var dimensionId = dimension.Guid;
+        var status = InteropMethods.Gdip.GdipImageSelectActiveFrame(new HandleRef(this, NativeImage), ref dimensionId, frameIndex);
+
+        if (status != InteropMethods.Gdip.Ok)
+            throw InteropMethods.Gdip.StatusException(status);
+
+        return count[0];
+    }
+
+    [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    [ResourceExposure(ResourceScope.Machine)]
+    [ResourceConsumption(ResourceScope.Machine)]
+    internal IntPtr GetHbitmap() => GetHbitmap(Colors.LightGray);
+
+    [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.UnmanagedCode)]
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    [ResourceExposure(ResourceScope.Machine)]
+    [ResourceConsumption(ResourceScope.Machine)]
+    internal IntPtr GetHbitmap(Color background)
+    {
+        var status = InteropMethods.Gdip.GdipCreateHBITMAPFromBitmap(new HandleRef(this, NativeImage), out var hBitmap,
+            ColorHelper.ToWin32(background));
+        if (status == 2 && (Width >= short.MaxValue || Height >= short.MaxValue))
+        {
+            throw new ArgumentException("GdiplusInvalidSize");
+        }
+
+        if (status != InteropMethods.Gdip.Ok && NativeImage != IntPtr.Zero)
+        {
+            throw InteropMethods.Gdip.StatusException(status);
+        }
+
+        return hBitmap;
+    }
+
+    private void GetBitmapSource()
+    {
+        var handle = IntPtr.Zero;
+
+        try
+        {
+            handle = GetHbitmap();
+            Source = Imaging.CreateBitmapSourceFromHBitmap(handle, IntPtr.Zero, Int32Rect.Empty,
+                BitmapSizeOptions.FromEmptyOptions());
+        }
+        catch
+        {
+            // ignored
+        }
+        finally
+        {
+            if (handle != IntPtr.Zero)
+            {
+                InteropMethods.DeleteObject(handle);
+            }
+        }
+    }
+
+    private void OnFrameChanged(object sender, EventArgs e)
+    {
+        Dispatcher.BeginInvoke(new Action(() =>
+        {
+            ImageAnimator.UpdateFrames();
+            Source?.Freeze();
+            GetBitmapSource();
+            InvalidateVisual();
+        }));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
index d4cb462d..0b6daaca 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
@@ -5,228 +5,227 @@ using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ImageBlock : FrameworkElement
 {
-    public class ImageBlock : FrameworkElement
+    private readonly DispatcherTimer _dispatcherTimer;
+
+    private BitmapSource _source;
+
+    private int _indexMax;
+
+    private int _indexMin;
+
+    private int _currentIndex;
+
+    private int _blockWidth;
+
+    private int _blockHeight;
+
+    private bool _isDisposed;
+
+    private int _columns = 1;
+
+    public ImageBlock()
     {
-        private readonly DispatcherTimer _dispatcherTimer;
-
-        private BitmapSource _source;
-
-        private int _indexMax;
-
-        private int _indexMin;
-
-        private int _currentIndex;
-
-        private int _blockWidth;
-
-        private int _blockHeight;
-
-        private bool _isDisposed;
-
-        private int _columns = 1;
-
-        public ImageBlock()
+        _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
         {
-            _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
+            Interval = Interval
+        };
+
+        IsVisibleChanged += ImageBlock_IsVisibleChanged;
+    }
+
+    ~ImageBlock() => Dispose();
+
+    public void Dispose()
+    {
+        if (_isDisposed) return;
+
+        IsVisibleChanged -= ImageBlock_IsVisibleChanged;
+        _dispatcherTimer.Stop();
+        _isDisposed = true;
+
+        GC.SuppressFinalize(this);
+    }
+
+    private void ImageBlock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (IsVisible)
+        {
+            _dispatcherTimer.Tick += DispatcherTimer_Tick;
+            if (IsPlaying)
             {
-                Interval = Interval
-            };
-
-            IsVisibleChanged += ImageBlock_IsVisibleChanged;
+                _dispatcherTimer.Start();
+            }
         }
-
-        ~ImageBlock() => Dispose();
-
-        public void Dispose()
+        else
         {
-            if (_isDisposed) return;
-
-            IsVisibleChanged -= ImageBlock_IsVisibleChanged;
             _dispatcherTimer.Stop();
-            _isDisposed = true;
-
-            GC.SuppressFinalize(this);
-        }
-
-        private void ImageBlock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (IsVisible)
-            {
-                _dispatcherTimer.Tick += DispatcherTimer_Tick;
-                if (IsPlaying)
-                {
-                    _dispatcherTimer.Start();
-                }
-            }
-            else
-            {
-                _dispatcherTimer.Stop();
-                _dispatcherTimer.Tick -= DispatcherTimer_Tick;
-            }
-        }
-
-        private void UpdateDatas()
-        {
-            if (_source == null) return;
-
-            _indexMin = StartRow * _columns + StartColumn;
-            _indexMax = EndRow * _columns + EndColumn;
-            _currentIndex = _indexMin;
-            _blockWidth = _source.PixelWidth / _columns;
-            _blockHeight = _source.PixelHeight / Rows;
-        }
-
-        private static void OnPositionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ImageBlock) d;
-
-            if (e.Property == ColumnsProperty)
-            {
-                ctl._columns = (int) e.NewValue;
-            }
-
-            ctl.UpdateDatas();
-        }
-
-        private void DispatcherTimer_Tick(object sender, EventArgs e) => InvalidateVisual();
-
-        public static readonly DependencyProperty StartColumnProperty = DependencyProperty.Register(
-            "StartColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
-
-        public int StartColumn
-        {
-            get => (int) GetValue(StartColumnProperty);
-            set => SetValue(StartColumnProperty, value);
-        }
-
-        public static readonly DependencyProperty StartRowProperty = DependencyProperty.Register(
-            "StartRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
-
-        public int StartRow
-        {
-            get => (int) GetValue(StartRowProperty);
-            set => SetValue(StartRowProperty, value);
-        }
-
-        public static readonly DependencyProperty EndColumnProperty = DependencyProperty.Register(
-            "EndColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
-
-        public int EndColumn
-        {
-            get => (int) GetValue(EndColumnProperty);
-            set => SetValue(EndColumnProperty, value);
-        }
-
-        public static readonly DependencyProperty EndRowProperty = DependencyProperty.Register(
-            "EndRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
-
-        public int EndRow
-        {
-            get => (int) GetValue(EndRowProperty);
-            set => SetValue(EndRowProperty, value);
-        }
-
-        public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register(
-            "IsPlaying", typeof(bool), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnIsPlayingChanged));
-
-        private static void OnIsPlayingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ImageBlock) d;
-            if ((bool) e.NewValue)
-            {
-                ctl._dispatcherTimer.Start();
-            }
-            else
-            {
-                ctl._dispatcherTimer.Stop();
-            }
-        }
-
-        public bool IsPlaying
-        {
-            get => (bool) GetValue(IsPlayingProperty);
-            set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ColumnsProperty = DependencyProperty.Register(
-            "Columns", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int) obj >= 1);
-
-        public int Columns
-        {
-            get => (int) GetValue(ColumnsProperty);
-            set => SetValue(ColumnsProperty, value);
-        }
-
-        public static readonly DependencyProperty RowsProperty = DependencyProperty.Register(
-            "Rows", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int) obj >= 1);
-
-        public int Rows
-        {
-            get => (int) GetValue(RowsProperty);
-            set => SetValue(RowsProperty, value);
-        }
-
-        public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
-            "Interval", typeof(TimeSpan), typeof(ImageBlock), new PropertyMetadata(TimeSpan.FromSeconds(1), OnIntervalChanged));
-
-        private static void OnIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ImageBlock) d;
-            ctl._dispatcherTimer.Interval = (TimeSpan) e.NewValue;
-        }
-
-        public TimeSpan Interval
-        {
-            get => (TimeSpan) GetValue(IntervalProperty);
-            set => SetValue(IntervalProperty, value);
-        }
-
-        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(ImageSource), typeof(ImageBlock), new FrameworkPropertyMetadata(default(ImageSource),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnSourceChanged));
-
-        private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ImageBlock) d;
-            ctl._source = e.NewValue as BitmapSource;
-            ctl.UpdateDatas();
-        }
-
-        public ImageSource Source
-        {
-            get => (ImageSource) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        protected override void OnRender(DrawingContext dc)
-        {
-            if (_source == null) return;
-            var croppedBitmap = new CroppedBitmap(_source, CalDisplayRect());
-            dc.DrawImage(croppedBitmap, new Rect(0, 0, RenderSize.Width, RenderSize.Height));
-        }
-
-        private Int32Rect CalDisplayRect()
-        {
-            if (_currentIndex > _indexMax)
-            {
-                _currentIndex = _indexMin;
-            }
-
-            var x = _currentIndex % _columns * _blockWidth;
-            var y = _currentIndex / _columns * _blockHeight;
-
-            var rect = new Int32Rect(x, y, _blockWidth, _blockHeight);
-            _currentIndex++;
-            return rect;
+            _dispatcherTimer.Tick -= DispatcherTimer_Tick;
         }
     }
-}
+
+    private void UpdateDatas()
+    {
+        if (_source == null) return;
+
+        _indexMin = StartRow * _columns + StartColumn;
+        _indexMax = EndRow * _columns + EndColumn;
+        _currentIndex = _indexMin;
+        _blockWidth = _source.PixelWidth / _columns;
+        _blockHeight = _source.PixelHeight / Rows;
+    }
+
+    private static void OnPositionsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ImageBlock) d;
+
+        if (e.Property == ColumnsProperty)
+        {
+            ctl._columns = (int) e.NewValue;
+        }
+
+        ctl.UpdateDatas();
+    }
+
+    private void DispatcherTimer_Tick(object sender, EventArgs e) => InvalidateVisual();
+
+    public static readonly DependencyProperty StartColumnProperty = DependencyProperty.Register(
+        "StartColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+    public int StartColumn
+    {
+        get => (int) GetValue(StartColumnProperty);
+        set => SetValue(StartColumnProperty, value);
+    }
+
+    public static readonly DependencyProperty StartRowProperty = DependencyProperty.Register(
+        "StartRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+    public int StartRow
+    {
+        get => (int) GetValue(StartRowProperty);
+        set => SetValue(StartRowProperty, value);
+    }
+
+    public static readonly DependencyProperty EndColumnProperty = DependencyProperty.Register(
+        "EndColumn", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+    public int EndColumn
+    {
+        get => (int) GetValue(EndColumnProperty);
+        set => SetValue(EndColumnProperty, value);
+    }
+
+    public static readonly DependencyProperty EndRowProperty = DependencyProperty.Register(
+        "EndRow", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged));
+
+    public int EndRow
+    {
+        get => (int) GetValue(EndRowProperty);
+        set => SetValue(EndRowProperty, value);
+    }
+
+    public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register(
+        "IsPlaying", typeof(bool), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.FalseBox,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnIsPlayingChanged));
+
+    private static void OnIsPlayingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ImageBlock) d;
+        if ((bool) e.NewValue)
+        {
+            ctl._dispatcherTimer.Start();
+        }
+        else
+        {
+            ctl._dispatcherTimer.Stop();
+        }
+    }
+
+    public bool IsPlaying
+    {
+        get => (bool) GetValue(IsPlayingProperty);
+        set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ColumnsProperty = DependencyProperty.Register(
+        "Columns", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int) obj >= 1);
+
+    public int Columns
+    {
+        get => (int) GetValue(ColumnsProperty);
+        set => SetValue(ColumnsProperty, value);
+    }
+
+    public static readonly DependencyProperty RowsProperty = DependencyProperty.Register(
+        "Rows", typeof(int), typeof(ImageBlock), new FrameworkPropertyMetadata(ValueBoxes.Int1Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnPositionsChanged), obj => (int) obj >= 1);
+
+    public int Rows
+    {
+        get => (int) GetValue(RowsProperty);
+        set => SetValue(RowsProperty, value);
+    }
+
+    public static readonly DependencyProperty IntervalProperty = DependencyProperty.Register(
+        "Interval", typeof(TimeSpan), typeof(ImageBlock), new PropertyMetadata(TimeSpan.FromSeconds(1), OnIntervalChanged));
+
+    private static void OnIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ImageBlock) d;
+        ctl._dispatcherTimer.Interval = (TimeSpan) e.NewValue;
+    }
+
+    public TimeSpan Interval
+    {
+        get => (TimeSpan) GetValue(IntervalProperty);
+        set => SetValue(IntervalProperty, value);
+    }
+
+    public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+        "Source", typeof(ImageSource), typeof(ImageBlock), new FrameworkPropertyMetadata(default(ImageSource),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender, OnSourceChanged));
+
+    private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ImageBlock) d;
+        ctl._source = e.NewValue as BitmapSource;
+        ctl.UpdateDatas();
+    }
+
+    public ImageSource Source
+    {
+        get => (ImageSource) GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+
+    protected override void OnRender(DrawingContext dc)
+    {
+        if (_source == null) return;
+        var croppedBitmap = new CroppedBitmap(_source, CalDisplayRect());
+        dc.DrawImage(croppedBitmap, new Rect(0, 0, RenderSize.Width, RenderSize.Height));
+    }
+
+    private Int32Rect CalDisplayRect()
+    {
+        if (_currentIndex > _indexMax)
+        {
+            _currentIndex = _indexMin;
+        }
+
+        var x = _currentIndex % _columns * _blockWidth;
+        var y = _currentIndex / _columns * _blockHeight;
+
+        var rect = new Int32Rect(x, y, _blockWidth, _blockHeight);
+        _currentIndex++;
+        return rect;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
index 48a99f79..13ce2fcd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -15,913 +15,912 @@ using HandyControl.Properties.Langs;
 using HandyControl.Tools;
 using Microsoft.Win32;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))]
+[TemplatePart(Name = ElementCanvasSmallImg, Type = typeof(Canvas))]
+[TemplatePart(Name = ElementBorderMove, Type = typeof(Border))]
+[TemplatePart(Name = ElementBorderBottom, Type = typeof(Border))]
+[TemplatePart(Name = ElementImageMain, Type = typeof(Image))]
+public class ImageViewer : Control
 {
-    [TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementCanvasSmallImg, Type = typeof(Canvas))]
-    [TemplatePart(Name = ElementBorderMove, Type = typeof(Border))]
-    [TemplatePart(Name = ElementBorderBottom, Type = typeof(Border))]
-    [TemplatePart(Name = ElementImageMain, Type = typeof(Image))]
-    public class ImageViewer : Control
+    #region Constants
+
+    private const string ElementPanelMain = "PART_PanelMain";
+
+    private const string ElementCanvasSmallImg = "PART_CanvasSmallImg";
+
+    private const string ElementBorderMove = "PART_BorderMove";
+
+    private const string ElementBorderBottom = "PART_BorderBottom";
+
+    private const string ElementImageMain = "PART_ImageMain";
+
+    /// <summary>
+    ///     缩放比间隔
+    /// </summary>
+    private const double ScaleInternal = 0.2;
+
+    #endregion Constants
+
+    #region Data
+
+    /// <summary>
+    ///     图片保存对话框
+    /// </summary>
+    private static readonly SaveFileDialog SaveFileDialog = new()
     {
-        #region Constants
+        Filter = $"{Lang.PngImg}|*.png"
+    };
 
-        private const string ElementPanelMain = "PART_PanelMain";
+    private Panel _panelMain;
 
-        private const string ElementCanvasSmallImg = "PART_CanvasSmallImg";
+    private Canvas _canvasSmallImg;
 
-        private const string ElementBorderMove = "PART_BorderMove";
+    private Border _borderMove;
 
-        private const string ElementBorderBottom = "PART_BorderBottom";
+    private Border _borderBottom;
 
-        private const string ElementImageMain = "PART_ImageMain";
+    private Image _imageMain;
 
-        /// <summary>
-        ///     缩放比间隔
-        /// </summary>
-        private const double ScaleInternal = 0.2;
+    /// <summary>
+    ///     右下角小图片是否加载过
+    /// </summary>
+    private bool _borderSmallIsLoaded;
 
-        #endregion Constants
+    /// <summary>
+    ///     图片是否可以在x轴方向移动
+    /// </summary>
+    private bool _canMoveX;
 
-        #region Data
+    /// <summary>
+    ///     图片是否可以在y轴方向移动
+    /// </summary>
+    private bool _canMoveY;
 
-        /// <summary>
-        ///     图片保存对话框
-        /// </summary>
-        private static readonly SaveFileDialog SaveFileDialog = new()
+    /// <summary>
+    ///     图片实际位置
+    /// </summary>
+    private Thickness _imgActualMargin;
+
+    /// <summary>
+    ///     图片实际旋转角度
+    /// </summary>
+    private double _imgActualRotate;
+
+    /// <summary>
+    ///     图片实际旋缩放比
+    /// </summary>
+    private double _imgActualScale = 1;
+
+    /// <summary>
+    ///     在图片上鼠标移动时的即时位置
+    /// </summary>
+    private Point _imgCurrentPoint;
+
+    /// <summary>
+    ///     鼠标是否在图片上按下左键
+    /// </summary>
+    private bool _imgIsMouseLeftButtonDown;
+
+    /// <summary>
+    ///     在图片上按下时图片的位置
+    /// </summary>
+    private Thickness _imgMouseDownMargin;
+
+    /// <summary>
+    ///     在图片上按下时鼠标的位置
+    /// </summary>
+    private Point _imgMouseDownPoint;
+
+    /// <summary>
+    ///     在小图片上鼠标移动时的即时位置
+    /// </summary>
+    private Point _imgSmallCurrentPoint;
+
+    /// <summary>
+    ///     鼠标是否在小图片上按下左键
+    /// </summary>
+    private bool _imgSmallIsMouseLeftButtonDown;
+
+    /// <summary>
+    ///     在小图片上按下时图片的位置
+    /// </summary>
+    private Thickness _imgSmallMouseDownMargin;
+
+    /// <summary>
+    ///     在小图片上按下时鼠标的位置
+    /// </summary>
+    private Point _imgSmallMouseDownPoint;
+
+    /// <summary>
+    ///     图片长宽比
+    /// </summary>
+    private double _imgWidHeiScale;
+
+    /// <summary>
+    ///     图片是否倾斜
+    /// </summary>
+    private bool _isOblique;
+
+    /// <summary>
+    ///     缩放高度间隔
+    /// </summary>
+    private double _scaleInternalHeight;
+
+    /// <summary>
+    ///     缩放宽度间隔
+    /// </summary>
+    private double _scaleInternalWidth;
+
+    /// <summary>
+    ///     底部BorderBottom（包含一些图片操作）是否显示中
+    /// </summary>
+    private bool _showBorderBottom;
+
+    private DispatcherTimer _dispatcher;
+
+    private bool _isLoaded;
+
+    #endregion Data
+
+    #region ctor
+
+    public ImageViewer()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Save, ButtonSave_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Open, ButtonWindowsOpen_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Restore, ButtonActual_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Reduce, ButtonReduce_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Enlarge, ButtonEnlarge_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.RotateLeft, ButtonRotateLeft_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.RotateRight, ButtonRotateRight_OnClick));
+
+        Loaded += (s, e) =>
         {
-            Filter = $"{Lang.PngImg}|*.png"
+            _isLoaded = true;
+            Init();
         };
+    }
 
-        private Panel _panelMain;
-
-        private Canvas _canvasSmallImg;
-
-        private Border _borderMove;
-
-        private Border _borderBottom;
-
-        private Image _imageMain;
-
-        /// <summary>
-        ///     右下角小图片是否加载过
-        /// </summary>
-        private bool _borderSmallIsLoaded;
-
-        /// <summary>
-        ///     图片是否可以在x轴方向移动
-        /// </summary>
-        private bool _canMoveX;
-
-        /// <summary>
-        ///     图片是否可以在y轴方向移动
-        /// </summary>
-        private bool _canMoveY;
-
-        /// <summary>
-        ///     图片实际位置
-        /// </summary>
-        private Thickness _imgActualMargin;
-
-        /// <summary>
-        ///     图片实际旋转角度
-        /// </summary>
-        private double _imgActualRotate;
-
-        /// <summary>
-        ///     图片实际旋缩放比
-        /// </summary>
-        private double _imgActualScale = 1;
-
-        /// <summary>
-        ///     在图片上鼠标移动时的即时位置
-        /// </summary>
-        private Point _imgCurrentPoint;
-
-        /// <summary>
-        ///     鼠标是否在图片上按下左键
-        /// </summary>
-        private bool _imgIsMouseLeftButtonDown;
-
-        /// <summary>
-        ///     在图片上按下时图片的位置
-        /// </summary>
-        private Thickness _imgMouseDownMargin;
-
-        /// <summary>
-        ///     在图片上按下时鼠标的位置
-        /// </summary>
-        private Point _imgMouseDownPoint;
-
-        /// <summary>
-        ///     在小图片上鼠标移动时的即时位置
-        /// </summary>
-        private Point _imgSmallCurrentPoint;
-
-        /// <summary>
-        ///     鼠标是否在小图片上按下左键
-        /// </summary>
-        private bool _imgSmallIsMouseLeftButtonDown;
-
-        /// <summary>
-        ///     在小图片上按下时图片的位置
-        /// </summary>
-        private Thickness _imgSmallMouseDownMargin;
-
-        /// <summary>
-        ///     在小图片上按下时鼠标的位置
-        /// </summary>
-        private Point _imgSmallMouseDownPoint;
-
-        /// <summary>
-        ///     图片长宽比
-        /// </summary>
-        private double _imgWidHeiScale;
-
-        /// <summary>
-        ///     图片是否倾斜
-        /// </summary>
-        private bool _isOblique;
-
-        /// <summary>
-        ///     缩放高度间隔
-        /// </summary>
-        private double _scaleInternalHeight;
-
-        /// <summary>
-        ///     缩放宽度间隔
-        /// </summary>
-        private double _scaleInternalWidth;
-
-        /// <summary>
-        ///     底部BorderBottom（包含一些图片操作）是否显示中
-        /// </summary>
-        private bool _showBorderBottom;
-
-        private DispatcherTimer _dispatcher;
-
-        private bool _isLoaded;
-
-        #endregion Data
-
-        #region ctor
-
-        public ImageViewer()
+    /// <summary>
+    ///     带一个图片Uri的构造函数
+    /// </summary>
+    /// <param name="uri"></param>
+    public ImageViewer(Uri uri) : this()
+    {
+        try
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Save, ButtonSave_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Open, ButtonWindowsOpen_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Restore, ButtonActual_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Reduce, ButtonReduce_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Enlarge, ButtonEnlarge_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.RotateLeft, ButtonRotateLeft_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.RotateRight, ButtonRotateRight_OnClick));
-
-            Loaded += (s, e) =>
+            ImageSource = BitmapFrame.Create(uri);
+            ImgPath = uri.AbsolutePath;
+            if (File.Exists(ImgPath))
             {
-                _isLoaded = true;
-                Init();
+                var info = new FileInfo(ImgPath);
+                ImgSize = info.Length;
+            }
+        }
+        catch
+        {
+            MessageBox.Show(Lang.ErrorImgPath);
+        }
+    }
+
+    /// <summary>
+    ///     带一个图片路径的构造函数
+    /// </summary>
+    /// <param name="path"></param>
+    public ImageViewer(string path) : this(new Uri(path))
+    {
+    }
+
+    #endregion
+
+    #region Properties
+
+    public static readonly DependencyProperty ShowImgMapProperty = DependencyProperty.Register(
+        "ShowImgMap", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register(
+        "ImageSource", typeof(BitmapFrame), typeof(ImageViewer), new PropertyMetadata(default(BitmapFrame), OnImageSourceChanged));
+
+    private static void OnImageSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ImageViewer) d;
+        ctl.Init();
+    }
+
+    public static readonly DependencyProperty ShowToolBarProperty = DependencyProperty.Register(
+        "ShowToolBar", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
+        "IsFullScreen", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    internal static readonly DependencyProperty ImgPathProperty = DependencyProperty.Register(
+        "ImgPath", typeof(string), typeof(ImageViewer), new PropertyMetadata(default(string)));
+
+    internal static readonly DependencyProperty ImgSizeProperty = DependencyProperty.Register(
+        "ImgSize", typeof(long), typeof(ImageViewer), new PropertyMetadata(-1L));
+
+    /// <summary>
+    ///     是否显示全屏按钮
+    /// </summary>
+    internal static readonly DependencyProperty ShowFullScreenButtonProperty = DependencyProperty.Register(
+        "ShowFullScreenButton", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     关闭按钮是否显示中
+    /// </summary>
+    internal static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.Register(
+        "ShowCloseButton", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    internal static readonly DependencyProperty ImageContentProperty = DependencyProperty.Register(
+        "ImageContent", typeof(object), typeof(ImageViewer), new PropertyMetadata(default(object)));
+
+    internal static readonly DependencyProperty ImageMarginProperty = DependencyProperty.Register(
+        "ImageMargin", typeof(Thickness), typeof(ImageViewer), new PropertyMetadata(default(Thickness)));
+
+    internal static readonly DependencyProperty ImageWidthProperty = DependencyProperty.Register(
+        "ImageWidth", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    internal static readonly DependencyProperty ImageHeightProperty = DependencyProperty.Register(
+        "ImageHeight", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    internal static readonly DependencyProperty ImageScaleProperty = DependencyProperty.Register(
+        "ImageScale", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double1Box, OnImageScaleChanged));
+
+    internal static readonly DependencyProperty ScaleStrProperty = DependencyProperty.Register(
+        "ScaleStr", typeof(string), typeof(ImageViewer), new PropertyMetadata("100%"));
+
+    internal static readonly DependencyProperty ImageRotateProperty = DependencyProperty.Register(
+        "ImageRotate", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    internal static readonly DependencyProperty ShowSmallImgInternalProperty = DependencyProperty.Register(
+        "ShowSmallImgInternal", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsFullScreen
+    {
+        get => (bool) GetValue(IsFullScreenProperty);
+        set => SetValue(IsFullScreenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool ShowImgMap
+    {
+        get => (bool) GetValue(ShowImgMapProperty);
+        set => SetValue(ShowImgMapProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public BitmapFrame ImageSource
+    {
+        get => (BitmapFrame) GetValue(ImageSourceProperty);
+        set => SetValue(ImageSourceProperty, value);
+    }
+
+    public bool ShowToolBar
+    {
+        get => (bool) GetValue(ShowToolBarProperty);
+        set => SetValue(ShowToolBarProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal object ImageContent
+    {
+        get => GetValue(ImageContentProperty);
+        set => SetValue(ImageContentProperty, value);
+    }
+
+    internal string ImgPath
+    {
+        get => (string) GetValue(ImgPathProperty);
+        set => SetValue(ImgPathProperty, value);
+    }
+
+    internal long ImgSize
+    {
+        get => (long) GetValue(ImgSizeProperty);
+        set => SetValue(ImgSizeProperty, value);
+    }
+
+    /// <summary>
+    ///     是否显示全屏按钮
+    /// </summary>
+    internal bool ShowFullScreenButton
+    {
+        get => (bool) GetValue(ShowFullScreenButtonProperty);
+        set => SetValue(ShowFullScreenButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal Thickness ImageMargin
+    {
+        get => (Thickness) GetValue(ImageMarginProperty);
+        set => SetValue(ImageMarginProperty, value);
+    }
+
+    internal double ImageWidth
+    {
+        get => (double) GetValue(ImageWidthProperty);
+        set => SetValue(ImageWidthProperty, value);
+    }
+
+    internal double ImageHeight
+    {
+        get => (double) GetValue(ImageHeightProperty);
+        set => SetValue(ImageHeightProperty, value);
+    }
+
+    internal double ImageScale
+    {
+        get => (double) GetValue(ImageScaleProperty);
+        set => SetValue(ImageScaleProperty, value);
+    }
+
+    internal string ScaleStr
+    {
+        get => (string) GetValue(ScaleStrProperty);
+        set => SetValue(ScaleStrProperty, value);
+    }
+
+    internal double ImageRotate
+    {
+        get => (double) GetValue(ImageRotateProperty);
+        set => SetValue(ImageRotateProperty, value);
+    }
+
+    internal bool ShowSmallImgInternal
+    {
+        get => (bool) GetValue(ShowSmallImgInternalProperty);
+        set => SetValue(ShowSmallImgInternalProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     图片原始宽度
+    /// </summary>
+    private double ImageOriWidth { get; set; }
+
+    /// <summary>
+    ///     图片原始高度
+    /// </summary>
+    private double ImageOriHeight { get; set; }
+
+    /// <summary>
+    ///     关闭按钮是否显示中
+    /// </summary>
+    internal bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     底部BorderBottom（包含一些图片操作）是否显示中
+    /// </summary>
+    internal bool ShowBorderBottom
+    {
+        get => _showBorderBottom;
+        set
+        {
+            if (_showBorderBottom == value) return;
+            _borderBottom?.BeginAnimation(OpacityProperty,
+                value ? AnimationHelper.CreateAnimation(1, 100) : AnimationHelper.CreateAnimation(0, 400));
+            _showBorderBottom = value;
+        }
+    }
+
+    #endregion
+
+    public override void OnApplyTemplate()
+    {
+        if (_imageMain != null) _imageMain.MouseLeftButtonDown -= ImageMain_OnMouseLeftButtonDown;
+
+        if (_canvasSmallImg != null)
+        {
+            _canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
+            _canvasSmallImg.MouseLeftButtonUp -= CanvasSmallImg_OnMouseLeftButtonUp;
+            _canvasSmallImg.MouseMove -= CanvasSmallImg_OnMouseMove;
+        }
+
+        base.OnApplyTemplate();
+
+        _panelMain = GetTemplateChild(ElementPanelMain) as Panel;
+        _canvasSmallImg = GetTemplateChild(ElementCanvasSmallImg) as Canvas;
+        _borderMove = GetTemplateChild(ElementBorderMove) as Border;
+        _imageMain = GetTemplateChild(ElementImageMain) as Image;
+        _borderBottom = GetTemplateChild(ElementBorderBottom) as Border;
+
+        if (_imageMain != null)
+        {
+            var t = new RotateTransform();
+            BindingOperations.SetBinding(t, RotateTransform.AngleProperty, new Binding(ImageRotateProperty.Name) { Source = this });
+            _imageMain.LayoutTransform = t;
+            _imageMain.MouseLeftButtonDown += ImageMain_OnMouseLeftButtonDown;
+        }
+
+        if (_canvasSmallImg != null)
+        {
+            _canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
+            _canvasSmallImg.MouseLeftButtonUp += CanvasSmallImg_OnMouseLeftButtonUp;
+            _canvasSmallImg.MouseMove += CanvasSmallImg_OnMouseMove;
+        }
+
+        _borderSmallIsLoaded = false;
+    }
+
+    private static void OnImageScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ImageViewer imageViewer && e.NewValue is double newValue)
+        {
+            imageViewer.ImageWidth = imageViewer.ImageOriWidth * newValue;
+            imageViewer.ImageHeight = imageViewer.ImageOriHeight * newValue;
+            imageViewer.ScaleStr = $"{newValue * 100:#0}%";
+        }
+    }
+
+    /// <summary>
+    ///     初始化
+    /// </summary>
+    private void Init()
+    {
+        if (ImageSource == null || !_isLoaded) return;
+
+        if (ImageSource.IsDownloading)
+        {
+            _dispatcher = new DispatcherTimer(DispatcherPriority.ApplicationIdle)
+            {
+                Interval = TimeSpan.FromSeconds(1)
             };
+            _dispatcher.Tick += Dispatcher_Tick;
+            _dispatcher.Start();
+
+            return;
         }
 
-        /// <summary>
-        ///     带一个图片Uri的构造函数
-        /// </summary>
-        /// <param name="uri"></param>
-        public ImageViewer(Uri uri) : this()
+        double width;
+        double height;
+
+        if (!_isOblique)
         {
-            try
+            width = ImageSource.PixelWidth;
+            height = ImageSource.PixelHeight;
+        }
+        else
+        {
+            width = ImageSource.PixelHeight;
+            height = ImageSource.PixelWidth;
+        }
+
+        ImageWidth = width;
+        ImageHeight = height;
+        ImageOriWidth = width;
+        ImageOriHeight = height;
+        _scaleInternalWidth = ImageOriWidth * ScaleInternal;
+        _scaleInternalHeight = ImageOriHeight * ScaleInternal;
+
+        if (Math.Abs(height - 0) < 0.001 || Math.Abs(width - 0) < 0.001)
+        {
+            MessageBox.Show(Lang.ErrorImgSize);
+            return;
+        }
+
+        _imgWidHeiScale = width / height;
+        var scaleWindow = ActualWidth / ActualHeight;
+        if (_imgWidHeiScale > scaleWindow)
+        {
+            if (width > ActualWidth)
+                ImageScale = ActualWidth / width;
+        }
+        else if (height > ActualHeight)
+        {
+            ImageScale = ActualHeight / height;
+        }
+        else
+        {
+            ImageScale = 1;
+        }
+
+        ImageMargin = new Thickness((ActualWidth - ImageWidth) / 2, (ActualHeight - ImageHeight) / 2, 0, 0);
+
+        _imgActualScale = ImageScale;
+        _imgActualMargin = ImageMargin;
+
+        InitBorderSmall();
+    }
+
+    private void Dispatcher_Tick(object sender, EventArgs e)
+    {
+        if (_dispatcher == null) return;
+
+        if (ImageSource == null || !_isLoaded)
+        {
+            _dispatcher.Stop();
+            _dispatcher.Tick -= Dispatcher_Tick;
+            _dispatcher = null;
+            return;
+        }
+
+        if (!ImageSource.IsDownloading)
+        {
+            _dispatcher.Stop();
+            _dispatcher.Tick -= Dispatcher_Tick;
+            _dispatcher = null;
+            Init();
+        }
+    }
+
+    private void ButtonActual_OnClick(object sender, RoutedEventArgs e)
+    {
+        var scaleAnimation = AnimationHelper.CreateAnimation(1);
+        scaleAnimation.FillBehavior = FillBehavior.Stop;
+        _imgActualScale = 1;
+        scaleAnimation.Completed += (s, e1) =>
+        {
+            ImageScale = 1;
+            _canMoveX = ImageWidth > ActualWidth;
+            _canMoveY = ImageHeight > ActualHeight;
+            BorderSmallShowSwitch();
+        };
+        var thickness = new Thickness((ActualWidth - ImageOriWidth) / 2, (ActualHeight - ImageOriHeight) / 2, 0, 0);
+        var marginAnimation = AnimationHelper.CreateAnimation(thickness);
+        marginAnimation.FillBehavior = FillBehavior.Stop;
+        _imgActualMargin = thickness;
+        marginAnimation.Completed += (s, e1) => { ImageMargin = thickness; };
+
+        BeginAnimation(ImageScaleProperty, scaleAnimation);
+        BeginAnimation(ImageMarginProperty, marginAnimation);
+    }
+
+    private void ButtonReduce_OnClick(object sender, RoutedEventArgs e) => ScaleImg(false);
+
+    private void ButtonEnlarge_OnClick(object sender, RoutedEventArgs e) => ScaleImg(true);
+
+    private void ButtonRotateLeft_OnClick(object sender, RoutedEventArgs e) => RotateImg(_imgActualRotate - 90);
+
+    private void ButtonRotateRight_OnClick(object sender, RoutedEventArgs e) => RotateImg(_imgActualRotate + 90);
+
+    private void ButtonSave_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (ImageSource == null) return;
+        SaveFileDialog.FileName = $"{DateTime.Now:yyyy-M-d-h-m-s.fff}";
+        if (SaveFileDialog.ShowDialog() == true)
+        {
+            var path = SaveFileDialog.FileName;
+            using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write))
             {
-                ImageSource = BitmapFrame.Create(uri);
-                ImgPath = uri.AbsolutePath;
-                if (File.Exists(ImgPath))
-                {
-                    var info = new FileInfo(ImgPath);
-                    ImgSize = info.Length;
-                }
-            }
-            catch
-            {
-                MessageBox.Show(Lang.ErrorImgPath);
+                var encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(ImageSource));
+                encoder.Save(fileStream);
             }
         }
+    }
 
-        /// <summary>
-        ///     带一个图片路径的构造函数
-        /// </summary>
-        /// <param name="path"></param>
-        public ImageViewer(string path) : this(new Uri(path))
+    private void ButtonWindowsOpen_OnClick(object sender, RoutedEventArgs e)
+    {
+        try
         {
+            Process.Start(ImgPath);
+        }
+        catch (Exception exception)
+        {
+            MessageBox.Show(exception.Message);
+        }
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e) => MoveImg();
+
+    protected override void OnMouseLeave(MouseEventArgs e) => ShowBorderBottom = false;
+
+    protected override void OnMouseWheel(MouseWheelEventArgs e) => ScaleImg(e.Delta > 0);
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+
+        OnRenderSizeChanged();
+    }
+
+    private void OnRenderSizeChanged()
+    {
+        if (ImageWidth < 0.001 || ImageHeight < 0.001) return;
+
+        _canMoveX = true;
+        _canMoveY = true;
+
+        var marginX = ImageMargin.Left;
+        var marginY = ImageMargin.Top;
+
+        if (ImageWidth <= ActualWidth)
+        {
+            _canMoveX = false;
+            marginX = (ActualWidth - ImageWidth) / 2;
         }
 
-        #endregion
-
-        #region Properties
-
-        public static readonly DependencyProperty ShowImgMapProperty = DependencyProperty.Register(
-            "ShowImgMap", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register(
-            "ImageSource", typeof(BitmapFrame), typeof(ImageViewer), new PropertyMetadata(default(BitmapFrame), OnImageSourceChanged));
-
-        private static void OnImageSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (ImageHeight <= ActualHeight)
         {
-            var ctl = (ImageViewer) d;
-            ctl.Init();
+            _canMoveY = false;
+            marginY = (ActualHeight - ImageHeight) / 2;
         }
 
-        public static readonly DependencyProperty ShowToolBarProperty = DependencyProperty.Register(
-            "ShowToolBar", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.TrueBox));
+        ImageMargin = new Thickness(marginX, marginY, 0, 0);
+        _imgActualMargin = ImageMargin;
 
-        public static readonly DependencyProperty IsFullScreenProperty = DependencyProperty.Register(
-            "IsFullScreen", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+        BorderSmallShowSwitch();
+        _imgSmallMouseDownMargin = _borderMove.Margin;
+        MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
+    }
 
-        internal static readonly DependencyProperty ImgPathProperty = DependencyProperty.Register(
-            "ImgPath", typeof(string), typeof(ImageViewer), new PropertyMetadata(default(string)));
+    private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        _imgMouseDownPoint = Mouse.GetPosition(_panelMain);
+        _imgMouseDownMargin = ImageMargin;
+        _imgIsMouseLeftButtonDown = true;
+    }
 
-        internal static readonly DependencyProperty ImgSizeProperty = DependencyProperty.Register(
-            "ImgSize", typeof(long), typeof(ImageViewer), new PropertyMetadata(-1L));
+    protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e) => _imgIsMouseLeftButtonDown = false;
 
-        /// <summary>
-        ///     是否显示全屏按钮
-        /// </summary>
-        internal static readonly DependencyProperty ShowFullScreenButtonProperty = DependencyProperty.Register(
-            "ShowFullScreenButton", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     关闭按钮是否显示中
-        /// </summary>
-        internal static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.Register(
-            "ShowCloseButton", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        internal static readonly DependencyProperty ImageContentProperty = DependencyProperty.Register(
-            "ImageContent", typeof(object), typeof(ImageViewer), new PropertyMetadata(default(object)));
-
-        internal static readonly DependencyProperty ImageMarginProperty = DependencyProperty.Register(
-            "ImageMargin", typeof(Thickness), typeof(ImageViewer), new PropertyMetadata(default(Thickness)));
-
-        internal static readonly DependencyProperty ImageWidthProperty = DependencyProperty.Register(
-            "ImageWidth", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        internal static readonly DependencyProperty ImageHeightProperty = DependencyProperty.Register(
-            "ImageHeight", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        internal static readonly DependencyProperty ImageScaleProperty = DependencyProperty.Register(
-            "ImageScale", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double1Box, OnImageScaleChanged));
-
-        internal static readonly DependencyProperty ScaleStrProperty = DependencyProperty.Register(
-            "ScaleStr", typeof(string), typeof(ImageViewer), new PropertyMetadata("100%"));
-
-        internal static readonly DependencyProperty ImageRotateProperty = DependencyProperty.Register(
-            "ImageRotate", typeof(double), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        internal static readonly DependencyProperty ShowSmallImgInternalProperty = DependencyProperty.Register(
-            "ShowSmallImgInternal", typeof(bool), typeof(ImageViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsFullScreen
+    /// <summary>
+    ///     右下角小图片显示切换
+    /// </summary>
+    private void BorderSmallShowSwitch()
+    {
+        if (_canMoveX || _canMoveY)
         {
-            get => (bool) GetValue(IsFullScreenProperty);
-            set => SetValue(IsFullScreenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool ShowImgMap
-        {
-            get => (bool) GetValue(ShowImgMapProperty);
-            set => SetValue(ShowImgMapProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public BitmapFrame ImageSource
-        {
-            get => (BitmapFrame) GetValue(ImageSourceProperty);
-            set => SetValue(ImageSourceProperty, value);
-        }
-
-        public bool ShowToolBar
-        {
-            get => (bool) GetValue(ShowToolBarProperty);
-            set => SetValue(ShowToolBarProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal object ImageContent
-        {
-            get => GetValue(ImageContentProperty);
-            set => SetValue(ImageContentProperty, value);
-        }
-
-        internal string ImgPath
-        {
-            get => (string) GetValue(ImgPathProperty);
-            set => SetValue(ImgPathProperty, value);
-        }
-
-        internal long ImgSize
-        {
-            get => (long) GetValue(ImgSizeProperty);
-            set => SetValue(ImgSizeProperty, value);
-        }
-
-        /// <summary>
-        ///     是否显示全屏按钮
-        /// </summary>
-        internal bool ShowFullScreenButton
-        {
-            get => (bool) GetValue(ShowFullScreenButtonProperty);
-            set => SetValue(ShowFullScreenButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal Thickness ImageMargin
-        {
-            get => (Thickness) GetValue(ImageMarginProperty);
-            set => SetValue(ImageMarginProperty, value);
-        }
-
-        internal double ImageWidth
-        {
-            get => (double) GetValue(ImageWidthProperty);
-            set => SetValue(ImageWidthProperty, value);
-        }
-
-        internal double ImageHeight
-        {
-            get => (double) GetValue(ImageHeightProperty);
-            set => SetValue(ImageHeightProperty, value);
-        }
-
-        internal double ImageScale
-        {
-            get => (double) GetValue(ImageScaleProperty);
-            set => SetValue(ImageScaleProperty, value);
-        }
-
-        internal string ScaleStr
-        {
-            get => (string) GetValue(ScaleStrProperty);
-            set => SetValue(ScaleStrProperty, value);
-        }
-
-        internal double ImageRotate
-        {
-            get => (double) GetValue(ImageRotateProperty);
-            set => SetValue(ImageRotateProperty, value);
-        }
-
-        internal bool ShowSmallImgInternal
-        {
-            get => (bool) GetValue(ShowSmallImgInternalProperty);
-            set => SetValue(ShowSmallImgInternalProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     图片原始宽度
-        /// </summary>
-        private double ImageOriWidth { get; set; }
-
-        /// <summary>
-        ///     图片原始高度
-        /// </summary>
-        private double ImageOriHeight { get; set; }
-
-        /// <summary>
-        ///     关闭按钮是否显示中
-        /// </summary>
-        internal bool ShowCloseButton
-        {
-            get => (bool) GetValue(ShowCloseButtonProperty);
-            set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     底部BorderBottom（包含一些图片操作）是否显示中
-        /// </summary>
-        internal bool ShowBorderBottom
-        {
-            get => _showBorderBottom;
-            set
+            if (!_borderSmallIsLoaded)
             {
-                if (_showBorderBottom == value) return;
-                _borderBottom?.BeginAnimation(OpacityProperty,
-                    value ? AnimationHelper.CreateAnimation(1, 100) : AnimationHelper.CreateAnimation(0, 400));
-                _showBorderBottom = value;
-            }
-        }
-
-        #endregion
-
-        public override void OnApplyTemplate()
-        {
-            if (_imageMain != null) _imageMain.MouseLeftButtonDown -= ImageMain_OnMouseLeftButtonDown;
-
-            if (_canvasSmallImg != null)
-            {
-                _canvasSmallImg.MouseLeftButtonDown -= CanvasSmallImg_OnMouseLeftButtonDown;
-                _canvasSmallImg.MouseLeftButtonUp -= CanvasSmallImg_OnMouseLeftButtonUp;
-                _canvasSmallImg.MouseMove -= CanvasSmallImg_OnMouseMove;
+                _canvasSmallImg.Background = new VisualBrush(_imageMain);
+                InitBorderSmall();
+                _borderSmallIsLoaded = true;
             }
 
-            base.OnApplyTemplate();
-
-            _panelMain = GetTemplateChild(ElementPanelMain) as Panel;
-            _canvasSmallImg = GetTemplateChild(ElementCanvasSmallImg) as Canvas;
-            _borderMove = GetTemplateChild(ElementBorderMove) as Border;
-            _imageMain = GetTemplateChild(ElementImageMain) as Image;
-            _borderBottom = GetTemplateChild(ElementBorderBottom) as Border;
-
-            if (_imageMain != null)
-            {
-                var t = new RotateTransform();
-                BindingOperations.SetBinding(t, RotateTransform.AngleProperty, new Binding(ImageRotateProperty.Name) { Source = this });
-                _imageMain.LayoutTransform = t;
-                _imageMain.MouseLeftButtonDown += ImageMain_OnMouseLeftButtonDown;
-            }
-
-            if (_canvasSmallImg != null)
-            {
-                _canvasSmallImg.MouseLeftButtonDown += CanvasSmallImg_OnMouseLeftButtonDown;
-                _canvasSmallImg.MouseLeftButtonUp += CanvasSmallImg_OnMouseLeftButtonUp;
-                _canvasSmallImg.MouseMove += CanvasSmallImg_OnMouseMove;
-            }
-
-            _borderSmallIsLoaded = false;
+            ShowSmallImgInternal = true;
+            UpdateBorderSmall();
         }
-
-        private static void OnImageScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else
         {
-            if (d is ImageViewer imageViewer && e.NewValue is double newValue)
-            {
-                imageViewer.ImageWidth = imageViewer.ImageOriWidth * newValue;
-                imageViewer.ImageHeight = imageViewer.ImageOriHeight * newValue;
-                imageViewer.ScaleStr = $"{newValue * 100:#0}%";
-            }
+            ShowSmallImgInternal = false;
         }
+    }
 
-        /// <summary>
-        ///     初始化
-        /// </summary>
-        private void Init()
+    /// <summary>
+    ///     初始化右下角小图片
+    /// </summary>
+    private void InitBorderSmall()
+    {
+        if (_canvasSmallImg == null) return;
+        var scaleWindow = _canvasSmallImg.MaxWidth / _canvasSmallImg.MaxHeight;
+        if (_imgWidHeiScale > scaleWindow)
         {
-            if (ImageSource == null || !_isLoaded) return;
-
-            if (ImageSource.IsDownloading)
-            {
-                _dispatcher = new DispatcherTimer(DispatcherPriority.ApplicationIdle)
-                {
-                    Interval = TimeSpan.FromSeconds(1)
-                };
-                _dispatcher.Tick += Dispatcher_Tick;
-                _dispatcher.Start();
-
-                return;
-            }
-
-            double width;
-            double height;
-
-            if (!_isOblique)
-            {
-                width = ImageSource.PixelWidth;
-                height = ImageSource.PixelHeight;
-            }
-            else
-            {
-                width = ImageSource.PixelHeight;
-                height = ImageSource.PixelWidth;
-            }
-
-            ImageWidth = width;
-            ImageHeight = height;
-            ImageOriWidth = width;
-            ImageOriHeight = height;
-            _scaleInternalWidth = ImageOriWidth * ScaleInternal;
-            _scaleInternalHeight = ImageOriHeight * ScaleInternal;
-
-            if (Math.Abs(height - 0) < 0.001 || Math.Abs(width - 0) < 0.001)
-            {
-                MessageBox.Show(Lang.ErrorImgSize);
-                return;
-            }
-
-            _imgWidHeiScale = width / height;
-            var scaleWindow = ActualWidth / ActualHeight;
-            if (_imgWidHeiScale > scaleWindow)
-            {
-                if (width > ActualWidth)
-                    ImageScale = ActualWidth / width;
-            }
-            else if (height > ActualHeight)
-            {
-                ImageScale = ActualHeight / height;
-            }
-            else
-            {
-                ImageScale = 1;
-            }
-
-            ImageMargin = new Thickness((ActualWidth - ImageWidth) / 2, (ActualHeight - ImageHeight) / 2, 0, 0);
-
-            _imgActualScale = ImageScale;
-            _imgActualMargin = ImageMargin;
-
-            InitBorderSmall();
+            _canvasSmallImg.Width = _canvasSmallImg.MaxWidth;
+            _canvasSmallImg.Height = _canvasSmallImg.Width / _imgWidHeiScale;
         }
-
-        private void Dispatcher_Tick(object sender, EventArgs e)
+        else
         {
-            if (_dispatcher == null) return;
-
-            if (ImageSource == null || !_isLoaded)
-            {
-                _dispatcher.Stop();
-                _dispatcher.Tick -= Dispatcher_Tick;
-                _dispatcher = null;
-                return;
-            }
-
-            if (!ImageSource.IsDownloading)
-            {
-                _dispatcher.Stop();
-                _dispatcher.Tick -= Dispatcher_Tick;
-                _dispatcher = null;
-                Init();
-            }
+            _canvasSmallImg.Width = _canvasSmallImg.MaxHeight * _imgWidHeiScale;
+            _canvasSmallImg.Height = _canvasSmallImg.MaxHeight;
         }
+    }
 
-        private void ButtonActual_OnClick(object sender, RoutedEventArgs e)
+    /// <summary>
+    ///     更新右下角小图片
+    /// </summary>
+    private void UpdateBorderSmall()
+    {
+        if (!ShowSmallImgInternal) return;
+
+        var widthMin = Math.Min(ImageWidth, ActualWidth);
+        var heightMin = Math.Min(ImageHeight, ActualHeight);
+
+        _borderMove.Width = widthMin / ImageWidth * _canvasSmallImg.Width;
+        _borderMove.Height = heightMin / ImageHeight * _canvasSmallImg.Height;
+
+        var marginX = -ImageMargin.Left / ImageWidth * _canvasSmallImg.Width;
+        var marginY = -ImageMargin.Top / ImageHeight * _canvasSmallImg.Height;
+
+        var marginXMax = _canvasSmallImg.Width - _borderMove.Width;
+        var marginYMax = _canvasSmallImg.Height - _borderMove.Height;
+
+        marginX = Math.Max(0, marginX);
+        marginX = Math.Min(marginXMax, marginX);
+        marginY = Math.Max(0, marginY);
+        marginY = Math.Min(marginYMax, marginY);
+
+        _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
+    }
+
+    /// <summary>
+    ///     缩放图片
+    /// </summary>
+    /// <param name="isEnlarge"></param>
+    private void ScaleImg(bool isEnlarge)
+    {
+        if (Mouse.LeftButton == MouseButtonState.Pressed) return;
+        var oldImageWidth = ImageWidth;
+        var olgImageHeight = ImageHeight;
+
+        var tempScale = isEnlarge ? _imgActualScale + ScaleInternal : _imgActualScale - ScaleInternal;
+        if (Math.Abs(tempScale) < ScaleInternal || Math.Abs(tempScale - 50) < 0.001)
+            return;
+
+        ImageScale = tempScale;
+
+        var posCanvas = Mouse.GetPosition(_panelMain);
+        var posImg = new Point(posCanvas.X - _imgActualMargin.Left, posCanvas.Y - _imgActualMargin.Top);
+
+        var marginX = .5 * _scaleInternalWidth;
+        var marginY = .5 * _scaleInternalHeight;
+
+        if (ImageWidth > ActualWidth)
         {
-            var scaleAnimation = AnimationHelper.CreateAnimation(1);
-            scaleAnimation.FillBehavior = FillBehavior.Stop;
-            _imgActualScale = 1;
-            scaleAnimation.Completed += (s, e1) =>
-            {
-                ImageScale = 1;
-                _canMoveX = ImageWidth > ActualWidth;
-                _canMoveY = ImageHeight > ActualHeight;
-                BorderSmallShowSwitch();
-            };
-            var thickness = new Thickness((ActualWidth - ImageOriWidth) / 2, (ActualHeight - ImageOriHeight) / 2, 0, 0);
-            var marginAnimation = AnimationHelper.CreateAnimation(thickness);
-            marginAnimation.FillBehavior = FillBehavior.Stop;
-            _imgActualMargin = thickness;
-            marginAnimation.Completed += (s, e1) => { ImageMargin = thickness; };
-
-            BeginAnimation(ImageScaleProperty, scaleAnimation);
-            BeginAnimation(ImageMarginProperty, marginAnimation);
-        }
-
-        private void ButtonReduce_OnClick(object sender, RoutedEventArgs e) => ScaleImg(false);
-
-        private void ButtonEnlarge_OnClick(object sender, RoutedEventArgs e) => ScaleImg(true);
-
-        private void ButtonRotateLeft_OnClick(object sender, RoutedEventArgs e) => RotateImg(_imgActualRotate - 90);
-
-        private void ButtonRotateRight_OnClick(object sender, RoutedEventArgs e) => RotateImg(_imgActualRotate + 90);
-
-        private void ButtonSave_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (ImageSource == null) return;
-            SaveFileDialog.FileName = $"{DateTime.Now:yyyy-M-d-h-m-s.fff}";
-            if (SaveFileDialog.ShowDialog() == true)
-            {
-                var path = SaveFileDialog.FileName;
-                using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write))
-                {
-                    var encoder = new PngBitmapEncoder();
-                    encoder.Frames.Add(BitmapFrame.Create(ImageSource));
-                    encoder.Save(fileStream);
-                }
-            }
-        }
-
-        private void ButtonWindowsOpen_OnClick(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                Process.Start(ImgPath);
-            }
-            catch (Exception exception)
-            {
-                MessageBox.Show(exception.Message);
-            }
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e) => MoveImg();
-
-        protected override void OnMouseLeave(MouseEventArgs e) => ShowBorderBottom = false;
-
-        protected override void OnMouseWheel(MouseWheelEventArgs e) => ScaleImg(e.Delta > 0);
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-
-            OnRenderSizeChanged();
-        }
-
-        private void OnRenderSizeChanged()
-        {
-            if (ImageWidth < 0.001 || ImageHeight < 0.001) return;
-
             _canMoveX = true;
-            _canMoveY = true;
-
-            var marginX = ImageMargin.Left;
-            var marginY = ImageMargin.Top;
-
-            if (ImageWidth <= ActualWidth)
+            if (ImageHeight > ActualHeight)
             {
-                _canMoveX = false;
-                marginX = (ActualWidth - ImageWidth) / 2;
+                _canMoveY = true;
+                marginX = posImg.X / oldImageWidth * _scaleInternalWidth;
+                marginY = posImg.Y / olgImageHeight * _scaleInternalHeight;
             }
-
-            if (ImageHeight <= ActualHeight)
+            else
             {
                 _canMoveY = false;
-                marginY = (ActualHeight - ImageHeight) / 2;
+            }
+        }
+        else
+        {
+            _canMoveY = ImageHeight > ActualHeight;
+            _canMoveX = false;
+        }
+
+        Thickness thickness;
+        if (isEnlarge)
+        {
+            thickness = new Thickness(_imgActualMargin.Left - marginX, _imgActualMargin.Top - marginY, 0, 0);
+        }
+        else
+        {
+            var marginActualX = _imgActualMargin.Left + marginX;
+            var marginActualY = _imgActualMargin.Top + marginY;
+            var subX = ImageWidth - ActualWidth;
+            var subY = ImageHeight - ActualHeight;
+
+            var right = Math.Abs(_borderMove.Width - _canvasSmallImg.ActualWidth + _borderMove.Margin.Left);
+            var top = Math.Abs(_borderMove.Height - _canvasSmallImg.ActualHeight + _borderMove.Margin.Top);
+            if (Math.Abs(ImageMargin.Left) < 0.001 || right < 0.001)
+                marginActualX = _imgActualMargin.Left + _borderMove.Margin.Left /
+                    (_canvasSmallImg.ActualWidth - _borderMove.Width) * _scaleInternalWidth;
+            if (Math.Abs(ImageMargin.Top) < 0.001 || top < 0.001)
+                marginActualY = _imgActualMargin.Top + _borderMove.Margin.Top /
+                    (_canvasSmallImg.ActualHeight - _borderMove.Height) * _scaleInternalHeight;
+            if (subX < 0.001) marginActualX = (ActualWidth - ImageWidth) / 2;
+            if (subY < 0.001) marginActualY = (ActualHeight - ImageHeight) / 2;
+            thickness = new Thickness(marginActualX, marginActualY, 0, 0);
+        }
+
+        ImageMargin = thickness;
+        _imgActualScale = tempScale;
+        _imgActualMargin = thickness;
+        BorderSmallShowSwitch();
+
+        _imgSmallMouseDownMargin = _borderMove.Margin;
+        MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
+    }
+
+    /// <summary>
+    ///     旋转图片
+    /// </summary>
+    /// <param name="rotate"></param>
+    private void RotateImg(double rotate)
+    {
+        _imgActualRotate = rotate;
+
+        _isOblique = ((int) _imgActualRotate - 90) % 180 == 0;
+        ShowSmallImgInternal = false;
+        Init();
+        InitBorderSmall();
+
+        var animation = AnimationHelper.CreateAnimation(rotate);
+        animation.Completed += (s, e1) => { ImageRotate = rotate; };
+        animation.FillBehavior = FillBehavior.Stop;
+        BeginAnimation(ImageRotateProperty, animation);
+    }
+
+    /// <summary>
+    ///     移动图片
+    /// </summary>
+    private void MoveImg()
+    {
+        _imgCurrentPoint = Mouse.GetPosition(_panelMain);
+        ShowCloseButton = _imgCurrentPoint.Y < 200;
+        ShowBorderBottom = _imgCurrentPoint.Y > ActualHeight - 200;
+
+        if (Mouse.LeftButton == MouseButtonState.Released)
+        {
+            return;
+        }
+
+        if (_imgIsMouseLeftButtonDown)
+        {
+            var subX = _imgCurrentPoint.X - _imgMouseDownPoint.X;
+            var subY = _imgCurrentPoint.Y - _imgMouseDownPoint.Y;
+
+            var marginX = _imgMouseDownMargin.Left;
+            if (ImageWidth > ActualWidth)
+            {
+                marginX = _imgMouseDownMargin.Left + subX;
+                if (marginX >= 0)
+                    marginX = 0;
+                else if (-marginX + ActualWidth >= ImageWidth) marginX = ActualWidth - ImageWidth;
+                _canMoveX = true;
+            }
+
+            var marginY = _imgMouseDownMargin.Top;
+            if (ImageHeight > ActualHeight)
+            {
+                marginY = _imgMouseDownMargin.Top + subY;
+                if (marginY >= 0)
+                    marginY = 0;
+                else if (-marginY + ActualHeight >= ImageHeight) marginY = ActualHeight - ImageHeight;
+                _canMoveY = true;
             }
 
             ImageMargin = new Thickness(marginX, marginY, 0, 0);
             _imgActualMargin = ImageMargin;
 
-            BorderSmallShowSwitch();
-            _imgSmallMouseDownMargin = _borderMove.Margin;
-            MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
+            UpdateBorderSmall();
         }
-
-        private void ImageMain_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            _imgMouseDownPoint = Mouse.GetPosition(_panelMain);
-            _imgMouseDownMargin = ImageMargin;
-            _imgIsMouseLeftButtonDown = true;
-        }
-
-        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e) => _imgIsMouseLeftButtonDown = false;
-
-        /// <summary>
-        ///     右下角小图片显示切换
-        /// </summary>
-        private void BorderSmallShowSwitch()
-        {
-            if (_canMoveX || _canMoveY)
-            {
-                if (!_borderSmallIsLoaded)
-                {
-                    _canvasSmallImg.Background = new VisualBrush(_imageMain);
-                    InitBorderSmall();
-                    _borderSmallIsLoaded = true;
-                }
-
-                ShowSmallImgInternal = true;
-                UpdateBorderSmall();
-            }
-            else
-            {
-                ShowSmallImgInternal = false;
-            }
-        }
-
-        /// <summary>
-        ///     初始化右下角小图片
-        /// </summary>
-        private void InitBorderSmall()
-        {
-            if (_canvasSmallImg == null) return;
-            var scaleWindow = _canvasSmallImg.MaxWidth / _canvasSmallImg.MaxHeight;
-            if (_imgWidHeiScale > scaleWindow)
-            {
-                _canvasSmallImg.Width = _canvasSmallImg.MaxWidth;
-                _canvasSmallImg.Height = _canvasSmallImg.Width / _imgWidHeiScale;
-            }
-            else
-            {
-                _canvasSmallImg.Width = _canvasSmallImg.MaxHeight * _imgWidHeiScale;
-                _canvasSmallImg.Height = _canvasSmallImg.MaxHeight;
-            }
-        }
-
-        /// <summary>
-        ///     更新右下角小图片
-        /// </summary>
-        private void UpdateBorderSmall()
-        {
-            if (!ShowSmallImgInternal) return;
-
-            var widthMin = Math.Min(ImageWidth, ActualWidth);
-            var heightMin = Math.Min(ImageHeight, ActualHeight);
-
-            _borderMove.Width = widthMin / ImageWidth * _canvasSmallImg.Width;
-            _borderMove.Height = heightMin / ImageHeight * _canvasSmallImg.Height;
-
-            var marginX = -ImageMargin.Left / ImageWidth * _canvasSmallImg.Width;
-            var marginY = -ImageMargin.Top / ImageHeight * _canvasSmallImg.Height;
-
-            var marginXMax = _canvasSmallImg.Width - _borderMove.Width;
-            var marginYMax = _canvasSmallImg.Height - _borderMove.Height;
-
-            marginX = Math.Max(0, marginX);
-            marginX = Math.Min(marginXMax, marginX);
-            marginY = Math.Max(0, marginY);
-            marginY = Math.Min(marginYMax, marginY);
-
-            _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
-        }
-
-        /// <summary>
-        ///     缩放图片
-        /// </summary>
-        /// <param name="isEnlarge"></param>
-        private void ScaleImg(bool isEnlarge)
-        {
-            if (Mouse.LeftButton == MouseButtonState.Pressed) return;
-            var oldImageWidth = ImageWidth;
-            var olgImageHeight = ImageHeight;
-
-            var tempScale = isEnlarge ? _imgActualScale + ScaleInternal : _imgActualScale - ScaleInternal;
-            if (Math.Abs(tempScale) < ScaleInternal || Math.Abs(tempScale - 50) < 0.001)
-                return;
-
-            ImageScale = tempScale;
-
-            var posCanvas = Mouse.GetPosition(_panelMain);
-            var posImg = new Point(posCanvas.X - _imgActualMargin.Left, posCanvas.Y - _imgActualMargin.Top);
-
-            var marginX = .5 * _scaleInternalWidth;
-            var marginY = .5 * _scaleInternalHeight;
-
-            if (ImageWidth > ActualWidth)
-            {
-                _canMoveX = true;
-                if (ImageHeight > ActualHeight)
-                {
-                    _canMoveY = true;
-                    marginX = posImg.X / oldImageWidth * _scaleInternalWidth;
-                    marginY = posImg.Y / olgImageHeight * _scaleInternalHeight;
-                }
-                else
-                {
-                    _canMoveY = false;
-                }
-            }
-            else
-            {
-                _canMoveY = ImageHeight > ActualHeight;
-                _canMoveX = false;
-            }
-
-            Thickness thickness;
-            if (isEnlarge)
-            {
-                thickness = new Thickness(_imgActualMargin.Left - marginX, _imgActualMargin.Top - marginY, 0, 0);
-            }
-            else
-            {
-                var marginActualX = _imgActualMargin.Left + marginX;
-                var marginActualY = _imgActualMargin.Top + marginY;
-                var subX = ImageWidth - ActualWidth;
-                var subY = ImageHeight - ActualHeight;
-
-                var right = Math.Abs(_borderMove.Width - _canvasSmallImg.ActualWidth + _borderMove.Margin.Left);
-                var top = Math.Abs(_borderMove.Height - _canvasSmallImg.ActualHeight + _borderMove.Margin.Top);
-                if (Math.Abs(ImageMargin.Left) < 0.001 || right < 0.001)
-                    marginActualX = _imgActualMargin.Left + _borderMove.Margin.Left /
-                                    (_canvasSmallImg.ActualWidth - _borderMove.Width) * _scaleInternalWidth;
-                if (Math.Abs(ImageMargin.Top) < 0.001 || top < 0.001)
-                    marginActualY = _imgActualMargin.Top + _borderMove.Margin.Top /
-                                    (_canvasSmallImg.ActualHeight - _borderMove.Height) * _scaleInternalHeight;
-                if (subX < 0.001) marginActualX = (ActualWidth - ImageWidth) / 2;
-                if (subY < 0.001) marginActualY = (ActualHeight - ImageHeight) / 2;
-                thickness = new Thickness(marginActualX, marginActualY, 0, 0);
-            }
-
-            ImageMargin = thickness;
-            _imgActualScale = tempScale;
-            _imgActualMargin = thickness;
-            BorderSmallShowSwitch();
-
-            _imgSmallMouseDownMargin = _borderMove.Margin;
-            MoveSmallImg(_imgSmallMouseDownMargin.Left, _imgSmallMouseDownMargin.Top);
-        }
-
-        /// <summary>
-        ///     旋转图片
-        /// </summary>
-        /// <param name="rotate"></param>
-        private void RotateImg(double rotate)
-        {
-            _imgActualRotate = rotate;
-
-            _isOblique = ((int) _imgActualRotate - 90) % 180 == 0;
-            ShowSmallImgInternal = false;
-            Init();
-            InitBorderSmall();
-
-            var animation = AnimationHelper.CreateAnimation(rotate);
-            animation.Completed += (s, e1) => { ImageRotate = rotate; };
-            animation.FillBehavior = FillBehavior.Stop;
-            BeginAnimation(ImageRotateProperty, animation);
-        }
-
-        /// <summary>
-        ///     移动图片
-        /// </summary>
-        private void MoveImg()
-        {
-            _imgCurrentPoint = Mouse.GetPosition(_panelMain);
-            ShowCloseButton = _imgCurrentPoint.Y < 200;
-            ShowBorderBottom = _imgCurrentPoint.Y > ActualHeight - 200;
-
-            if (Mouse.LeftButton == MouseButtonState.Released)
-            {
-                return;
-            }
-
-            if (_imgIsMouseLeftButtonDown)
-            {
-                var subX = _imgCurrentPoint.X - _imgMouseDownPoint.X;
-                var subY = _imgCurrentPoint.Y - _imgMouseDownPoint.Y;
-
-                var marginX = _imgMouseDownMargin.Left;
-                if (ImageWidth > ActualWidth)
-                {
-                    marginX = _imgMouseDownMargin.Left + subX;
-                    if (marginX >= 0)
-                        marginX = 0;
-                    else if (-marginX + ActualWidth >= ImageWidth) marginX = ActualWidth - ImageWidth;
-                    _canMoveX = true;
-                }
-
-                var marginY = _imgMouseDownMargin.Top;
-                if (ImageHeight > ActualHeight)
-                {
-                    marginY = _imgMouseDownMargin.Top + subY;
-                    if (marginY >= 0)
-                        marginY = 0;
-                    else if (-marginY + ActualHeight >= ImageHeight) marginY = ActualHeight - ImageHeight;
-                    _canMoveY = true;
-                }
-
-                ImageMargin = new Thickness(marginX, marginY, 0, 0);
-                _imgActualMargin = ImageMargin;
-
-                UpdateBorderSmall();
-            }
-        }
-
-        /// <summary>
-        ///     移动小图片
-        /// </summary>
-        private void MoveSmallImg()
-        {
-            if (!_imgSmallIsMouseLeftButtonDown)
-            {
-                return;
-            }
-
-            if (Mouse.LeftButton == MouseButtonState.Released)
-            {
-                return;
-            }
-
-            _imgSmallCurrentPoint = Mouse.GetPosition(_canvasSmallImg);
-
-            var subX = _imgSmallCurrentPoint.X - _imgSmallMouseDownPoint.X;
-            var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
-
-            var marginX = _imgSmallMouseDownMargin.Left + subX;
-            var marginY = _imgSmallMouseDownMargin.Top + subY;
-
-            MoveSmallImg(marginX, marginY);
-        }
-
-        private void MoveSmallImg(double marginX, double marginY)
-        {
-            if (marginX < 0)
-                marginX = 0;
-            else if (marginX + _borderMove.Width >= _canvasSmallImg.Width)
-                marginX = _canvasSmallImg.Width - _borderMove.Width;
-            if (marginY < 0)
-                marginY = 0;
-            else if (marginY + _borderMove.Height >= _canvasSmallImg.Height)
-                marginY = _canvasSmallImg.Height - _borderMove.Height;
-            _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
-
-            var marginActualX = (ActualWidth - ImageWidth) / 2;
-            var marginActualY = (ActualHeight - ImageHeight) / 2;
-
-            if (_canMoveX) marginActualX = -marginX / _canvasSmallImg.Width * ImageWidth;
-            if (_canMoveY) marginActualY = -marginY / _canvasSmallImg.Height * ImageHeight;
-
-            ImageMargin = new Thickness(marginActualX, marginActualY, 0, 0);
-            _imgActualMargin = ImageMargin;
-        }
-
-        private void CanvasSmallImg_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            _imgSmallMouseDownPoint = Mouse.GetPosition(_canvasSmallImg);
-            _imgSmallMouseDownMargin = _borderMove.Margin;
-            _imgSmallIsMouseLeftButtonDown = true;
-            e.Handled = true;
-        }
-
-        private void CanvasSmallImg_OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => _imgSmallIsMouseLeftButtonDown = false;
-
-        private void CanvasSmallImg_OnMouseMove(object sender, MouseEventArgs e) => MoveSmallImg();
     }
-}
+
+    /// <summary>
+    ///     移动小图片
+    /// </summary>
+    private void MoveSmallImg()
+    {
+        if (!_imgSmallIsMouseLeftButtonDown)
+        {
+            return;
+        }
+
+        if (Mouse.LeftButton == MouseButtonState.Released)
+        {
+            return;
+        }
+
+        _imgSmallCurrentPoint = Mouse.GetPosition(_canvasSmallImg);
+
+        var subX = _imgSmallCurrentPoint.X - _imgSmallMouseDownPoint.X;
+        var subY = _imgSmallCurrentPoint.Y - _imgSmallMouseDownPoint.Y;
+
+        var marginX = _imgSmallMouseDownMargin.Left + subX;
+        var marginY = _imgSmallMouseDownMargin.Top + subY;
+
+        MoveSmallImg(marginX, marginY);
+    }
+
+    private void MoveSmallImg(double marginX, double marginY)
+    {
+        if (marginX < 0)
+            marginX = 0;
+        else if (marginX + _borderMove.Width >= _canvasSmallImg.Width)
+            marginX = _canvasSmallImg.Width - _borderMove.Width;
+        if (marginY < 0)
+            marginY = 0;
+        else if (marginY + _borderMove.Height >= _canvasSmallImg.Height)
+            marginY = _canvasSmallImg.Height - _borderMove.Height;
+        _borderMove.Margin = new Thickness(marginX, marginY, 0, 0);
+
+        var marginActualX = (ActualWidth - ImageWidth) / 2;
+        var marginActualY = (ActualHeight - ImageHeight) / 2;
+
+        if (_canMoveX) marginActualX = -marginX / _canvasSmallImg.Width * ImageWidth;
+        if (_canMoveY) marginActualY = -marginY / _canvasSmallImg.Height * ImageHeight;
+
+        ImageMargin = new Thickness(marginActualX, marginActualY, 0, 0);
+        _imgActualMargin = ImageMargin;
+    }
+
+    private void CanvasSmallImg_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        _imgSmallMouseDownPoint = Mouse.GetPosition(_canvasSmallImg);
+        _imgSmallMouseDownMargin = _borderMove.Margin;
+        _imgSmallIsMouseLeftButtonDown = true;
+        e.Handled = true;
+    }
+
+    private void CanvasSmallImg_OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => _imgSmallIsMouseLeftButtonDown = false;
+
+    private void CanvasSmallImg_OnMouseMove(object sender, MouseEventArgs e) => MoveSmallImg();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
index 2f50a0bd..54ccaec5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
@@ -4,156 +4,155 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Tools.Helper;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = SearchTextBox, Type = typeof(System.Windows.Controls.TextBox))]
+public class AutoCompleteTextBox : ComboBox
 {
-    [TemplatePart(Name = SearchTextBox, Type = typeof(System.Windows.Controls.TextBox))]
-    public class AutoCompleteTextBox : ComboBox
+    private const string SearchTextBox = "PART_SearchTextBox";
+
+    private bool ignoreTextChanging;
+
+    private System.Windows.Controls.TextBox _searchTextBox;
+
+    private object _selectedItem;
+
+    static AutoCompleteTextBox()
     {
-        private const string SearchTextBox = "PART_SearchTextBox";
+        TextProperty.OverrideMetadata(typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+    }
 
-        private bool ignoreTextChanging;
-
-        private System.Windows.Controls.TextBox _searchTextBox;
-
-        private object _selectedItem;
-
-        static AutoCompleteTextBox()
+    public override void OnApplyTemplate()
+    {
+        if (_searchTextBox != null)
         {
-            TextProperty.OverrideMetadata(typeof(AutoCompleteTextBox), new FrameworkPropertyMetadata(default(string), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
+            _searchTextBox.GotFocus -= SearchTextBoxGotFocus;
+            _searchTextBox.KeyDown -= SearchTextBoxKeyDown;
+            _searchTextBox.TextChanged -= SearchTextBoxTextChanged;
         }
 
-        public override void OnApplyTemplate()
+        base.OnApplyTemplate();
+
+        _searchTextBox = GetTemplateChild(SearchTextBox) as System.Windows.Controls.TextBox;
+        if (_searchTextBox != null)
         {
-            if (_searchTextBox != null)
-            {
-                _searchTextBox.GotFocus -= SearchTextBoxGotFocus;
-                _searchTextBox.KeyDown -= SearchTextBoxKeyDown;
-                _searchTextBox.TextChanged -= SearchTextBoxTextChanged;
-            }
+            _searchTextBox.GotFocus += SearchTextBoxGotFocus;
+            _searchTextBox.PreviewKeyDown += SearchTextBoxKeyDown;
+            _searchTextBox.TextChanged += SearchTextBoxTextChanged;
+        }
 
-            base.OnApplyTemplate();
+        UpdateTextBoxBySelectedItem(_selectedItem);
+    }
 
-            _searchTextBox = GetTemplateChild(SearchTextBox) as System.Windows.Controls.TextBox;
-            if (_searchTextBox != null)
-            {
-                _searchTextBox.GotFocus += SearchTextBoxGotFocus;
-                _searchTextBox.PreviewKeyDown += SearchTextBoxKeyDown;
-                _searchTextBox.TextChanged += SearchTextBoxTextChanged;
-            }
+    protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+    {
+        base.OnSelectionChanged(e);
 
+        if (e.AddedItems.Count > 0)
+        {
+            _selectedItem = e.AddedItems[0];
             UpdateTextBoxBySelectedItem(_selectedItem);
         }
+    }
 
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is AutoCompleteTextBoxItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new AutoCompleteTextBoxItem();
+
+    private void SearchTextBoxTextChanged(object sender, TextChangedEventArgs e)
+    {
+        _selectedItem = null;
+        SelectedIndex = -1;
+
+        if (ignoreTextChanging)
         {
-            base.OnSelectionChanged(e);
-
-            if (e.AddedItems.Count > 0)
-            {
-                _selectedItem = e.AddedItems[0];
-                UpdateTextBoxBySelectedItem(_selectedItem);
-            }
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is AutoCompleteTextBoxItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new AutoCompleteTextBoxItem();
-
-        private void SearchTextBoxTextChanged(object sender, TextChangedEventArgs e)
-        {
-            _selectedItem = null;
-            SelectedIndex = -1;
-
-            if (ignoreTextChanging)
-            {
-                ignoreTextChanging = false;
-                return;
-            }
-
-            Text = _searchTextBox.Text;
-            if (string.IsNullOrEmpty(Text))
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-                _searchTextBox.Focus();
-            }
-            else if (_searchTextBox.IsFocused)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
-            }
-        }
-
-        private void SearchTextBoxKeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Up)
-            {
-                var index = SelectedIndex - 1;
-                if (index < 0)
-                {
-                    index = Items.Count - 1;
-                }
-
-                UpdateTextBoxBySelectedIndex(index);
-            }
-            else if (e.Key == Key.Down)
-            {
-                var index = SelectedIndex + 1;
-                if (index >= Items.Count)
-                {
-                    index = 0;
-                }
-
-                UpdateTextBoxBySelectedIndex(index);
-            }
-            else if (e.Key == Key.Enter)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-                e.Handled = true;
-            }
-        }
-
-        private void UpdateTextBoxBySelectedIndex(int selectedIndex)
-        {
-            if (_searchTextBox == null)
-            {
-                return;
-            }
-
-            ignoreTextChanging = true;
-
-            if (ItemContainerGenerator.ContainerFromIndex(selectedIndex) is AutoCompleteTextBoxItem boxItem)
-            {
-                _searchTextBox.Text = BindingHelper.GetString(boxItem.Content, DisplayMemberPath);
-                _searchTextBox.CaretIndex = _searchTextBox.Text.Length;
-
-                SelectedIndex = selectedIndex;
-            }
-        }
-
-        private void UpdateTextBoxBySelectedItem(object selectedItem)
-        {
-            if (_searchTextBox == null)
-            {
-                return;
-            }
-
-            ignoreTextChanging = true;
-
-            _searchTextBox.Text = BindingHelper.GetString(selectedItem, DisplayMemberPath);
-            _searchTextBox.CaretIndex = _searchTextBox.Text.Length;
-
-            ignoreTextChanging = true;
-
-            Text = _searchTextBox.Text;
-
             ignoreTextChanging = false;
+            return;
         }
 
-        private void SearchTextBoxGotFocus(object sender, RoutedEventArgs e)
+        Text = _searchTextBox.Text;
+        if (string.IsNullOrEmpty(Text))
         {
-            if (!string.IsNullOrEmpty(Text))
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
-            }
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+            _searchTextBox.Focus();
+        }
+        else if (_searchTextBox.IsFocused)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
         }
     }
-}
+
+    private void SearchTextBoxKeyDown(object sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.Up)
+        {
+            var index = SelectedIndex - 1;
+            if (index < 0)
+            {
+                index = Items.Count - 1;
+            }
+
+            UpdateTextBoxBySelectedIndex(index);
+        }
+        else if (e.Key == Key.Down)
+        {
+            var index = SelectedIndex + 1;
+            if (index >= Items.Count)
+            {
+                index = 0;
+            }
+
+            UpdateTextBoxBySelectedIndex(index);
+        }
+        else if (e.Key == Key.Enter)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+            e.Handled = true;
+        }
+    }
+
+    private void UpdateTextBoxBySelectedIndex(int selectedIndex)
+    {
+        if (_searchTextBox == null)
+        {
+            return;
+        }
+
+        ignoreTextChanging = true;
+
+        if (ItemContainerGenerator.ContainerFromIndex(selectedIndex) is AutoCompleteTextBoxItem boxItem)
+        {
+            _searchTextBox.Text = BindingHelper.GetString(boxItem.Content, DisplayMemberPath);
+            _searchTextBox.CaretIndex = _searchTextBox.Text.Length;
+
+            SelectedIndex = selectedIndex;
+        }
+    }
+
+    private void UpdateTextBoxBySelectedItem(object selectedItem)
+    {
+        if (_searchTextBox == null)
+        {
+            return;
+        }
+
+        ignoreTextChanging = true;
+
+        _searchTextBox.Text = BindingHelper.GetString(selectedItem, DisplayMemberPath);
+        _searchTextBox.CaretIndex = _searchTextBox.Text.Length;
+
+        ignoreTextChanging = true;
+
+        Text = _searchTextBox.Text;
+
+        ignoreTextChanging = false;
+    }
+
+    private void SearchTextBoxGotFocus(object sender, RoutedEventArgs e)
+    {
+        if (!string.IsNullOrEmpty(Text))
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
index 9972ba6b..520814bc 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
@@ -1,9 +1,8 @@
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
-{
-    public class AutoCompleteTextBoxItem : ComboBoxItem
-    {
+namespace HandyControl.Controls;
 
-    }
-}
+public class AutoCompleteTextBoxItem : ComboBoxItem
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
index cf626bda..01f4d432 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
@@ -9,285 +9,284 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+[TemplatePart(Name = ElementSelectAll, Type = typeof(CheckComboBoxItem))]
+public class CheckComboBox : ListBox, IDataInput
 {
-    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementSelectAll, Type = typeof(CheckComboBoxItem))]
-    public class CheckComboBox : ListBox, IDataInput
+    private const string ElementPanel = "PART_Panel";
+
+    private const string ElementSelectAll = "PART_SelectAll";
+
+    private Panel _panel;
+
+    private CheckComboBoxItem _selectAllItem;
+
+    private bool _isInternalAction;
+
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsError
     {
-        private const string ElementPanel = "PART_Panel";
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private const string ElementSelectAll = "PART_SelectAll";
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(CheckComboBox), new PropertyMetadata(default(string)));
 
-        private Panel _panel;
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
 
-        private CheckComboBoxItem _selectAllItem;
+    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+        "TextType", typeof(TextType), typeof(CheckComboBox), new PropertyMetadata(default(TextType)));
 
-        private bool _isInternalAction;
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
 
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool IsError
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty MaxDropDownHeightProperty =
+        System.Windows.Controls.ComboBox.MaxDropDownHeightProperty.AddOwner(typeof(CheckComboBox),
+            new FrameworkPropertyMetadata(SystemParameters.PrimaryScreenHeight / 3));
+
+    [Bindable(true), Category("Layout")]
+    [TypeConverter(typeof(LengthConverter))]
+    public double MaxDropDownHeight
+    {
+        get => (double) GetValue(MaxDropDownHeightProperty);
+        set => SetValue(MaxDropDownHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
+        "IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDropDownOpenChanged));
+
+    private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (CheckComboBox) d;
+
+        if (!(bool) e.NewValue)
         {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(CheckComboBox), new PropertyMetadata(default(string)));
-
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
-
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(CheckComboBox), new PropertyMetadata(default(TextType)));
-
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty MaxDropDownHeightProperty =
-            System.Windows.Controls.ComboBox.MaxDropDownHeightProperty.AddOwner(typeof(CheckComboBox),
-                new FrameworkPropertyMetadata(SystemParameters.PrimaryScreenHeight / 3));
-
-        [Bindable(true), Category("Layout")]
-        [TypeConverter(typeof(LengthConverter))]
-        public double MaxDropDownHeight
-        {
-            get => (double) GetValue(MaxDropDownHeightProperty);
-            set => SetValue(MaxDropDownHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-            "IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDropDownOpenChanged));
-
-        private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (CheckComboBox) d;
-
-            if (!(bool) e.NewValue)
+            ctl.Dispatcher.BeginInvoke(new Action(() =>
             {
-                ctl.Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    Mouse.Capture(null);
-                }), DispatcherPriority.Send);
+                Mouse.Capture(null);
+            }), DispatcherPriority.Send);
+        }
+    }
+
+    public bool IsDropDownOpen
+    {
+        get => (bool) GetValue(IsDropDownOpenProperty);
+        set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty TagStyleProperty = DependencyProperty.Register(
+        "TagStyle", typeof(Style), typeof(CheckComboBox), new PropertyMetadata(default(Style)));
+
+    public Style TagStyle
+    {
+        get => (Style) GetValue(TagStyleProperty);
+        set => SetValue(TagStyleProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.Register(
+        "ShowSelectAllButton", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowSelectAllButton
+    {
+        get => (bool) GetValue(ShowSelectAllButtonProperty);
+        set => SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public CheckComboBox()
+    {
+        AddHandler(Controls.Tag.ClosedEvent, new RoutedEventHandler(Tags_OnClosed));
+
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
+        {
+            SetCurrentValue(SelectedValueProperty, null);
+            SetCurrentValue(SelectedItemProperty, null);
+            SetCurrentValue(SelectedIndexProperty, -1);
+            SelectedItems.Clear();
+        }));
+
+        ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
+    }
+
+    private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
+    {
+        if (ItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated)
+        {
+            UpdateTags();
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_selectAllItem != null)
+        {
+            _selectAllItem.Selected -= SelectAllItem_Selected;
+            _selectAllItem.Unselected -= SelectAllItem_Unselected;
+        }
+
+        base.OnApplyTemplate();
+
+        _panel = GetTemplateChild(ElementPanel) as Panel;
+        _selectAllItem = GetTemplateChild(ElementSelectAll) as CheckComboBoxItem;
+        if (_selectAllItem != null)
+        {
+            _selectAllItem.Selected += SelectAllItem_Selected;
+            _selectAllItem.Unselected += SelectAllItem_Unselected;
+        }
+
+        Dispatcher.BeginInvoke(new Action(() =>
+        {
+            IsDropDownOpen = true;
+            IsDropDownOpen = false;
+        }), DispatcherPriority.DataBind);
+    }
+
+    public bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        if (VerifyFunc != null)
+        {
+            result = VerifyFunc.Invoke(null);
+        }
+        else
+        {
+            if (SelectedItems.Count > 0)
+            {
+                result = OperationResult.Success();
             }
-        }
-
-        public bool IsDropDownOpen
-        {
-            get => (bool) GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty TagStyleProperty = DependencyProperty.Register(
-            "TagStyle", typeof(Style), typeof(CheckComboBox), new PropertyMetadata(default(Style)));
-
-        public Style TagStyle
-        {
-            get => (Style) GetValue(TagStyleProperty);
-            set => SetValue(TagStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowSelectAllButtonProperty = DependencyProperty.Register(
-            "ShowSelectAllButton", typeof(bool), typeof(CheckComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowSelectAllButton
-        {
-            get => (bool) GetValue(ShowSelectAllButtonProperty);
-            set => SetValue(ShowSelectAllButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public CheckComboBox()
-        {
-            AddHandler(Controls.Tag.ClosedEvent, new RoutedEventHandler(Tags_OnClosed));
-
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
+            else if (InfoElement.GetNecessary(this))
             {
-                SetCurrentValue(SelectedValueProperty, null);
-                SetCurrentValue(SelectedItemProperty, null);
-                SetCurrentValue(SelectedIndexProperty, -1);
-                SelectedItems.Clear();
-            }));
-
-            ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
-        }
-
-        private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
-        {
-            if (ItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated)
-            {
-                UpdateTags();
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            if (_selectAllItem != null)
-            {
-                _selectAllItem.Selected -= SelectAllItem_Selected;
-                _selectAllItem.Unselected -= SelectAllItem_Unselected;
-            }
-
-            base.OnApplyTemplate();
-
-            _panel = GetTemplateChild(ElementPanel) as Panel;
-            _selectAllItem = GetTemplateChild(ElementSelectAll) as CheckComboBoxItem;
-            if (_selectAllItem != null)
-            {
-                _selectAllItem.Selected += SelectAllItem_Selected;
-                _selectAllItem.Unselected += SelectAllItem_Unselected;
-            }
-
-            Dispatcher.BeginInvoke(new Action(() =>
-            {
-                IsDropDownOpen = true;
-                IsDropDownOpen = false;
-            }), DispatcherPriority.DataBind);
-        }
-
-        public bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            if (VerifyFunc != null)
-            {
-                result = VerifyFunc.Invoke(null);
+                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
             }
             else
             {
-                if (SelectedItems.Count > 0)
-                {
-                    result = OperationResult.Success();
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
+                result = OperationResult.Success();
             }
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
+            }
+        }
+
+        return !isError;
+    }
+
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+
+    protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+    {
+        UpdateTags();
+        VerifyData();
+
+        base.OnSelectionChanged(e);
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is CheckComboBoxItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new CheckComboBoxItem();
+
+    protected override void OnDisplayMemberPathChanged(string oldDisplayMemberPath, string newDisplayMemberPath) => UpdateTags();
+
+    private void Tags_OnClosed(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Tag { Tag: CheckComboBoxItem checkComboBoxItem })
+        {
+            checkComboBoxItem.SetCurrentValue(IsSelectedProperty, false);
+        }
+    }
+
+    private void SwitchAllItems(bool selected)
+    {
+        if (_isInternalAction) return;
+        _isInternalAction = true;
+
+        foreach (var item in Items)
+        {
+            if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
+            {
+                checkComboBoxItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, selected);
+            }
+        }
+
+        _isInternalAction = false;
+        UpdateTags();
+    }
+
+    private void SelectAllItem_Selected(object sender, RoutedEventArgs e) => SwitchAllItems(true);
+
+    private void SelectAllItem_Unselected(object sender, RoutedEventArgs e) => SwitchAllItems(false);
+
+    private void UpdateTags()
+    {
+        if (_panel == null || _isInternalAction) return;
+
+        if (_selectAllItem != null)
+        {
+            _isInternalAction = true;
+            _selectAllItem.SetCurrentValue(IsSelectedProperty, SelectedItems.Count == Items.Count);
+            _isInternalAction = false;
+        }
+
+        _panel.Children.Clear();
+
+        foreach (var item in SelectedItems)
+        {
+            if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
+            {
+                var tag = new Tag
                 {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
+                    Style = TagStyle,
+                    Tag = checkComboBoxItem
+                };
+
+                if (ItemsSource != null)
+                {
+                    tag.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item });
                 }
                 else
                 {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
+                    tag.Content = checkComboBoxItem.Content;
                 }
-            }
 
-            return !isError;
-        }
-
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
-        {
-            UpdateTags();
-            VerifyData();
-
-            base.OnSelectionChanged(e);
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is CheckComboBoxItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new CheckComboBoxItem();
-
-        protected override void OnDisplayMemberPathChanged(string oldDisplayMemberPath, string newDisplayMemberPath) => UpdateTags();
-
-        private void Tags_OnClosed(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is Tag { Tag: CheckComboBoxItem checkComboBoxItem })
-            {
-                checkComboBoxItem.SetCurrentValue(IsSelectedProperty, false);
-            }
-        }
-
-        private void SwitchAllItems(bool selected)
-        {
-            if (_isInternalAction) return;
-            _isInternalAction = true;
-
-            foreach (var item in Items)
-            {
-                if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
-                {
-                    checkComboBoxItem.SetCurrentValue(ListBoxItem.IsSelectedProperty, selected);
-                }
-            }
-
-            _isInternalAction = false;
-            UpdateTags();
-        }
-
-        private void SelectAllItem_Selected(object sender, RoutedEventArgs e) => SwitchAllItems(true);
-
-        private void SelectAllItem_Unselected(object sender, RoutedEventArgs e) => SwitchAllItems(false);
-
-        private void UpdateTags()
-        {
-            if (_panel == null || _isInternalAction) return;
-
-            if (_selectAllItem != null)
-            {
-                _isInternalAction = true;
-                _selectAllItem.SetCurrentValue(IsSelectedProperty, SelectedItems.Count == Items.Count);
-                _isInternalAction = false;
-            }
-
-            _panel.Children.Clear();
-
-            foreach (var item in SelectedItems)
-            {
-                if (ItemContainerGenerator.ContainerFromItem(item) is CheckComboBoxItem checkComboBoxItem)
-                {
-                    var tag = new Tag
-                    {
-                        Style = TagStyle,
-                        Tag = checkComboBoxItem
-                    };
-
-                    if (ItemsSource != null)
-                    {
-                        tag.SetBinding(ContentControl.ContentProperty, new Binding(DisplayMemberPath) { Source = item });
-                    }
-                    else
-                    {
-                        tag.Content = checkComboBoxItem.Content;
-                    }
-
-                    _panel.Children.Add(tag);
-                }
+                _panel.Children.Add(tag);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
index 67e0dd7a..5f1cb89e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
@@ -1,9 +1,8 @@
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
-{
-    public class CheckComboBoxItem : ListBoxItem
-    {
+namespace HandyControl.Controls;
 
-    }
-}
+public class CheckComboBoxItem : ListBoxItem
+{
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
index 94c838ef..e34e40a8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
@@ -12,120 +12,120 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = AutoCompletePanel, Type = typeof(Panel))]
+[TemplatePart(Name = EditableTextBox, Type = typeof(System.Windows.Controls.TextBox))]
+[TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))]
+public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
 {
-    [TemplatePart(Name = AutoCompletePanel, Type = typeof(Panel))]
-    [TemplatePart(Name = EditableTextBox, Type = typeof(System.Windows.Controls.TextBox))]
-    [TemplatePart(Name = AutoPopupAutoComplete, Type = typeof(Popup))]
-    public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
-    {
 #if NET40
 
-        private string _searchText;
+    private string _searchText;
 
-        private DispatcherTimer _autoCompleteTimer;
+    private DispatcherTimer _autoCompleteTimer;
 
 #endif
-        private bool _isAutoCompleteAction = true;
+    private bool _isAutoCompleteAction = true;
 
-        private Panel _autoCompletePanel;
+    private Panel _autoCompletePanel;
 
-        private System.Windows.Controls.TextBox _editableTextBox;
+    private System.Windows.Controls.TextBox _editableTextBox;
 
-        private Popup _autoPopupAutoComplete;
+    private Popup _autoPopupAutoComplete;
 
-        private const string AutoCompletePanel = "PART_AutoCompletePanel";
+    private const string AutoCompletePanel = "PART_AutoCompletePanel";
 
-        private const string AutoPopupAutoComplete = "PART_Popup_AutoComplete";
+    private const string AutoPopupAutoComplete = "PART_Popup_AutoComplete";
 
-        private const string EditableTextBox = "PART_EditableTextBox";
+    private const string EditableTextBox = "PART_EditableTextBox";
 
-        public ComboBox()
+    public ComboBox()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
-            {
-                SetCurrentValue(SelectedValueProperty, null);
-                SetCurrentValue(SelectedItemProperty, null);
-                SetCurrentValue(SelectedIndexProperty, -1);
-                SetCurrentValue(TextProperty, "");
-            }));
+            SetCurrentValue(SelectedValueProperty, null);
+            SetCurrentValue(SelectedItemProperty, null);
+            SetCurrentValue(SelectedIndexProperty, -1);
+            SetCurrentValue(TextProperty, "");
+        }));
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_editableTextBox != null)
+        {
+            BindingOperations.ClearBinding(_editableTextBox, System.Windows.Controls.TextBox.TextProperty);
+            _editableTextBox.GotFocus -= EditableTextBox_GotFocus;
+            _editableTextBox.LostFocus -= EditableTextBox_LostFocus;
         }
 
-        public override void OnApplyTemplate()
+        base.OnApplyTemplate();
+
+        if (IsEditable)
         {
+            _editableTextBox = GetTemplateChild(EditableTextBox) as System.Windows.Controls.TextBox;
+
             if (_editableTextBox != null)
             {
-                BindingOperations.ClearBinding(_editableTextBox, System.Windows.Controls.TextBox.TextProperty);
-                _editableTextBox.GotFocus -= EditableTextBox_GotFocus;
-                _editableTextBox.LostFocus -= EditableTextBox_LostFocus;
-            }
+                _editableTextBox.TextChanged += EditableTextBox_TextChanged;
 
-            base.OnApplyTemplate();
-
-            if (IsEditable)
-            {
-                _editableTextBox = GetTemplateChild(EditableTextBox) as System.Windows.Controls.TextBox;
-
-                if (_editableTextBox != null)
-                {
-                    _editableTextBox.TextChanged += EditableTextBox_TextChanged;
-
-                    _editableTextBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+                _editableTextBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                     _editableTextBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-                    _editableTextBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                    _editableTextBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+                _editableTextBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+                _editableTextBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                    if (AutoComplete)
-                    {
+                if (AutoComplete)
+                {
 #if NET40
-                        _autoCompleteTimer = new DispatcherTimer
-                        {
-                            Interval = TimeSpan.FromMilliseconds(500)
-                        };
-                        _autoCompleteTimer.Tick += AutoCompleteTimer_Tick;
+                    _autoCompleteTimer = new DispatcherTimer
+                    {
+                        Interval = TimeSpan.FromMilliseconds(500)
+                    };
+                    _autoCompleteTimer.Tick += AutoCompleteTimer_Tick;
 #endif
-                        _autoPopupAutoComplete = GetTemplateChild(AutoPopupAutoComplete) as Popup;
-                        _autoCompletePanel = GetTemplateChild(AutoCompletePanel) as Panel;
-                        _editableTextBox.SetBinding(System.Windows.Controls.TextBox.TextProperty, new Binding(SearchTextProperty.Name)
-                        {
-                            UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
-                            Mode = BindingMode.OneWayToSource,
+                    _autoPopupAutoComplete = GetTemplateChild(AutoPopupAutoComplete) as Popup;
+                    _autoCompletePanel = GetTemplateChild(AutoCompletePanel) as Panel;
+                    _editableTextBox.SetBinding(System.Windows.Controls.TextBox.TextProperty, new Binding(SearchTextProperty.Name)
+                    {
+                        UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
+                        Mode = BindingMode.OneWayToSource,
 #if !NET40
                             Delay = 500,
 #endif
-                            Source = this
-                        });
-                        _editableTextBox.GotFocus += EditableTextBox_GotFocus;
-                        _editableTextBox.LostFocus += EditableTextBox_LostFocus;
-                    }
+                        Source = this
+                    });
+                    _editableTextBox.GotFocus += EditableTextBox_GotFocus;
+                    _editableTextBox.LostFocus += EditableTextBox_LostFocus;
                 }
             }
         }
+    }
 
 #if NET40
 
-        private void AutoCompleteTimer_Tick(object sender, EventArgs e)
-        {
-            UpdateSearchItems(_searchText);
-            _autoCompleteTimer.Stop();
-        }
+    private void AutoCompleteTimer_Tick(object sender, EventArgs e)
+    {
+        UpdateSearchItems(_searchText);
+        _autoCompleteTimer.Stop();
+    }
 
 #endif
 
-        private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            VerifyData();
-        }
+    private void EditableTextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        VerifyData();
+    }
 
-        private void EditableTextBox_LostFocus(object sender, RoutedEventArgs e)
+    private void EditableTextBox_LostFocus(object sender, RoutedEventArgs e)
+    {
+        if (_autoPopupAutoComplete != null)
         {
-            if (_autoPopupAutoComplete != null)
-            {
-                _autoPopupAutoComplete.IsOpen = false;
-            }
+            _autoPopupAutoComplete.IsOpen = false;
         }
+    }
 
 #if !NET40
         protected override void OnDropDownClosed(EventArgs e)
@@ -136,165 +136,165 @@ namespace HandyControl.Controls
         }
 #endif
 
-        private void EditableTextBox_GotFocus(object sender, RoutedEventArgs e)
+    private void EditableTextBox_GotFocus(object sender, RoutedEventArgs e)
+    {
+        if (_autoPopupAutoComplete != null && _editableTextBox != null &&
+            !string.IsNullOrEmpty(_editableTextBox.Text))
         {
-            if (_autoPopupAutoComplete != null && _editableTextBox != null &&
-                !string.IsNullOrEmpty(_editableTextBox.Text))
-            {
-                _autoPopupAutoComplete.IsOpen = true;
-            }
+            _autoPopupAutoComplete.IsOpen = true;
         }
+    }
 
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
-        {
-            _isAutoCompleteAction = false;
-            base.OnSelectionChanged(e);
-            VerifyData();
+    protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+    {
+        _isAutoCompleteAction = false;
+        base.OnSelectionChanged(e);
+        VerifyData();
 #if NET40
-            _isAutoCompleteAction = true;
+        _isAutoCompleteAction = true;
 #endif
-        }
+    }
 
-        /// <summary>
-        ///     数据验证委托
-        /// </summary>
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+    /// <summary>
+    ///     数据验证委托
+    /// </summary>
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        /// <summary>
-        ///     数据搜索委托
-        /// </summary>
-        public Func<ItemCollection, object, IEnumerable<object>> SearchFunc { get; set; }
+    /// <summary>
+    ///     数据搜索委托
+    /// </summary>
+    public Func<ItemCollection, object, IEnumerable<object>> SearchFunc { get; set; }
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+    /// <summary>
+    ///     数据是否错误
+    /// </summary>
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        public bool IsError
+    /// <summary>
+    ///     数据是否错误
+    /// </summary>
+    public bool IsError
+    {
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     错误提示
+    /// </summary>
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string)));
+
+    /// <summary>
+    ///     错误提示
+    /// </summary>
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
+
+    /// <summary>
+    ///     文本类型
+    /// </summary>
+    public static readonly DependencyPropertyKey TextTypePropertyKey =
+        DependencyProperty.RegisterReadOnly("TextType", typeof(TextType), typeof(ComboBox),
+            new PropertyMetadata(default(TextType)));
+
+    /// <summary>
+    ///     文本类型
+    /// </summary>
+    public static readonly DependencyProperty TextTypeProperty = TextTypePropertyKey.DependencyProperty;
+
+    /// <summary>
+    ///     文本类型
+    /// </summary>
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
+
+    /// <summary>
+    ///     是否显示清除按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否显示清除按钮
+    /// </summary>
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否自动完成输入
+    /// </summary>
+    public static readonly DependencyProperty AutoCompleteProperty = DependencyProperty.Register(
+        "AutoComplete", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnAutoCompleteChanged));
+
+    private static void OnAutoCompleteChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ComboBox) d;
+        if (ctl._editableTextBox != null)
         {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+            ctl.UpdateSearchItems(ctl._editableTextBox.Text);
         }
+    }
 
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string)));
+    /// <summary>
+    ///     是否自动完成输入
+    /// </summary>
+    public bool AutoComplete
+    {
+        get => (bool) GetValue(AutoCompleteProperty);
+        set => SetValue(AutoCompleteProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        public string ErrorStr
+    /// <summary>
+    ///     搜索文本
+    /// </summary>
+    internal static readonly DependencyProperty SearchTextProperty = DependencyProperty.Register(
+        "SearchText", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string), OnSearchTextChanged));
+
+    private static void OnSearchTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ComboBox) d;
+        if (ctl._isAutoCompleteAction)
         {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
-
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public static readonly DependencyPropertyKey TextTypePropertyKey =
-            DependencyProperty.RegisterReadOnly("TextType", typeof(TextType), typeof(ComboBox),
-                new PropertyMetadata(default(TextType)));
-
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public static readonly DependencyProperty TextTypeProperty = TextTypePropertyKey.DependencyProperty;
-
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否自动完成输入
-        /// </summary>
-        public static readonly DependencyProperty AutoCompleteProperty = DependencyProperty.Register(
-            "AutoComplete", typeof(bool), typeof(ComboBox), new PropertyMetadata(ValueBoxes.FalseBox, OnAutoCompleteChanged));
-
-        private static void OnAutoCompleteChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ComboBox) d;
-            if (ctl._editableTextBox != null)
-            {
-                ctl.UpdateSearchItems(ctl._editableTextBox.Text);
-            }
-        }
-
-        /// <summary>
-        ///     是否自动完成输入
-        /// </summary>
-        public bool AutoComplete
-        {
-            get => (bool) GetValue(AutoCompleteProperty);
-            set => SetValue(AutoCompleteProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     搜索文本
-        /// </summary>
-        internal static readonly DependencyProperty SearchTextProperty = DependencyProperty.Register(
-            "SearchText", typeof(string), typeof(ComboBox), new PropertyMetadata(default(string), OnSearchTextChanged));
-
-        private static void OnSearchTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ComboBox) d;
-            if (ctl._isAutoCompleteAction)
-            {
 #if NET40
-                ctl._searchText = e.NewValue as string;
-                ctl._autoCompleteTimer.Stop();
-                ctl._autoCompleteTimer.Start();
+            ctl._searchText = e.NewValue as string;
+            ctl._autoCompleteTimer.Stop();
+            ctl._autoCompleteTimer.Start();
 #else
                 ctl.UpdateSearchItems(e.NewValue as string);
 #endif
-            }
-
-            ctl._isAutoCompleteAction = true;
         }
 
-        /// <summary>
-        ///     搜索文本
-        /// </summary>
-        internal string SearchText
-        {
-            get => (string) GetValue(SearchTextProperty);
-            set => SetValue(SearchTextProperty, value);
-        }
+        ctl._isAutoCompleteAction = true;
+    }
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(ComboBox));
+    /// <summary>
+    ///     搜索文本
+    /// </summary>
+    internal string SearchText
+    {
+        get => (string) GetValue(SearchTextProperty);
+        set => SetValue(SearchTextProperty, value);
+    }
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(ComboBox));
+
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -309,138 +309,137 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(ComboBox));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(ComboBox));
 
-        public double SelectionOpacity
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(ComboBox));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+
+    /// <summary>
+    ///     验证数据
+    /// </summary>
+    /// <returns></returns>
+    public virtual bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        var value = _editableTextBox == null ? Text : _editableTextBox.Text;
+
+        if (VerifyFunc != null)
         {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
+            result = VerifyFunc.Invoke(value);
         }
-
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(ComboBox));
-
-        public Brush CaretBrush
+        else
         {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
-        }
-
-        /// <summary>
-        ///     验证数据
-        /// </summary>
-        /// <returns></returns>
-        public virtual bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            var value = _editableTextBox == null ? Text : _editableTextBox.Text;
-
-            if (VerifyFunc != null)
+            if (!string.IsNullOrEmpty(value))
             {
-                result = VerifyFunc.Invoke(value);
+                result = OperationResult.Success();
+            }
+            else if (InfoElement.GetNecessary(this))
+            {
+                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
             }
             else
             {
-                if (!string.IsNullOrEmpty(value))
-                {
-                    result = OperationResult.Success();
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
+                result = OperationResult.Success();
             }
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
             }
-
-            return !isError;
         }
 
-        /// <summary>
-        ///     更新搜索的项目
-        /// </summary>
-        /// <param name="key"></param>
-        private void UpdateSearchItems(string key)
+        return !isError;
+    }
+
+    /// <summary>
+    ///     更新搜索的项目
+    /// </summary>
+    /// <param name="key"></param>
+    private void UpdateSearchItems(string key)
+    {
+        if (_editableTextBox != null && _autoPopupAutoComplete != null)
         {
-            if (_editableTextBox != null && _autoPopupAutoComplete != null)
+            _autoPopupAutoComplete.IsOpen = !string.IsNullOrEmpty(key);
+            _autoCompletePanel.Children.Clear();
+
+            if (SearchFunc == null)
             {
-                _autoPopupAutoComplete.IsOpen = !string.IsNullOrEmpty(key);
-                _autoCompletePanel.Children.Clear();
-
-                if (SearchFunc == null)
+                if (!string.IsNullOrEmpty(key))
                 {
-                    if (!string.IsNullOrEmpty(key))
+                    foreach (var item in Items)
                     {
-                        foreach (var item in Items)
-                        {
-                            var content = item?.ToString();
-                            if (content == null) continue;
-                            if (!content.Contains(key)) continue;
+                        var content = item?.ToString();
+                        if (content == null) continue;
+                        if (!content.Contains(key)) continue;
 
-                            _autoCompletePanel.Children.Add(CreateSearchItem(item));
-                        }
-                    }
-                }
-                else
-                {
-                    foreach (var item in SearchFunc.Invoke(Items, key))
-                    {
                         _autoCompletePanel.Children.Add(CreateSearchItem(item));
                     }
                 }
             }
-        }
-
-        private ComboBoxItem CreateSearchItem(object content)
-        {
-            var item = new ComboBoxItem
+            else
             {
-                Content = content,
-                Style = ItemContainerStyle,
-                ContentTemplate = ItemTemplate
-            };
-
-            item.PreviewMouseLeftButtonDown += AutoCompleteItem_PreviewMouseLeftButtonDown;
-
-            return item;
-        }
-
-        private void AutoCompleteItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is ComboBoxItem comboBoxItem)
-            {
-                if (_autoPopupAutoComplete != null)
+                foreach (var item in SearchFunc.Invoke(Items, key))
                 {
-                    _autoPopupAutoComplete.IsOpen = false;
+                    _autoCompletePanel.Children.Add(CreateSearchItem(item));
                 }
-
-                _isAutoCompleteAction = false;
-                SelectedValue = comboBoxItem.Content;
             }
         }
     }
-}
+
+    private ComboBoxItem CreateSearchItem(object content)
+    {
+        var item = new ComboBoxItem
+        {
+            Content = content,
+            Style = ItemContainerStyle,
+            ContentTemplate = ItemTemplate
+        };
+
+        item.PreviewMouseLeftButtonDown += AutoCompleteItem_PreviewMouseLeftButtonDown;
+
+        return item;
+    }
+
+    private void AutoCompleteItem_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is ComboBoxItem comboBoxItem)
+        {
+            if (_autoPopupAutoComplete != null)
+            {
+                _autoPopupAutoComplete.IsOpen = false;
+            }
+
+            _isAutoCompleteAction = false;
+            SelectedValue = comboBoxItem.Content;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
index 515d62d9..95db140e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
@@ -8,95 +8,95 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))]
+public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
 {
-    [TemplatePart(Name = ElementTextBox, Type = typeof(DatePickerTextBox))]
-    public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
+    private const string ElementTextBox = "PART_TextBox";
+
+    private System.Windows.Controls.TextBox _textBox;
+
+    public DatePicker()
     {
-        private const string ElementTextBox = "PART_TextBox";
-
-        private System.Windows.Controls.TextBox _textBox;
-
-        public DatePicker()
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
-            {
-                SetCurrentValue(SelectedDateProperty, null);
-                SetCurrentValue(TextProperty, "");
-            }));
+            SetCurrentValue(SelectedDateProperty, null);
+            SetCurrentValue(TextProperty, "");
+        }));
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_textBox != null)
+        {
+            _textBox.TextChanged -= TextBox_TextChanged;
         }
 
-        public override void OnApplyTemplate()
+        base.OnApplyTemplate();
+
+        _textBox = GetTemplateChild(ElementTextBox) as System.Windows.Controls.TextBox;
+        if (_textBox != null)
         {
-            if (_textBox != null)
-            {
-                _textBox.TextChanged -= TextBox_TextChanged;
-            }
-
-            base.OnApplyTemplate();
-
-            _textBox = GetTemplateChild(ElementTextBox) as System.Windows.Controls.TextBox;
-            if (_textBox != null)
-            {
-                _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                 _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-                _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+            _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                _textBox.TextChanged += TextBox_TextChanged;
-            }
+            _textBox.TextChanged += TextBox_TextChanged;
         }
+    }
 
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => VerifyData();
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e) => VerifyData();
 
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool IsError
+    {
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(DatePicker), new PropertyMetadata(default(string)));
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(DatePicker), new PropertyMetadata(default(string)));
 
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
 
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(DatePicker), new PropertyMetadata(default(TextType)));
+    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+        "TextType", typeof(TextType), typeof(DatePicker), new PropertyMetadata(default(TextType)));
 
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
 
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(DatePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DatePicker));
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DatePicker));
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -111,68 +111,67 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(DatePicker));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(DatePicker));
 
-        public double SelectionOpacity
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(DatePicker));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+
+    public virtual bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        if (VerifyFunc != null)
         {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
+            result = VerifyFunc.Invoke(Text);
         }
-
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(DatePicker));
-
-        public Brush CaretBrush
+        else
         {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
-        }
-
-        public virtual bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            if (VerifyFunc != null)
+            if (!string.IsNullOrEmpty(Text))
             {
-                result = VerifyFunc.Invoke(Text);
+                result = OperationResult.Success();
+            }
+            else if (InfoElement.GetNecessary(this))
+            {
+                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
             }
             else
             {
-                if (!string.IsNullOrEmpty(Text))
-                {
-                    result = OperationResult.Success();
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
+                result = OperationResult.Success();
             }
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
             }
-            return !isError;
         }
+        return !isError;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
index b694bbb7..83b05e3c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
@@ -12,280 +12,280 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     时间日期选择器
+/// </summary>
+[TemplatePart(Name = ElementRoot, Type = typeof(Grid))]
+[TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
+[TemplatePart(Name = ElementButton, Type = typeof(Button))]
+[TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
+public class DateTimePicker : Control, IDataInput
 {
-    /// <summary>
-    ///     时间日期选择器
-    /// </summary>
-    [TemplatePart(Name = ElementRoot, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
-    [TemplatePart(Name = ElementButton, Type = typeof(Button))]
-    [TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
-    public class DateTimePicker : Control, IDataInput
+    #region Constants
+
+    private const string ElementRoot = "PART_Root";
+
+    private const string ElementTextBox = "PART_TextBox";
+
+    private const string ElementButton = "PART_Button";
+
+    private const string ElementPopup = "PART_Popup";
+
+    #endregion Constants
+
+    #region Data
+
+    private CalendarWithClock _calendarWithClock;
+
+    private string _defaultText;
+
+    private ButtonBase _dropDownButton;
+
+    private Popup _popup;
+
+    private bool _disablePopupReopen;
+
+    private WatermarkTextBox _textBox;
+
+    private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
+
+    private DateTime? _originalSelectedDateTime;
+
+    #endregion Data
+
+    #region Public Events
+
+    public static readonly RoutedEvent SelectedDateTimeChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedDateTimeChanged", RoutingStrategy.Direct,
+            typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(DateTimePicker));
+
+    public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged
     {
-        #region Constants
+        add => AddHandler(SelectedDateTimeChangedEvent, value);
+        remove => RemoveHandler(SelectedDateTimeChangedEvent, value);
+    }
 
-        private const string ElementRoot = "PART_Root";
+    public event RoutedEventHandler PickerClosed;
 
-        private const string ElementTextBox = "PART_TextBox";
+    public event RoutedEventHandler PickerOpened;
 
-        private const string ElementButton = "PART_Button";
+    #endregion Public Events
 
-        private const string ElementPopup = "PART_Popup";
+    static DateTimePicker()
+    {
+        EventManager.RegisterClassHandler(typeof(DateTimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
+        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
+        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+    }
 
-        #endregion Constants
-
-        #region Data
-
-        private CalendarWithClock _calendarWithClock;
-
-        private string _defaultText;
-
-        private ButtonBase _dropDownButton;
-
-        private Popup _popup;
-
-        private bool _disablePopupReopen;
-
-        private WatermarkTextBox _textBox;
-
-        private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
-
-        private DateTime? _originalSelectedDateTime;
-
-        #endregion Data
-
-        #region Public Events
-
-        public static readonly RoutedEvent SelectedDateTimeChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedDateTimeChanged", RoutingStrategy.Direct,
-                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(DateTimePicker));
-
-        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged
+    public DateTimePicker()
+    {
+        Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
+        InitCalendarWithClock();
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            add => AddHandler(SelectedDateTimeChangedEvent, value);
-            remove => RemoveHandler(SelectedDateTimeChangedEvent, value);
+            SetCurrentValue(SelectedDateTimeProperty, null);
+            SetCurrentValue(TextProperty, "");
+            _textBox.Text = string.Empty;
+        }));
+    }
+
+    #region Public Properties
+
+    public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
+        "DateTimeFormat", typeof(string), typeof(DateTimePicker), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
+
+    public string DateTimeFormat
+    {
+        get => (string) GetValue(DateTimeFormatProperty);
+        set => SetValue(DateTimeFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty CalendarStyleProperty = DependencyProperty.Register(
+        "CalendarStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
+
+    public Style CalendarStyle
+    {
+        get => (Style) GetValue(CalendarStyleProperty);
+        set => SetValue(CalendarStyleProperty, value);
+    }
+
+    public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(
+        "DisplayDateTime", typeof(DateTime), typeof(DateTimePicker), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayDateTime));
+
+    private static object CoerceDisplayDateTime(DependencyObject d, object value)
+    {
+        var dp = (DateTimePicker) d;
+        dp._calendarWithClock.DisplayDateTime = (DateTime) value;
+
+        return dp._calendarWithClock.DisplayDateTime;
+    }
+
+    public DateTime DisplayDateTime
+    {
+        get => (DateTime) GetValue(DisplayDateTimeProperty);
+        set => SetValue(DisplayDateTimeProperty, value);
+    }
+
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
+        "IsDropDownOpen", typeof(bool), typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
+
+    private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
+        d is DateTimePicker
+        {
+            IsEnabled: false
         }
+            ? false
+            : baseValue;
 
-        public event RoutedEventHandler PickerClosed;
+    private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var dp = d as DateTimePicker;
 
-        public event RoutedEventHandler PickerOpened;
-
-        #endregion Public Events
-
-        static DateTimePicker()
+        var newValue = (bool) e.NewValue;
+        if (dp?._popup != null && dp._popup.IsOpen != newValue)
         {
-            EventManager.RegisterClassHandler(typeof(DateTimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
-            KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
-            KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-        }
-
-        public DateTimePicker()
-        {
-            Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
-            InitCalendarWithClock();
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
+            dp._popup.IsOpen = newValue;
+            if (newValue)
             {
-                SetCurrentValue(SelectedDateTimeProperty, null);
-                SetCurrentValue(TextProperty, "");
-                _textBox.Text = string.Empty;
-            }));
-        }
+                dp._originalSelectedDateTime = dp.SelectedDateTime;
 
-        #region Public Properties
-
-        public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
-            "DateTimeFormat", typeof(string), typeof(DateTimePicker), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
-
-        public string DateTimeFormat
-        {
-            get => (string) GetValue(DateTimeFormatProperty);
-            set => SetValue(DateTimeFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty CalendarStyleProperty = DependencyProperty.Register(
-            "CalendarStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
-
-        public Style CalendarStyle
-        {
-            get => (Style) GetValue(CalendarStyleProperty);
-            set => SetValue(CalendarStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(
-            "DisplayDateTime", typeof(DateTime), typeof(DateTimePicker), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayDateTime));
-
-        private static object CoerceDisplayDateTime(DependencyObject d, object value)
-        {
-            var dp = (DateTimePicker) d;
-            dp._calendarWithClock.DisplayDateTime = (DateTime) value;
-
-            return dp._calendarWithClock.DisplayDateTime;
-        }
-
-        public DateTime DisplayDateTime
-        {
-            get => (DateTime) GetValue(DisplayDateTimeProperty);
-            set => SetValue(DisplayDateTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-            "IsDropDownOpen", typeof(bool), typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
-
-        private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
-            d is DateTimePicker
-            {
-                IsEnabled: false
-            }
-                ? false
-                : baseValue;
-
-        private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var dp = d as DateTimePicker;
-
-            var newValue = (bool) e.NewValue;
-            if (dp?._popup != null && dp._popup.IsOpen != newValue)
-            {
-                dp._popup.IsOpen = newValue;
-                if (newValue)
+                dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action) delegate
                 {
-                    dp._originalSelectedDateTime = dp.SelectedDateTime;
-
-                    dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action) delegate
-                     {
-                         dp._calendarWithClock.Focus();
-                     });
-                }
+                    dp._calendarWithClock.Focus();
+                });
             }
         }
+    }
 
-        public bool IsDropDownOpen
+    public bool IsDropDownOpen
+    {
+        get => (bool) GetValue(IsDropDownOpenProperty);
+        set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
+        "SelectedDateTime", typeof(DateTime?), typeof(DateTimePicker), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedDateTimeChanged, CoerceSelectedDateTime));
+
+    private static object CoerceSelectedDateTime(DependencyObject d, object value)
+    {
+        var dp = (DateTimePicker) d;
+        dp._calendarWithClock.SelectedDateTime = (DateTime?) value;
+        return dp._calendarWithClock.SelectedDateTime;
+    }
+
+    private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not DateTimePicker dp) return;
+
+        if (dp.SelectedDateTime.HasValue)
         {
-            get => (bool) GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+            var time = dp.SelectedDateTime.Value;
+            dp.SetTextInternal(dp.DateTimeToString(time));
         }
 
-        public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
-            "SelectedDateTime", typeof(DateTime?), typeof(DateTimePicker), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedDateTimeChanged, CoerceSelectedDateTime));
-
-        private static object CoerceSelectedDateTime(DependencyObject d, object value)
+        dp.RaiseEvent(new FunctionEventArgs<DateTime?>(SelectedDateTimeChangedEvent, dp)
         {
-            var dp = (DateTimePicker) d;
-            dp._calendarWithClock.SelectedDateTime = (DateTime?) value;
-            return dp._calendarWithClock.SelectedDateTime;
-        }
+            Info = dp.SelectedDateTime
+        });
+    }
 
-        private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    public DateTime? SelectedDateTime
+    {
+        get => (DateTime?) GetValue(SelectedDateTimeProperty);
+        set => SetValue(SelectedDateTimeProperty, value);
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(DateTimePicker), new FrameworkPropertyMetadata(string.Empty, OnTextChanged));
+
+    private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is DateTimePicker dp && !dp.IsHandlerSuspended(TextProperty))
         {
-            if (d is not DateTimePicker dp) return;
-
-            if (dp.SelectedDateTime.HasValue)
+            if (e.NewValue is string newValue)
             {
-                var time = dp.SelectedDateTime.Value;
-                dp.SetTextInternal(dp.DateTimeToString(time));
-            }
-
-            dp.RaiseEvent(new FunctionEventArgs<DateTime?>(SelectedDateTimeChangedEvent, dp)
-            {
-                Info = dp.SelectedDateTime
-            });
-        }
-
-        public DateTime? SelectedDateTime
-        {
-            get => (DateTime?) GetValue(SelectedDateTimeProperty);
-            set => SetValue(SelectedDateTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(DateTimePicker), new FrameworkPropertyMetadata(string.Empty, OnTextChanged));
-
-        private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is DateTimePicker dp && !dp.IsHandlerSuspended(TextProperty))
-            {
-                if (e.NewValue is string newValue)
+                if (dp._textBox != null)
                 {
-                    if (dp._textBox != null)
-                    {
-                        dp._textBox.Text = newValue;
-                    }
-                    else
-                    {
-                        dp._defaultText = newValue;
-                    }
-
-                    dp.SetSelectedDateTime();
+                    dp._textBox.Text = newValue;
                 }
                 else
                 {
-                    dp.SetValueNoCallback(SelectedDateTimeProperty, null);
+                    dp._defaultText = newValue;
                 }
+
+                dp.SetSelectedDateTime();
+            }
+            else
+            {
+                dp.SetValueNoCallback(SelectedDateTimeProperty, null);
             }
         }
+    }
 
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
 
-        /// <summary>
-        /// Sets the local Text property without breaking bindings
-        /// </summary>
-        /// <param name="value"></param>
-        private void SetTextInternal(string value)
-        {
-            SetCurrentValue(TextProperty, value);
-        }
+    /// <summary>
+    /// Sets the local Text property without breaking bindings
+    /// </summary>
+    /// <param name="value"></param>
+    private void SetTextInternal(string value)
+    {
+        SetCurrentValue(TextProperty, value);
+    }
 
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool IsError
+    {
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(DateTimePicker), new PropertyMetadata(default(string)));
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(DateTimePicker), new PropertyMetadata(default(string)));
 
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
 
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(DateTimePicker), new PropertyMetadata(default(TextType)));
+    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+        "TextType", typeof(TextType), typeof(DateTimePicker), new PropertyMetadata(default(TextType)));
 
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
 
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(DateTimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DateTimePicker));
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(DateTimePicker));
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -300,467 +300,466 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(DateTimePicker));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(DateTimePicker));
 
-        public double SelectionOpacity
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(DateTimePicker));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    public override void OnApplyTemplate()
+    {
+        if (DesignerProperties.GetIsInDesignMode(this)) return;
+        if (_popup != null)
         {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
+            _popup.PreviewMouseLeftButtonDown -= PopupPreviewMouseLeftButtonDown;
+            _popup.Opened -= PopupOpened;
+            _popup.Closed -= PopupClosed;
+            _popup.Child = null;
         }
 
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(DateTimePicker));
-
-        public Brush CaretBrush
+        if (_dropDownButton != null)
         {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
+            _dropDownButton.Click -= DropDownButton_Click;
+            _dropDownButton.MouseLeave -= DropDownButton_MouseLeave;
         }
 
-        #endregion
-
-        #region Public Methods
-
-        public override void OnApplyTemplate()
+        if (_textBox != null)
         {
-            if (DesignerProperties.GetIsInDesignMode(this)) return;
-            if (_popup != null)
+            _textBox.KeyDown -= TextBox_KeyDown;
+            _textBox.TextChanged -= TextBox_TextChanged;
+            _textBox.LostFocus -= TextBox_LostFocus;
+        }
+
+        base.OnApplyTemplate();
+
+        _popup = GetTemplateChild(ElementPopup) as Popup;
+        _dropDownButton = GetTemplateChild(ElementButton) as Button;
+        _textBox = GetTemplateChild(ElementTextBox) as WatermarkTextBox;
+
+        CheckNull();
+
+        _popup.PreviewMouseLeftButtonDown += PopupPreviewMouseLeftButtonDown;
+        _popup.Opened += PopupOpened;
+        _popup.Closed += PopupClosed;
+        _popup.Child = _calendarWithClock;
+
+        if (IsDropDownOpen)
+        {
+            _popup.IsOpen = true;
+        }
+
+        _dropDownButton.Click += DropDownButton_Click;
+        _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
+
+        var selectedDateTime = SelectedDateTime;
+
+        if (_textBox != null)
+        {
+            if (selectedDateTime == null)
             {
-                _popup.PreviewMouseLeftButtonDown -= PopupPreviewMouseLeftButtonDown;
-                _popup.Opened -= PopupOpened;
-                _popup.Closed -= PopupClosed;
-                _popup.Child = null;
+                _textBox.Text = DateTime.Now.ToString(DateTimeFormat);
             }
 
-            if (_dropDownButton != null)
-            {
-                _dropDownButton.Click -= DropDownButton_Click;
-                _dropDownButton.MouseLeave -= DropDownButton_MouseLeave;
-            }
-
-            if (_textBox != null)
-            {
-                _textBox.KeyDown -= TextBox_KeyDown;
-                _textBox.TextChanged -= TextBox_TextChanged;
-                _textBox.LostFocus -= TextBox_LostFocus;
-            }
-
-            base.OnApplyTemplate();
-
-            _popup = GetTemplateChild(ElementPopup) as Popup;
-            _dropDownButton = GetTemplateChild(ElementButton) as Button;
-            _textBox = GetTemplateChild(ElementTextBox) as WatermarkTextBox;
-
-            CheckNull();
-
-            _popup.PreviewMouseLeftButtonDown += PopupPreviewMouseLeftButtonDown;
-            _popup.Opened += PopupOpened;
-            _popup.Closed += PopupClosed;
-            _popup.Child = _calendarWithClock;
-
-            if (IsDropDownOpen)
-            {
-                _popup.IsOpen = true;
-            }
-
-            _dropDownButton.Click += DropDownButton_Click;
-            _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
-
-            var selectedDateTime = SelectedDateTime;
-
-            if (_textBox != null)
-            {
-                if (selectedDateTime == null)
-                {
-                    _textBox.Text = DateTime.Now.ToString(DateTimeFormat);
-                }
-
-                _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                 _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-                _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+            _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                _textBox.KeyDown += TextBox_KeyDown;
-                _textBox.TextChanged += TextBox_TextChanged;
-                _textBox.LostFocus += TextBox_LostFocus;
+            _textBox.KeyDown += TextBox_KeyDown;
+            _textBox.TextChanged += TextBox_TextChanged;
+            _textBox.LostFocus += TextBox_LostFocus;
 
-                if (selectedDateTime == null)
-                {
-                    if (!string.IsNullOrEmpty(_defaultText))
-                    {
-                        _textBox.Text = _defaultText;
-                        SetSelectedDateTime();
-                    }
-                }
-                else
-                {
-                    _textBox.Text = DateTimeToString(selectedDateTime.Value);
-                }
-            }
-
-            if (selectedDateTime is null)
+            if (selectedDateTime == null)
             {
-                _originalSelectedDateTime ??= DateTime.Now;
-                SetCurrentValue(DisplayDateTimeProperty, _originalSelectedDateTime);
+                if (!string.IsNullOrEmpty(_defaultText))
+                {
+                    _textBox.Text = _defaultText;
+                    SetSelectedDateTime();
+                }
             }
             else
             {
-                SetCurrentValue(DisplayDateTimeProperty, selectedDateTime);
+                _textBox.Text = DateTimeToString(selectedDateTime.Value);
             }
         }
 
-        public virtual bool VerifyData()
+        if (selectedDateTime is null)
         {
-            OperationResult<bool> result;
+            _originalSelectedDateTime ??= DateTime.Now;
+            SetCurrentValue(DisplayDateTimeProperty, _originalSelectedDateTime);
+        }
+        else
+        {
+            SetCurrentValue(DisplayDateTimeProperty, selectedDateTime);
+        }
+    }
 
-            if (VerifyFunc != null)
+    public virtual bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        if (VerifyFunc != null)
+        {
+            result = VerifyFunc.Invoke(Text);
+        }
+        else
+        {
+            if (!string.IsNullOrEmpty(Text))
             {
-                result = VerifyFunc.Invoke(Text);
+                result = OperationResult.Success();
+            }
+            else if (InfoElement.GetNecessary(this))
+            {
+                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
             }
             else
             {
-                if (!string.IsNullOrEmpty(Text))
-                {
-                    result = OperationResult.Success();
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
+                result = OperationResult.Success();
             }
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
+            }
+        }
+        return !isError;
+    }
+
+    public override string ToString() => SelectedDateTime?.ToString(DateTimeFormat) ?? string.Empty;
+
+    #endregion
+
+    #region Protected Methods
+
+    protected virtual void OnPickerClosed(RoutedEventArgs e)
+    {
+        var handler = PickerClosed;
+        handler?.Invoke(this, e);
+    }
+
+    protected virtual void OnPickerOpened(RoutedEventArgs e)
+    {
+        var handler = PickerOpened;
+        handler?.Invoke(this, e);
+    }
+
+    #endregion Protected Methods
+
+    #region Private Methods
+
+    private void CheckNull()
+    {
+        if (_dropDownButton == null || _popup == null || _textBox == null)
+            throw new Exception();
+    }
+
+    private void InitCalendarWithClock()
+    {
+        _calendarWithClock = new CalendarWithClock
+        {
+            ShowConfirmButton = true
+        };
+        _calendarWithClock.SelectedDateTimeChanged += CalendarWithClock_SelectedDateTimeChanged;
+        _calendarWithClock.Confirmed += CalendarWithClock_Confirmed;
+    }
+
+    private void CalendarWithClock_Confirmed() => TogglePopup();
+
+    private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedDateTime = e.Info;
+
+    private void TextBox_LostFocus(object sender, RoutedEventArgs e)
+    {
+        SetSelectedDateTime();
+    }
+
+    private void SetIsHandlerSuspended(DependencyProperty property, bool value)
+    {
+        if (value)
+        {
+            _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
+            _isHandlerSuspended[property] = true;
+        }
+        else
+        {
+            _isHandlerSuspended?.Remove(property);
+        }
+    }
+
+    private void SetValueNoCallback(DependencyProperty property, object value)
+    {
+        SetIsHandlerSuspended(property, true);
+        try
+        {
+            SetCurrentValue(property, value);
+        }
+        finally
+        {
+            SetIsHandlerSuspended(property, false);
+        }
+    }
+
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        SetValueNoCallback(TextProperty, _textBox.Text);
+        VerifyData();
+    }
+
+    private bool ProcessDateTimePickerKey(KeyEventArgs e)
+    {
+        switch (e.Key)
+        {
+            case Key.System:
+            {
+                switch (e.SystemKey)
                 {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
-            }
-            return !isError;
-        }
-
-        public override string ToString() => SelectedDateTime?.ToString(DateTimeFormat) ?? string.Empty;
-
-        #endregion
-
-        #region Protected Methods
-
-        protected virtual void OnPickerClosed(RoutedEventArgs e)
-        {
-            var handler = PickerClosed;
-            handler?.Invoke(this, e);
-        }
-
-        protected virtual void OnPickerOpened(RoutedEventArgs e)
-        {
-            var handler = PickerOpened;
-            handler?.Invoke(this, e);
-        }
-
-        #endregion Protected Methods
-
-        #region Private Methods
-
-        private void CheckNull()
-        {
-            if (_dropDownButton == null || _popup == null || _textBox == null)
-                throw new Exception();
-        }
-
-        private void InitCalendarWithClock()
-        {
-            _calendarWithClock = new CalendarWithClock
-            {
-                ShowConfirmButton = true
-            };
-            _calendarWithClock.SelectedDateTimeChanged += CalendarWithClock_SelectedDateTimeChanged;
-            _calendarWithClock.Confirmed += CalendarWithClock_Confirmed;
-        }
-
-        private void CalendarWithClock_Confirmed() => TogglePopup();
-
-        private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedDateTime = e.Info;
-
-        private void TextBox_LostFocus(object sender, RoutedEventArgs e)
-        {
-            SetSelectedDateTime();
-        }
-
-        private void SetIsHandlerSuspended(DependencyProperty property, bool value)
-        {
-            if (value)
-            {
-                _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
-                _isHandlerSuspended[property] = true;
-            }
-            else
-            {
-                _isHandlerSuspended?.Remove(property);
-            }
-        }
-
-        private void SetValueNoCallback(DependencyProperty property, object value)
-        {
-            SetIsHandlerSuspended(property, true);
-            try
-            {
-                SetCurrentValue(property, value);
-            }
-            finally
-            {
-                SetIsHandlerSuspended(property, false);
-            }
-        }
-
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            SetValueNoCallback(TextProperty, _textBox.Text);
-            VerifyData();
-        }
-
-        private bool ProcessDateTimePickerKey(KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.System:
+                    case Key.Down:
                     {
-                        switch (e.SystemKey)
+                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
                         {
-                            case Key.Down:
-                                {
-                                    if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                                    {
-                                        TogglePopup();
-                                        return true;
-                                    }
-
-                                    break;
-                                }
+                            TogglePopup();
+                            return true;
                         }
 
                         break;
                     }
-
-                case Key.Enter:
-                    {
-                        SetSelectedDateTime();
-                        return true;
-                    }
-            }
-
-            return false;
-        }
-
-        private void TextBox_KeyDown(object sender, KeyEventArgs e)
-        {
-            e.Handled = ProcessDateTimePickerKey(e) || e.Handled;
-        }
-
-        private void DropDownButton_MouseLeave(object sender, MouseEventArgs e)
-        {
-            _disablePopupReopen = false;
-        }
-
-        private bool IsHandlerSuspended(DependencyProperty property)
-        {
-            return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
-        }
-
-        private void PopupPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is Popup { StaysOpen: false })
-            {
-                if (_dropDownButton?.InputHitTest(e.GetPosition(_dropDownButton)) != null)
-                {
-                    _disablePopupReopen = true;
                 }
+
+                break;
+            }
+
+            case Key.Enter:
+            {
+                SetSelectedDateTime();
+                return true;
             }
         }
 
-        private void PopupOpened(object sender, EventArgs e)
+        return false;
+    }
+
+    private void TextBox_KeyDown(object sender, KeyEventArgs e)
+    {
+        e.Handled = ProcessDateTimePickerKey(e) || e.Handled;
+    }
+
+    private void DropDownButton_MouseLeave(object sender, MouseEventArgs e)
+    {
+        _disablePopupReopen = false;
+    }
+
+    private bool IsHandlerSuspended(DependencyProperty property)
+    {
+        return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
+    }
+
+    private void PopupPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is Popup { StaysOpen: false })
         {
-            if (!IsDropDownOpen)
+            if (_dropDownButton?.InputHitTest(e.GetPosition(_dropDownButton)) != null)
             {
+                _disablePopupReopen = true;
+            }
+        }
+    }
+
+    private void PopupOpened(object sender, EventArgs e)
+    {
+        if (!IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
+        }
+
+        _calendarWithClock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+
+        OnPickerOpened(new RoutedEventArgs());
+    }
+
+    private void PopupClosed(object sender, EventArgs e)
+    {
+        if (IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+        }
+
+        if (_calendarWithClock.IsKeyboardFocusWithin)
+        {
+            MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+        }
+
+        OnPickerClosed(new RoutedEventArgs());
+    }
+
+    private void DropDownButton_Click(object sender, RoutedEventArgs e) => TogglePopup();
+
+    private void TogglePopup()
+    {
+        if (IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+        }
+        else
+        {
+            if (_disablePopupReopen)
+            {
+                _disablePopupReopen = false;
+            }
+            else
+            {
+                SetSelectedDateTime();
                 SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
             }
+        }
+    }
 
-            _calendarWithClock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+    private void SafeSetText(string s)
+    {
+        if (string.Compare(Text, s, StringComparison.Ordinal) != 0)
+        {
+            SetCurrentValue(TextProperty, s);
+        }
+    }
 
-            OnPickerOpened(new RoutedEventArgs());
+    private DateTime? ParseText(string text)
+    {
+        try
+        {
+            return DateTime.Parse(text);
+        }
+        catch
+        {
+            // ignored
         }
 
-        private void PopupClosed(object sender, EventArgs e)
+        return null;
+    }
+
+    private DateTime? SetTextBoxValue(string s)
+    {
+        if (string.IsNullOrEmpty(s))
         {
-            if (IsDropDownOpen)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-            }
-
-            if (_calendarWithClock.IsKeyboardFocusWithin)
-            {
-                MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
-            }
-
-            OnPickerClosed(new RoutedEventArgs());
+            SafeSetText(s);
+            return SelectedDateTime;
         }
 
-        private void DropDownButton_Click(object sender, RoutedEventArgs e) => TogglePopup();
+        var d = ParseText(s);
 
-        private void TogglePopup()
+        if (d != null)
         {
-            if (IsDropDownOpen)
+            SafeSetText(DateTimeToString((DateTime) d));
+            return d;
+        }
+
+        if (SelectedDateTime != null)
+        {
+            var newtext = DateTimeToString(SelectedDateTime.Value);
+            SafeSetText(newtext);
+            return SelectedDateTime;
+        }
+        SafeSetText(DateTimeToString(DisplayDateTime));
+        return DisplayDateTime;
+    }
+
+    private void SetSelectedDateTime()
+    {
+        if (_textBox != null)
+        {
+            if (!string.IsNullOrEmpty(_textBox.Text))
             {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-            }
-            else
-            {
-                if (_disablePopupReopen)
+                var s = _textBox.Text;
+
+                if (SelectedDateTime != null)
                 {
-                    _disablePopupReopen = false;
-                }
-                else
-                {
-                    SetSelectedDateTime();
-                    SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
-                }
-            }
-        }
-
-        private void SafeSetText(string s)
-        {
-            if (string.Compare(Text, s, StringComparison.Ordinal) != 0)
-            {
-                SetCurrentValue(TextProperty, s);
-            }
-        }
-
-        private DateTime? ParseText(string text)
-        {
-            try
-            {
-                return DateTime.Parse(text);
-            }
-            catch
-            {
-                // ignored
-            }
-
-            return null;
-        }
-
-        private DateTime? SetTextBoxValue(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                SafeSetText(s);
-                return SelectedDateTime;
-            }
-
-            var d = ParseText(s);
-
-            if (d != null)
-            {
-                SafeSetText(DateTimeToString((DateTime) d));
-                return d;
-            }
-
-            if (SelectedDateTime != null)
-            {
-                var newtext = DateTimeToString(SelectedDateTime.Value);
-                SafeSetText(newtext);
-                return SelectedDateTime;
-            }
-            SafeSetText(DateTimeToString(DisplayDateTime));
-            return DisplayDateTime;
-        }
-
-        private void SetSelectedDateTime()
-        {
-            if (_textBox != null)
-            {
-                if (!string.IsNullOrEmpty(_textBox.Text))
-                {
-                    var s = _textBox.Text;
-
-                    if (SelectedDateTime != null)
+                    if (SelectedDateTime != DisplayDateTime)
                     {
-                        if (SelectedDateTime != DisplayDateTime)
-                        {
-                            SetCurrentValue(DisplayDateTimeProperty, SelectedDateTime);
-                        }
-
-                        var selectedTime = DateTimeToString(SelectedDateTime.Value);
-
-                        if (string.Compare(selectedTime, s, StringComparison.Ordinal) == 0)
-                        {
-                            return;
-                        }
+                        SetCurrentValue(DisplayDateTimeProperty, SelectedDateTime);
                     }
 
-                    var d = SetTextBoxValue(s);
-                    if (!SelectedDateTime.Equals(d))
+                    var selectedTime = DateTimeToString(SelectedDateTime.Value);
+
+                    if (string.Compare(selectedTime, s, StringComparison.Ordinal) == 0)
                     {
-                        SetCurrentValue(SelectedDateTimeProperty, d);
-                        SetCurrentValue(DisplayDateTimeProperty, d);
+                        return;
                     }
                 }
-                else
-                {
-                    if (SelectedDateTime.HasValue)
-                    {
-                        SetCurrentValue(SelectedDateTimeProperty, null);
-                    }
-                }
-            }
-            else
-            {
-                var d = SetTextBoxValue(_defaultText);
+
+                var d = SetTextBoxValue(s);
                 if (!SelectedDateTime.Equals(d))
                 {
                     SetCurrentValue(SelectedDateTimeProperty, d);
+                    SetCurrentValue(DisplayDateTimeProperty, d);
                 }
             }
-        }
-
-        private string DateTimeToString(DateTime d) => d.ToString(DateTimeFormat);
-
-        private static void OnGotFocus(object sender, RoutedEventArgs e)
-        {
-            var picker = (DateTimePicker) sender;
-            if (!e.Handled && picker._textBox != null)
+            else
             {
-                if (Equals(e.OriginalSource, picker))
+                if (SelectedDateTime.HasValue)
                 {
-                    picker._textBox.Focus();
-                    e.Handled = true;
-                }
-                else if (Equals(e.OriginalSource, picker._textBox))
-                {
-                    picker._textBox.SelectAll();
-                    e.Handled = true;
+                    SetCurrentValue(SelectedDateTimeProperty, null);
                 }
             }
         }
-
-        #endregion
+        else
+        {
+            var d = SetTextBoxValue(_defaultText);
+            if (!SelectedDateTime.Equals(d))
+            {
+                SetCurrentValue(SelectedDateTimeProperty, d);
+            }
+        }
     }
-}
+
+    private string DateTimeToString(DateTime d) => d.ToString(DateTimeFormat);
+
+    private static void OnGotFocus(object sender, RoutedEventArgs e)
+    {
+        var picker = (DateTimePicker) sender;
+        if (!e.Handled && picker._textBox != null)
+        {
+            if (Equals(e.OriginalSource, picker))
+            {
+                picker._textBox.Focus();
+                e.Handled = true;
+            }
+            else if (Equals(e.OriginalSource, picker._textBox))
+            {
+                picker._textBox.SelectAll();
+                e.Handled = true;
+            }
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs b/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
index 1f71e29c..d1a1fd2d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
@@ -2,42 +2,41 @@
 using HandyControl.Data;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     表示可以成为一个数据输入控件
+/// </summary>
+public interface IDataInput
 {
     /// <summary>
-    ///     表示可以成为一个数据输入控件
+    ///     验证数据
     /// </summary>
-    public interface IDataInput
-    {
-        /// <summary>
-        ///     验证数据
-        /// </summary>
-        /// <returns></returns>
-        bool VerifyData();
+    /// <returns></returns>
+    bool VerifyData();
 
-        /// <summary>
-        ///     数据验证委托
-        /// </summary>
-        Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+    /// <summary>
+    ///     数据验证委托
+    /// </summary>
+    Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        bool IsError { get; set; }
+    /// <summary>
+    ///     数据是否错误
+    /// </summary>
+    bool IsError { get; set; }
 
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        string ErrorStr { get; set; }
+    /// <summary>
+    ///     错误提示
+    /// </summary>
+    string ErrorStr { get; set; }
 
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        TextType TextType { get; set; }
+    /// <summary>
+    ///     文本类型
+    /// </summary>
+    TextType TextType { get; set; }
 
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        bool ShowClearButton { get; set; }
-    }
-}
+    /// <summary>
+    ///     是否显示清除按钮
+    /// </summary>
+    bool ShowClearButton { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
index f42e4065..2d8e965f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
@@ -8,130 +8,129 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using Microsoft.Win32;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ImageSelector : Control
 {
-    public class ImageSelector : Control
+    public static readonly RoutedEvent ImageSelectedEvent =
+        EventManager.RegisterRoutedEvent("ImageSelected", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(ImageSelector));
+
+    public event RoutedEventHandler ImageSelected
     {
-        public static readonly RoutedEvent ImageSelectedEvent =
-            EventManager.RegisterRoutedEvent("ImageSelected", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(ImageSelector));
+        add => AddHandler(ImageSelectedEvent, value);
+        remove => RemoveHandler(ImageSelectedEvent, value);
+    }
 
-        public event RoutedEventHandler ImageSelected
+    public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage));
+
+    private void SwitchImage(object sender, ExecutedRoutedEventArgs e)
+    {
+        if (!HasValue)
         {
-            add => AddHandler(ImageSelectedEvent, value);
-            remove => RemoveHandler(ImageSelectedEvent, value);
-        }
-
-        public ImageSelector() => CommandBindings.Add(new CommandBinding(ControlCommands.Switch, SwitchImage));
-
-        private void SwitchImage(object sender, ExecutedRoutedEventArgs e)
-        {
-            if (!HasValue)
+            var dialog = new OpenFileDialog
             {
-                var dialog = new OpenFileDialog
-                {
-                    RestoreDirectory = true,
-                    Filter = Filter,
-                    DefaultExt = DefaultExt
-                };
+                RestoreDirectory = true,
+                Filter = Filter,
+                DefaultExt = DefaultExt
+            };
 
-                if (dialog.ShowDialog() == true)
-                {
-                    SetValue(UriPropertyKey, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
-                    SetValue(PreviewBrushPropertyKey, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
-                    {
-                        Stretch = Stretch
-                    });
-                    SetValue(HasValuePropertyKey, ValueBoxes.TrueBox);
-                    SetCurrentValue(ToolTipProperty, dialog.FileName);
-                    RaiseEvent(new RoutedEventArgs(ImageSelectedEvent, this));
-                }
-            }
-            else
+            if (dialog.ShowDialog() == true)
             {
-                SetValue(UriPropertyKey, default(Uri));
-                SetValue(PreviewBrushPropertyKey, default(Brush));
-                SetValue(HasValuePropertyKey, ValueBoxes.FalseBox);
-                SetCurrentValue(ToolTipProperty, default);
+                SetValue(UriPropertyKey, new Uri(dialog.FileName, UriKind.RelativeOrAbsolute));
+                SetValue(PreviewBrushPropertyKey, new ImageBrush(BitmapFrame.Create(Uri, BitmapCreateOptions.IgnoreImageCache, BitmapCacheOption.None))
+                {
+                    Stretch = Stretch
+                });
+                SetValue(HasValuePropertyKey, ValueBoxes.TrueBox);
+                SetCurrentValue(ToolTipProperty, dialog.FileName);
+                RaiseEvent(new RoutedEventArgs(ImageSelectedEvent, this));
             }
         }
-
-        public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(
-            "Stretch", typeof(Stretch), typeof(ImageSelector), new PropertyMetadata(default(Stretch)));
-
-        public Stretch Stretch
+        else
         {
-            get => (Stretch) GetValue(StretchProperty);
-            set => SetValue(StretchProperty, value);
-        }
-
-        public static readonly DependencyPropertyKey UriPropertyKey = DependencyProperty.RegisterReadOnly(
-            "Uri", typeof(Uri), typeof(ImageSelector), new PropertyMetadata(default(Uri)));
-
-        public static readonly DependencyProperty UriProperty = UriPropertyKey.DependencyProperty;
-
-        public Uri Uri
-        {
-            get => (Uri) GetValue(UriProperty);
-            set => SetValue(UriProperty, value);
-        }
-
-        public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
-            "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
-
-        public Brush PreviewBrush
-        {
-            get => (Brush) GetValue(PreviewBrushProperty);
-            set => SetValue(PreviewBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
-            "StrokeThickness", typeof(double), typeof(ImageSelector), new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public double StrokeThickness
-        {
-            get => (double) GetValue(StrokeThicknessProperty);
-            set => SetValue(StrokeThicknessProperty, value);
-        }
-
-        public static readonly DependencyProperty StrokeDashArrayProperty = DependencyProperty.Register(
-            "StrokeDashArray", typeof(DoubleCollection), typeof(ImageSelector), new FrameworkPropertyMetadata(default(DoubleCollection), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public DoubleCollection StrokeDashArray
-        {
-            get => (DoubleCollection) GetValue(StrokeDashArrayProperty);
-            set => SetValue(StrokeDashArrayProperty, value);
-        }
-
-        public static readonly DependencyProperty DefaultExtProperty = DependencyProperty.Register(
-            "DefaultExt", typeof(string), typeof(ImageSelector), new PropertyMetadata(".jpg"));
-
-        public string DefaultExt
-        {
-            get => (string) GetValue(DefaultExtProperty);
-            set => SetValue(DefaultExtProperty, value);
-        }
-
-        public static readonly DependencyProperty FilterProperty = DependencyProperty.Register(
-            "Filter", typeof(string), typeof(ImageSelector), new PropertyMetadata("(.jpg)|*.jpg|(.png)|*.png"));
-
-        public string Filter
-        {
-            get => (string) GetValue(FilterProperty);
-            set => SetValue(FilterProperty, value);
-        }
-
-        public static readonly DependencyPropertyKey HasValuePropertyKey = DependencyProperty.RegisterReadOnly(
-            "HasValue", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public static readonly DependencyProperty HasValueProperty = HasValuePropertyKey.DependencyProperty;
-
-        public bool HasValue
-        {
-            get => (bool) GetValue(HasValueProperty);
-            set => SetValue(HasValueProperty, ValueBoxes.BooleanBox(value));
+            SetValue(UriPropertyKey, default(Uri));
+            SetValue(PreviewBrushPropertyKey, default(Brush));
+            SetValue(HasValuePropertyKey, ValueBoxes.FalseBox);
+            SetCurrentValue(ToolTipProperty, default);
         }
     }
-}
+
+    public static readonly DependencyProperty StretchProperty = DependencyProperty.Register(
+        "Stretch", typeof(Stretch), typeof(ImageSelector), new PropertyMetadata(default(Stretch)));
+
+    public Stretch Stretch
+    {
+        get => (Stretch) GetValue(StretchProperty);
+        set => SetValue(StretchProperty, value);
+    }
+
+    public static readonly DependencyPropertyKey UriPropertyKey = DependencyProperty.RegisterReadOnly(
+        "Uri", typeof(Uri), typeof(ImageSelector), new PropertyMetadata(default(Uri)));
+
+    public static readonly DependencyProperty UriProperty = UriPropertyKey.DependencyProperty;
+
+    public Uri Uri
+    {
+        get => (Uri) GetValue(UriProperty);
+        set => SetValue(UriProperty, value);
+    }
+
+    public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
+        "PreviewBrush", typeof(Brush), typeof(ImageSelector), new PropertyMetadata(default(Brush)));
+
+    public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
+
+    public Brush PreviewBrush
+    {
+        get => (Brush) GetValue(PreviewBrushProperty);
+        set => SetValue(PreviewBrushProperty, value);
+    }
+
+    public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
+        "StrokeThickness", typeof(double), typeof(ImageSelector), new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double StrokeThickness
+    {
+        get => (double) GetValue(StrokeThicknessProperty);
+        set => SetValue(StrokeThicknessProperty, value);
+    }
+
+    public static readonly DependencyProperty StrokeDashArrayProperty = DependencyProperty.Register(
+        "StrokeDashArray", typeof(DoubleCollection), typeof(ImageSelector), new FrameworkPropertyMetadata(default(DoubleCollection), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public DoubleCollection StrokeDashArray
+    {
+        get => (DoubleCollection) GetValue(StrokeDashArrayProperty);
+        set => SetValue(StrokeDashArrayProperty, value);
+    }
+
+    public static readonly DependencyProperty DefaultExtProperty = DependencyProperty.Register(
+        "DefaultExt", typeof(string), typeof(ImageSelector), new PropertyMetadata(".jpg"));
+
+    public string DefaultExt
+    {
+        get => (string) GetValue(DefaultExtProperty);
+        set => SetValue(DefaultExtProperty, value);
+    }
+
+    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register(
+        "Filter", typeof(string), typeof(ImageSelector), new PropertyMetadata("(.jpg)|*.jpg|(.png)|*.png"));
+
+    public string Filter
+    {
+        get => (string) GetValue(FilterProperty);
+        set => SetValue(FilterProperty, value);
+    }
+
+    public static readonly DependencyPropertyKey HasValuePropertyKey = DependencyProperty.RegisterReadOnly(
+        "HasValue", typeof(bool), typeof(ImageSelector), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static readonly DependencyProperty HasValueProperty = HasValuePropertyKey.DependencyProperty;
+
+    public bool HasValue
+    {
+        get => (bool) GetValue(HasValueProperty);
+        set => SetValue(HasValueProperty, ValueBoxes.BooleanBox(value));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index a48c60ff..fce25db2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -9,305 +9,305 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     数值选择控件
+/// </summary>
+[TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
+public class NumericUpDown : Control
 {
-    /// <summary>
-    ///     数值选择控件
-    /// </summary>
-    [TemplatePart(Name = ElementTextBox, Type = typeof(TextBox))]
-    public class NumericUpDown : Control
+    private const string ElementTextBox = "PART_TextBox";
+
+    private TextBox _textBox;
+
+    public NumericUpDown()
     {
-        private const string ElementTextBox = "PART_TextBox";
-
-        private TextBox _textBox;
-
-        public NumericUpDown()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) =>
-            {
-                if (IsReadOnly) return;
-
-                SetCurrentValue(ValueProperty, Value + Increment);
-            }));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) =>
-            {
-                if (IsReadOnly) return;
-
-                SetCurrentValue(ValueProperty, Value - Increment);
-            }));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
-            {
-                if (IsReadOnly) return;
-
-                SetCurrentValue(ValueProperty, ValueBoxes.Double0Box);
-            }));
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _textBox = GetTemplateChild(ElementTextBox) as TextBox;
-
-            if (_textBox != null)
-            {
-                _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
-#if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
-#endif
-                _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
-
-                _textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
-                _textBox.Text = CurrentText;
-            }
-        }
-
-        private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) =>
         {
             if (IsReadOnly) return;
 
-            if (e.Key == Key.Up)
-            {
-                Value += Increment;
-            }
-            else if (e.Key == Key.Down)
-            {
-                Value -= Increment;
-            }
-        }
-
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
+            SetCurrentValue(ValueProperty, Value + Increment);
+        }));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) =>
         {
-            base.OnMouseWheel(e);
+            if (IsReadOnly) return;
 
-            if (_textBox.IsFocused && !IsReadOnly)
-            {
-                Value += e.Delta > 0 ? Increment : -Increment;
-                e.Handled = true;
-            }
-        }
-
-        private string CurrentText => string.IsNullOrWhiteSpace(ValueFormat)
-            ? DecimalPlaces.HasValue
-                ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}")
-                : Value.ToString()
-            : Value.ToString(ValueFormat);
-
-        protected virtual void OnValueChanged(FunctionEventArgs<double> e) => RaiseEvent(e);
-
-        /// <summary>
-        ///     值改变事件
-        /// </summary>
-        public static readonly RoutedEvent ValueChangedEvent =
-            EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<double>>), typeof(NumericUpDown));
-
-        /// <summary>
-        ///     值改变事件
-        /// </summary>
-        public event EventHandler<FunctionEventArgs<double>> ValueChanged
+            SetCurrentValue(ValueProperty, Value - Increment);
+        }));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
+            if (IsReadOnly) return;
 
-        /// <summary>
-        ///     当前值
-        /// </summary>
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-            "Value", typeof(double), typeof(NumericUpDown),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-                OnValueChanged, CoerceValue), ValidateHelper.IsInRangeOfDouble);
+            SetCurrentValue(ValueProperty, ValueBoxes.Double0Box);
+        }));
+    }
 
-        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _textBox = GetTemplateChild(ElementTextBox) as TextBox;
+
+        if (_textBox != null)
         {
-            var ctl = (NumericUpDown) d;
-            var v = (double) e.NewValue;
-            ctl.SetText();
+            _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+#if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
+                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+#endif
+            _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+            _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-            ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)
-            {
-                Info = v
-            });
+            _textBox.PreviewKeyDown += TextBox_PreviewKeyDown;
+            _textBox.Text = CurrentText;
         }
+    }
 
-        private void SetText()
+    private void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+    {
+        if (IsReadOnly) return;
+
+        if (e.Key == Key.Up)
         {
-            if (_textBox != null)
-            {
-                _textBox.Text = CurrentText;
-                _textBox.Select(_textBox.Text.Length, 0);
-            }
+            Value += Increment;
         }
-
-        private static object CoerceValue(DependencyObject d, object basevalue)
+        else if (e.Key == Key.Down)
         {
-            var ctl = (NumericUpDown) d;
-            var minimum = ctl.Minimum;
-            var num = (double) basevalue;
-            if (num < minimum)
-            {
-                ctl.Value = minimum;
-                return minimum;
-            }
-            var maximum = ctl.Maximum;
-            if (num > maximum)
-            {
-                ctl.Value = maximum;
-            }
-            ctl.SetText();
-            return num > maximum ? maximum : num;
+            Value -= Increment;
         }
+    }
 
-        /// <summary>
-        ///     当前值
-        /// </summary>
-        public double Value
+    protected override void OnMouseWheel(MouseWheelEventArgs e)
+    {
+        base.OnMouseWheel(e);
+
+        if (_textBox.IsFocused && !IsReadOnly)
         {
-            get => (double) GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
+            Value += e.Delta > 0 ? Increment : -Increment;
+            e.Handled = true;
         }
+    }
 
-        /// <summary>
-        ///     最大值
-        /// </summary>
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
-            "Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(double.MaxValue, OnMaximumChanged, CoerceMaximum), ValidateHelper.IsInRangeOfDouble);
+    private string CurrentText => string.IsNullOrWhiteSpace(ValueFormat)
+        ? DecimalPlaces.HasValue
+            ? Value.ToString($"#0.{new string('0', DecimalPlaces.Value)}")
+            : Value.ToString()
+        : Value.ToString(ValueFormat);
 
-        private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    protected virtual void OnValueChanged(FunctionEventArgs<double> e) => RaiseEvent(e);
+
+    /// <summary>
+    ///     值改变事件
+    /// </summary>
+    public static readonly RoutedEvent ValueChangedEvent =
+        EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<double>>), typeof(NumericUpDown));
+
+    /// <summary>
+    ///     值改变事件
+    /// </summary>
+    public event EventHandler<FunctionEventArgs<double>> ValueChanged
+    {
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
+    }
+
+    /// <summary>
+    ///     当前值
+    /// </summary>
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+        "Value", typeof(double), typeof(NumericUpDown),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+            OnValueChanged, CoerceValue), ValidateHelper.IsInRangeOfDouble);
+
+    private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NumericUpDown) d;
+        var v = (double) e.NewValue;
+        ctl.SetText();
+
+        ctl.OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, ctl)
         {
-            var ctl = (NumericUpDown) d;
-            ctl.CoerceValue(MinimumProperty);
-            ctl.CoerceValue(ValueProperty);
-        }
+            Info = v
+        });
+    }
 
-        private static object CoerceMaximum(DependencyObject d, object basevalue)
+    private void SetText()
+    {
+        if (_textBox != null)
         {
-            var minimum = ((NumericUpDown) d).Minimum;
-            return (double) basevalue < minimum ? minimum : basevalue;
+            _textBox.Text = CurrentText;
+            _textBox.Select(_textBox.Text.Length, 0);
         }
+    }
 
-        /// <summary>
-        ///     最大值
-        /// </summary>
-        public double Maximum
+    private static object CoerceValue(DependencyObject d, object basevalue)
+    {
+        var ctl = (NumericUpDown) d;
+        var minimum = ctl.Minimum;
+        var num = (double) basevalue;
+        if (num < minimum)
         {
-            get => (double) GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
+            ctl.Value = minimum;
+            return minimum;
         }
-
-        /// <summary>
-        ///     最小值
-        /// </summary>
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
-            "Minimum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(double.MinValue, OnMinimumChanged, CoerceMinimum), ValidateHelper.IsInRangeOfDouble);
-
-        private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        var maximum = ctl.Maximum;
+        if (num > maximum)
         {
-            var ctl = (NumericUpDown) d;
-            ctl.CoerceValue(MaximumProperty);
-            ctl.CoerceValue(ValueProperty);
+            ctl.Value = maximum;
         }
+        ctl.SetText();
+        return num > maximum ? maximum : num;
+    }
 
-        private static object CoerceMinimum(DependencyObject d, object basevalue)
-        {
-            var maximum = ((NumericUpDown) d).Maximum;
-            return (double) basevalue > maximum ? maximum : basevalue;
-        }
+    /// <summary>
+    ///     当前值
+    /// </summary>
+    public double Value
+    {
+        get => (double) GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
+    }
 
-        /// <summary>
-        ///     最小值
-        /// </summary>
-        public double Minimum
-        {
-            get => (double) GetValue(MinimumProperty);
-            set => SetValue(MinimumProperty, value);
-        }
+    /// <summary>
+    ///     最大值
+    /// </summary>
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+        "Maximum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(double.MaxValue, OnMaximumChanged, CoerceMaximum), ValidateHelper.IsInRangeOfDouble);
 
-        /// <summary>
-        ///     指示每单击一下按钮时增加或减少的数量
-        /// </summary>
-        public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register(
-            "Increment", typeof(double), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.Double1Box));
+    private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NumericUpDown) d;
+        ctl.CoerceValue(MinimumProperty);
+        ctl.CoerceValue(ValueProperty);
+    }
 
-        /// <summary>
-        ///     指示每单击一下按钮时增加或减少的数量
-        /// </summary>
-        public double Increment
-        {
-            get => (double) GetValue(IncrementProperty);
-            set => SetValue(IncrementProperty, value);
-        }
+    private static object CoerceMaximum(DependencyObject d, object basevalue)
+    {
+        var minimum = ((NumericUpDown) d).Minimum;
+        return (double) basevalue < minimum ? minimum : basevalue;
+    }
 
-        /// <summary>
-        ///     指示要显示的小数位数
-        /// </summary>
-        public static readonly DependencyProperty DecimalPlacesProperty = DependencyProperty.Register(
-            "DecimalPlaces", typeof(int?), typeof(NumericUpDown), new PropertyMetadata(default(int?)));
+    /// <summary>
+    ///     最大值
+    /// </summary>
+    public double Maximum
+    {
+        get => (double) GetValue(MaximumProperty);
+        set => SetValue(MaximumProperty, value);
+    }
 
-        /// <summary>
-        ///     指示要显示的小数位数
-        /// </summary>
-        public int? DecimalPlaces
-        {
-            get => (int?) GetValue(DecimalPlacesProperty);
-            set => SetValue(DecimalPlacesProperty, value);
-        }
+    /// <summary>
+    ///     最小值
+    /// </summary>
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+        "Minimum", typeof(double), typeof(NumericUpDown), new PropertyMetadata(double.MinValue, OnMinimumChanged, CoerceMinimum), ValidateHelper.IsInRangeOfDouble);
 
-        /// <summary>
-        ///     指示要显示的数字的格式
-        /// </summary>
-        public static readonly DependencyProperty ValueFormatProperty = DependencyProperty.Register(
-            "ValueFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
+    private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NumericUpDown) d;
+        ctl.CoerceValue(MaximumProperty);
+        ctl.CoerceValue(ValueProperty);
+    }
 
-        /// <summary>
-        ///     指示要显示的数字的格式，这将会覆盖 <see cref="DecimalPlaces"/> 属性
-        /// </summary>
-        public string ValueFormat
-        {
-            get => (string) GetValue(ValueFormatProperty);
-            set => SetValue(ValueFormatProperty, value);
-        }
+    private static object CoerceMinimum(DependencyObject d, object basevalue)
+    {
+        var maximum = ((NumericUpDown) d).Maximum;
+        return (double) basevalue > maximum ? maximum : basevalue;
+    }
 
-        /// <summary>
-        ///     是否显示上下调值按钮
-        /// </summary>
-        internal static readonly DependencyProperty ShowUpDownButtonProperty = DependencyProperty.Register(
-            "ShowUpDownButton", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.TrueBox));
+    /// <summary>
+    ///     最小值
+    /// </summary>
+    public double Minimum
+    {
+        get => (double) GetValue(MinimumProperty);
+        set => SetValue(MinimumProperty, value);
+    }
 
-        /// <summary>
-        ///     是否显示上下调值按钮
-        /// </summary>
-        internal bool ShowUpDownButton
-        {
-            get => (bool) GetValue(ShowUpDownButtonProperty);
-            set => SetValue(ShowUpDownButtonProperty, ValueBoxes.BooleanBox(value));
-        }
+    /// <summary>
+    ///     指示每单击一下按钮时增加或减少的数量
+    /// </summary>
+    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register(
+        "Increment", typeof(double), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.Double1Box));
 
-        /// <summary>
-        ///     标识 IsReadOnly 依赖属性。
-        /// </summary>
-        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
-            "IsReadOnly", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.FalseBox));
+    /// <summary>
+    ///     指示每单击一下按钮时增加或减少的数量
+    /// </summary>
+    public double Increment
+    {
+        get => (double) GetValue(IncrementProperty);
+        set => SetValue(IncrementProperty, value);
+    }
 
-        /// <summary>
-        ///     获取或设置一个值，该值指示NumericUpDown是否只读。
-        /// </summary>
-        public bool IsReadOnly
-        {
-            get => (bool) GetValue(IsReadOnlyProperty);
-            set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
-        }
+    /// <summary>
+    ///     指示要显示的小数位数
+    /// </summary>
+    public static readonly DependencyProperty DecimalPlacesProperty = DependencyProperty.Register(
+        "DecimalPlaces", typeof(int?), typeof(NumericUpDown), new PropertyMetadata(default(int?)));
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(NumericUpDown));
+    /// <summary>
+    ///     指示要显示的小数位数
+    /// </summary>
+    public int? DecimalPlaces
+    {
+        get => (int?) GetValue(DecimalPlacesProperty);
+        set => SetValue(DecimalPlacesProperty, value);
+    }
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    /// <summary>
+    ///     指示要显示的数字的格式
+    /// </summary>
+    public static readonly DependencyProperty ValueFormatProperty = DependencyProperty.Register(
+        "ValueFormat", typeof(string), typeof(NumericUpDown), new PropertyMetadata(default(string)));
+
+    /// <summary>
+    ///     指示要显示的数字的格式，这将会覆盖 <see cref="DecimalPlaces"/> 属性
+    /// </summary>
+    public string ValueFormat
+    {
+        get => (string) GetValue(ValueFormatProperty);
+        set => SetValue(ValueFormatProperty, value);
+    }
+
+    /// <summary>
+    ///     是否显示上下调值按钮
+    /// </summary>
+    internal static readonly DependencyProperty ShowUpDownButtonProperty = DependencyProperty.Register(
+        "ShowUpDownButton", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    /// <summary>
+    ///     是否显示上下调值按钮
+    /// </summary>
+    internal bool ShowUpDownButton
+    {
+        get => (bool) GetValue(ShowUpDownButtonProperty);
+        set => SetValue(ShowUpDownButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     标识 IsReadOnly 依赖属性。
+    /// </summary>
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
+        "IsReadOnly", typeof(bool), typeof(NumericUpDown), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     获取或设置一个值，该值指示NumericUpDown是否只读。
+    /// </summary>
+    public bool IsReadOnly
+    {
+        get => (bool) GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(NumericUpDown));
+
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -322,22 +322,21 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(NumericUpDown));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(NumericUpDown));
 
-        public double SelectionOpacity
-        {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
-        }
-
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(NumericUpDown));
-
-        public Brush CaretBrush
-        {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
-        }
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
     }
-}
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(NumericUpDown));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 7f85902c..62072d09 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -12,151 +12,151 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Properties.Langs;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))]
+[TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
+public class PasswordBox : Control, IDataInput
 {
-    [TemplatePart(Name = ElementPasswordBox, Type = typeof(System.Windows.Controls.PasswordBox))]
-    [TemplatePart(Name = ElementTextBox, Type = typeof(System.Windows.Controls.TextBox))]
-    public class PasswordBox : Control, IDataInput
+    private const string ElementPasswordBox = "PART_PasswordBox";
+
+    private const string ElementTextBox = "PART_TextBox";
+
+    private SecureString _password;
+
+    private System.Windows.Controls.TextBox _textBox;
+
+    /// <summary>
+    ///     掩码字符
+    /// </summary>
+    public static readonly DependencyProperty PasswordCharProperty =
+        System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PasswordBox),
+            new FrameworkPropertyMetadata('●'));
+
+    public char PasswordChar
     {
-        private const string ElementPasswordBox = "PART_PasswordBox";
+        get => (char) GetValue(PasswordCharProperty);
+        set => SetValue(PasswordCharProperty, value);
+    }
 
-        private const string ElementTextBox = "PART_TextBox";
+    /// <summary>
+    ///     数据是否错误
+    /// </summary>
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        private SecureString _password;
+    public bool IsError
+    {
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private System.Windows.Controls.TextBox _textBox;
+    /// <summary>
+    ///     错误提示
+    /// </summary>
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(PasswordBox), new PropertyMetadata(default(string)));
 
-        /// <summary>
-        ///     掩码字符
-        /// </summary>
-        public static readonly DependencyProperty PasswordCharProperty =
-            System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PasswordBox),
-                new FrameworkPropertyMetadata('●'));
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
 
-        public char PasswordChar
+    /// <summary>
+    ///     文本类型
+    /// </summary>
+    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+        "TextType", typeof(TextType), typeof(PasswordBox), new PropertyMetadata(default(TextType)));
+
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
+
+    /// <summary>
+    ///     是否显示清除按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ShowEyeButtonProperty = DependencyProperty.Register(
+        "ShowEyeButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowEyeButton
+    {
+        get => (bool) GetValue(ShowEyeButtonProperty);
+        set => SetValue(ShowEyeButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ShowPasswordProperty = DependencyProperty.Register(
+        "ShowPassword", typeof(bool), typeof(PasswordBox),
+        new PropertyMetadata(ValueBoxes.FalseBox, OnShowPasswordChanged));
+
+    public bool ShowPassword
+    {
+        get => (bool) GetValue(ShowPasswordProperty);
+        set => SetValue(ShowPasswordProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty IsSafeEnabledProperty = DependencyProperty.Register(
+        "IsSafeEnabled", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.TrueBox, OnIsSafeEnabledChanged));
+
+    private static void OnIsSafeEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var p = (PasswordBox) d;
+        p.SetCurrentValue(UnsafePasswordProperty, !(bool) e.NewValue ? p.Password : string.Empty);
+    }
+
+    public bool IsSafeEnabled
+    {
+        get => (bool) GetValue(IsSafeEnabledProperty);
+        set => SetValue(IsSafeEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty UnsafePasswordProperty = DependencyProperty.Register(
+        "UnsafePassword", typeof(string), typeof(PasswordBox), new FrameworkPropertyMetadata(default(string),
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnUnsafePasswordChanged));
+
+    private static void OnUnsafePasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var p = (PasswordBox) d;
+        if (!p.IsSafeEnabled)
         {
-            get => (char) GetValue(PasswordCharProperty);
-            set => SetValue(PasswordCharProperty, value);
+            p.Password = e.NewValue != null ? e.NewValue.ToString() : string.Empty;
         }
+    }
 
-        /// <summary>
-        ///     数据是否错误
-        /// </summary>
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
+    public string UnsafePassword
+    {
+        get => (string) GetValue(UnsafePasswordProperty);
+        set => SetValue(UnsafePasswordProperty, value);
+    }
 
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
+    public static readonly DependencyProperty MaxLengthProperty =
+        System.Windows.Controls.TextBox.MaxLengthProperty.AddOwner(typeof(PasswordBox));
 
-        /// <summary>
-        ///     错误提示
-        /// </summary>
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(PasswordBox), new PropertyMetadata(default(string)));
+    public int MaxLength
+    {
+        get => (int) GetValue(MaxLengthProperty);
+        set => SetValue(MaxLengthProperty, value);
+    }
 
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(PasswordBox));
 
-        /// <summary>
-        ///     文本类型
-        /// </summary>
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(PasswordBox), new PropertyMetadata(default(TextType)));
-
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
-
-        /// <summary>
-        ///     是否显示清除按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ShowEyeButtonProperty = DependencyProperty.Register(
-            "ShowEyeButton", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowEyeButton
-        {
-            get => (bool) GetValue(ShowEyeButtonProperty);
-            set => SetValue(ShowEyeButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ShowPasswordProperty = DependencyProperty.Register(
-            "ShowPassword", typeof(bool), typeof(PasswordBox),
-            new PropertyMetadata(ValueBoxes.FalseBox, OnShowPasswordChanged));
-
-        public bool ShowPassword
-        {
-            get => (bool) GetValue(ShowPasswordProperty);
-            set => SetValue(ShowPasswordProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty IsSafeEnabledProperty = DependencyProperty.Register(
-            "IsSafeEnabled", typeof(bool), typeof(PasswordBox), new PropertyMetadata(ValueBoxes.TrueBox, OnIsSafeEnabledChanged));
-
-        private static void OnIsSafeEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var p = (PasswordBox) d;
-            p.SetCurrentValue(UnsafePasswordProperty, !(bool) e.NewValue ? p.Password : string.Empty);
-        }
-
-        public bool IsSafeEnabled
-        {
-            get => (bool) GetValue(IsSafeEnabledProperty);
-            set => SetValue(IsSafeEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty UnsafePasswordProperty = DependencyProperty.Register(
-            "UnsafePassword", typeof(string), typeof(PasswordBox), new FrameworkPropertyMetadata(default(string),
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnUnsafePasswordChanged));
-
-        private static void OnUnsafePasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var p = (PasswordBox) d;
-            if (!p.IsSafeEnabled)
-            {
-                p.Password = e.NewValue != null ? e.NewValue.ToString() : string.Empty;
-            }
-        }
-
-        public string UnsafePassword
-        {
-            get => (string) GetValue(UnsafePasswordProperty);
-            set => SetValue(UnsafePasswordProperty, value);
-        }
-
-        public static readonly DependencyProperty MaxLengthProperty =
-            System.Windows.Controls.TextBox.MaxLengthProperty.AddOwner(typeof(PasswordBox));
-
-        public int MaxLength
-        {
-            get => (int) GetValue(MaxLengthProperty);
-            set => SetValue(MaxLengthProperty, value);
-        }
-
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(PasswordBox));
-
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -171,23 +171,23 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(PasswordBox));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(PasswordBox));
 
-        public double SelectionOpacity
-        {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
-        }
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
 
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(PasswordBox));
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(PasswordBox));
 
-        public Brush CaretBrush
-        {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
-        }
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
 
 #if !NET40
 
@@ -198,197 +198,196 @@ namespace HandyControl.Controls
 
 #endif
 
-        public PasswordBox() => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
+    public PasswordBox() => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => Clear()));
 
-        public System.Windows.Controls.PasswordBox ActualPasswordBox { get; set; }
+    public System.Windows.Controls.PasswordBox ActualPasswordBox { get; set; }
 
-        [DefaultValue("")]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public string Password
+    [DefaultValue("")]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public string Password
+    {
+        get
         {
-            get
+            if (ShowEyeButton && ShowPassword)
             {
-                if (ShowEyeButton && ShowPassword)
-                {
-                    return _textBox.Text;
-                }
-                return ActualPasswordBox?.Password;
-            }
-            set
-            {
-                if (ActualPasswordBox == null)
-                {
-                    _password = new SecureString();
-                    value ??= string.Empty;
-                    foreach (var item in value)
-                        _password.AppendChar(item);
-
-                    return;
-                }
-
-                if (Equals(ActualPasswordBox.Password, value)) return;
-                ActualPasswordBox.Password = value;
+                return _textBox.Text;
             }
+            return ActualPasswordBox?.Password;
         }
-
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public SecureString SecurePassword => ActualPasswordBox?.SecurePassword;
-
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
-
-        public virtual bool VerifyData()
+        set
         {
-            OperationResult<bool> result;
+            if (ActualPasswordBox == null)
+            {
+                _password = new SecureString();
+                value ??= string.Empty;
+                foreach (var item in value)
+                    _password.AppendChar(item);
 
-            if (VerifyFunc != null)
-            {
-                result = VerifyFunc.Invoke(ShowEyeButton && ShowPassword
-                    ? _textBox.Text
-                    : ActualPasswordBox.Password);
+                return;
             }
-            else
-            {
-                if (!string.IsNullOrEmpty(ShowEyeButton && ShowPassword
+
+            if (Equals(ActualPasswordBox.Password, value)) return;
+            ActualPasswordBox.Password = value;
+        }
+    }
+
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public SecureString SecurePassword => ActualPasswordBox?.SecurePassword;
+
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+
+    public virtual bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        if (VerifyFunc != null)
+        {
+            result = VerifyFunc.Invoke(ShowEyeButton && ShowPassword
+                ? _textBox.Text
+                : ActualPasswordBox.Password);
+        }
+        else
+        {
+            if (!string.IsNullOrEmpty(ShowEyeButton && ShowPassword
                     ? _textBox.Text
                     : ActualPasswordBox.Password))
-                    result = OperationResult.Success();
-                else if (InfoElement.GetNecessary(this))
-                    result = OperationResult.Failed(Lang.IsNecessary);
-                else
-                    result = OperationResult.Success();
-            }
+                result = OperationResult.Success();
+            else if (InfoElement.GetNecessary(this))
+                result = OperationResult.Failed(Lang.IsNecessary);
+            else
+                result = OperationResult.Success();
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
-            }
-            return !isError;
-        }
-
-        private static void OnShowPasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (PasswordBox) d;
-            if (!ctl.ShowEyeButton) return;
-            if ((bool) e.NewValue)
-            {
-                ctl._textBox.Text = ctl.ActualPasswordBox.Password;
-                ctl._textBox.Select(string.IsNullOrEmpty(ctl._textBox.Text) ? 0 : ctl._textBox.Text.Length, 0);
-            }
-            else
-            {
-                ctl.ActualPasswordBox.Password = ctl._textBox.Text;
-                ctl._textBox.Clear();
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
             }
         }
+        return !isError;
+    }
 
-        public override void OnApplyTemplate()
+    private static void OnShowPasswordChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (PasswordBox) d;
+        if (!ctl.ShowEyeButton) return;
+        if ((bool) e.NewValue)
         {
-            if (ActualPasswordBox != null)
-                ActualPasswordBox.PasswordChanged -= PasswordBox_PasswordChanged;
+            ctl._textBox.Text = ctl.ActualPasswordBox.Password;
+            ctl._textBox.Select(string.IsNullOrEmpty(ctl._textBox.Text) ? 0 : ctl._textBox.Text.Length, 0);
+        }
+        else
+        {
+            ctl.ActualPasswordBox.Password = ctl._textBox.Text;
+            ctl._textBox.Clear();
+        }
+    }
 
-            if (_textBox != null)
-                _textBox.TextChanged -= TextBox_TextChanged;
+    public override void OnApplyTemplate()
+    {
+        if (ActualPasswordBox != null)
+            ActualPasswordBox.PasswordChanged -= PasswordBox_PasswordChanged;
 
-            base.OnApplyTemplate();
+        if (_textBox != null)
+            _textBox.TextChanged -= TextBox_TextChanged;
 
-            ActualPasswordBox = GetTemplateChild(ElementPasswordBox) as System.Windows.Controls.PasswordBox;
-            _textBox = GetTemplateChild(ElementTextBox) as System.Windows.Controls.TextBox;
-            if (ActualPasswordBox != null)
-            {
-                ActualPasswordBox.PasswordChanged += PasswordBox_PasswordChanged;
-                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.MaxLengthProperty, new Binding(MaxLengthProperty.Name) { Source = this });
-                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+        base.OnApplyTemplate();
+
+        ActualPasswordBox = GetTemplateChild(ElementPasswordBox) as System.Windows.Controls.PasswordBox;
+        _textBox = GetTemplateChild(ElementTextBox) as System.Windows.Controls.TextBox;
+        if (ActualPasswordBox != null)
+        {
+            ActualPasswordBox.PasswordChanged += PasswordBox_PasswordChanged;
+            ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.MaxLengthProperty, new Binding(MaxLengthProperty.Name) { Source = this });
+            ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                 ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+            ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+            ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                if (_password is { Length: > 0 })
-                {
-                    var valuePtr = IntPtr.Zero;
-                    try
-                    {
-                        valuePtr = Marshal.SecureStringToGlobalAllocUnicode(_password);
-                        ActualPasswordBox.Password = Marshal.PtrToStringUni(valuePtr) ?? throw new InvalidOperationException();
-                    }
-                    finally
-                    {
-                        Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
-                        _password.Clear();
-                    }
-                }
-            }
-
-            if (_textBox != null)
+            if (_password is { Length: > 0 })
             {
-                _textBox.TextChanged += TextBox_TextChanged;
+                var valuePtr = IntPtr.Zero;
+                try
+                {
+                    valuePtr = Marshal.SecureStringToGlobalAllocUnicode(_password);
+                    ActualPasswordBox.Password = Marshal.PtrToStringUni(valuePtr) ?? throw new InvalidOperationException();
+                }
+                finally
+                {
+                    Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
+                    _password.Clear();
+                }
             }
         }
 
-        public void Paste()
+        if (_textBox != null)
         {
-            ActualPasswordBox.Paste();
-            if (ShowEyeButton && ShowPassword)
+            _textBox.TextChanged += TextBox_TextChanged;
+        }
+    }
+
+    public void Paste()
+    {
+        ActualPasswordBox.Paste();
+        if (ShowEyeButton && ShowPassword)
+        {
+            _textBox.Text = ActualPasswordBox.Password;
+        }
+    }
+
+    public void SelectAll()
+    {
+        ActualPasswordBox.SelectAll();
+        if (ShowEyeButton && ShowPassword)
+        {
+            _textBox.SelectAll();
+        }
+    }
+
+    public void Clear()
+    {
+        ActualPasswordBox.Clear();
+        _textBox.Clear();
+    }
+
+    private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+    {
+        if (!IsSafeEnabled)
+        {
+            SetCurrentValue(UnsafePasswordProperty, ActualPasswordBox.Password);
+
+            if (ShowPassword)
             {
                 _textBox.Text = ActualPasswordBox.Password;
             }
         }
 
-        public void SelectAll()
-        {
-            ActualPasswordBox.SelectAll();
-            if (ShowEyeButton && ShowPassword)
-            {
-                _textBox.SelectAll();
-            }
-        }
-
-        public void Clear()
-        {
-            ActualPasswordBox.Clear();
-            _textBox.Clear();
-        }
-
-        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
-        {
-            if (!IsSafeEnabled)
-            {
-                SetCurrentValue(UnsafePasswordProperty, ActualPasswordBox.Password);
-
-                if (ShowPassword)
-                {
-                    _textBox.Text = ActualPasswordBox.Password;
-                }
-            }
-
-            VerifyData();
-        }
-
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            if (!IsSafeEnabled && ShowPassword)
-            {
-                Password = _textBox.Text;
-                SetCurrentValue(UnsafePasswordProperty, Password);
-            }
-
-            VerifyData();
-        }
+        VerifyData();
     }
-}
+
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        if (!IsSafeEnabled && ShowPassword)
+        {
+            Password = _textBox.Text;
+            SetCurrentValue(UnsafePasswordProperty, Password);
+        }
+
+        VerifyData();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
index d3ecc06e..7990dce9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
@@ -13,282 +13,282 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+public class PinBox : Control
 {
-    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
-    public class PinBox : Control
+    private const string ElementPanel = "PART_Panel";
+
+    private static readonly object MinLength = 4;
+
+    private Panel _panel;
+
+    private int _inputIndex;
+
+    private bool _changed;
+
+    private bool _isInternalAction;
+
+    private List<SecureString> _passwordList;
+
+    private RoutedEventHandler _passwordBoxsGotFocusEventHandler;
+
+    private RoutedEventHandler _passwordBoxsPasswordChangedEventHandler;
+
+    public PinBox()
     {
-        private const string ElementPanel = "PART_Panel";
+        Loaded += PinBox_Loaded;
+        Unloaded += PinBox_Unloaded;
+    }
 
-        private static readonly object MinLength = 4;
+    private void PinBox_Unloaded(object sender, RoutedEventArgs e)
+    {
+        RemoveHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
+        RemoveHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
 
-        private Panel _panel;
+        Loaded -= PinBox_Loaded;
+        Unloaded -= PinBox_Unloaded;
+    }
 
-        private int _inputIndex;
+    private void PinBox_Loaded(object sender, RoutedEventArgs e)
+    {
+        _passwordBoxsPasswordChangedEventHandler = PasswordBoxsPasswordChanged;
+        AddHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
 
-        private bool _changed;
+        _passwordBoxsGotFocusEventHandler = PasswordBoxsGotFocus;
+        AddHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
 
-        private bool _isInternalAction;
+        FocusPasswordBox();
+    }
 
-        private List<SecureString> _passwordList;
-
-        private RoutedEventHandler _passwordBoxsGotFocusEventHandler;
-
-        private RoutedEventHandler _passwordBoxsPasswordChangedEventHandler;
-
-        public PinBox()
+    private void FocusPasswordBox()
+    {
+        if (!IsFocused)
         {
-            Loaded += PinBox_Loaded;
-            Unloaded += PinBox_Unloaded;
+            return;
         }
 
-        private void PinBox_Unloaded(object sender, RoutedEventArgs e)
+        if (_panel.Children.Count == 0)
         {
-            RemoveHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
-            RemoveHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
-
-            Loaded -= PinBox_Loaded;
-            Unloaded -= PinBox_Unloaded;
+            return;
         }
 
-        private void PinBox_Loaded(object sender, RoutedEventArgs e)
+        if (_panel.Children.OfType<System.Windows.Controls.PasswordBox>().Any(box => box.IsFocused))
         {
-            _passwordBoxsPasswordChangedEventHandler = PasswordBoxsPasswordChanged;
-            AddHandler(System.Windows.Controls.PasswordBox.PasswordChangedEvent, _passwordBoxsPasswordChangedEventHandler);
-
-            _passwordBoxsGotFocusEventHandler = PasswordBoxsGotFocus;
-            AddHandler(GotFocusEvent, _passwordBoxsGotFocusEventHandler);
-
-            FocusPasswordBox();
+            return;
         }
 
-        private void FocusPasswordBox()
+        FocusManager.SetFocusedElement(this, _panel.Children[0]);
+    }
+
+    private void PasswordBoxsPasswordChanged(object sender, RoutedEventArgs e)
+    {
+        if (_isInternalAction) return;
+
+        if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
         {
-            if (!IsFocused)
-            {
-                return;
-            }
-
-            if (_panel.Children.Count == 0)
-            {
-                return;
-            }
-
-            if (_panel.Children.OfType<System.Windows.Controls.PasswordBox>().Any(box => box.IsFocused))
-            {
-                return;
-            }
-
-            FocusManager.SetFocusedElement(this, _panel.Children[0]);
-        }
-
-        private void PasswordBoxsPasswordChanged(object sender, RoutedEventArgs e)
-        {
-            if (_isInternalAction) return;
-
-            if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
-            {
-                if (passwordBox.Password.Length > 0)
-                {
-                    if (++_inputIndex >= Length)
-                    {
-                        _inputIndex = Length - 1;
-
-                        if (_panel.Children.OfType<System.Windows.Controls.PasswordBox>()
-                            .All(item => item.Password.Any()))
-                        {
-                            FocusManager.SetFocusedElement(this, null);
-                            Keyboard.ClearFocus();
-                            RaiseEvent(new RoutedEventArgs(CompletedEvent, this));
-                        }
-                        return;
-                    }
-                }
-                else
-                {
-                    if (--_inputIndex < 0)
-                    {
-                        _inputIndex = 0;
-                        return;
-                    }
-                }
-
-                _changed = true;
-                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
-            }
-        }
-
-        private void PasswordBoxsGotFocus(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
-            {
-                _inputIndex = _panel.Children.IndexOf(passwordBox);
-                passwordBox.SelectAll();
-            }
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            base.OnPreviewKeyUp(e);
-
-            if (e.Key == Key.Left)
-            {
-                if (--_inputIndex < 0)
-                {
-                    _inputIndex = 0;
-                    return;
-                }
-
-                var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
-                passwordBox?.SelectAll();
-
-                FocusManager.SetFocusedElement(this, passwordBox);
-            }
-            else if (e.Key == Key.Right)
+            if (passwordBox.Password.Length > 0)
             {
                 if (++_inputIndex >= Length)
                 {
                     _inputIndex = Length - 1;
+
+                    if (_panel.Children.OfType<System.Windows.Controls.PasswordBox>()
+                        .All(item => item.Password.Any()))
+                    {
+                        FocusManager.SetFocusedElement(this, null);
+                        Keyboard.ClearFocus();
+                        RaiseEvent(new RoutedEventArgs(CompletedEvent, this));
+                    }
                     return;
                 }
-
-                var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
-                passwordBox?.SelectAll();
-
-                FocusManager.SetFocusedElement(this, passwordBox);
             }
-        }
-
-        protected override void OnPreviewKeyUp(KeyEventArgs e)
-        {
-            base.OnPreviewKeyUp(e);
-
-            if (_changed)
+            else
             {
-                _changed = false;
-                return;
-            }
-
-            if (e.Key == Key.Delete || e.Key == Key.Back)
-            {
-                if (_panel.Children[_inputIndex] is System.Windows.Controls.PasswordBox passwordBox)
-                {
-                    _isInternalAction = true;
-                    passwordBox.Clear();
-                    _isInternalAction = false;
-                }
-
                 if (--_inputIndex < 0)
                 {
                     _inputIndex = 0;
                     return;
                 }
-
-                FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
             }
-        }
 
-        public string Password
+            _changed = true;
+            FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+        }
+    }
+
+    private void PasswordBoxsGotFocus(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is System.Windows.Controls.PasswordBox passwordBox)
         {
-            get
+            _inputIndex = _panel.Children.IndexOf(passwordBox);
+            passwordBox.SelectAll();
+        }
+    }
+
+    protected override void OnPreviewKeyDown(KeyEventArgs e)
+    {
+        base.OnPreviewKeyUp(e);
+
+        if (e.Key == Key.Left)
+        {
+            if (--_inputIndex < 0)
             {
-                return string.Join("", _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Select(item => item.Password));
+                _inputIndex = 0;
+                return;
             }
-            set
+
+            var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
+            passwordBox?.SelectAll();
+
+            FocusManager.SetFocusedElement(this, passwordBox);
+        }
+        else if (e.Key == Key.Right)
+        {
+            if (++_inputIndex >= Length)
             {
-                if (_panel == null)
+                _inputIndex = Length - 1;
+                return;
+            }
+
+            var passwordBox = _panel.Children[_inputIndex] as System.Windows.Controls.PasswordBox;
+            passwordBox?.SelectAll();
+
+            FocusManager.SetFocusedElement(this, passwordBox);
+        }
+    }
+
+    protected override void OnPreviewKeyUp(KeyEventArgs e)
+    {
+        base.OnPreviewKeyUp(e);
+
+        if (_changed)
+        {
+            _changed = false;
+            return;
+        }
+
+        if (e.Key == Key.Delete || e.Key == Key.Back)
+        {
+            if (_panel.Children[_inputIndex] is System.Windows.Controls.PasswordBox passwordBox)
+            {
+                _isInternalAction = true;
+                passwordBox.Clear();
+                _isInternalAction = false;
+            }
+
+            if (--_inputIndex < 0)
+            {
+                _inputIndex = 0;
+                return;
+            }
+
+            FocusManager.SetFocusedElement(this, _panel.Children[_inputIndex]);
+        }
+    }
+
+    public string Password
+    {
+        get
+        {
+            return string.Join("", _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Select(item => item.Password));
+        }
+        set
+        {
+            if (_panel == null)
+            {
+                _passwordList = new List<SecureString>();
+
+                value ??= string.Empty;
+
+                foreach (var item in value)
                 {
-                    _passwordList = new List<SecureString>();
-
-                    value ??= string.Empty;
-
-                    foreach (var item in value)
-                    {
-                        var secureString = new SecureString();
-                        secureString.AppendChar(item);
-                        _passwordList.Add(secureString);
-                    }
-
-                    return;
+                    var secureString = new SecureString();
+                    secureString.AppendChar(item);
+                    _passwordList.Add(secureString);
                 }
 
-                var length = Length;
-                if (string.IsNullOrEmpty(value) || value.Length != length || value.Length != _panel.Children.Count)
-                {
-                    _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Do(item => item.Clear());
-                }
-                else
-                {
-                    _panel.Children.OfType<System.Windows.Controls.PasswordBox>().DoWithIndex((item, index) => item.Password = value[index].ToString());
-                }
+                return;
+            }
+
+            var length = Length;
+            if (string.IsNullOrEmpty(value) || value.Length != length || value.Length != _panel.Children.Count)
+            {
+                _panel.Children.OfType<System.Windows.Controls.PasswordBox>().Do(item => item.Clear());
+            }
+            else
+            {
+                _panel.Children.OfType<System.Windows.Controls.PasswordBox>().DoWithIndex((item, index) => item.Password = value[index].ToString());
             }
         }
+    }
 
-        /// <summary>
-        ///     掩码字符
-        /// </summary>
-        public static readonly DependencyProperty PasswordCharProperty =
-            System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PinBox),
-                new FrameworkPropertyMetadata('●'));
+    /// <summary>
+    ///     掩码字符
+    /// </summary>
+    public static readonly DependencyProperty PasswordCharProperty =
+        System.Windows.Controls.PasswordBox.PasswordCharProperty.AddOwner(typeof(PinBox),
+            new FrameworkPropertyMetadata('●'));
 
-        public char PasswordChar
-        {
-            get => (char) GetValue(PasswordCharProperty);
-            set => SetValue(PasswordCharProperty, value);
-        }
+    public char PasswordChar
+    {
+        get => (char) GetValue(PasswordCharProperty);
+        set => SetValue(PasswordCharProperty, value);
+    }
 
-        public static readonly DependencyProperty LengthProperty = DependencyProperty.Register(
-            "Length", typeof(int), typeof(PinBox), new PropertyMetadata(MinLength, OnLengthChanged, CoerceLength), ValidateHelper.IsInRangeOfPosInt);
+    public static readonly DependencyProperty LengthProperty = DependencyProperty.Register(
+        "Length", typeof(int), typeof(PinBox), new PropertyMetadata(MinLength, OnLengthChanged, CoerceLength), ValidateHelper.IsInRangeOfPosInt);
 
-        private static void OnLengthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (PinBox) d;
-            ctl.UpdateItems();
-        }
+    private static void OnLengthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (PinBox) d;
+        ctl.UpdateItems();
+    }
 
-        private static object CoerceLength(DependencyObject d, object basevalue) => (int) basevalue < 4 ? MinLength : basevalue;
+    private static object CoerceLength(DependencyObject d, object basevalue) => (int) basevalue < 4 ? MinLength : basevalue;
 
-        public int Length
-        {
-            get => (int) GetValue(LengthProperty);
-            set => SetValue(LengthProperty, value);
-        }
+    public int Length
+    {
+        get => (int) GetValue(LengthProperty);
+        set => SetValue(LengthProperty, value);
+    }
 
-        public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
-            "ItemMargin", typeof(Thickness), typeof(PinBox), new PropertyMetadata(default(Thickness)));
+    public static readonly DependencyProperty ItemMarginProperty = DependencyProperty.Register(
+        "ItemMargin", typeof(Thickness), typeof(PinBox), new PropertyMetadata(default(Thickness)));
 
-        public Thickness ItemMargin
-        {
-            get => (Thickness) GetValue(ItemMarginProperty);
-            set => SetValue(ItemMarginProperty, value);
-        }
+    public Thickness ItemMargin
+    {
+        get => (Thickness) GetValue(ItemMarginProperty);
+        set => SetValue(ItemMarginProperty, value);
+    }
 
-        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
-            "ItemWidth", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
+    public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
+        "ItemWidth", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
 
-        public double ItemWidth
-        {
-            get => (double) GetValue(ItemWidthProperty);
-            set => SetValue(ItemWidthProperty, value);
-        }
+    public double ItemWidth
+    {
+        get => (double) GetValue(ItemWidthProperty);
+        set => SetValue(ItemWidthProperty, value);
+    }
 
-        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
-            "ItemHeight", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
+    public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
+        "ItemHeight", typeof(double), typeof(PinBox), new PropertyMetadata(ValueBoxes.Double0Box));
 
-        public double ItemHeight
-        {
-            get => (double) GetValue(ItemHeightProperty);
-            set => SetValue(ItemHeightProperty, value);
-        }
+    public double ItemHeight
+    {
+        get => (double) GetValue(ItemHeightProperty);
+        set => SetValue(ItemHeightProperty, value);
+    }
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(PinBox));
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(PinBox));
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -303,109 +303,108 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(PinBox));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(PinBox));
 
-        public double SelectionOpacity
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(PinBox));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+
+    public static readonly RoutedEvent CompletedEvent =
+        EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(PinBox));
+
+    public event RoutedEventHandler Completed
+    {
+        add => AddHandler(CompletedEvent, value);
+        remove => RemoveHandler(CompletedEvent, value);
+    }
+
+    private void UpdateItems()
+    {
+        if (_panel == null) return;
+
+        _panel.Children.Clear();
+        var length = Length;
+
+        for (var i = 0; i < length; i++)
         {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
+            _panel.Children.Add(CreatePasswordBox());
         }
+    }
 
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(PinBox));
-
-        public Brush CaretBrush
+    private System.Windows.Controls.PasswordBox CreatePasswordBox()
+    {
+        var passwordBox = new System.Windows.Controls.PasswordBox
         {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
-        }
+            MaxLength = 1,
+            HorizontalContentAlignment = HorizontalAlignment.Center,
+            VerticalAlignment = VerticalAlignment.Center,
+            Margin = ItemMargin,
+            Width = ItemWidth,
+            Height = ItemHeight,
+            Padding = default,
+            PasswordChar = PasswordChar,
+            Foreground = Foreground
+        };
 
-        public static readonly RoutedEvent CompletedEvent =
-            EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(PinBox));
-
-        public event RoutedEventHandler Completed
-        {
-            add => AddHandler(CompletedEvent, value);
-            remove => RemoveHandler(CompletedEvent, value);
-        }
-
-        private void UpdateItems()
-        {
-            if (_panel == null) return;
-
-            _panel.Children.Clear();
-            var length = Length;
-
-            for (var i = 0; i < length; i++)
-            {
-                _panel.Children.Add(CreatePasswordBox());
-            }
-        }
-
-        private System.Windows.Controls.PasswordBox CreatePasswordBox()
-        {
-            var passwordBox = new System.Windows.Controls.PasswordBox
-            {
-                MaxLength = 1,
-                HorizontalContentAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center,
-                Margin = ItemMargin,
-                Width = ItemWidth,
-                Height = ItemHeight,
-                Padding = default,
-                PasswordChar = PasswordChar,
-                Foreground = Foreground
-            };
-
-            passwordBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+        passwordBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
             passwordBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-            passwordBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-            passwordBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+        passwordBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+        passwordBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-            return passwordBox;
-        }
+        return passwordBox;
+    }
 
-        public override void OnApplyTemplate()
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _panel = GetTemplateChild(ElementPanel) as Panel;
+        if (_panel != null)
         {
-            base.OnApplyTemplate();
+            UpdateItems();
 
-            _panel = GetTemplateChild(ElementPanel) as Panel;
-            if (_panel != null)
+            var length = Length;
+            if (_passwordList != null && _passwordList.Count == length && _panel.Children.Count == length)
             {
-                UpdateItems();
-
-                var length = Length;
-                if (_passwordList != null && _passwordList.Count == length && _panel.Children.Count == length)
+                for (var i = 0; i < length; i++)
                 {
-                    for (var i = 0; i < length; i++)
+                    var password = _passwordList[i];
+                    if (password.Length > 0)
                     {
-                        var password = _passwordList[i];
-                        if (password.Length > 0)
+                        var valuePtr = IntPtr.Zero;
+                        try
                         {
-                            var valuePtr = IntPtr.Zero;
-                            try
+                            valuePtr = Marshal.SecureStringToGlobalAllocUnicode(password);
+                            if (_panel.Children[i] is System.Windows.Controls.PasswordBox passwordBox)
                             {
-                                valuePtr = Marshal.SecureStringToGlobalAllocUnicode(password);
-                                if (_panel.Children[i] is System.Windows.Controls.PasswordBox passwordBox)
-                                {
-                                    passwordBox.Password = Marshal.PtrToStringUni(valuePtr) ?? throw new InvalidOperationException();
-                                }
-                            }
-                            finally
-                            {
-                                Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
-                                password.Clear();
+                                passwordBox.Password = Marshal.PtrToStringUni(valuePtr) ?? throw new InvalidOperationException();
                             }
                         }
+                        finally
+                        {
+                            Marshal.ZeroFreeGlobalAllocUnicode(valuePtr);
+                            password.Clear();
+                        }
                     }
-
-                    _passwordList.Clear();
                 }
+
+                _passwordList.Clear();
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
index daa3e7ac..fa6156f1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
@@ -5,127 +5,126 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SearchBar : TextBox, ICommandSource
 {
-    public class SearchBar : TextBox, ICommandSource
+    public SearchBar()
     {
-        public SearchBar()
+        CommandBindings.Add(new CommandBinding(ControlCommands.Search, (s, e) => OnSearchStarted()));
+    }
+
+    public static readonly RoutedEvent SearchStartedEvent =
+        EventManager.RegisterRoutedEvent("SearchStarted", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<string>>), typeof(SearchBar));
+
+    public event EventHandler<FunctionEventArgs<string>> SearchStarted
+    {
+        add => AddHandler(SearchStartedEvent, value);
+        remove => RemoveHandler(SearchStartedEvent, value);
+    }
+
+    protected override void OnKeyDown(KeyEventArgs e)
+    {
+        base.OnKeyDown(e);
+
+        if (e.Key == Key.Enter)
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Search, (s, e) => OnSearchStarted()));
-        }
-
-        public static readonly RoutedEvent SearchStartedEvent =
-            EventManager.RegisterRoutedEvent("SearchStarted", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<string>>), typeof(SearchBar));
-
-        public event EventHandler<FunctionEventArgs<string>> SearchStarted
-        {
-            add => AddHandler(SearchStartedEvent, value);
-            remove => RemoveHandler(SearchStartedEvent, value);
-        }
-
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-
-            if (e.Key == Key.Enter)
-            {
-                OnSearchStarted();
-            }
-        }
-
-        protected override void OnTextChanged(TextChangedEventArgs e)
-        {
-            base.OnTextChanged(e);
-
-            if (IsRealTime)
-            {
-                OnSearchStarted();
-            }
-        }
-
-        private void OnSearchStarted()
-        {
-            RaiseEvent(new FunctionEventArgs<string>(SearchStartedEvent, this)
-            {
-                Info = Text
-            });
-
-            switch (Command)
-            {
-                case null:
-                    return;
-                case RoutedCommand command:
-                    command.Execute(CommandParameter, CommandTarget);
-                    break;
-                default:
-                    Command.Execute(CommandParameter);
-                    break;
-            }
-        }
-
-        /// <summary>
-        ///     是否实时搜索
-        /// </summary>
-        public static readonly DependencyProperty IsRealTimeProperty = DependencyProperty.Register(
-            "IsRealTime", typeof(bool), typeof(SearchBar), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否实时搜索
-        /// </summary>
-        public bool IsRealTime
-        {
-            get => (bool) GetValue(IsRealTimeProperty);
-            set => SetValue(IsRealTimeProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
-            "Command", typeof(ICommand), typeof(SearchBar), new PropertyMetadata(default(ICommand), OnCommandChanged));
-
-        private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (SearchBar) d;
-            if (e.OldValue is ICommand oldCommand)
-            {
-                oldCommand.CanExecuteChanged -= ctl.CanExecuteChanged;
-            }
-            if (e.NewValue is ICommand newCommand)
-            {
-                newCommand.CanExecuteChanged += ctl.CanExecuteChanged;
-            }
-        }
-
-        public ICommand Command
-        {
-            get => (ICommand) GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
-            "CommandParameter", typeof(object), typeof(SearchBar), new PropertyMetadata(default(object)));
-
-        public object CommandParameter
-        {
-            get => GetValue(CommandParameterProperty);
-            set => SetValue(CommandParameterProperty, value);
-        }
-
-        public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register(
-            "CommandTarget", typeof(IInputElement), typeof(SearchBar), new PropertyMetadata(default(IInputElement)));
-
-        public IInputElement CommandTarget
-        {
-            get => (IInputElement) GetValue(CommandTargetProperty);
-            set => SetValue(CommandTargetProperty, value);
-        }
-
-        private void CanExecuteChanged(object sender, EventArgs e)
-        {
-            if (Command == null) return;
-
-            IsEnabled = Command is RoutedCommand command
-                ? command.CanExecute(CommandParameter, CommandTarget)
-                : Command.CanExecute(CommandParameter);
+            OnSearchStarted();
         }
     }
-}
+
+    protected override void OnTextChanged(TextChangedEventArgs e)
+    {
+        base.OnTextChanged(e);
+
+        if (IsRealTime)
+        {
+            OnSearchStarted();
+        }
+    }
+
+    private void OnSearchStarted()
+    {
+        RaiseEvent(new FunctionEventArgs<string>(SearchStartedEvent, this)
+        {
+            Info = Text
+        });
+
+        switch (Command)
+        {
+            case null:
+                return;
+            case RoutedCommand command:
+                command.Execute(CommandParameter, CommandTarget);
+                break;
+            default:
+                Command.Execute(CommandParameter);
+                break;
+        }
+    }
+
+    /// <summary>
+    ///     是否实时搜索
+    /// </summary>
+    public static readonly DependencyProperty IsRealTimeProperty = DependencyProperty.Register(
+        "IsRealTime", typeof(bool), typeof(SearchBar), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否实时搜索
+    /// </summary>
+    public bool IsRealTime
+    {
+        get => (bool) GetValue(IsRealTimeProperty);
+        set => SetValue(IsRealTimeProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
+        "Command", typeof(ICommand), typeof(SearchBar), new PropertyMetadata(default(ICommand), OnCommandChanged));
+
+    private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (SearchBar) d;
+        if (e.OldValue is ICommand oldCommand)
+        {
+            oldCommand.CanExecuteChanged -= ctl.CanExecuteChanged;
+        }
+        if (e.NewValue is ICommand newCommand)
+        {
+            newCommand.CanExecuteChanged += ctl.CanExecuteChanged;
+        }
+    }
+
+    public ICommand Command
+    {
+        get => (ICommand) GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
+        "CommandParameter", typeof(object), typeof(SearchBar), new PropertyMetadata(default(object)));
+
+    public object CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register(
+        "CommandTarget", typeof(IInputElement), typeof(SearchBar), new PropertyMetadata(default(IInputElement)));
+
+    public IInputElement CommandTarget
+    {
+        get => (IInputElement) GetValue(CommandTargetProperty);
+        set => SetValue(CommandTargetProperty, value);
+    }
+
+    private void CanExecuteChanged(object sender, EventArgs e)
+    {
+        if (Command == null) return;
+
+        IsEnabled = Command is RoutedCommand command
+            ? command.CanExecute(CommandParameter, CommandTarget)
+            : Command.CanExecute(CommandParameter);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
index 961c6b37..cbaf593f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
@@ -1,16 +1,15 @@
 using System.Windows.Input;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TextBox : System.Windows.Controls.TextBox
 {
-    public class TextBox : System.Windows.Controls.TextBox
+    public TextBox()
     {
-        public TextBox()
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
-            {
-                SetCurrentValue(TextProperty, string.Empty);
-            }));
-        }
+            SetCurrentValue(TextProperty, string.Empty);
+        }));
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
index 921f7f54..896278f3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
@@ -11,303 +11,303 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     时间选择器
+/// </summary>
+[TemplatePart(Name = ElementRoot, Type = typeof(Grid))]
+[TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
+[TemplatePart(Name = ElementButton, Type = typeof(Button))]
+[TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
+public class TimePicker : Control, IDataInput
 {
-    /// <summary>
-    ///     时间选择器
-    /// </summary>
-    [TemplatePart(Name = ElementRoot, Type = typeof(Grid))]
-    [TemplatePart(Name = ElementTextBox, Type = typeof(WatermarkTextBox))]
-    [TemplatePart(Name = ElementButton, Type = typeof(Button))]
-    [TemplatePart(Name = ElementPopup, Type = typeof(Popup))]
-    public class TimePicker : Control, IDataInput
+    #region Constants
+
+    private const string ElementRoot = "PART_Root";
+
+    private const string ElementTextBox = "PART_TextBox";
+
+    private const string ElementButton = "PART_Button";
+
+    private const string ElementPopup = "PART_Popup";
+
+    #endregion Constants
+
+    #region Data
+
+    private string _defaultText;
+
+    private ButtonBase _dropDownButton;
+
+    private Popup _popup;
+
+    private bool _disablePopupReopen;
+
+    private WatermarkTextBox _textBox;
+
+    private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
+
+    private DateTime? _originalSelectedTime;
+
+    #endregion Data
+
+    #region Public Events
+
+    public static readonly RoutedEvent SelectedTimeChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
+            typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(TimePicker));
+
+    public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
     {
-        #region Constants
+        add => AddHandler(SelectedTimeChangedEvent, value);
+        remove => RemoveHandler(SelectedTimeChangedEvent, value);
+    }
 
-        private const string ElementRoot = "PART_Root";
+    public event RoutedEventHandler ClockClosed;
 
-        private const string ElementTextBox = "PART_TextBox";
+    public event RoutedEventHandler ClockOpened;
 
-        private const string ElementButton = "PART_Button";
+    #endregion Public Events
 
-        private const string ElementPopup = "PART_Popup";
+    static TimePicker()
+    {
+        EventManager.RegisterClassHandler(typeof(TimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
+        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
+        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+    }
 
-        #endregion Constants
-
-        #region Data
-
-        private string _defaultText;
-
-        private ButtonBase _dropDownButton;
-
-        private Popup _popup;
-
-        private bool _disablePopupReopen;
-
-        private WatermarkTextBox _textBox;
-
-        private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
-
-        private DateTime? _originalSelectedTime;
-
-        #endregion Data
-
-        #region Public Events
-
-        public static readonly RoutedEvent SelectedTimeChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
-                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(TimePicker));
-
-        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
+    public TimePicker()
+    {
+        Clock = new Clock();
+        CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
         {
-            add => AddHandler(SelectedTimeChangedEvent, value);
-            remove => RemoveHandler(SelectedTimeChangedEvent, value);
-        }
+            SetCurrentValue(SelectedTimeProperty, null);
+            SetCurrentValue(TextProperty, "");
+            _textBox.Text = string.Empty;
+        }));
+    }
 
-        public event RoutedEventHandler ClockClosed;
+    #region Public Properties
 
-        public event RoutedEventHandler ClockOpened;
+    #region TimeFormat
 
-        #endregion Public Events
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
+        "TimeFormat", typeof(string), typeof(TimePicker), new PropertyMetadata("HH:mm:ss"));
 
-        static TimePicker()
-        {
-            EventManager.RegisterClassHandler(typeof(TimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
-            KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
-            KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-        }
+    public string TimeFormat
+    {
+        get => (string) GetValue(TimeFormatProperty);
+        set => SetValue(TimeFormatProperty, value);
+    }
 
-        public TimePicker()
-        {
-            Clock = new Clock();
-            CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
-            {
-                SetCurrentValue(SelectedTimeProperty, null);
-                SetCurrentValue(TextProperty, "");
-                _textBox.Text = string.Empty;
-            }));
-        }
+    #endregion TimeFormat
 
-        #region Public Properties
+    #region DisplayTime
 
-        #region TimeFormat
+    public DateTime DisplayTime
+    {
+        get => (DateTime) GetValue(DisplayTimeProperty);
+        set => SetValue(DisplayTimeProperty, value);
+    }
 
-        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
-            "TimeFormat", typeof(string), typeof(TimePicker), new PropertyMetadata("HH:mm:ss"));
+    public static readonly DependencyProperty DisplayTimeProperty =
+        DependencyProperty.Register(
+            "DisplayTime",
+            typeof(DateTime),
+            typeof(TimePicker),
+            new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayTime));
 
-        public string TimeFormat
-        {
-            get => (string) GetValue(TimeFormatProperty);
-            set => SetValue(TimeFormatProperty, value);
-        }
+    private static object CoerceDisplayTime(DependencyObject d, object value)
+    {
+        var dp = (TimePicker) d;
+        dp.Clock.DisplayTime = (DateTime) value;
+        return dp.Clock.DisplayTime;
+    }
 
-        #endregion TimeFormat
+    #endregion DisplayTime
 
-        #region DisplayTime
+    #region IsDropDownOpen
 
-        public DateTime DisplayTime
-        {
-            get => (DateTime) GetValue(DisplayTimeProperty);
-            set => SetValue(DisplayTimeProperty, value);
-        }
+    public bool IsDropDownOpen
+    {
+        get => (bool) GetValue(IsDropDownOpenProperty);
+        set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty DisplayTimeProperty =
-            DependencyProperty.Register(
-                "DisplayTime",
-                typeof(DateTime),
-                typeof(TimePicker),
-                new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayTime));
-
-        private static object CoerceDisplayTime(DependencyObject d, object value)
-        {
-            var dp = (TimePicker) d;
-            dp.Clock.DisplayTime = (DateTime) value;
-            return dp.Clock.DisplayTime;
-        }
-
-        #endregion DisplayTime
-
-        #region IsDropDownOpen
-
-        public bool IsDropDownOpen
-        {
-            get => (bool) GetValue(IsDropDownOpenProperty);
-            set => SetValue(IsDropDownOpenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty IsDropDownOpenProperty =
-            DependencyProperty.Register(
+    public static readonly DependencyProperty IsDropDownOpenProperty =
+        DependencyProperty.Register(
             "IsDropDownOpen",
             typeof(bool),
             typeof(TimePicker),
             new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
 
-        private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
-            d is TimePicker
-            {
-                IsEnabled: false
-            }
-                ? false
-                : baseValue;
-
-        private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
+        d is TimePicker
         {
-            var dp = d as TimePicker;
+            IsEnabled: false
+        }
+            ? false
+            : baseValue;
 
-            var newValue = (bool) e.NewValue;
-            if (dp?._popup != null && dp._popup.IsOpen != newValue)
+    private static void OnIsDropDownOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var dp = d as TimePicker;
+
+        var newValue = (bool) e.NewValue;
+        if (dp?._popup != null && dp._popup.IsOpen != newValue)
+        {
+            dp._popup.IsOpen = newValue;
+            if (newValue)
             {
-                dp._popup.IsOpen = newValue;
-                if (newValue)
+                dp._originalSelectedTime = dp.SelectedTime;
+
+                dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action) delegate
                 {
-                    dp._originalSelectedTime = dp.SelectedTime;
-
-                    dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action) delegate
-                     {
-                         dp.Clock.Focus();
-                     });
-                }
+                    dp.Clock.Focus();
+                });
             }
         }
+    }
 
-        #endregion IsDropDownOpen
+    #endregion IsDropDownOpen
 
-        #region SelectedTime
+    #region SelectedTime
 
-        public DateTime? SelectedTime
-        {
-            get => (DateTime?) GetValue(SelectedTimeProperty);
-            set => SetValue(SelectedTimeProperty, value);
-        }
+    public DateTime? SelectedTime
+    {
+        get => (DateTime?) GetValue(SelectedTimeProperty);
+        set => SetValue(SelectedTimeProperty, value);
+    }
 
-        public static readonly DependencyProperty SelectedTimeProperty =
-            DependencyProperty.Register(
+    public static readonly DependencyProperty SelectedTimeProperty =
+        DependencyProperty.Register(
             "SelectedTime",
             typeof(DateTime?),
             typeof(TimePicker),
             new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedTimeChanged, CoerceSelectedTime));
 
-        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not TimePicker dp) return;
+
+        if (dp.SelectedTime.HasValue)
         {
-            if (d is not TimePicker dp) return;
-
-            if (dp.SelectedTime.HasValue)
-            {
-                var time = dp.SelectedTime.Value;
-                dp.SetTextInternal(dp.DateTimeToString(time));
-            }
-
-            dp.RaiseEvent(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, dp)
-            {
-                Info = dp.SelectedTime
-            });
+            var time = dp.SelectedTime.Value;
+            dp.SetTextInternal(dp.DateTimeToString(time));
         }
 
-        private static object CoerceSelectedTime(DependencyObject d, object value)
+        dp.RaiseEvent(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, dp)
         {
-            var dp = (TimePicker) d;
-            dp.Clock.SelectedTime = (DateTime?) value;
-            return dp.Clock.SelectedTime;
-        }
+            Info = dp.SelectedTime
+        });
+    }
 
-        #endregion SelectedDate
+    private static object CoerceSelectedTime(DependencyObject d, object value)
+    {
+        var dp = (TimePicker) d;
+        dp.Clock.SelectedTime = (DateTime?) value;
+        return dp.Clock.SelectedTime;
+    }
 
-        #region Text
+    #endregion SelectedDate
 
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
+    #region Text
 
-        public static readonly DependencyProperty TextProperty =
-            DependencyProperty.Register(
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty TextProperty =
+        DependencyProperty.Register(
             "Text",
             typeof(string),
             typeof(TimePicker),
             new FrameworkPropertyMetadata(string.Empty, OnTextChanged));
 
-        private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TimePicker dp && !dp.IsHandlerSuspended(TextProperty))
         {
-            if (d is TimePicker dp && !dp.IsHandlerSuspended(TextProperty))
+            if (e.NewValue is string newValue)
             {
-                if (e.NewValue is string newValue)
+                if (dp._textBox != null)
                 {
-                    if (dp._textBox != null)
-                    {
-                        dp._textBox.Text = newValue;
-                    }
-                    else
-                    {
-                        dp._defaultText = newValue;
-                    }
-
-                    dp.SetSelectedTime();
+                    dp._textBox.Text = newValue;
                 }
                 else
                 {
-                    dp.SetValueNoCallback(SelectedTimeProperty, null);
+                    dp._defaultText = newValue;
                 }
+
+                dp.SetSelectedTime();
+            }
+            else
+            {
+                dp.SetValueNoCallback(SelectedTimeProperty, null);
             }
         }
+    }
 
-        /// <summary>
-        /// Sets the local Text property without breaking bindings
-        /// </summary>
-        /// <param name="value"></param>
-        private void SetTextInternal(string value)
-        {
-            SetCurrentValue(TextProperty, value);
-        }
+    /// <summary>
+    /// Sets the local Text property without breaking bindings
+    /// </summary>
+    /// <param name="value"></param>
+    private void SetTextInternal(string value)
+    {
+        SetCurrentValue(TextProperty, value);
+    }
 
-        #endregion Text
+    #endregion Text
 
-        public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
+    public Func<string, OperationResult<bool>> VerifyFunc { get; set; }
 
-        public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
-            "IsError", typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register(
+        "IsError", typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool IsError
-        {
-            get => (bool) GetValue(IsErrorProperty);
-            set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool IsError
+    {
+        get => (bool) GetValue(IsErrorProperty);
+        set => SetValue(IsErrorProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
-            "ErrorStr", typeof(string), typeof(TimePicker), new PropertyMetadata(default(string)));
+    public static readonly DependencyProperty ErrorStrProperty = DependencyProperty.Register(
+        "ErrorStr", typeof(string), typeof(TimePicker), new PropertyMetadata(default(string)));
 
-        public string ErrorStr
-        {
-            get => (string) GetValue(ErrorStrProperty);
-            set => SetValue(ErrorStrProperty, value);
-        }
+    public string ErrorStr
+    {
+        get => (string) GetValue(ErrorStrProperty);
+        set => SetValue(ErrorStrProperty, value);
+    }
 
-        public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
-            "TextType", typeof(TextType), typeof(TimePicker), new PropertyMetadata(default(TextType)));
+    public static readonly DependencyProperty TextTypeProperty = DependencyProperty.Register(
+        "TextType", typeof(TextType), typeof(TimePicker), new PropertyMetadata(default(TextType)));
 
-        public TextType TextType
-        {
-            get => (TextType) GetValue(TextTypeProperty);
-            set => SetValue(TextTypeProperty, value);
-        }
+    public TextType TextType
+    {
+        get => (TextType) GetValue(TextTypeProperty);
+        set => SetValue(TextTypeProperty, value);
+    }
 
-        public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
-            "ShowClearButton", typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
+    public static readonly DependencyProperty ShowClearButtonProperty = DependencyProperty.Register(
+        "ShowClearButton", typeof(bool), typeof(TimePicker), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        public bool ShowClearButton
-        {
-            get => (bool) GetValue(ShowClearButtonProperty);
-            set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
-        }
+    public bool ShowClearButton
+    {
+        get => (bool) GetValue(ShowClearButtonProperty);
+        set => SetValue(ShowClearButtonProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty SelectionBrushProperty =
-            TextBoxBase.SelectionBrushProperty.AddOwner(typeof(TimePicker));
+    public static readonly DependencyProperty SelectionBrushProperty =
+        TextBoxBase.SelectionBrushProperty.AddOwner(typeof(TimePicker));
 
-        public Brush SelectionBrush
-        {
-            get => (Brush) GetValue(SelectionBrushProperty);
-            set => SetValue(SelectionBrushProperty, value);
-        }
+    public Brush SelectionBrush
+    {
+        get => (Brush) GetValue(SelectionBrushProperty);
+        set => SetValue(SelectionBrushProperty, value);
+    }
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
@@ -322,476 +322,475 @@ namespace HandyControl.Controls
 
 #endif
 
-        public static readonly DependencyProperty SelectionOpacityProperty =
-            TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(TimePicker));
+    public static readonly DependencyProperty SelectionOpacityProperty =
+        TextBoxBase.SelectionOpacityProperty.AddOwner(typeof(TimePicker));
 
-        public double SelectionOpacity
+    public double SelectionOpacity
+    {
+        get => (double) GetValue(SelectionOpacityProperty);
+        set => SetValue(SelectionOpacityProperty, value);
+    }
+
+    public static readonly DependencyProperty CaretBrushProperty =
+        TextBoxBase.CaretBrushProperty.AddOwner(typeof(TimePicker));
+
+    public Brush CaretBrush
+    {
+        get => (Brush) GetValue(CaretBrushProperty);
+        set => SetValue(CaretBrushProperty, value);
+    }
+
+    public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(
+        "Clock", typeof(ClockBase), typeof(TimePicker), new FrameworkPropertyMetadata(default(Clock), FrameworkPropertyMetadataOptions.NotDataBindable, OnClockChanged));
+
+    private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TimePicker) d;
+
+        if (e.OldValue is ClockBase oldClock)
         {
-            get => (double) GetValue(SelectionOpacityProperty);
-            set => SetValue(SelectionOpacityProperty, value);
+            oldClock.SelectedTimeChanged -= ctl.Clock_SelectedTimeChanged;
+            oldClock.Confirmed -= ctl.Clock_Confirmed;
         }
 
-        public static readonly DependencyProperty CaretBrushProperty =
-            TextBoxBase.CaretBrushProperty.AddOwner(typeof(TimePicker));
-
-        public Brush CaretBrush
+        if (e.NewValue is ClockBase newClock)
         {
-            get => (Brush) GetValue(CaretBrushProperty);
-            set => SetValue(CaretBrushProperty, value);
+            newClock.ShowConfirmButton = true;
+            newClock.SelectedTimeChanged += ctl.Clock_SelectedTimeChanged;
+            newClock.Confirmed += ctl.Clock_Confirmed;
         }
+    }
 
-        public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(
-            "Clock", typeof(ClockBase), typeof(TimePicker), new FrameworkPropertyMetadata(default(Clock), FrameworkPropertyMetadataOptions.NotDataBindable, OnClockChanged));
+    public ClockBase Clock
+    {
+        get => (ClockBase) GetValue(ClockProperty);
+        set => SetValue(ClockProperty, value);
+    }
 
-        private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    #endregion Public Properties
+
+    #region Public Methods
+
+    public virtual bool VerifyData()
+    {
+        OperationResult<bool> result;
+
+        if (VerifyFunc != null)
         {
-            var ctl = (TimePicker) d;
-
-            if (e.OldValue is ClockBase oldClock)
+            result = VerifyFunc.Invoke(Text);
+        }
+        else
+        {
+            if (!string.IsNullOrEmpty(Text))
             {
-                oldClock.SelectedTimeChanged -= ctl.Clock_SelectedTimeChanged;
-                oldClock.Confirmed -= ctl.Clock_Confirmed;
+                result = OperationResult.Success();
             }
-
-            if (e.NewValue is ClockBase newClock)
+            else if (InfoElement.GetNecessary(this))
             {
-                newClock.ShowConfirmButton = true;
-                newClock.SelectedTimeChanged += ctl.Clock_SelectedTimeChanged;
-                newClock.Confirmed += ctl.Clock_Confirmed;
-            }
-        }
-
-        public ClockBase Clock
-        {
-            get => (ClockBase) GetValue(ClockProperty);
-            set => SetValue(ClockProperty, value);
-        }
-
-        #endregion Public Properties
-
-        #region Public Methods
-
-        public virtual bool VerifyData()
-        {
-            OperationResult<bool> result;
-
-            if (VerifyFunc != null)
-            {
-                result = VerifyFunc.Invoke(Text);
+                result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
             }
             else
             {
-                if (!string.IsNullOrEmpty(Text))
-                {
-                    result = OperationResult.Success();
-                }
-                else if (InfoElement.GetNecessary(this))
-                {
-                    result = OperationResult.Failed(Properties.Langs.Lang.IsNecessary);
-                }
-                else
-                {
-                    result = OperationResult.Success();
-                }
+                result = OperationResult.Success();
             }
+        }
 
-            var isError = !result.Data;
+        var isError = !result.Data;
+        if (isError)
+        {
+            SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
+            SetCurrentValue(ErrorStrProperty, result.Message);
+        }
+        else
+        {
+            isError = Validation.GetHasError(this);
             if (isError)
             {
-                SetCurrentValue(IsErrorProperty, ValueBoxes.TrueBox);
-                SetCurrentValue(ErrorStrProperty, result.Message);
+                SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
             }
             else
             {
-                isError = Validation.GetHasError(this);
-                if (isError)
-                {
-                    SetCurrentValue(ErrorStrProperty, Validation.GetErrors(this)[0].ErrorContent?.ToString());
-                }
-                else
-                {
-                    SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
-                    SetCurrentValue(ErrorStrProperty, default(string));
-                }
+                SetCurrentValue(IsErrorProperty, ValueBoxes.FalseBox);
+                SetCurrentValue(ErrorStrProperty, default(string));
             }
-            return !isError;
+        }
+        return !isError;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (DesignerProperties.GetIsInDesignMode(this)) return;
+        if (_popup != null)
+        {
+            _popup.PreviewMouseLeftButtonDown -= PopupPreviewMouseLeftButtonDown;
+            _popup.Opened -= PopupOpened;
+            _popup.Closed -= PopupClosed;
+            _popup.Child = null;
         }
 
-        public override void OnApplyTemplate()
+        if (_dropDownButton != null)
         {
-            if (DesignerProperties.GetIsInDesignMode(this)) return;
-            if (_popup != null)
+            _dropDownButton.Click -= DropDownButton_Click;
+            _dropDownButton.MouseLeave -= DropDownButton_MouseLeave;
+        }
+
+        if (_textBox != null)
+        {
+            _textBox.KeyDown -= TextBox_KeyDown;
+            _textBox.TextChanged -= TextBox_TextChanged;
+            _textBox.LostFocus -= TextBox_LostFocus;
+        }
+
+        base.OnApplyTemplate();
+
+        _popup = GetTemplateChild(ElementPopup) as Popup;
+        _dropDownButton = GetTemplateChild(ElementButton) as Button;
+        _textBox = GetTemplateChild(ElementTextBox) as WatermarkTextBox;
+
+        CheckNull();
+
+        _popup.PreviewMouseLeftButtonDown += PopupPreviewMouseLeftButtonDown;
+        _popup.Opened += PopupOpened;
+        _popup.Closed += PopupClosed;
+        _popup.Child = Clock;
+
+        if (IsDropDownOpen)
+        {
+            _popup.IsOpen = true;
+        }
+
+        _dropDownButton.Click += DropDownButton_Click;
+        _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
+
+        var selectedTime = SelectedTime;
+
+        if (_textBox != null)
+        {
+            if (selectedTime == null)
             {
-                _popup.PreviewMouseLeftButtonDown -= PopupPreviewMouseLeftButtonDown;
-                _popup.Opened -= PopupOpened;
-                _popup.Closed -= PopupClosed;
-                _popup.Child = null;
+                _textBox.Text = DateTime.Now.ToString(TimeFormat);
             }
 
-            if (_dropDownButton != null)
-            {
-                _dropDownButton.Click -= DropDownButton_Click;
-                _dropDownButton.MouseLeave -= DropDownButton_MouseLeave;
-            }
-
-            if (_textBox != null)
-            {
-                _textBox.KeyDown -= TextBox_KeyDown;
-                _textBox.TextChanged -= TextBox_TextChanged;
-                _textBox.LostFocus -= TextBox_LostFocus;
-            }
-
-            base.OnApplyTemplate();
-
-            _popup = GetTemplateChild(ElementPopup) as Popup;
-            _dropDownButton = GetTemplateChild(ElementButton) as Button;
-            _textBox = GetTemplateChild(ElementTextBox) as WatermarkTextBox;
-
-            CheckNull();
-
-            _popup.PreviewMouseLeftButtonDown += PopupPreviewMouseLeftButtonDown;
-            _popup.Opened += PopupOpened;
-            _popup.Closed += PopupClosed;
-            _popup.Child = Clock;
-
-            if (IsDropDownOpen)
-            {
-                _popup.IsOpen = true;
-            }
-
-            _dropDownButton.Click += DropDownButton_Click;
-            _dropDownButton.MouseLeave += DropDownButton_MouseLeave;
-
-            var selectedTime = SelectedTime;
-
-            if (_textBox != null)
-            {
-                if (selectedTime == null)
-                {
-                    _textBox.Text = DateTime.Now.ToString(TimeFormat);
-                }
-
-                _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
                 _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
-                _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
-                _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
+            _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
 
-                _textBox.KeyDown += TextBox_KeyDown;
-                _textBox.TextChanged += TextBox_TextChanged;
-                _textBox.LostFocus += TextBox_LostFocus;
+            _textBox.KeyDown += TextBox_KeyDown;
+            _textBox.TextChanged += TextBox_TextChanged;
+            _textBox.LostFocus += TextBox_LostFocus;
 
-                if (selectedTime == null)
-                {
-                    if (!string.IsNullOrEmpty(_defaultText))
-                    {
-                        _textBox.Text = _defaultText;
-                        SetSelectedTime();
-                    }
-                }
-                else
-                {
-                    _textBox.Text = DateTimeToString(selectedTime.Value);
-                }
-            }
-
-            if (selectedTime is null)
+            if (selectedTime == null)
             {
-                _originalSelectedTime ??= DateTime.Now;
-                SetCurrentValue(DisplayTimeProperty, _originalSelectedTime);
+                if (!string.IsNullOrEmpty(_defaultText))
+                {
+                    _textBox.Text = _defaultText;
+                    SetSelectedTime();
+                }
             }
             else
             {
-                SetCurrentValue(DisplayTimeProperty, selectedTime);
+                _textBox.Text = DateTimeToString(selectedTime.Value);
             }
         }
 
-        public override string ToString() => SelectedTime?.ToString(TimeFormat) ?? string.Empty;
-
-        #endregion
-
-        #region Protected Methods
-
-        protected virtual void OnClockClosed(RoutedEventArgs e)
+        if (selectedTime is null)
         {
-            var handler = ClockClosed;
-            handler?.Invoke(this, e);
+            _originalSelectedTime ??= DateTime.Now;
+            SetCurrentValue(DisplayTimeProperty, _originalSelectedTime);
         }
-
-        protected virtual void OnClockOpened(RoutedEventArgs e)
+        else
         {
-            var handler = ClockOpened;
-            handler?.Invoke(this, e);
+            SetCurrentValue(DisplayTimeProperty, selectedTime);
         }
+    }
 
-        #endregion Protected Methods
+    public override string ToString() => SelectedTime?.ToString(TimeFormat) ?? string.Empty;
 
-        #region Private Methods
+    #endregion
 
-        private void CheckNull()
+    #region Protected Methods
+
+    protected virtual void OnClockClosed(RoutedEventArgs e)
+    {
+        var handler = ClockClosed;
+        handler?.Invoke(this, e);
+    }
+
+    protected virtual void OnClockOpened(RoutedEventArgs e)
+    {
+        var handler = ClockOpened;
+        handler?.Invoke(this, e);
+    }
+
+    #endregion Protected Methods
+
+    #region Private Methods
+
+    private void CheckNull()
+    {
+        if (_dropDownButton == null || _popup == null || _textBox == null)
+            throw new Exception();
+    }
+
+    private void TextBox_LostFocus(object sender, RoutedEventArgs e) => SetSelectedTime();
+
+    private void SetIsHandlerSuspended(DependencyProperty property, bool value)
+    {
+        if (value)
         {
-            if (_dropDownButton == null || _popup == null || _textBox == null)
-                throw new Exception();
+            _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
+            _isHandlerSuspended[property] = true;
         }
-
-        private void TextBox_LostFocus(object sender, RoutedEventArgs e) => SetSelectedTime();
-
-        private void SetIsHandlerSuspended(DependencyProperty property, bool value)
+        else
         {
-            if (value)
+            _isHandlerSuspended?.Remove(property);
+        }
+    }
+
+    private void SetValueNoCallback(DependencyProperty property, object value)
+    {
+        SetIsHandlerSuspended(property, true);
+        try
+        {
+            SetCurrentValue(property, value);
+        }
+        finally
+        {
+            SetIsHandlerSuspended(property, false);
+        }
+    }
+
+    private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        SetValueNoCallback(TextProperty, _textBox.Text);
+        VerifyData();
+    }
+
+    private bool ProcessTimePickerKey(KeyEventArgs e)
+    {
+        switch (e.Key)
+        {
+            case Key.System:
             {
-                _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
-                _isHandlerSuspended[property] = true;
-            }
-            else
-            {
-                _isHandlerSuspended?.Remove(property);
-            }
-        }
-
-        private void SetValueNoCallback(DependencyProperty property, object value)
-        {
-            SetIsHandlerSuspended(property, true);
-            try
-            {
-                SetCurrentValue(property, value);
-            }
-            finally
-            {
-                SetIsHandlerSuspended(property, false);
-            }
-        }
-
-        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            SetValueNoCallback(TextProperty, _textBox.Text);
-            VerifyData();
-        }
-
-        private bool ProcessTimePickerKey(KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.System:
+                switch (e.SystemKey)
+                {
+                    case Key.Down:
                     {
-                        switch (e.SystemKey)
+                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
                         {
-                            case Key.Down:
-                                {
-                                    if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                                    {
-                                        TogglePopup();
-                                        return true;
-                                    }
-
-                                    break;
-                                }
+                            TogglePopup();
+                            return true;
                         }
 
                         break;
                     }
-
-                case Key.Enter:
-                    {
-                        SetSelectedTime();
-                        return true;
-                    }
-            }
-
-            return false;
-        }
-
-        private void TextBox_KeyDown(object sender, KeyEventArgs e)
-        {
-            e.Handled = ProcessTimePickerKey(e) || e.Handled;
-        }
-
-        private void DropDownButton_MouseLeave(object sender, MouseEventArgs e)
-        {
-            _disablePopupReopen = false;
-        }
-
-        private bool IsHandlerSuspended(DependencyProperty property)
-        {
-            return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
-        }
-
-        private void PopupPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (sender is Popup { StaysOpen: false })
-            {
-                if (_dropDownButton?.InputHitTest(e.GetPosition(_dropDownButton)) != null)
-                {
-                    _disablePopupReopen = true;
                 }
+
+                break;
+            }
+
+            case Key.Enter:
+            {
+                SetSelectedTime();
+                return true;
             }
         }
 
-        private void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+        return false;
+    }
 
-        private void Clock_Confirmed() => TogglePopup();
+    private void TextBox_KeyDown(object sender, KeyEventArgs e)
+    {
+        e.Handled = ProcessTimePickerKey(e) || e.Handled;
+    }
 
-        private void PopupOpened(object sender, EventArgs e)
+    private void DropDownButton_MouseLeave(object sender, MouseEventArgs e)
+    {
+        _disablePopupReopen = false;
+    }
+
+    private bool IsHandlerSuspended(DependencyProperty property)
+    {
+        return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
+    }
+
+    private void PopupPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is Popup { StaysOpen: false })
         {
-            if (!IsDropDownOpen)
+            if (_dropDownButton?.InputHitTest(e.GetPosition(_dropDownButton)) != null)
             {
+                _disablePopupReopen = true;
+            }
+        }
+    }
+
+    private void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+
+    private void Clock_Confirmed() => TogglePopup();
+
+    private void PopupOpened(object sender, EventArgs e)
+    {
+        if (!IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
+        }
+
+        Clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+
+        OnClockOpened(new RoutedEventArgs());
+    }
+
+    private void PopupClosed(object sender, EventArgs e)
+    {
+        if (IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+        }
+
+        if (Clock.IsKeyboardFocusWithin)
+        {
+            MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+        }
+
+        OnClockClosed(new RoutedEventArgs());
+    }
+
+    private void DropDownButton_Click(object sender, RoutedEventArgs e) => TogglePopup();
+
+    private void TogglePopup()
+    {
+        if (IsDropDownOpen)
+        {
+            SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
+        }
+        else
+        {
+            if (_disablePopupReopen)
+            {
+                _disablePopupReopen = false;
+            }
+            else
+            {
+                SetSelectedTime();
                 SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
             }
+        }
+    }
 
-            Clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+    private void SafeSetText(string s)
+    {
+        if (string.Compare(Text, s, StringComparison.Ordinal) != 0)
+        {
+            SetCurrentValue(TextProperty, s);
+        }
+    }
 
-            OnClockOpened(new RoutedEventArgs());
+    private DateTime? ParseText(string text)
+    {
+        try
+        {
+            return DateTime.Parse(text);
+        }
+        catch
+        {
+            // ignored
         }
 
-        private void PopupClosed(object sender, EventArgs e)
+        return null;
+    }
+
+    private DateTime? SetTextBoxValue(string s)
+    {
+        if (string.IsNullOrEmpty(s))
         {
-            if (IsDropDownOpen)
-            {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-            }
-
-            if (Clock.IsKeyboardFocusWithin)
-            {
-                MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
-            }
-
-            OnClockClosed(new RoutedEventArgs());
+            SafeSetText(s);
+            return SelectedTime;
         }
 
-        private void DropDownButton_Click(object sender, RoutedEventArgs e) => TogglePopup();
+        var d = ParseText(s);
 
-        private void TogglePopup()
+        if (d != null)
         {
-            if (IsDropDownOpen)
+            SafeSetText(DateTimeToString((DateTime) d));
+            return d;
+        }
+
+        if (SelectedTime != null)
+        {
+            var newtext = DateTimeToString((DateTime) SelectedTime);
+            SafeSetText(newtext);
+            return SelectedTime;
+        }
+        SafeSetText(DateTimeToString(DisplayTime));
+        return DisplayTime;
+    }
+
+    private void SetSelectedTime()
+    {
+        if (_textBox != null)
+        {
+            if (!string.IsNullOrEmpty(_textBox.Text))
             {
-                SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
-            }
-            else
-            {
-                if (_disablePopupReopen)
+                var s = _textBox.Text;
+
+                if (SelectedTime != null)
                 {
-                    _disablePopupReopen = false;
-                }
-                else
-                {
-                    SetSelectedTime();
-                    SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
-                }
-            }
-        }
+                    var selectedTime = DateTimeToString(SelectedTime.Value);
 
-        private void SafeSetText(string s)
-        {
-            if (string.Compare(Text, s, StringComparison.Ordinal) != 0)
-            {
-                SetCurrentValue(TextProperty, s);
-            }
-        }
-
-        private DateTime? ParseText(string text)
-        {
-            try
-            {
-                return DateTime.Parse(text);
-            }
-            catch
-            {
-                // ignored
-            }
-
-            return null;
-        }
-
-        private DateTime? SetTextBoxValue(string s)
-        {
-            if (string.IsNullOrEmpty(s))
-            {
-                SafeSetText(s);
-                return SelectedTime;
-            }
-
-            var d = ParseText(s);
-
-            if (d != null)
-            {
-                SafeSetText(DateTimeToString((DateTime) d));
-                return d;
-            }
-
-            if (SelectedTime != null)
-            {
-                var newtext = DateTimeToString((DateTime) SelectedTime);
-                SafeSetText(newtext);
-                return SelectedTime;
-            }
-            SafeSetText(DateTimeToString(DisplayTime));
-            return DisplayTime;
-        }
-
-        private void SetSelectedTime()
-        {
-            if (_textBox != null)
-            {
-                if (!string.IsNullOrEmpty(_textBox.Text))
-                {
-                    var s = _textBox.Text;
-
-                    if (SelectedTime != null)
+                    if (string.Compare(selectedTime, s, StringComparison.Ordinal) == 0)
                     {
-                        var selectedTime = DateTimeToString(SelectedTime.Value);
-
-                        if (string.Compare(selectedTime, s, StringComparison.Ordinal) == 0)
-                        {
-                            return;
-                        }
-                    }
-
-                    var d = SetTextBoxValue(s);
-                    if (!SelectedTime.Equals(d))
-                    {
-                        SetCurrentValue(SelectedTimeProperty, d);
-                        SetCurrentValue(DisplayTimeProperty, d);
+                        return;
                     }
                 }
-                else
-                {
-                    if (SelectedTime.HasValue)
-                    {
-                        SetCurrentValue(SelectedTimeProperty, null);
-                    }
-                }
-            }
-            else
-            {
-                var d = SetTextBoxValue(_defaultText);
+
+                var d = SetTextBoxValue(s);
                 if (!SelectedTime.Equals(d))
                 {
                     SetCurrentValue(SelectedTimeProperty, d);
+                    SetCurrentValue(DisplayTimeProperty, d);
                 }
             }
-        }
-
-        private string DateTimeToString(DateTime d) => d.ToString(TimeFormat);
-
-        private static void OnGotFocus(object sender, RoutedEventArgs e)
-        {
-            var picker = (TimePicker) sender;
-            if (!e.Handled && picker._textBox != null)
+            else
             {
-                if (Equals(e.OriginalSource, picker))
+                if (SelectedTime.HasValue)
                 {
-                    picker._textBox.Focus();
-                    e.Handled = true;
-                }
-                else if (Equals(e.OriginalSource, picker._textBox))
-                {
-                    picker._textBox.SelectAll();
-                    e.Handled = true;
+                    SetCurrentValue(SelectedTimeProperty, null);
                 }
             }
         }
-
-        #endregion Private Methods
+        else
+        {
+            var d = SetTextBoxValue(_defaultText);
+            if (!SelectedTime.Equals(d))
+            {
+                SetCurrentValue(SelectedTimeProperty, d);
+            }
+        }
     }
-}
+
+    private string DateTimeToString(DateTime d) => d.ToString(TimeFormat);
+
+    private static void OnGotFocus(object sender, RoutedEventArgs e)
+    {
+        var picker = (TimePicker) sender;
+        if (!e.Handled && picker._textBox != null)
+        {
+            if (Equals(e.OriginalSource, picker))
+            {
+                picker._textBox.Focus();
+                e.Handled = true;
+            }
+            else if (Equals(e.OriginalSource, picker._textBox))
+            {
+                picker._textBox.SelectAll();
+                e.Handled = true;
+            }
+        }
+    }
+
+    #endregion Private Methods
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
index 814238f7..2e1b055e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
@@ -1,36 +1,35 @@
 using System.Windows;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class WatermarkTextBox : TextBox
 {
-    public class WatermarkTextBox : TextBox
+    #region Public Properties
+
+    #region Watermark
+
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(
+        "Watermark", typeof(object), typeof(WatermarkTextBox), new PropertyMetadata(default(object)));
+
+    public object Watermark
     {
-        #region Public Properties
+        get => GetValue(WatermarkProperty);
+        set => SetValue(WatermarkProperty, value);
+    }
 
-        #region Watermark
+    #endregion Watermark
 
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register(
-            "Watermark", typeof(object), typeof(WatermarkTextBox), new PropertyMetadata(default(object)));
+    #endregion Public Properties
 
-        public object Watermark
+    protected override void OnGotFocus(RoutedEventArgs e)
+    {
+        base.OnGotFocus(e);
+        if (IsEnabled)
         {
-            get => GetValue(WatermarkProperty);
-            set => SetValue(WatermarkProperty, value);
-        }
-
-        #endregion Watermark
-
-        #endregion Public Properties
-
-        protected override void OnGotFocus(RoutedEventArgs e)
-        {
-            base.OnGotFocus(e);
-            if (IsEnabled)
+            if (!string.IsNullOrEmpty(Text))
             {
-                if (!string.IsNullOrEmpty(Text))
-                {
-                    Select(0, Text.Length);
-                }
+                Select(0, Text.Length);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
index d752e9cb..1ae6cc5f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
@@ -7,130 +7,129 @@ using System.Windows.Shapes;
 using HandyControl.Data;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public abstract class LoadingBase : ContentControl
 {
-    public abstract class LoadingBase : ContentControl
-    {
-        protected Storyboard Storyboard;
+    protected Storyboard Storyboard;
 
-        public static readonly DependencyProperty IsRunningProperty = DependencyProperty.Register(
-            "IsRunning", typeof(bool), typeof(LoadingBase), new PropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
+    public static readonly DependencyProperty IsRunningProperty = DependencyProperty.Register(
+        "IsRunning", typeof(bool), typeof(LoadingBase), new PropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
+        {
+            var ctl = (LoadingBase) o;
+            var v = (bool) args.NewValue;
+            if (v)
             {
-                var ctl = (LoadingBase) o;
-                var v = (bool) args.NewValue;
-                if (v)
-                {
-                    ctl.Storyboard?.Resume();
-                }
-                else
-                {
-                    ctl.Storyboard?.Pause();
-                }
-            }));
+                ctl.Storyboard?.Resume();
+            }
+            else
+            {
+                ctl.Storyboard?.Pause();
+            }
+        }));
 
-        public bool IsRunning
-        {
-            get => (bool) GetValue(IsRunningProperty);
-            set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty DotCountProperty = DependencyProperty.Register(
-            "DotCount", typeof(int), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotIntervalProperty = DependencyProperty.Register(
-            "DotInterval", typeof(double), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(ValueBoxes.Double10Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotBorderBrushProperty = DependencyProperty.Register(
-            "DotBorderBrush", typeof(Brush), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotBorderThicknessProperty = DependencyProperty.Register(
-            "DotBorderThickness", typeof(double), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotDiameterProperty = DependencyProperty.Register(
-            "DotDiameter", typeof(double), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(6.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotSpeedProperty = DependencyProperty.Register(
-            "DotSpeed", typeof(double), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(4.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty DotDelayTimeProperty = DependencyProperty.Register(
-            "DotDelayTime", typeof(double), typeof(LoadingBase),
-            new FrameworkPropertyMetadata(80.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        protected readonly Canvas PrivateCanvas = new()
-        {
-            ClipToBounds = true
-        };
-
-        protected LoadingBase()
-        {
-            Content = PrivateCanvas;
-        }
-
-        public int DotCount
-        {
-            get => (int) GetValue(DotCountProperty);
-            set => SetValue(DotCountProperty, value);
-        }
-
-        public double DotInterval
-        {
-            get => (double) GetValue(DotIntervalProperty);
-            set => SetValue(DotIntervalProperty, value);
-        }
-
-        public Brush DotBorderBrush
-        {
-            get => (Brush) GetValue(DotBorderBrushProperty);
-            set => SetValue(DotBorderBrushProperty, value);
-        }
-
-        public double DotBorderThickness
-        {
-            get => (double) GetValue(DotBorderThicknessProperty);
-            set => SetValue(DotBorderThicknessProperty, value);
-        }
-
-        public double DotDiameter
-        {
-            get => (double) GetValue(DotDiameterProperty);
-            set => SetValue(DotDiameterProperty, value);
-        }
-
-        public double DotSpeed
-        {
-            get => (double) GetValue(DotSpeedProperty);
-            set => SetValue(DotSpeedProperty, value);
-        }
-
-        public double DotDelayTime
-        {
-            get => (double) GetValue(DotDelayTimeProperty);
-            set => SetValue(DotDelayTimeProperty, value);
-        }
-
-        protected abstract void UpdateDots();
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-            UpdateDots();
-        }
-
-        protected virtual Ellipse CreateEllipse(int index)
-        {
-            var ellipse = new Ellipse();
-            ellipse.SetBinding(WidthProperty, new Binding(DotDiameterProperty.Name) { Source = this });
-            ellipse.SetBinding(HeightProperty, new Binding(DotDiameterProperty.Name) { Source = this });
-            ellipse.SetBinding(Shape.FillProperty, new Binding(ForegroundProperty.Name) { Source = this });
-            ellipse.SetBinding(Shape.StrokeThicknessProperty, new Binding(DotBorderThicknessProperty.Name) { Source = this });
-            ellipse.SetBinding(Shape.StrokeProperty, new Binding(DotBorderBrushProperty.Name) { Source = this });
-            return ellipse;
-        }
+    public bool IsRunning
+    {
+        get => (bool) GetValue(IsRunningProperty);
+        set => SetValue(IsRunningProperty, ValueBoxes.BooleanBox(value));
     }
-}
+
+    public static readonly DependencyProperty DotCountProperty = DependencyProperty.Register(
+        "DotCount", typeof(int), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotIntervalProperty = DependencyProperty.Register(
+        "DotInterval", typeof(double), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(ValueBoxes.Double10Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotBorderBrushProperty = DependencyProperty.Register(
+        "DotBorderBrush", typeof(Brush), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotBorderThicknessProperty = DependencyProperty.Register(
+        "DotBorderThickness", typeof(double), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotDiameterProperty = DependencyProperty.Register(
+        "DotDiameter", typeof(double), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(6.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotSpeedProperty = DependencyProperty.Register(
+        "DotSpeed", typeof(double), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(4.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty DotDelayTimeProperty = DependencyProperty.Register(
+        "DotDelayTime", typeof(double), typeof(LoadingBase),
+        new FrameworkPropertyMetadata(80.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    protected readonly Canvas PrivateCanvas = new()
+    {
+        ClipToBounds = true
+    };
+
+    protected LoadingBase()
+    {
+        Content = PrivateCanvas;
+    }
+
+    public int DotCount
+    {
+        get => (int) GetValue(DotCountProperty);
+        set => SetValue(DotCountProperty, value);
+    }
+
+    public double DotInterval
+    {
+        get => (double) GetValue(DotIntervalProperty);
+        set => SetValue(DotIntervalProperty, value);
+    }
+
+    public Brush DotBorderBrush
+    {
+        get => (Brush) GetValue(DotBorderBrushProperty);
+        set => SetValue(DotBorderBrushProperty, value);
+    }
+
+    public double DotBorderThickness
+    {
+        get => (double) GetValue(DotBorderThicknessProperty);
+        set => SetValue(DotBorderThicknessProperty, value);
+    }
+
+    public double DotDiameter
+    {
+        get => (double) GetValue(DotDiameterProperty);
+        set => SetValue(DotDiameterProperty, value);
+    }
+
+    public double DotSpeed
+    {
+        get => (double) GetValue(DotSpeedProperty);
+        set => SetValue(DotSpeedProperty, value);
+    }
+
+    public double DotDelayTime
+    {
+        get => (double) GetValue(DotDelayTimeProperty);
+        set => SetValue(DotDelayTimeProperty, value);
+    }
+
+    protected abstract void UpdateDots();
+
+    protected override void OnRender(DrawingContext drawingContext)
+    {
+        base.OnRender(drawingContext);
+        UpdateDots();
+    }
+
+    protected virtual Ellipse CreateEllipse(int index)
+    {
+        var ellipse = new Ellipse();
+        ellipse.SetBinding(WidthProperty, new Binding(DotDiameterProperty.Name) { Source = this });
+        ellipse.SetBinding(HeightProperty, new Binding(DotDiameterProperty.Name) { Source = this });
+        ellipse.SetBinding(Shape.FillProperty, new Binding(ForegroundProperty.Name) { Source = this });
+        ellipse.SetBinding(Shape.StrokeThicknessProperty, new Binding(DotBorderThicknessProperty.Name) { Source = this });
+        ellipse.SetBinding(Shape.StrokeProperty, new Binding(DotBorderBrushProperty.Name) { Source = this });
+        return ellipse;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
index 1d644160..68454025 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
@@ -7,207 +7,206 @@ using System.Windows.Media.Animation;
 using HandyControl.Data;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class LoadingCircle : LoadingBase
 {
-    public class LoadingCircle : LoadingBase
+    public static readonly DependencyProperty DotOffSetProperty = DependencyProperty.Register(
+        "DotOffSet", typeof(double), typeof(LoadingCircle),
+        new FrameworkPropertyMetadata(20.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double DotOffSet
     {
-        public static readonly DependencyProperty DotOffSetProperty = DependencyProperty.Register(
-            "DotOffSet", typeof(double), typeof(LoadingCircle),
-            new FrameworkPropertyMetadata(20.0, FrameworkPropertyMetadataOptions.AffectsRender));
+        get => (double) GetValue(DotOffSetProperty);
+        set => SetValue(DotOffSetProperty, value);
+    }
 
-        public double DotOffSet
+    public static readonly DependencyProperty NeedHiddenProperty = DependencyProperty.Register(
+        "NeedHidden", typeof(bool), typeof(LoadingCircle),
+        new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public bool NeedHidden
+    {
+        get => (bool) GetValue(NeedHiddenProperty);
+        set => SetValue(NeedHiddenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    static LoadingCircle()
+    {
+        DotSpeedProperty.OverrideMetadata(typeof(LoadingCircle),
+            new FrameworkPropertyMetadata(6.0, FrameworkPropertyMetadataOptions.AffectsRender));
+        DotDelayTimeProperty.OverrideMetadata(typeof(LoadingCircle),
+            new FrameworkPropertyMetadata(220.0, FrameworkPropertyMetadataOptions.AffectsRender));
+    }
+
+    protected sealed override void UpdateDots()
+    {
+        var dotCount = DotCount;
+        var dotInterval = DotInterval;
+        var dotSpeed = DotSpeed;
+        var dotDelayTime = DotDelayTime;
+        var needHidden = NeedHidden;
+
+        if (dotCount < 1) return;
+        PrivateCanvas.Children.Clear();
+
+        //定义动画
+        Storyboard = new Storyboard
         {
-            get => (double) GetValue(DotOffSetProperty);
-            set => SetValue(DotOffSetProperty, value);
-        }
+            RepeatBehavior = RepeatBehavior.Forever
+        };
 
-        public static readonly DependencyProperty NeedHiddenProperty = DependencyProperty.Register(
-            "NeedHidden", typeof(bool), typeof(LoadingCircle),
-            new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public bool NeedHidden
+        //创建圆点
+        for (var i = 0; i < dotCount; i++)
         {
-            get => (bool) GetValue(NeedHiddenProperty);
-            set => SetValue(NeedHiddenProperty, ValueBoxes.BooleanBox(value));
-        }
+            var border = CreateBorder(i, dotInterval, needHidden);
 
-        static LoadingCircle()
-        {
-            DotSpeedProperty.OverrideMetadata(typeof(LoadingCircle),
-                new FrameworkPropertyMetadata(6.0, FrameworkPropertyMetadataOptions.AffectsRender));
-            DotDelayTimeProperty.OverrideMetadata(typeof(LoadingCircle),
-                new FrameworkPropertyMetadata(220.0, FrameworkPropertyMetadataOptions.AffectsRender));
-        }
-
-        protected sealed override void UpdateDots()
-        {
-            var dotCount = DotCount;
-            var dotInterval = DotInterval;
-            var dotSpeed = DotSpeed;
-            var dotDelayTime = DotDelayTime;
-            var needHidden = NeedHidden;
-
-            if (dotCount < 1) return;
-            PrivateCanvas.Children.Clear();
-
-            //定义动画
-            Storyboard = new Storyboard
+            var framesMove = new DoubleAnimationUsingKeyFrames
             {
-                RepeatBehavior = RepeatBehavior.Forever
+                BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
             };
 
-            //创建圆点
-            for (var i = 0; i < dotCount; i++)
+            var subAngle = -dotInterval * i;
+
+            //开始位置
+            var frame0 = new LinearDoubleKeyFrame
             {
-                var border = CreateBorder(i, dotInterval, needHidden);
+                Value = 0 + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
+            };
 
-                var framesMove = new DoubleAnimationUsingKeyFrames
+            //开始位置到第一次匀速开始
+            var frame1 = new EasingDoubleKeyFrame
+            {
+                EasingFunction = new PowerEase
                 {
-                    BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
-                };
+                    EasingMode = EasingMode.EaseOut
+                },
+                Value = 180 + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (0.75 / 7)))
+            };
 
-                var subAngle = -dotInterval * i;
+            //第一次匀速开始到第一次匀速结束
+            var frame2 = new LinearDoubleKeyFrame
+            {
+                Value = 180 + DotOffSet + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (2.75 / 7)))
+            };
 
-                //开始位置
-                var frame0 = new LinearDoubleKeyFrame
+            //第一次匀速结束到匀加速结束
+            var frame3 = new EasingDoubleKeyFrame
+            {
+                EasingFunction = new PowerEase
                 {
-                    Value = 0 + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
-                };
+                    EasingMode = EasingMode.EaseIn
+                },
+                Value = 360 + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (3.5 / 7)))
+            };
 
-                //开始位置到第一次匀速开始
-                var frame1 = new EasingDoubleKeyFrame
+            //匀加速结束到匀减速结束
+            var frame4 = new EasingDoubleKeyFrame
+            {
+                EasingFunction = new PowerEase
                 {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseOut
-                    },
-                    Value = 180 + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (0.75 / 7)))
-                };
+                    EasingMode = EasingMode.EaseOut
+                },
+                Value = 540 + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (4.25 / 7)))
+            };
 
-                //第一次匀速开始到第一次匀速结束
-                var frame2 = new LinearDoubleKeyFrame
-                {
-                    Value = 180 + DotOffSet + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (2.75 / 7)))
-                };
+            //匀减速结束到第二次匀速结束
+            var frame5 = new LinearDoubleKeyFrame
+            {
+                Value = 540 + DotOffSet + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (6.25 / 7)))
+            };
 
-                //第一次匀速结束到匀加速结束
-                var frame3 = new EasingDoubleKeyFrame
+            //第二次匀速结束到匀加速结束
+            var frame6 = new EasingDoubleKeyFrame
+            {
+                EasingFunction = new PowerEase
                 {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseIn
-                    },
-                    Value = 360 + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (3.5 / 7)))
-                };
+                    EasingMode = EasingMode.EaseIn
+                },
+                Value = 720 + subAngle,
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed))
+            };
 
-                //匀加速结束到匀减速结束
-                var frame4 = new EasingDoubleKeyFrame
-                {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseOut
-                    },
-                    Value = 540 + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (4.25 / 7)))
-                };
+            framesMove.KeyFrames.Add(frame0);
+            framesMove.KeyFrames.Add(frame1);
+            framesMove.KeyFrames.Add(frame2);
+            framesMove.KeyFrames.Add(frame3);
+            framesMove.KeyFrames.Add(frame4);
+            framesMove.KeyFrames.Add(frame5);
+            framesMove.KeyFrames.Add(frame6);
 
-                //匀减速结束到第二次匀速结束
-                var frame5 = new LinearDoubleKeyFrame
-                {
-                    Value = 540 + DotOffSet + subAngle,
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (6.25 / 7)))
-                };
+            Storyboard.SetTarget(framesMove, border);
+            Storyboard.SetTargetProperty(framesMove, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)"));
+            Storyboard.Children.Add(framesMove);
 
-                //第二次匀速结束到匀加速结束
-                var frame6 = new EasingDoubleKeyFrame
+            if (NeedHidden)
+            {
+                //隐藏一段时间
+                var frame7 = new DiscreteObjectKeyFrame
                 {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseIn
-                    },
-                    Value = 720 + subAngle,
+                    Value = Visibility.Collapsed,
                     KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed))
                 };
 
-                framesMove.KeyFrames.Add(frame0);
-                framesMove.KeyFrames.Add(frame1);
-                framesMove.KeyFrames.Add(frame2);
-                framesMove.KeyFrames.Add(frame3);
-                framesMove.KeyFrames.Add(frame4);
-                framesMove.KeyFrames.Add(frame5);
-                framesMove.KeyFrames.Add(frame6);
-
-                Storyboard.SetTarget(framesMove, border);
-                Storyboard.SetTargetProperty(framesMove, new PropertyPath("(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)"));
-                Storyboard.Children.Add(framesMove);
-
-                if (NeedHidden)
+                var frame8 = new DiscreteObjectKeyFrame
                 {
-                    //隐藏一段时间
-                    var frame7 = new DiscreteObjectKeyFrame
-                    {
-                        Value = Visibility.Collapsed,
-                        KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed))
-                    };
+                    Value = Visibility.Collapsed,
+                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed + 0.4))
+                };
 
-                    var frame8 = new DiscreteObjectKeyFrame
-                    {
-                        Value = Visibility.Collapsed,
-                        KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed + 0.4))
-                    };
-
-                    var frame9 = new DiscreteObjectKeyFrame
-                    {
-                        Value = Visibility.Visible,
-                        KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
-                    };
-                    var framesVisibility = new ObjectAnimationUsingKeyFrames
-                    {
-                        BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
-                    };
-                    framesVisibility.KeyFrames.Add(frame9);
-                    framesVisibility.KeyFrames.Add(frame7);
-                    framesVisibility.KeyFrames.Add(frame8);
-                    Storyboard.SetTarget(framesVisibility, border);
-                    Storyboard.SetTargetProperty(framesVisibility, new PropertyPath("(UIElement.Visibility)"));
-                    Storyboard.Children.Add(framesVisibility);
-                }
-                PrivateCanvas.Children.Add(border);
-            }
-
-            Storyboard.Begin();
-            if (!IsRunning)
-            {
-                Storyboard.Pause();
+                var frame9 = new DiscreteObjectKeyFrame
+                {
+                    Value = Visibility.Visible,
+                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
+                };
+                var framesVisibility = new ObjectAnimationUsingKeyFrames
+                {
+                    BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
+                };
+                framesVisibility.KeyFrames.Add(frame9);
+                framesVisibility.KeyFrames.Add(frame7);
+                framesVisibility.KeyFrames.Add(frame8);
+                Storyboard.SetTarget(framesVisibility, border);
+                Storyboard.SetTargetProperty(framesVisibility, new PropertyPath("(UIElement.Visibility)"));
+                Storyboard.Children.Add(framesVisibility);
             }
+            PrivateCanvas.Children.Add(border);
         }
 
-        private Border CreateBorder(int index, double dotInterval, bool needHidden)
+        Storyboard.Begin();
+        if (!IsRunning)
         {
-            var ellipse = CreateEllipse(index);
-            ellipse.HorizontalAlignment = HorizontalAlignment.Center;
-            ellipse.VerticalAlignment = VerticalAlignment.Bottom;
-            var rt = new RotateTransform
-            {
-                Angle = -dotInterval * index
-            };
-            var myTransGroup = new TransformGroup();
-            myTransGroup.Children.Add(rt);
-            var border = new Border
-            {
-                RenderTransformOrigin = new Point(0.5, 0.5),
-                RenderTransform = myTransGroup,
-                Child = ellipse,
-                Visibility = needHidden ? Visibility.Collapsed : Visibility.Visible
-            };
-            border.SetBinding(WidthProperty, new Binding("Width") { Source = this });
-            border.SetBinding(HeightProperty, new Binding("Height") { Source = this });
-
-            return border;
+            Storyboard.Pause();
         }
     }
-}
+
+    private Border CreateBorder(int index, double dotInterval, bool needHidden)
+    {
+        var ellipse = CreateEllipse(index);
+        ellipse.HorizontalAlignment = HorizontalAlignment.Center;
+        ellipse.VerticalAlignment = VerticalAlignment.Bottom;
+        var rt = new RotateTransform
+        {
+            Angle = -dotInterval * index
+        };
+        var myTransGroup = new TransformGroup();
+        myTransGroup.Children.Add(rt);
+        var border = new Border
+        {
+            RenderTransformOrigin = new Point(0.5, 0.5),
+            RenderTransform = myTransGroup,
+            Child = ellipse,
+            Visibility = needHidden ? Visibility.Collapsed : Visibility.Visible
+        };
+        border.SetBinding(WidthProperty, new Binding("Width") { Source = this });
+        border.SetBinding(HeightProperty, new Binding("Height") { Source = this });
+
+        return border;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
index b8976dca..20810367 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
@@ -5,112 +5,111 @@ using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class LoadingLine : LoadingBase
 {
-    public class LoadingLine : LoadingBase
+    private const double MoveLength = 80;
+
+    private const double UniformScale = .6;
+
+    public LoadingLine()
     {
-        private const double MoveLength = 80;
+        SetBinding(HeightProperty, new Binding("DotDiameter") { Source = this });
+    }
 
-        private const double UniformScale = .6;
+    protected sealed override void UpdateDots()
+    {
+        var dotCount = DotCount;
+        var dotInterval = DotInterval;
+        var dotDiameter = DotDiameter;
+        var dotSpeed = DotSpeed;
+        var dotDelayTime = DotDelayTime;
 
-        public LoadingLine()
+        if (dotCount < 1) return;
+        PrivateCanvas.Children.Clear();
+
+        //计算相关尺寸
+        var centerWidth = dotDiameter * dotCount + dotInterval * (dotCount - 1) + MoveLength;
+        var speedDownLength = (ActualWidth - MoveLength) / 2;
+        var speedUniformLength = centerWidth / 2;
+
+        //定义动画
+        Storyboard = new Storyboard
         {
-            SetBinding(HeightProperty, new Binding("DotDiameter") { Source = this });
-        }
+            RepeatBehavior = RepeatBehavior.Forever
+        };
 
-        protected sealed override void UpdateDots()
+        //创建圆点
+        for (var i = 0; i < dotCount; i++)
         {
-            var dotCount = DotCount;
-            var dotInterval = DotInterval;
-            var dotDiameter = DotDiameter;
-            var dotSpeed = DotSpeed;
-            var dotDelayTime = DotDelayTime;
+            var ellipse = CreateEllipse(i, dotInterval, dotDiameter);
 
-            if (dotCount < 1) return;
-            PrivateCanvas.Children.Clear();
-
-            //计算相关尺寸
-            var centerWidth = dotDiameter * dotCount + dotInterval * (dotCount - 1) + MoveLength;
-            var speedDownLength = (ActualWidth - MoveLength) / 2;
-            var speedUniformLength = centerWidth / 2;
-
-            //定义动画
-            Storyboard = new Storyboard
+            var frames = new ThicknessAnimationUsingKeyFrames
             {
-                RepeatBehavior = RepeatBehavior.Forever
+                BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
+            };
+            //开始位置
+            var frame0 = new LinearThicknessKeyFrame
+            {
+                Value = new Thickness(ellipse.Margin.Left, 0, 0, 0),
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
             };
 
-            //创建圆点
-            for (var i = 0; i < dotCount; i++)
+            //开始位置到匀速开始
+            var frame1 = new EasingThicknessKeyFrame
             {
-                var ellipse = CreateEllipse(i, dotInterval, dotDiameter);
-
-                var frames = new ThicknessAnimationUsingKeyFrames
+                EasingFunction = new PowerEase
                 {
-                    BeginTime = TimeSpan.FromMilliseconds(dotDelayTime * i)
-                };
-                //开始位置
-                var frame0 = new LinearThicknessKeyFrame
-                {
-                    Value = new Thickness(ellipse.Margin.Left, 0, 0, 0),
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
-                };
+                    EasingMode = EasingMode.EaseOut
+                },
+                Value = new Thickness(speedDownLength + ellipse.Margin.Left, 0, 0, 0),
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (1 - UniformScale) / 2))
+            };
 
-                //开始位置到匀速开始
-                var frame1 = new EasingThicknessKeyFrame
-                {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseOut
-                    },
-                    Value = new Thickness(speedDownLength + ellipse.Margin.Left, 0, 0, 0),
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (1 - UniformScale) / 2))
-                };
-
-                //匀速开始到匀速结束
-                var frame2 = new LinearThicknessKeyFrame
-                {
-                    Value = new Thickness(speedDownLength + speedUniformLength + ellipse.Margin.Left, 0, 0, 0),
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (1 + UniformScale) / 2))
-                };
-
-                //匀速结束到匀加速结束
-                var frame3 = new EasingThicknessKeyFrame
-                {
-                    EasingFunction = new PowerEase
-                    {
-                        EasingMode = EasingMode.EaseIn
-                    },
-                    Value = new Thickness(ActualWidth + ellipse.Margin.Left + speedUniformLength, 0, 0, 0),
-                    KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed))
-                };
-
-                frames.KeyFrames.Add(frame0);
-                frames.KeyFrames.Add(frame1);
-                frames.KeyFrames.Add(frame2);
-                frames.KeyFrames.Add(frame3);
-
-                Storyboard.SetTarget(frames, ellipse);
-                Storyboard.SetTargetProperty(frames, new PropertyPath(MarginProperty));
-                Storyboard.Children.Add(frames);
-
-                PrivateCanvas.Children.Add(ellipse);
-            }
-
-            Storyboard.Begin();
-            if (!IsRunning)
+            //匀速开始到匀速结束
+            var frame2 = new LinearThicknessKeyFrame
             {
-                Storyboard.Pause();
-            }
+                Value = new Thickness(speedDownLength + speedUniformLength + ellipse.Margin.Left, 0, 0, 0),
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed * (1 + UniformScale) / 2))
+            };
+
+            //匀速结束到匀加速结束
+            var frame3 = new EasingThicknessKeyFrame
+            {
+                EasingFunction = new PowerEase
+                {
+                    EasingMode = EasingMode.EaseIn
+                },
+                Value = new Thickness(ActualWidth + ellipse.Margin.Left + speedUniformLength, 0, 0, 0),
+                KeyTime = KeyTime.FromTimeSpan(TimeSpan.FromSeconds(dotSpeed))
+            };
+
+            frames.KeyFrames.Add(frame0);
+            frames.KeyFrames.Add(frame1);
+            frames.KeyFrames.Add(frame2);
+            frames.KeyFrames.Add(frame3);
+
+            Storyboard.SetTarget(frames, ellipse);
+            Storyboard.SetTargetProperty(frames, new PropertyPath(MarginProperty));
+            Storyboard.Children.Add(frames);
+
+            PrivateCanvas.Children.Add(ellipse);
         }
 
-        private Ellipse CreateEllipse(int index, double dotInterval, double dotDiameter)
+        Storyboard.Begin();
+        if (!IsRunning)
         {
-            var ellipse = base.CreateEllipse(index);
-            ellipse.HorizontalAlignment = HorizontalAlignment.Left;
-            ellipse.VerticalAlignment = VerticalAlignment.Top;
-            ellipse.Margin = new Thickness(-(dotInterval + dotDiameter) * index, 0, 0, 0);
-            return ellipse;
+            Storyboard.Pause();
         }
     }
-}
+
+    private Ellipse CreateEllipse(int index, double dotInterval, double dotDiameter)
+    {
+        var ellipse = base.CreateEllipse(index);
+        ellipse.HorizontalAlignment = HorizontalAlignment.Left;
+        ellipse.VerticalAlignment = VerticalAlignment.Top;
+        ellipse.Margin = new Thickness(-(dotInterval + dotDiameter) * index, 0, 0, 0);
+        return ellipse;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
index d9ecb961..1e083f31 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
@@ -8,164 +8,163 @@ using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class AnimationPath : Shape
 {
-    public class AnimationPath : Shape
+    private Storyboard _storyboard;
+
+    private double _pathLength;
+
+    public static readonly DependencyProperty DataProperty = DependencyProperty.Register(nameof(Data),
+        typeof(Geometry), typeof(AnimationPath), new FrameworkPropertyMetadata(null,
+            OnPropertiesChanged));
+
+    private static void OnPropertiesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        private Storyboard _storyboard;
-
-        private double _pathLength;
-
-        public static readonly DependencyProperty DataProperty = DependencyProperty.Register(nameof(Data),
-            typeof(Geometry), typeof(AnimationPath), new FrameworkPropertyMetadata(null,
-                OnPropertiesChanged));
-
-        private static void OnPropertiesChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (d is AnimationPath path)
         {
-            if (d is AnimationPath path)
-            {
-                path.UpdatePath();
-            }
+            path.UpdatePath();
         }
-
-        public Geometry Data
-        {
-            get => (Geometry) GetValue(DataProperty);
-            set => SetValue(DataProperty, value);
-        }
-
-        protected override Geometry DefiningGeometry => Data ?? Geometry.Empty;
-
-        public static readonly DependencyProperty PathLengthProperty = DependencyProperty.Register(
-            "PathLength", typeof(double), typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, OnPropertiesChanged));
-
-        public double PathLength
-        {
-            get => (double) GetValue(PathLengthProperty);
-            set => SetValue(PathLengthProperty, value);
-        }
-
-        public static readonly DependencyProperty DurationProperty = DependencyProperty.Register(
-            "Duration", typeof(Duration), typeof(AnimationPath), new FrameworkPropertyMetadata(new Duration(TimeSpan.FromSeconds(2)),
-                OnPropertiesChanged));
-
-        public Duration Duration
-        {
-            get => (Duration) GetValue(DurationProperty);
-            set => SetValue(DurationProperty, value);
-        }
-
-        public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register(
-            "IsPlaying", typeof(bool), typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
-            {
-                var ctl = (AnimationPath) o;
-                var v = (bool) args.NewValue;
-                if (v)
-                {
-                    ctl.UpdatePath();
-                }
-                else
-                {
-                    ctl._storyboard?.Pause();
-                }
-            }));
-
-        public bool IsPlaying
-        {
-            get => (bool) GetValue(IsPlayingProperty);
-            set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty RepeatBehaviorProperty =
-            Timeline.RepeatBehaviorProperty.AddOwner(typeof(AnimationPath),
-                new PropertyMetadata(RepeatBehavior.Forever));
-
-        public RepeatBehavior RepeatBehavior
-        {
-            get => (RepeatBehavior) GetValue(RepeatBehaviorProperty);
-            set => SetValue(RepeatBehaviorProperty, value);
-        }
-
-        public static readonly DependencyProperty FillBehaviorProperty =
-            Timeline.FillBehaviorProperty.AddOwner(typeof(AnimationPath), new PropertyMetadata(FillBehavior.Stop));
-
-        public FillBehavior FillBehavior
-        {
-            get { return (FillBehavior) GetValue(FillBehaviorProperty); }
-            set { SetValue(FillBehaviorProperty, value); }
-        }
-
-        static AnimationPath()
-        {
-            StretchProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(Stretch.Uniform,
-                OnPropertiesChanged));
-
-            StrokeThicknessProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.Double1Box,
-                OnPropertiesChanged));
-        }
-
-        public AnimationPath() => Loaded += (s, e) => UpdatePath();
-
-        public static readonly RoutedEvent CompletedEvent =
-            EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
-                typeof(EventHandler), typeof(AnimationPath));
-
-        public event EventHandler Completed
-        {
-            add => AddHandler(CompletedEvent, value);
-            remove => RemoveHandler(CompletedEvent, value);
-        }
-
-        private void UpdatePath()
-        {
-            if (!Duration.HasTimeSpan || !IsPlaying) return;
-
-            _pathLength = PathLength > 0 ? PathLength : Data.GetTotalLength(new Size(ActualWidth, ActualHeight), StrokeThickness);
-
-            if (MathHelper.IsVerySmall(_pathLength)) return;
-
-            StrokeDashOffset = _pathLength;
-            StrokeDashArray = new DoubleCollection(new List<double>
-            {
-                _pathLength,
-                _pathLength
-            });
-
-            if (_storyboard != null)
-            {
-                _storyboard.Stop();
-                _storyboard.Completed -= Storyboard_Completed;
-            }
-            _storyboard = new Storyboard
-            {
-                RepeatBehavior = RepeatBehavior,
-                FillBehavior = FillBehavior
-            };
-            _storyboard.Completed += Storyboard_Completed;
-
-            var frames = new DoubleAnimationUsingKeyFrames();
-
-            var frameIn = new LinearDoubleKeyFrame
-            {
-                Value = _pathLength,
-                KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
-            };
-            frames.KeyFrames.Add(frameIn);
-
-            var frameOut = new LinearDoubleKeyFrame
-            {
-                Value = FillBehavior == FillBehavior.Stop ? -_pathLength : 0,
-                KeyTime = KeyTime.FromTimeSpan(Duration.TimeSpan)
-            };
-            frames.KeyFrames.Add(frameOut);
-
-            Storyboard.SetTarget(frames, this);
-            Storyboard.SetTargetProperty(frames, new PropertyPath(StrokeDashOffsetProperty));
-            _storyboard.Children.Add(frames);
-
-            _storyboard.Begin();
-        }
-
-        private void Storyboard_Completed(object sender, EventArgs e) => RaiseEvent(new RoutedEventArgs(CompletedEvent));
     }
-}
+
+    public Geometry Data
+    {
+        get => (Geometry) GetValue(DataProperty);
+        set => SetValue(DataProperty, value);
+    }
+
+    protected override Geometry DefiningGeometry => Data ?? Geometry.Empty;
+
+    public static readonly DependencyProperty PathLengthProperty = DependencyProperty.Register(
+        "PathLength", typeof(double), typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, OnPropertiesChanged));
+
+    public double PathLength
+    {
+        get => (double) GetValue(PathLengthProperty);
+        set => SetValue(PathLengthProperty, value);
+    }
+
+    public static readonly DependencyProperty DurationProperty = DependencyProperty.Register(
+        "Duration", typeof(Duration), typeof(AnimationPath), new FrameworkPropertyMetadata(new Duration(TimeSpan.FromSeconds(2)),
+            OnPropertiesChanged));
+
+    public Duration Duration
+    {
+        get => (Duration) GetValue(DurationProperty);
+        set => SetValue(DurationProperty, value);
+    }
+
+    public static readonly DependencyProperty IsPlayingProperty = DependencyProperty.Register(
+        "IsPlaying", typeof(bool), typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, (o, args) =>
+        {
+            var ctl = (AnimationPath) o;
+            var v = (bool) args.NewValue;
+            if (v)
+            {
+                ctl.UpdatePath();
+            }
+            else
+            {
+                ctl._storyboard?.Pause();
+            }
+        }));
+
+    public bool IsPlaying
+    {
+        get => (bool) GetValue(IsPlayingProperty);
+        set => SetValue(IsPlayingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty RepeatBehaviorProperty =
+        Timeline.RepeatBehaviorProperty.AddOwner(typeof(AnimationPath),
+            new PropertyMetadata(RepeatBehavior.Forever));
+
+    public RepeatBehavior RepeatBehavior
+    {
+        get => (RepeatBehavior) GetValue(RepeatBehaviorProperty);
+        set => SetValue(RepeatBehaviorProperty, value);
+    }
+
+    public static readonly DependencyProperty FillBehaviorProperty =
+        Timeline.FillBehaviorProperty.AddOwner(typeof(AnimationPath), new PropertyMetadata(FillBehavior.Stop));
+
+    public FillBehavior FillBehavior
+    {
+        get { return (FillBehavior) GetValue(FillBehaviorProperty); }
+        set { SetValue(FillBehaviorProperty, value); }
+    }
+
+    static AnimationPath()
+    {
+        StretchProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(Stretch.Uniform,
+            OnPropertiesChanged));
+
+        StrokeThicknessProperty.AddOwner(typeof(AnimationPath), new FrameworkPropertyMetadata(ValueBoxes.Double1Box,
+            OnPropertiesChanged));
+    }
+
+    public AnimationPath() => Loaded += (s, e) => UpdatePath();
+
+    public static readonly RoutedEvent CompletedEvent =
+        EventManager.RegisterRoutedEvent("Completed", RoutingStrategy.Bubble,
+            typeof(EventHandler), typeof(AnimationPath));
+
+    public event EventHandler Completed
+    {
+        add => AddHandler(CompletedEvent, value);
+        remove => RemoveHandler(CompletedEvent, value);
+    }
+
+    private void UpdatePath()
+    {
+        if (!Duration.HasTimeSpan || !IsPlaying) return;
+
+        _pathLength = PathLength > 0 ? PathLength : Data.GetTotalLength(new Size(ActualWidth, ActualHeight), StrokeThickness);
+
+        if (MathHelper.IsVerySmall(_pathLength)) return;
+
+        StrokeDashOffset = _pathLength;
+        StrokeDashArray = new DoubleCollection(new List<double>
+        {
+            _pathLength,
+            _pathLength
+        });
+
+        if (_storyboard != null)
+        {
+            _storyboard.Stop();
+            _storyboard.Completed -= Storyboard_Completed;
+        }
+        _storyboard = new Storyboard
+        {
+            RepeatBehavior = RepeatBehavior,
+            FillBehavior = FillBehavior
+        };
+        _storyboard.Completed += Storyboard_Completed;
+
+        var frames = new DoubleAnimationUsingKeyFrames();
+
+        var frameIn = new LinearDoubleKeyFrame
+        {
+            Value = _pathLength,
+            KeyTime = KeyTime.FromTimeSpan(TimeSpan.Zero)
+        };
+        frames.KeyFrames.Add(frameIn);
+
+        var frameOut = new LinearDoubleKeyFrame
+        {
+            Value = FillBehavior == FillBehavior.Stop ? -_pathLength : 0,
+            KeyTime = KeyTime.FromTimeSpan(Duration.TimeSpan)
+        };
+        frames.KeyFrames.Add(frameOut);
+
+        Storyboard.SetTarget(frames, this);
+        Storyboard.SetTargetProperty(frames, new PropertyPath(StrokeDashOffsetProperty));
+        _storyboard.Children.Add(frames);
+
+        _storyboard.Begin();
+    }
+
+    private void Storyboard_Completed(object sender, EventArgs e) => RaiseEvent(new RoutedEventArgs(CompletedEvent));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
index 5c04ba38..45fb1b3e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
@@ -4,98 +4,97 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     标记
+/// </summary>
+public class Badge : ContentControl
 {
-    /// <summary>
-    ///     标记
-    /// </summary>
-    public class Badge : ContentControl
+    public static readonly RoutedEvent ValueChangedEvent =
+        EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<int>>), typeof(Badge));
+
+    public event EventHandler<FunctionEventArgs<int>> ValueChanged
     {
-        public static readonly RoutedEvent ValueChangedEvent =
-            EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<int>>), typeof(Badge));
-
-        public event EventHandler<FunctionEventArgs<int>> ValueChanged
-        {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(Badge), new PropertyMetadata("0"));
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-            "Value", typeof(int), typeof(Badge), new PropertyMetadata(ValueBoxes.Int0Box, OnValueChanged));
-
-        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Badge) d;
-            var v = (int) e.NewValue;
-            ctl.SetCurrentValue(TextProperty, v <= ctl.Maximum ? v.ToString() : $"{ctl.Maximum}+");
-            if (ctl.IsInitialized)
-            {
-                ctl.RaiseEvent(new FunctionEventArgs<int>(ValueChangedEvent, ctl)
-                {
-                    Info = v
-                });
-            }
-        }
-
-        public int Value
-        {
-            get => (int) GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
-        }
-
-        public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
-            "Status", typeof(BadgeStatus), typeof(Badge), new PropertyMetadata(default(BadgeStatus)));
-
-        public BadgeStatus Status
-        {
-            get => (BadgeStatus) GetValue(StatusProperty);
-            set => SetValue(StatusProperty, value);
-        }
-
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
-            "Maximum", typeof(int), typeof(Badge), new PropertyMetadata(ValueBoxes.Int99Box, OnMaximumChanged));
-
-        private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Badge) d;
-            var v = ctl.Value;
-            ctl.SetCurrentValue(TextProperty, v <= ctl.Maximum ? v.ToString() : $"{ctl.Maximum}+");
-        }
-
-        public int Maximum
-        {
-            get => (int) GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
-
-        public static readonly DependencyProperty BadgeMarginProperty = DependencyProperty.Register(
-            "BadgeMargin", typeof(Thickness), typeof(Badge), new PropertyMetadata(default(Thickness)));
-
-        public Thickness BadgeMargin
-        {
-            get => (Thickness) GetValue(BadgeMarginProperty);
-            set => SetValue(BadgeMarginProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowBadgeProperty = DependencyProperty.Register(
-            "ShowBadge", typeof(bool), typeof(Badge), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ShowBadge
-        {
-            get => (bool) GetValue(ShowBadgeProperty);
-            set => SetValue(ShowBadgeProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override Geometry GetLayoutClip(Size layoutSlotSize) => null;
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
     }
-}
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(Badge), new PropertyMetadata("0"));
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+        "Value", typeof(int), typeof(Badge), new PropertyMetadata(ValueBoxes.Int0Box, OnValueChanged));
+
+    private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (Badge) d;
+        var v = (int) e.NewValue;
+        ctl.SetCurrentValue(TextProperty, v <= ctl.Maximum ? v.ToString() : $"{ctl.Maximum}+");
+        if (ctl.IsInitialized)
+        {
+            ctl.RaiseEvent(new FunctionEventArgs<int>(ValueChangedEvent, ctl)
+            {
+                Info = v
+            });
+        }
+    }
+
+    public int Value
+    {
+        get => (int) GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
+    }
+
+    public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
+        "Status", typeof(BadgeStatus), typeof(Badge), new PropertyMetadata(default(BadgeStatus)));
+
+    public BadgeStatus Status
+    {
+        get => (BadgeStatus) GetValue(StatusProperty);
+        set => SetValue(StatusProperty, value);
+    }
+
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+        "Maximum", typeof(int), typeof(Badge), new PropertyMetadata(ValueBoxes.Int99Box, OnMaximumChanged));
+
+    private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (Badge) d;
+        var v = ctl.Value;
+        ctl.SetCurrentValue(TextProperty, v <= ctl.Maximum ? v.ToString() : $"{ctl.Maximum}+");
+    }
+
+    public int Maximum
+    {
+        get => (int) GetValue(MaximumProperty);
+        set => SetValue(MaximumProperty, value);
+    }
+
+    public static readonly DependencyProperty BadgeMarginProperty = DependencyProperty.Register(
+        "BadgeMargin", typeof(Thickness), typeof(Badge), new PropertyMetadata(default(Thickness)));
+
+    public Thickness BadgeMargin
+    {
+        get => (Thickness) GetValue(BadgeMarginProperty);
+        set => SetValue(BadgeMarginProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowBadgeProperty = DependencyProperty.Register(
+        "ShowBadge", typeof(bool), typeof(Badge), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ShowBadge
+    {
+        get => (bool) GetValue(ShowBadgeProperty);
+        set => SetValue(ShowBadgeProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override Geometry GetLayoutClip(Size layoutSlotSize) => null;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
index abb17f7c..94c9c320 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
@@ -7,110 +7,109 @@ using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media.Effects;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[DefaultProperty("Content")]
+[ContentProperty("Content")]
+public class BlendEffectBox : Control
 {
-    [DefaultProperty("Content")]
-    [ContentProperty("Content")]
-    public class BlendEffectBox : Control
+    private readonly ContentPresenter _effectBottomPresenter;
+
+    private readonly ContentPresenter _effectTopPresenter;
+
+    private bool _isInternalAction;
+
+    public BlendEffectBox()
     {
-        private readonly ContentPresenter _effectBottomPresenter;
+        _effectTopPresenter = new ContentPresenter();
+        ActualContent = _effectTopPresenter;
 
-        private readonly ContentPresenter _effectTopPresenter;
-
-        private bool _isInternalAction;
-
-        public BlendEffectBox()
+        _effectBottomPresenter = new ContentPresenter();
+        _effectBottomPresenter.SetBinding(ContentPresenter.ContentProperty, new Binding(ContentProperty.Name)
         {
-            _effectTopPresenter = new ContentPresenter();
-            ActualContent = _effectTopPresenter;
+            Source = this
+        });
 
-            _effectBottomPresenter = new ContentPresenter();
-            _effectBottomPresenter.SetBinding(ContentPresenter.ContentProperty, new Binding(ContentProperty.Name)
-            {
-                Source = this
-            });
+        var effects = new ObservableCollection<Effect>();
+        effects.CollectionChanged += OnEffectsChanged;
+        Effects = effects;
+    }
 
-            var effects = new ObservableCollection<Effect>();
-            effects.CollectionChanged += OnEffectsChanged;
-            Effects = effects;
+    private void OnEffectsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (Effects == null || Effects.Count == 0)
+        {
+            ClearEffect(_effectTopPresenter);
+            return;
         }
 
-        private void OnEffectsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        if (_isInternalAction) return;
+
+        _isInternalAction = true;
+        AddEffect(_effectTopPresenter, Effects.Count);
+        _isInternalAction = false;
+    }
+
+    private void ClearEffect(ContentPresenter presenter)
+    {
+        if (presenter == null) return;
+
+        if (ReferenceEquals(_effectBottomPresenter, presenter))
         {
-            if (Effects == null || Effects.Count == 0)
+            _effectBottomPresenter.SetCurrentValue(EffectProperty, null);
+            return;
+        }
+
+        presenter.SetCurrentValue(EffectProperty, null);
+        ClearEffect(presenter.Content as ContentPresenter);
+    }
+
+    private void AddEffect(ContentPresenter presenter, int count)
+    {
+        var newCount = --count;
+
+        if (newCount >= 0)
+        {
+            presenter.Effect = Effects[newCount];
+
+            var nextCount = --count;
+            if (nextCount >= 1)
             {
-                ClearEffect(_effectTopPresenter);
-                return;
+                var content = new ContentPresenter();
+                presenter.Content = content;
+                AddEffect(content, newCount);
             }
-
-            if (_isInternalAction) return;
-
-            _isInternalAction = true;
-            AddEffect(_effectTopPresenter, Effects.Count);
-            _isInternalAction = false;
-        }
-
-        private void ClearEffect(ContentPresenter presenter)
-        {
-            if (presenter == null) return;
-
-            if (ReferenceEquals(_effectBottomPresenter, presenter))
+            else if (nextCount >= 0)
             {
-                _effectBottomPresenter.SetCurrentValue(EffectProperty, null);
-                return;
+                _effectBottomPresenter.Effect = Effects[0];
+                presenter.Content = _effectBottomPresenter;
             }
-
-            presenter.SetCurrentValue(EffectProperty, null);
-            ClearEffect(presenter.Content as ContentPresenter);
-        }
-
-        private void AddEffect(ContentPresenter presenter, int count)
-        {
-            var newCount = --count;
-
-            if (newCount >= 0)
+            else
             {
-                presenter.Effect = Effects[newCount];
-
-                var nextCount = --count;
-                if (nextCount >= 1)
-                {
-                    var content = new ContentPresenter();
-                    presenter.Content = content;
-                    AddEffect(content, newCount);
-                }
-                else if (nextCount >= 0)
-                {
-                    _effectBottomPresenter.Effect = Effects[0];
-                    presenter.Content = _effectBottomPresenter;
-                }
-                else
-                {
-                    presenter.Content = _effectBottomPresenter;
-                }
+                presenter.Content = _effectBottomPresenter;
             }
         }
-
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
-        [Bindable(true)]
-        public Collection<Effect> Effects { get; }
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
-            "Content", typeof(FrameworkElement), typeof(BlendEffectBox), new PropertyMetadata(default(FrameworkElement)));
-
-        public FrameworkElement Content
-        {
-            get => (FrameworkElement) GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        internal static readonly DependencyProperty ActualContentProperty = DependencyProperty.Register(
-            "ActualContent", typeof(FrameworkElement), typeof(BlendEffectBox), new PropertyMetadata(default(FrameworkElement)));
-
-        internal FrameworkElement ActualContent
-        {
-            get => (FrameworkElement) GetValue(ActualContentProperty);
-            set => SetValue(ActualContentProperty, value);
-        }
     }
-}
+
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+    [Bindable(true)]
+    public Collection<Effect> Effects { get; }
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+        "Content", typeof(FrameworkElement), typeof(BlendEffectBox), new PropertyMetadata(default(FrameworkElement)));
+
+    public FrameworkElement Content
+    {
+        get => (FrameworkElement) GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    internal static readonly DependencyProperty ActualContentProperty = DependencyProperty.Register(
+        "ActualContent", typeof(FrameworkElement), typeof(BlendEffectBox), new PropertyMetadata(default(FrameworkElement)));
+
+    internal FrameworkElement ActualContent
+    {
+        get => (FrameworkElement) GetValue(ActualContentProperty);
+        set => SetValue(ActualContentProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Card.cs b/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
index 4ea894b6..4da0db8f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
@@ -2,86 +2,85 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Card : ContentControl
 {
-    public class Card : ContentControl
+    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+        "Header", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
+
+    public object Header
     {
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            "Header", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
-
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-            "HeaderTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
-
-        [Bindable(true), Category("Content")]
-        public DataTemplate HeaderTemplate
-        {
-            get => (DataTemplate) GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
-            "HeaderTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
-
-        [Bindable(true), Category("Content")]
-        public DataTemplateSelector HeaderTemplateSelector
-        {
-            get => (DataTemplateSelector) GetValue(HeaderTemplateSelectorProperty);
-            set => SetValue(HeaderTemplateSelectorProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
-            "HeaderStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
-
-        [Bindable(true), Category("Content")]
-        public string HeaderStringFormat
-        {
-            get => (string) GetValue(HeaderStringFormatProperty);
-            set => SetValue(HeaderStringFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
-            "Footer", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
-
-        public object Footer
-        {
-            get => GetValue(FooterProperty);
-            set => SetValue(FooterProperty, value);
-        }
-
-        public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
-            "FooterTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
-
-        [Bindable(true), Category("Content")]
-        public DataTemplate FooterTemplate
-        {
-            get => (DataTemplate) GetValue(FooterTemplateProperty);
-            set => SetValue(FooterTemplateProperty, value);
-        }
-
-        public static readonly DependencyProperty FooterTemplateSelectorProperty = DependencyProperty.Register(
-            "FooterTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
-
-        [Bindable(true), Category("Content")]
-        public DataTemplateSelector FooterTemplateSelector
-        {
-            get => (DataTemplateSelector) GetValue(FooterTemplateSelectorProperty);
-            set => SetValue(FooterTemplateSelectorProperty, value);
-        }
-
-        public static readonly DependencyProperty FooterStringFormatProperty = DependencyProperty.Register(
-            "FooterStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
-
-        [Bindable(true), Category("Content")]
-        public string FooterStringFormat
-        {
-            get => (string) GetValue(FooterStringFormatProperty);
-            set => SetValue(FooterStringFormatProperty, value);
-        }
+        get => GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
     }
-}
+
+    public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+        "HeaderTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
+
+    [Bindable(true), Category("Content")]
+    public DataTemplate HeaderTemplate
+    {
+        get => (DataTemplate) GetValue(HeaderTemplateProperty);
+        set => SetValue(HeaderTemplateProperty, value);
+    }
+
+    public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
+        "HeaderTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
+
+    [Bindable(true), Category("Content")]
+    public DataTemplateSelector HeaderTemplateSelector
+    {
+        get => (DataTemplateSelector) GetValue(HeaderTemplateSelectorProperty);
+        set => SetValue(HeaderTemplateSelectorProperty, value);
+    }
+
+    public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
+        "HeaderStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
+
+    [Bindable(true), Category("Content")]
+    public string HeaderStringFormat
+    {
+        get => (string) GetValue(HeaderStringFormatProperty);
+        set => SetValue(HeaderStringFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty FooterProperty = DependencyProperty.Register(
+        "Footer", typeof(object), typeof(Card), new PropertyMetadata(default(object)));
+
+    public object Footer
+    {
+        get => GetValue(FooterProperty);
+        set => SetValue(FooterProperty, value);
+    }
+
+    public static readonly DependencyProperty FooterTemplateProperty = DependencyProperty.Register(
+        "FooterTemplate", typeof(DataTemplate), typeof(Card), new PropertyMetadata(default(DataTemplate)));
+
+    [Bindable(true), Category("Content")]
+    public DataTemplate FooterTemplate
+    {
+        get => (DataTemplate) GetValue(FooterTemplateProperty);
+        set => SetValue(FooterTemplateProperty, value);
+    }
+
+    public static readonly DependencyProperty FooterTemplateSelectorProperty = DependencyProperty.Register(
+        "FooterTemplateSelector", typeof(DataTemplateSelector), typeof(Card), new PropertyMetadata(default(DataTemplateSelector)));
+
+    [Bindable(true), Category("Content")]
+    public DataTemplateSelector FooterTemplateSelector
+    {
+        get => (DataTemplateSelector) GetValue(FooterTemplateSelectorProperty);
+        set => SetValue(FooterTemplateSelectorProperty, value);
+    }
+
+    public static readonly DependencyProperty FooterStringFormatProperty = DependencyProperty.Register(
+        "FooterStringFormat", typeof(string), typeof(Card), new PropertyMetadata(default(string)));
+
+    [Bindable(true), Category("Content")]
+    public string FooterStringFormat
+    {
+        get => (string) GetValue(FooterStringFormatProperty);
+        set => SetValue(FooterStringFormatProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
index dbb903eb..a75994e6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
@@ -2,45 +2,44 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ChatBubble : SelectableItem
 {
-    public class ChatBubble : SelectableItem
+    public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
+        "Role", typeof(ChatRoleType), typeof(ChatBubble), new PropertyMetadata(default(ChatRoleType)));
+
+    public ChatRoleType Role
     {
-        public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
-            "Role", typeof(ChatRoleType), typeof(ChatBubble), new PropertyMetadata(default(ChatRoleType)));
-
-        public ChatRoleType Role
-        {
-            get => (ChatRoleType) GetValue(RoleProperty);
-            set => SetValue(RoleProperty, value);
-        }
-
-        public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
-            "Type", typeof(ChatMessageType), typeof(ChatBubble), new PropertyMetadata(default(ChatMessageType)));
-
-        public ChatMessageType Type
-        {
-            get => (ChatMessageType) GetValue(TypeProperty);
-            set => SetValue(TypeProperty, value);
-        }
-
-        public static readonly DependencyProperty IsReadProperty = DependencyProperty.Register(
-            "IsRead", typeof(bool), typeof(ChatBubble), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsRead
-        {
-            get => (bool) GetValue(IsReadProperty);
-            set => SetValue(IsReadProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public Action<object> ReadAction { get; set; }
-
-        protected override void OnSelected(RoutedEventArgs e)
-        {
-            base.OnSelected(e);
-
-            IsRead = true;
-            ReadAction?.Invoke(Content);
-        }
+        get => (ChatRoleType) GetValue(RoleProperty);
+        set => SetValue(RoleProperty, value);
     }
-}
+
+    public static readonly DependencyProperty TypeProperty = DependencyProperty.Register(
+        "Type", typeof(ChatMessageType), typeof(ChatBubble), new PropertyMetadata(default(ChatMessageType)));
+
+    public ChatMessageType Type
+    {
+        get => (ChatMessageType) GetValue(TypeProperty);
+        set => SetValue(TypeProperty, value);
+    }
+
+    public static readonly DependencyProperty IsReadProperty = DependencyProperty.Register(
+        "IsRead", typeof(bool), typeof(ChatBubble), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsRead
+    {
+        get => (bool) GetValue(IsReadProperty);
+        set => SetValue(IsReadProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public Action<object> ReadAction { get; set; }
+
+    protected override void OnSelected(RoutedEventArgs e)
+    {
+        base.OnSelected(e);
+
+        IsRead = true;
+        ReadAction?.Invoke(Content);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs b/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
index 024e1b11..504d4adc 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
@@ -7,664 +7,663 @@ using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class DashedBorder : Decorator
 {
-    public class DashedBorder : Decorator
+    private bool _useComplexRenderCodePath;
+
+    private Pen GeometryPenCache { get; set; }
+
+    private Pen LeftPenCache { get; set; }
+
+    private Pen RightPenCache { get; set; }
+
+    private Pen TopPenCache { get; set; }
+
+    private Pen BottomPenCache { get; set; }
+
+    private StreamGeometry BackgroundGeometryCache { get; set; }
+
+    private StreamGeometry BorderGeometryCache { get; set; }
+
+    private static void OnClearPenCache(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        private bool _useComplexRenderCodePath;
+        var border = (DashedBorder) d;
+        border.LeftPenCache = null;
+        border.RightPenCache = null;
+        border.TopPenCache = null;
+        border.BottomPenCache = null;
+        border.GeometryPenCache = null;
+    }
 
-        private Pen GeometryPenCache { get; set; }
+    public static readonly DependencyProperty BorderThicknessProperty = DependencyProperty.Register(
+        "BorderThickness", typeof(Thickness), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Thickness),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+            OnClearPenCache));
 
-        private Pen LeftPenCache { get; set; }
+    public Thickness BorderThickness
+    {
+        get => (Thickness) GetValue(BorderThicknessProperty);
+        set => SetValue(BorderThicknessProperty, value);
+    }
 
-        private Pen RightPenCache { get; set; }
+    public static readonly DependencyProperty BorderDashThicknessProperty = DependencyProperty.Register(
+        "BorderDashThickness", typeof(double), typeof(DashedBorder), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+            OnClearPenCache));
 
-        private Pen TopPenCache { get; set; }
+    public double BorderDashThickness
+    {
+        get => (double) GetValue(BorderDashThicknessProperty);
+        set => SetValue(BorderDashThicknessProperty, value);
+    }
 
-        private Pen BottomPenCache { get; set; }
+    public static readonly DependencyProperty PaddingProperty = DependencyProperty.Register(
+        "Padding", typeof(Thickness), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Thickness),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender));
 
-        private StreamGeometry BackgroundGeometryCache { get; set; }
+    public Thickness Padding
+    {
+        get => (Thickness) GetValue(PaddingProperty);
+        set => SetValue(PaddingProperty, value);
+    }
 
-        private StreamGeometry BorderGeometryCache { get; set; }
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
+        "CornerRadius", typeof(CornerRadius), typeof(DashedBorder), new FrameworkPropertyMetadata(default(CornerRadius),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender));
 
-        private static void OnClearPenCache(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    public CornerRadius CornerRadius
+    {
+        get => (CornerRadius) GetValue(CornerRadiusProperty);
+        set => SetValue(CornerRadiusProperty, value);
+    }
+
+    public static readonly DependencyProperty BorderBrushProperty = DependencyProperty.Register(
+        "BorderBrush", typeof(Brush), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Brush),
+            FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.SubPropertiesDoNotAffectRender,
+            OnClearPenCache));
+
+    public Brush BorderBrush
+    {
+        get => (Brush) GetValue(BorderBrushProperty);
+        set => SetValue(BorderBrushProperty, value);
+    }
+
+    public static readonly DependencyProperty BackgroundProperty = DependencyProperty.Register(
+        "Background", typeof(Brush), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Brush),
+            FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.SubPropertiesDoNotAffectRender,
+            OnClearPenCache));
+
+    public Brush Background
+    {
+        get => (Brush) GetValue(BackgroundProperty);
+        set => SetValue(BackgroundProperty, value);
+    }
+
+    public static readonly DependencyProperty BorderDashArrayProperty = DependencyProperty.Register(
+        "BorderDashArray", typeof(DoubleCollection), typeof(DashedBorder), new FrameworkPropertyMetadata(default(DoubleCollection),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+            OnClearPenCache));
+
+    public DoubleCollection BorderDashArray
+    {
+        get => (DoubleCollection) GetValue(BorderDashArrayProperty);
+        set => SetValue(BorderDashArrayProperty, value);
+    }
+
+    public static readonly DependencyProperty BorderDashCapProperty = DependencyProperty.Register(
+        "BorderDashCap", typeof(PenLineCap), typeof(DashedBorder), new FrameworkPropertyMetadata(default(PenLineCap),
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+            OnClearPenCache));
+
+    public PenLineCap BorderDashCap
+    {
+        get => (PenLineCap) GetValue(BorderDashCapProperty);
+        set => SetValue(BorderDashCapProperty, value);
+    }
+
+    public static readonly DependencyProperty BorderDashOffsetProperty = DependencyProperty.Register(
+        "BorderDashOffset", typeof(double), typeof(DashedBorder), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
+            OnClearPenCache));
+
+    public double BorderDashOffset
+    {
+        get => (double) GetValue(BorderDashOffsetProperty);
+        set => SetValue(BorderDashOffsetProperty, value);
+    }
+
+    private static Size ConvertThickness2Size(Thickness th) => new(th.Left + th.Right, th.Top + th.Bottom);
+
+    private static Rect DeflateRect(Rect rt, Thickness thick) => new(rt.Left + thick.Left,
+        rt.Top + thick.Top,
+        Math.Max(0.0, rt.Width - thick.Left - thick.Right),
+        Math.Max(0.0, rt.Height - thick.Top - thick.Bottom));
+
+    private static bool AreUniformCorners(CornerRadius borderRadii)
+    {
+        var topLeft = borderRadii.TopLeft;
+        return MathHelper.AreClose(topLeft, borderRadii.TopRight) &&
+               MathHelper.AreClose(topLeft, borderRadii.BottomLeft) &&
+               MathHelper.AreClose(topLeft, borderRadii.BottomRight);
+    }
+
+    private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, in Radii radii)
+    {
+        var topLeft = new Point(radii.LeftTop, 0);
+        var topRight = new Point(rect.Width - radii.RightTop, 0);
+        var rightTop = new Point(rect.Width, radii.TopRight);
+        var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
+        var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
+        var bottomLeft = new Point(radii.LeftBottom, rect.Height);
+        var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
+        var leftTop = new Point(0, radii.TopLeft);
+
+        //  top edge
+        if (topLeft.X > topRight.X)
         {
-            var border = (DashedBorder) d;
-            border.LeftPenCache = null;
-            border.RightPenCache = null;
-            border.TopPenCache = null;
-            border.BottomPenCache = null;
-            border.GeometryPenCache = null;
+            var v = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
+            topLeft.X = v;
+            topRight.X = v;
         }
 
-        public static readonly DependencyProperty BorderThicknessProperty = DependencyProperty.Register(
-            "BorderThickness", typeof(Thickness), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Thickness),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                OnClearPenCache));
-
-        public Thickness BorderThickness
+        //  right edge
+        if (rightTop.Y > rightBottom.Y)
         {
-            get => (Thickness) GetValue(BorderThicknessProperty);
-            set => SetValue(BorderThicknessProperty, value);
+            var v = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
+            rightTop.Y = v;
+            rightBottom.Y = v;
         }
 
-        public static readonly DependencyProperty BorderDashThicknessProperty = DependencyProperty.Register(
-            "BorderDashThickness", typeof(double), typeof(DashedBorder), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                OnClearPenCache));
-
-        public double BorderDashThickness
+        //  bottom edge
+        if (bottomRight.X < bottomLeft.X)
         {
-            get => (double) GetValue(BorderDashThicknessProperty);
-            set => SetValue(BorderDashThicknessProperty, value);
+            var v = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
+            bottomRight.X = v;
+            bottomLeft.X = v;
         }
 
-        public static readonly DependencyProperty PaddingProperty = DependencyProperty.Register(
-            "Padding", typeof(Thickness), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Thickness),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public Thickness Padding
+        //  left edge
+        if (leftBottom.Y < leftTop.Y)
         {
-            get => (Thickness) GetValue(PaddingProperty);
-            set => SetValue(PaddingProperty, value);
+            var v = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
+            leftBottom.Y = v;
+            leftTop.Y = v;
         }
 
-        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
-            "CornerRadius", typeof(CornerRadius), typeof(DashedBorder), new FrameworkPropertyMetadata(default(CornerRadius),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender));
+        //  add on offsets
+        var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
+        topLeft += offset;
+        topRight += offset;
+        rightTop += offset;
+        rightBottom += offset;
+        bottomRight += offset;
+        bottomLeft += offset;
+        leftBottom += offset;
+        leftTop += offset;
 
-        public CornerRadius CornerRadius
+        //  create the border geometry
+        ctx.BeginFigure(topLeft, true, true);
+
+        //  Top line
+        ctx.LineTo(topRight, true, false);
+
+        //  Upper-right corner
+        var radiusX = rect.TopRight.X - topRight.X;
+        var radiusY = rightTop.Y - rect.TopRight.Y;
+        if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
         {
-            get => (CornerRadius) GetValue(CornerRadiusProperty);
-            set => SetValue(CornerRadiusProperty, value);
+            ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
         }
 
-        public static readonly DependencyProperty BorderBrushProperty = DependencyProperty.Register(
-            "BorderBrush", typeof(Brush), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Brush),
-                FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.SubPropertiesDoNotAffectRender,
-                OnClearPenCache));
+        //  Right line
+        ctx.LineTo(rightBottom, true, false);
 
-        public Brush BorderBrush
+        //  Lower-right corner
+        radiusX = rect.BottomRight.X - bottomRight.X;
+        radiusY = rect.BottomRight.Y - rightBottom.Y;
+        if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
         {
-            get => (Brush) GetValue(BorderBrushProperty);
-            set => SetValue(BorderBrushProperty, value);
+            ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
         }
 
-        public static readonly DependencyProperty BackgroundProperty = DependencyProperty.Register(
-            "Background", typeof(Brush), typeof(DashedBorder), new FrameworkPropertyMetadata(default(Brush),
-                FrameworkPropertyMetadataOptions.AffectsRender | FrameworkPropertyMetadataOptions.SubPropertiesDoNotAffectRender,
-                OnClearPenCache));
+        //  Bottom line
+        ctx.LineTo(bottomLeft, true, false);
 
-        public Brush Background
+        //  Lower-left corner
+        radiusX = bottomLeft.X - rect.BottomLeft.X;
+        radiusY = rect.BottomLeft.Y - leftBottom.Y;
+        if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
         {
-            get => (Brush) GetValue(BackgroundProperty);
-            set => SetValue(BackgroundProperty, value);
+            ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
         }
 
-        public static readonly DependencyProperty BorderDashArrayProperty = DependencyProperty.Register(
-            "BorderDashArray", typeof(DoubleCollection), typeof(DashedBorder), new FrameworkPropertyMetadata(default(DoubleCollection),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                OnClearPenCache));
+        //  Left line
+        ctx.LineTo(leftTop, true, false);
 
-        public DoubleCollection BorderDashArray
+        //  Upper-left corner
+        radiusX = topLeft.X - rect.TopLeft.X;
+        radiusY = leftTop.Y - rect.TopLeft.Y;
+        if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
         {
-            get => (DoubleCollection) GetValue(BorderDashArrayProperty);
-            set => SetValue(BorderDashArrayProperty, value);
+            ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
+        }
+    }
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var child = Child;
+        var borderThickness = BorderThickness;
+        var padding = Padding;
+
+        if (UseLayoutRounding)
+        {
+            var dpiScaleX = DpiHelper.DeviceDpiX;
+            var dpiScaleY = DpiHelper.DeviceDpiY;
+
+            borderThickness = new Thickness(
+                DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
+                DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
         }
 
-        public static readonly DependencyProperty BorderDashCapProperty = DependencyProperty.Register(
-            "BorderDashCap", typeof(PenLineCap), typeof(DashedBorder), new FrameworkPropertyMetadata(default(PenLineCap),
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                OnClearPenCache));
+        var borderSize = ConvertThickness2Size(borderThickness);
+        var paddingSize = ConvertThickness2Size(padding);
+        var mySize = new Size();
 
-        public PenLineCap BorderDashCap
+        if (child != null)
         {
-            get => (PenLineCap) GetValue(BorderDashCapProperty);
-            set => SetValue(BorderDashCapProperty, value);
+            var combined = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
+            var childConstraint = new Size(Math.Max(0.0, constraint.Width - combined.Width), Math.Max(0.0, constraint.Height - combined.Height));
+
+            child.Measure(childConstraint);
+            var childSize = child.DesiredSize;
+
+            mySize.Width = childSize.Width + combined.Width;
+            mySize.Height = childSize.Height + combined.Height;
+        }
+        else
+        {
+            mySize = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
         }
 
-        public static readonly DependencyProperty BorderDashOffsetProperty = DependencyProperty.Register(
-            "BorderDashOffset", typeof(double), typeof(DashedBorder), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure | FrameworkPropertyMetadataOptions.AffectsRender,
-                OnClearPenCache));
+        return mySize;
+    }
 
-        public double BorderDashOffset
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        var borderThickness = BorderThickness;
+
+        if (UseLayoutRounding)
         {
-            get => (double) GetValue(BorderDashOffsetProperty);
-            set => SetValue(BorderDashOffsetProperty, value);
+            var dpiScaleX = DpiHelper.DeviceDpiX;
+            var dpiScaleY = DpiHelper.DeviceDpiY;
+
+            borderThickness = new Thickness(
+                DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
+                DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
+                DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
         }
 
-        private static Size ConvertThickness2Size(Thickness th) => new(th.Left + th.Right, th.Top + th.Bottom);
+        var boundRect = new Rect(arrangeSize);
+        var innerRect = DeflateRect(boundRect, borderThickness);
 
-        private static Rect DeflateRect(Rect rt, Thickness thick) => new(rt.Left + thick.Left,
-            rt.Top + thick.Top,
-            Math.Max(0.0, rt.Width - thick.Left - thick.Right),
-            Math.Max(0.0, rt.Height - thick.Top - thick.Bottom));
-
-        private static bool AreUniformCorners(CornerRadius borderRadii)
+        var child = Child;
+        if (child != null)
         {
-            var topLeft = borderRadii.TopLeft;
-            return MathHelper.AreClose(topLeft, borderRadii.TopRight) &&
-                   MathHelper.AreClose(topLeft, borderRadii.BottomLeft) &&
-                   MathHelper.AreClose(topLeft, borderRadii.BottomRight);
-        }
-
-        private static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, in Radii radii)
-        {
-            var topLeft = new Point(radii.LeftTop, 0);
-            var topRight = new Point(rect.Width - radii.RightTop, 0);
-            var rightTop = new Point(rect.Width, radii.TopRight);
-            var rightBottom = new Point(rect.Width, rect.Height - radii.BottomRight);
-            var bottomRight = new Point(rect.Width - radii.RightBottom, rect.Height);
-            var bottomLeft = new Point(radii.LeftBottom, rect.Height);
-            var leftBottom = new Point(0, rect.Height - radii.BottomLeft);
-            var leftTop = new Point(0, radii.TopLeft);
-
-            //  top edge
-            if (topLeft.X > topRight.X)
-            {
-                var v = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
-                topLeft.X = v;
-                topRight.X = v;
-            }
-
-            //  right edge
-            if (rightTop.Y > rightBottom.Y)
-            {
-                var v = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
-                rightTop.Y = v;
-                rightBottom.Y = v;
-            }
-
-            //  bottom edge
-            if (bottomRight.X < bottomLeft.X)
-            {
-                var v = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
-                bottomRight.X = v;
-                bottomLeft.X = v;
-            }
-
-            //  left edge
-            if (leftBottom.Y < leftTop.Y)
-            {
-                var v = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
-                leftBottom.Y = v;
-                leftTop.Y = v;
-            }
-
-            //  add on offsets
-            var offset = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
-            topLeft += offset;
-            topRight += offset;
-            rightTop += offset;
-            rightBottom += offset;
-            bottomRight += offset;
-            bottomLeft += offset;
-            leftBottom += offset;
-            leftTop += offset;
-
-            //  create the border geometry
-            ctx.BeginFigure(topLeft, true, true);
-
-            //  Top line
-            ctx.LineTo(topRight, true, false);
-
-            //  Upper-right corner
-            var radiusX = rect.TopRight.X - topRight.X;
-            var radiusY = rightTop.Y - rect.TopRight.Y;
-            if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
-            {
-                ctx.ArcTo(rightTop, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
-            }
-
-            //  Right line
-            ctx.LineTo(rightBottom, true, false);
-
-            //  Lower-right corner
-            radiusX = rect.BottomRight.X - bottomRight.X;
-            radiusY = rect.BottomRight.Y - rightBottom.Y;
-            if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
-            {
-                ctx.ArcTo(bottomRight, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
-            }
-
-            //  Bottom line
-            ctx.LineTo(bottomLeft, true, false);
-
-            //  Lower-left corner
-            radiusX = bottomLeft.X - rect.BottomLeft.X;
-            radiusY = rect.BottomLeft.Y - leftBottom.Y;
-            if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
-            {
-                ctx.ArcTo(leftBottom, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
-            }
-
-            //  Left line
-            ctx.LineTo(leftTop, true, false);
-
-            //  Upper-left corner
-            radiusX = topLeft.X - rect.TopLeft.X;
-            radiusY = leftTop.Y - rect.TopLeft.Y;
-            if (!MathHelper.IsZero(radiusX) || !MathHelper.IsZero(radiusY))
-            {
-                ctx.ArcTo(topLeft, new Size(radiusX, radiusY), 0, false, SweepDirection.Clockwise, true, false);
-            }
-        }
-
-        protected override Size MeasureOverride(Size constraint)
-        {
-            var child = Child;
-            var borderThickness = BorderThickness;
             var padding = Padding;
-
-            if (UseLayoutRounding)
-            {
-                var dpiScaleX = DpiHelper.DeviceDpiX;
-                var dpiScaleY = DpiHelper.DeviceDpiY;
-
-                borderThickness = new Thickness(
-                    DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
-                    DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
-            }
-
-            var borderSize = ConvertThickness2Size(borderThickness);
-            var paddingSize = ConvertThickness2Size(padding);
-            var mySize = new Size();
-
-            if (child != null)
-            {
-                var combined = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
-                var childConstraint = new Size(Math.Max(0.0, constraint.Width - combined.Width), Math.Max(0.0, constraint.Height - combined.Height));
-
-                child.Measure(childConstraint);
-                var childSize = child.DesiredSize;
-
-                mySize.Width = childSize.Width + combined.Width;
-                mySize.Height = childSize.Height + combined.Height;
-            }
-            else
-            {
-                mySize = new Size(borderSize.Width + paddingSize.Width, borderSize.Height + paddingSize.Height);
-            }
-
-            return mySize;
+            var childRect = DeflateRect(innerRect, padding);
+            child.Arrange(childRect);
         }
 
-        protected override Size ArrangeOverride(Size arrangeSize)
+        var radii = CornerRadius;
+        var borderBrush = BorderBrush;
+        var uniformCorners = AreUniformCorners(radii);
+
+        _useComplexRenderCodePath = !uniformCorners;
+        if (!_useComplexRenderCodePath && borderBrush != null)
         {
-            var borderThickness = BorderThickness;
+            _useComplexRenderCodePath = !MathHelper.IsZero(radii.TopLeft) && !borderThickness.IsUniform();
+        }
 
-            if (UseLayoutRounding)
+        if (_useComplexRenderCodePath)
+        {
+            var innerRadii = new Radii(radii, borderThickness, false);
+            StreamGeometry backgroundGeometry = null;
+
+            if (!MathHelper.IsZero(innerRect.Width) && !MathHelper.IsZero(innerRect.Height))
             {
-                var dpiScaleX = DpiHelper.DeviceDpiX;
-                var dpiScaleY = DpiHelper.DeviceDpiY;
+                backgroundGeometry = new StreamGeometry();
 
-                borderThickness = new Thickness(
-                    DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY),
-                    DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
-                    DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
-            }
-
-            var boundRect = new Rect(arrangeSize);
-            var innerRect = DeflateRect(boundRect, borderThickness);
-
-            var child = Child;
-            if (child != null)
-            {
-                var padding = Padding;
-                var childRect = DeflateRect(innerRect, padding);
-                child.Arrange(childRect);
-            }
-
-            var radii = CornerRadius;
-            var borderBrush = BorderBrush;
-            var uniformCorners = AreUniformCorners(radii);
-
-            _useComplexRenderCodePath = !uniformCorners;
-            if (!_useComplexRenderCodePath && borderBrush != null)
-            {
-                _useComplexRenderCodePath = !MathHelper.IsZero(radii.TopLeft) && !borderThickness.IsUniform();
-            }
-
-            if (_useComplexRenderCodePath)
-            {
-                var innerRadii = new Radii(radii, borderThickness, false);
-                StreamGeometry backgroundGeometry = null;
-
-                if (!MathHelper.IsZero(innerRect.Width) && !MathHelper.IsZero(innerRect.Height))
+                using (var ctx = backgroundGeometry.Open())
                 {
-                    backgroundGeometry = new StreamGeometry();
-
-                    using (var ctx = backgroundGeometry.Open())
-                    {
-                        GenerateGeometry(ctx, innerRect, innerRadii);
-                    }
-
-                    backgroundGeometry.Freeze();
-                    BackgroundGeometryCache = backgroundGeometry;
-                }
-                else
-                {
-                    BackgroundGeometryCache = null;
+                    GenerateGeometry(ctx, innerRect, innerRadii);
                 }
 
-                if (!MathHelper.IsZero(boundRect.Width) && !MathHelper.IsZero(boundRect.Height))
-                {
-                    var outerRadii = new Radii(radii, borderThickness, true);
-                    var borderGeometry = new StreamGeometry();
-
-                    using (var ctx = borderGeometry.Open())
-                    {
-                        GenerateGeometry(ctx, boundRect, outerRadii);
-
-                        if (backgroundGeometry != null)
-                        {
-                            GenerateGeometry(ctx, innerRect, innerRadii);
-                        }
-                    }
-
-                    borderGeometry.Freeze();
-                    BorderGeometryCache = borderGeometry;
-                }
-                else
-                {
-                    BorderGeometryCache = null;
-                }
+                backgroundGeometry.Freeze();
+                BackgroundGeometryCache = backgroundGeometry;
             }
             else
             {
                 BackgroundGeometryCache = null;
-                BorderGeometryCache = null;
             }
 
-            return arrangeSize;
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var background = Background;
-            var borderBrush = BorderBrush;
-            var useLayoutRounding = UseLayoutRounding;
-
-            if (_useComplexRenderCodePath)
+            if (!MathHelper.IsZero(boundRect.Width) && !MathHelper.IsZero(boundRect.Height))
             {
-                var borderGeometry = BorderGeometryCache;
-                if (borderGeometry != null && borderBrush != null)
+                var outerRadii = new Radii(radii, borderThickness, true);
+                var borderGeometry = new StreamGeometry();
+
+                using (var ctx = borderGeometry.Open())
                 {
-                    var pen = GeometryPenCache;
-                    if (pen == null)
+                    GenerateGeometry(ctx, boundRect, outerRadii);
+
+                    if (backgroundGeometry != null)
                     {
-                        pen = new Pen
-                        {
-                            Brush = borderBrush,
-                            Thickness = BorderDashThickness,
-                            DashCap = BorderDashCap,
-                            DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
-                        };
-
-                        if (borderBrush.IsFrozen)
-                        {
-                            pen.Freeze();
-                        }
-
-                        GeometryPenCache = pen;
+                        GenerateGeometry(ctx, innerRect, innerRadii);
                     }
-
-                    drawingContext.DrawGeometry(null, pen, borderGeometry);
                 }
 
-                var backgroundGeometry = BackgroundGeometryCache;
-                if (backgroundGeometry != null && background != null)
-                {
-                    drawingContext.DrawGeometry(background, null, backgroundGeometry);
-                }
+                borderGeometry.Freeze();
+                BorderGeometryCache = borderGeometry;
             }
             else
             {
-                var dpiScaleX = DpiHelper.DeviceDpiX;
-                var dpiScaleY = DpiHelper.DeviceDpiY;
-
-                var borderThickness = BorderThickness;
-                var cornerRadius = CornerRadius;
-                var outerCornerRadius = cornerRadius.TopLeft;
-                var roundedCorners = !MathHelper.IsZero(outerCornerRadius);
-
-                if (!borderThickness.IsZero() && borderBrush != null)
-                {
-                    var pen = LeftPenCache;
-                    if (pen == null)
-                    {
-                        pen = new Pen
-                        {
-                            Brush = borderBrush,
-                            Thickness = useLayoutRounding
-                                ? DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX)
-                                : borderThickness.Left,
-                            DashCap = BorderDashCap,
-                            DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
-                        };
-
-                        if (borderBrush.IsFrozen)
-                        {
-                            pen.Freeze();
-                        }
-
-                        LeftPenCache = pen;
-                    }
-
-                    double halfThickness;
-                    var renderSize = RenderSize;
-
-                    if (borderThickness.IsUniform())
-                    {
-                        halfThickness = pen.Thickness * 0.5;
-                        var rect = new Rect(new Point(halfThickness, halfThickness), new Point(renderSize.Width - halfThickness, renderSize.Height - halfThickness));
-
-                        if (roundedCorners)
-                        {
-                            drawingContext.DrawRoundedRectangle(null, pen, rect, outerCornerRadius, outerCornerRadius);
-                        }
-                        else
-                        {
-                            drawingContext.DrawRectangle(null, pen, rect);
-                        }
-                    }
-                    else
-                    {
-                        if (MathHelper.GreaterThan(borderThickness.Left, 0))
-                        {
-                            halfThickness = pen.Thickness * 0.5;
-                            drawingContext.DrawLine(pen, new Point(halfThickness, 0), new Point(halfThickness, renderSize.Height));
-                        }
-
-                        if (MathHelper.GreaterThan(borderThickness.Right, 0))
-                        {
-                            pen = RightPenCache;
-                            if (pen == null)
-                            {
-                                pen = new Pen
-                                {
-                                    Brush = borderBrush,
-                                    Thickness = useLayoutRounding
-                                        ? DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX)
-                                        : borderThickness.Right,
-                                    DashCap = BorderDashCap,
-                                    DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
-                                };
-
-                                if (borderBrush.IsFrozen)
-                                {
-                                    pen.Freeze();
-                                }
-
-                                RightPenCache = pen;
-                            }
-
-                            halfThickness = pen.Thickness * 0.5;
-                            drawingContext.DrawLine(pen, new Point(renderSize.Width - halfThickness, 0), new Point(renderSize.Width - halfThickness, renderSize.Height));
-                        }
-
-                        if (MathHelper.GreaterThan(borderThickness.Top, 0))
-                        {
-                            pen = TopPenCache;
-                            if (pen == null)
-                            {
-                                pen = new Pen
-                                {
-                                    Brush = borderBrush,
-                                    Thickness = useLayoutRounding
-                                        ? DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY)
-                                        : borderThickness.Top,
-                                    DashCap = BorderDashCap,
-                                    DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
-                                };
-
-                                if (borderBrush.IsFrozen)
-                                {
-                                    pen.Freeze();
-                                }
-
-                                TopPenCache = pen;
-                            }
-
-                            halfThickness = pen.Thickness * 0.5;
-                            drawingContext.DrawLine(pen, new Point(0, halfThickness), new Point(renderSize.Width, halfThickness));
-                        }
-
-                        if (MathHelper.GreaterThan(borderThickness.Bottom, 0))
-                        {
-                            pen = BottomPenCache;
-                            if (pen == null)
-                            {
-                                pen = new Pen
-                                {
-                                    Brush = borderBrush,
-                                    Thickness = useLayoutRounding
-                                        ? DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY)
-                                        : borderThickness.Bottom,
-                                    DashCap = BorderDashCap,
-                                    DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
-                                };
-
-                                if (borderBrush.IsFrozen)
-                                {
-                                    pen.Freeze();
-                                }
-
-                                BottomPenCache = pen;
-                            }
-
-                            halfThickness = pen.Thickness * 0.5;
-                            drawingContext.DrawLine(pen, new Point(0, renderSize.Height - halfThickness), new Point(renderSize.Width, renderSize.Height - halfThickness));
-                        }
-                    }
-                }
-
-                if (background != null)
-                {
-                    Point ptTL, ptBR;
-
-                    if (useLayoutRounding)
-                    {
-                        ptTL = new Point(DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX), DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY));
-                        ptBR = new Point(RenderSize.Width - DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
-                            RenderSize.Height - DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
-                    }
-                    else
-                    {
-                        ptTL = new Point(borderThickness.Left, borderThickness.Top);
-                        ptBR = new Point(RenderSize.Width - borderThickness.Right, RenderSize.Height - borderThickness.Bottom);
-                    }
-
-                    if (ptBR.X > ptTL.X && ptBR.Y > ptTL.Y)
-                    {
-                        if (roundedCorners)
-                        {
-                            var innerRadii = new Radii(cornerRadius, borderThickness, false);
-                            var innerCornerRadius = innerRadii.TopLeft;
-                            drawingContext.DrawRoundedRectangle(background, null, new Rect(ptTL, ptBR), innerCornerRadius, innerCornerRadius);
-                        }
-                        else
-                        {
-                            drawingContext.DrawRectangle(background, null, new Rect(ptTL, ptBR));
-                        }
-                    }
-                }
+                BorderGeometryCache = null;
             }
         }
-
-        private readonly struct Radii
+        else
         {
-            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;
+            BackgroundGeometryCache = null;
+            BorderGeometryCache = null;
+        }
 
-                if (outer)
+        return arrangeSize;
+    }
+
+    protected override void OnRender(DrawingContext drawingContext)
+    {
+        var background = Background;
+        var borderBrush = BorderBrush;
+        var useLayoutRounding = UseLayoutRounding;
+
+        if (_useComplexRenderCodePath)
+        {
+            var borderGeometry = BorderGeometryCache;
+            if (borderGeometry != null && borderBrush != null)
+            {
+                var pen = GeometryPenCache;
+                if (pen == null)
                 {
-                    if (MathHelper.IsZero(radii.TopLeft))
+                    pen = new Pen
                     {
-                        LeftTop = TopLeft = 0.0;
+                        Brush = borderBrush,
+                        Thickness = BorderDashThickness,
+                        DashCap = BorderDashCap,
+                        DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
+                    };
+
+                    if (borderBrush.IsFrozen)
+                    {
+                        pen.Freeze();
+                    }
+
+                    GeometryPenCache = pen;
+                }
+
+                drawingContext.DrawGeometry(null, pen, borderGeometry);
+            }
+
+            var backgroundGeometry = BackgroundGeometryCache;
+            if (backgroundGeometry != null && background != null)
+            {
+                drawingContext.DrawGeometry(background, null, backgroundGeometry);
+            }
+        }
+        else
+        {
+            var dpiScaleX = DpiHelper.DeviceDpiX;
+            var dpiScaleY = DpiHelper.DeviceDpiY;
+
+            var borderThickness = BorderThickness;
+            var cornerRadius = CornerRadius;
+            var outerCornerRadius = cornerRadius.TopLeft;
+            var roundedCorners = !MathHelper.IsZero(outerCornerRadius);
+
+            if (!borderThickness.IsZero() && borderBrush != null)
+            {
+                var pen = LeftPenCache;
+                if (pen == null)
+                {
+                    pen = new Pen
+                    {
+                        Brush = borderBrush,
+                        Thickness = useLayoutRounding
+                            ? DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX)
+                            : borderThickness.Left,
+                        DashCap = BorderDashCap,
+                        DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
+                    };
+
+                    if (borderBrush.IsFrozen)
+                    {
+                        pen.Freeze();
+                    }
+
+                    LeftPenCache = pen;
+                }
+
+                double halfThickness;
+                var renderSize = RenderSize;
+
+                if (borderThickness.IsUniform())
+                {
+                    halfThickness = pen.Thickness * 0.5;
+                    var rect = new Rect(new Point(halfThickness, halfThickness), new Point(renderSize.Width - halfThickness, renderSize.Height - halfThickness));
+
+                    if (roundedCorners)
+                    {
+                        drawingContext.DrawRoundedRectangle(null, pen, rect, outerCornerRadius, outerCornerRadius);
                     }
                     else
                     {
-                        LeftTop = radii.TopLeft + left;
-                        TopLeft = radii.TopLeft + top;
-                    }
-                    if (MathHelper.IsZero(radii.TopRight))
-                    {
-                        TopRight = RightTop = 0.0;
-                    }
-                    else
-                    {
-                        TopRight = radii.TopRight + top;
-                        RightTop = radii.TopRight + right;
-                    }
-                    if (MathHelper.IsZero(radii.BottomRight))
-                    {
-                        RightBottom = BottomRight = 0.0;
-                    }
-                    else
-                    {
-                        RightBottom = radii.BottomRight + right;
-                        BottomRight = radii.BottomRight + bottom;
-                    }
-                    if (MathHelper.IsZero(radii.BottomLeft))
-                    {
-                        BottomLeft = LeftBottom = 0.0;
-                    }
-                    else
-                    {
-                        BottomLeft = radii.BottomLeft + bottom;
-                        LeftBottom = radii.BottomLeft + left;
+                        drawingContext.DrawRectangle(null, pen, rect);
                     }
                 }
                 else
                 {
-                    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);
+                    if (MathHelper.GreaterThan(borderThickness.Left, 0))
+                    {
+                        halfThickness = pen.Thickness * 0.5;
+                        drawingContext.DrawLine(pen, new Point(halfThickness, 0), new Point(halfThickness, renderSize.Height));
+                    }
+
+                    if (MathHelper.GreaterThan(borderThickness.Right, 0))
+                    {
+                        pen = RightPenCache;
+                        if (pen == null)
+                        {
+                            pen = new Pen
+                            {
+                                Brush = borderBrush,
+                                Thickness = useLayoutRounding
+                                    ? DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX)
+                                    : borderThickness.Right,
+                                DashCap = BorderDashCap,
+                                DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
+                            };
+
+                            if (borderBrush.IsFrozen)
+                            {
+                                pen.Freeze();
+                            }
+
+                            RightPenCache = pen;
+                        }
+
+                        halfThickness = pen.Thickness * 0.5;
+                        drawingContext.DrawLine(pen, new Point(renderSize.Width - halfThickness, 0), new Point(renderSize.Width - halfThickness, renderSize.Height));
+                    }
+
+                    if (MathHelper.GreaterThan(borderThickness.Top, 0))
+                    {
+                        pen = TopPenCache;
+                        if (pen == null)
+                        {
+                            pen = new Pen
+                            {
+                                Brush = borderBrush,
+                                Thickness = useLayoutRounding
+                                    ? DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY)
+                                    : borderThickness.Top,
+                                DashCap = BorderDashCap,
+                                DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
+                            };
+
+                            if (borderBrush.IsFrozen)
+                            {
+                                pen.Freeze();
+                            }
+
+                            TopPenCache = pen;
+                        }
+
+                        halfThickness = pen.Thickness * 0.5;
+                        drawingContext.DrawLine(pen, new Point(0, halfThickness), new Point(renderSize.Width, halfThickness));
+                    }
+
+                    if (MathHelper.GreaterThan(borderThickness.Bottom, 0))
+                    {
+                        pen = BottomPenCache;
+                        if (pen == null)
+                        {
+                            pen = new Pen
+                            {
+                                Brush = borderBrush,
+                                Thickness = useLayoutRounding
+                                    ? DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY)
+                                    : borderThickness.Bottom,
+                                DashCap = BorderDashCap,
+                                DashStyle = new DashStyle(BorderDashArray, BorderDashOffset)
+                            };
+
+                            if (borderBrush.IsFrozen)
+                            {
+                                pen.Freeze();
+                            }
+
+                            BottomPenCache = pen;
+                        }
+
+                        halfThickness = pen.Thickness * 0.5;
+                        drawingContext.DrawLine(pen, new Point(0, renderSize.Height - halfThickness), new Point(renderSize.Width, renderSize.Height - halfThickness));
+                    }
                 }
             }
 
-            internal readonly double LeftTop;
-            internal readonly double TopLeft;
-            internal readonly double TopRight;
-            internal readonly double RightTop;
-            internal readonly double RightBottom;
-            internal readonly double BottomRight;
-            internal readonly double BottomLeft;
-            internal readonly double LeftBottom;
+            if (background != null)
+            {
+                Point ptTL, ptBR;
+
+                if (useLayoutRounding)
+                {
+                    ptTL = new Point(DpiHelper.RoundLayoutValue(borderThickness.Left, dpiScaleX), DpiHelper.RoundLayoutValue(borderThickness.Top, dpiScaleY));
+                    ptBR = new Point(RenderSize.Width - DpiHelper.RoundLayoutValue(borderThickness.Right, dpiScaleX),
+                        RenderSize.Height - DpiHelper.RoundLayoutValue(borderThickness.Bottom, dpiScaleY));
+                }
+                else
+                {
+                    ptTL = new Point(borderThickness.Left, borderThickness.Top);
+                    ptBR = new Point(RenderSize.Width - borderThickness.Right, RenderSize.Height - borderThickness.Bottom);
+                }
+
+                if (ptBR.X > ptTL.X && ptBR.Y > ptTL.Y)
+                {
+                    if (roundedCorners)
+                    {
+                        var innerRadii = new Radii(cornerRadius, borderThickness, false);
+                        var innerCornerRadius = innerRadii.TopLeft;
+                        drawingContext.DrawRoundedRectangle(background, null, new Rect(ptTL, ptBR), innerCornerRadius, innerCornerRadius);
+                    }
+                    else
+                    {
+                        drawingContext.DrawRectangle(background, null, new Rect(ptTL, ptBR));
+                    }
+                }
+            }
         }
     }
-}
+
+    private readonly 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)
+            {
+                if (MathHelper.IsZero(radii.TopLeft))
+                {
+                    LeftTop = TopLeft = 0.0;
+                }
+                else
+                {
+                    LeftTop = radii.TopLeft + left;
+                    TopLeft = radii.TopLeft + top;
+                }
+                if (MathHelper.IsZero(radii.TopRight))
+                {
+                    TopRight = RightTop = 0.0;
+                }
+                else
+                {
+                    TopRight = radii.TopRight + top;
+                    RightTop = radii.TopRight + right;
+                }
+                if (MathHelper.IsZero(radii.BottomRight))
+                {
+                    RightBottom = BottomRight = 0.0;
+                }
+                else
+                {
+                    RightBottom = radii.BottomRight + right;
+                    BottomRight = radii.BottomRight + bottom;
+                }
+                if (MathHelper.IsZero(radii.BottomLeft))
+                {
+                    BottomLeft = LeftBottom = 0.0;
+                }
+                else
+                {
+                    BottomLeft = radii.BottomLeft + bottom;
+                    LeftBottom = radii.BottomLeft + left;
+                }
+            }
+            else
+            {
+                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);
+            }
+        }
+
+        internal readonly double LeftTop;
+        internal readonly double TopLeft;
+        internal readonly double TopRight;
+        internal readonly double RightTop;
+        internal readonly double RightBottom;
+        internal readonly double BottomRight;
+        internal readonly double BottomLeft;
+        internal readonly double LeftBottom;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs b/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
index ae8725f9..d5304fd8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
@@ -3,80 +3,79 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Divider : Control
 {
-    public class Divider : Control
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+        "Content", typeof(object), typeof(Divider), new PropertyMetadata(default(object)));
+
+    public object Content
     {
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
-            "Content", typeof(object), typeof(Divider), new PropertyMetadata(default(object)));
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(Divider), new PropertyMetadata(default(Orientation)));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(
-            "ContentTemplate", typeof(DataTemplate), typeof(Divider), new PropertyMetadata(default(DataTemplate)));
-
-        public DataTemplate ContentTemplate
-        {
-            get => (DataTemplate) GetValue(ContentTemplateProperty);
-            set => SetValue(ContentTemplateProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register(
-            "ContentStringFormat", typeof(string), typeof(Divider), new PropertyMetadata(default(string)));
-
-        public string ContentStringFormat
-        {
-            get => (string) GetValue(ContentStringFormatProperty);
-            set => SetValue(ContentStringFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register(
-            "ContentTemplateSelector", typeof(DataTemplateSelector), typeof(Divider), new PropertyMetadata(default(DataTemplateSelector)));
-
-        public DataTemplateSelector ContentTemplateSelector
-        {
-            get => (DataTemplateSelector) GetValue(ContentTemplateSelectorProperty);
-            set => SetValue(ContentTemplateSelectorProperty, value);
-        }
-
-        public static readonly DependencyProperty LineStrokeProperty = DependencyProperty.Register(
-            "LineStroke", typeof(Brush), typeof(Divider), new PropertyMetadata(default(Brush)));
-
-        public Brush LineStroke
-        {
-            get => (Brush) GetValue(LineStrokeProperty);
-            set => SetValue(LineStrokeProperty, value);
-        }
-
-        public static readonly DependencyProperty LineStrokeThicknessProperty = DependencyProperty.Register(
-            "LineStrokeThickness", typeof(double), typeof(Divider), new PropertyMetadata(ValueBoxes.Double1Box));
-
-        public double LineStrokeThickness
-        {
-            get => (double) GetValue(LineStrokeThicknessProperty);
-            set => SetValue(LineStrokeThicknessProperty, value);
-        }
-
-        public static readonly DependencyProperty LineStrokeDashArrayProperty = DependencyProperty.Register(
-            "LineStrokeDashArray", typeof(DoubleCollection), typeof(Divider), new PropertyMetadata(new DoubleCollection()));
-
-        public DoubleCollection LineStrokeDashArray
-        {
-            get => (DoubleCollection) GetValue(LineStrokeDashArrayProperty);
-            set => SetValue(LineStrokeDashArrayProperty, value);
-        }
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
     }
-}
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(Divider), new PropertyMetadata(default(Orientation)));
+
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(
+        "ContentTemplate", typeof(DataTemplate), typeof(Divider), new PropertyMetadata(default(DataTemplate)));
+
+    public DataTemplate ContentTemplate
+    {
+        get => (DataTemplate) GetValue(ContentTemplateProperty);
+        set => SetValue(ContentTemplateProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register(
+        "ContentStringFormat", typeof(string), typeof(Divider), new PropertyMetadata(default(string)));
+
+    public string ContentStringFormat
+    {
+        get => (string) GetValue(ContentStringFormatProperty);
+        set => SetValue(ContentStringFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register(
+        "ContentTemplateSelector", typeof(DataTemplateSelector), typeof(Divider), new PropertyMetadata(default(DataTemplateSelector)));
+
+    public DataTemplateSelector ContentTemplateSelector
+    {
+        get => (DataTemplateSelector) GetValue(ContentTemplateSelectorProperty);
+        set => SetValue(ContentTemplateSelectorProperty, value);
+    }
+
+    public static readonly DependencyProperty LineStrokeProperty = DependencyProperty.Register(
+        "LineStroke", typeof(Brush), typeof(Divider), new PropertyMetadata(default(Brush)));
+
+    public Brush LineStroke
+    {
+        get => (Brush) GetValue(LineStrokeProperty);
+        set => SetValue(LineStrokeProperty, value);
+    }
+
+    public static readonly DependencyProperty LineStrokeThicknessProperty = DependencyProperty.Register(
+        "LineStrokeThickness", typeof(double), typeof(Divider), new PropertyMetadata(ValueBoxes.Double1Box));
+
+    public double LineStrokeThickness
+    {
+        get => (double) GetValue(LineStrokeThicknessProperty);
+        set => SetValue(LineStrokeThicknessProperty, value);
+    }
+
+    public static readonly DependencyProperty LineStrokeDashArrayProperty = DependencyProperty.Register(
+        "LineStrokeDashArray", typeof(DoubleCollection), typeof(Divider), new PropertyMetadata(new DoubleCollection()));
+
+    public DoubleCollection LineStrokeDashArray
+    {
+        get => (DoubleCollection) GetValue(LineStrokeDashArrayProperty);
+        set => SetValue(LineStrokeDashArrayProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
index e2e05252..f0e5d9d7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
@@ -2,35 +2,34 @@
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Empty : ContentControl
 {
-    public class Empty : ContentControl
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+        "Description", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+    public object Description
     {
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-            "Description", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
-
-        public object Description
-        {
-            get => GetValue(DescriptionProperty);
-            set => SetValue(DescriptionProperty, value);
-        }
-
-        public static readonly DependencyProperty LogoProperty = DependencyProperty.Register(
-            "Logo", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
-
-        public object Logo
-        {
-            get => GetValue(LogoProperty);
-            set => SetValue(LogoProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowEmptyProperty = DependencyProperty.RegisterAttached(
-            "ShowEmpty", typeof(bool), typeof(Empty), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetShowEmpty(DependencyObject element, bool value)
-            => element.SetValue(ShowEmptyProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowEmpty(DependencyObject element)
-            => (bool) element.GetValue(ShowEmptyProperty);
+        get => GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
     }
-}
+
+    public static readonly DependencyProperty LogoProperty = DependencyProperty.Register(
+        "Logo", typeof(object), typeof(Empty), new PropertyMetadata(default(object)));
+
+    public object Logo
+    {
+        get => GetValue(LogoProperty);
+        set => SetValue(LogoProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowEmptyProperty = DependencyProperty.RegisterAttached(
+        "ShowEmpty", typeof(bool), typeof(Empty), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetShowEmpty(DependencyObject element, bool value)
+        => element.SetValue(ShowEmptyProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowEmpty(DependencyObject element)
+        => (bool) element.GetValue(ShowEmptyProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
index 7ab0c0c3..4d564d12 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
@@ -5,96 +5,95 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class GotoTop : Button
 {
-    public class GotoTop : Button
+    private Action _gotoTopAction;
+
+    private System.Windows.Controls.ScrollViewer _scrollViewer;
+
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
+        "Target", typeof(DependencyObject), typeof(GotoTop), new PropertyMetadata(default(DependencyObject)));
+
+    public DependencyObject Target
     {
-        private Action _gotoTopAction;
+        get => (DependencyObject) GetValue(TargetProperty);
+        set => SetValue(TargetProperty, value);
+    }
 
-        private System.Windows.Controls.ScrollViewer _scrollViewer;
+    public GotoTop() => Loaded += (s, e) => CreateGotoAction(Target);
 
-        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register(
-            "Target", typeof(DependencyObject), typeof(GotoTop), new PropertyMetadata(default(DependencyObject)));
-
-        public DependencyObject Target
+    public virtual void CreateGotoAction(DependencyObject obj)
+    {
+        if (_scrollViewer != null)
         {
-            get => (DependencyObject) GetValue(TargetProperty);
-            set => SetValue(TargetProperty, value);
+            _scrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
         }
-
-        public GotoTop() => Loaded += (s, e) => CreateGotoAction(Target);
-
-        public virtual void CreateGotoAction(DependencyObject obj)
+        _scrollViewer = VisualHelper.GetChild<System.Windows.Controls.ScrollViewer>(obj);
+        if (_scrollViewer != null)
         {
-            if (_scrollViewer != null)
+            _scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
+
+            if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsInertiaEnabled)
             {
-                _scrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
+                _gotoTopAction = () => scrollViewerHandy.ScrollToTopInternal(AnimationTime);
             }
-            _scrollViewer = VisualHelper.GetChild<System.Windows.Controls.ScrollViewer>(obj);
-            if (_scrollViewer != null)
+            else
             {
-                _scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
-
-                if (_scrollViewer is ScrollViewer scrollViewerHandy && Animated && scrollViewerHandy.IsInertiaEnabled)
-                {
-                    _gotoTopAction = () => scrollViewerHandy.ScrollToTopInternal(AnimationTime);
-                }
-                else
-                {
-                    _gotoTopAction = () => _scrollViewer.ScrollToTop();
-                }
+                _gotoTopAction = () => _scrollViewer.ScrollToTop();
             }
         }
-
-        private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
-        {
-            if (AutoHiding)
-            {
-                this.Show(e.VerticalOffset >= HidingHeight);
-            }
-        }
-
-        public static readonly DependencyProperty AnimatedProperty = DependencyProperty.Register(
-            "Animated", typeof(bool), typeof(GotoTop), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool Animated
-        {
-            get => (bool) GetValue(AnimatedProperty);
-            set => SetValue(AnimatedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty AnimationTimeProperty = DependencyProperty.Register(
-            "AnimationTime", typeof(double), typeof(GotoTop), new PropertyMetadata(ValueBoxes.Double200Box));
-
-        public double AnimationTime
-        {
-            get => (double) GetValue(AnimationTimeProperty);
-            set => SetValue(AnimationTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty HidingHeightProperty = DependencyProperty.Register(
-            "HidingHeight", typeof(double), typeof(GotoTop), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double HidingHeight
-        {
-            get => (double) GetValue(HidingHeightProperty);
-            set => SetValue(HidingHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty AutoHidingProperty = DependencyProperty.Register(
-            "AutoHiding", typeof(bool), typeof(GotoTop), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool AutoHiding
-        {
-            get => (bool) GetValue(AutoHidingProperty);
-            set => SetValue(AutoHidingProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override void OnClick()
-        {
-            base.OnClick();
-
-            _gotoTopAction?.Invoke();
-        }
     }
-}
+
+    private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
+    {
+        if (AutoHiding)
+        {
+            this.Show(e.VerticalOffset >= HidingHeight);
+        }
+    }
+
+    public static readonly DependencyProperty AnimatedProperty = DependencyProperty.Register(
+        "Animated", typeof(bool), typeof(GotoTop), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool Animated
+    {
+        get => (bool) GetValue(AnimatedProperty);
+        set => SetValue(AnimatedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty AnimationTimeProperty = DependencyProperty.Register(
+        "AnimationTime", typeof(double), typeof(GotoTop), new PropertyMetadata(ValueBoxes.Double200Box));
+
+    public double AnimationTime
+    {
+        get => (double) GetValue(AnimationTimeProperty);
+        set => SetValue(AnimationTimeProperty, value);
+    }
+
+    public static readonly DependencyProperty HidingHeightProperty = DependencyProperty.Register(
+        "HidingHeight", typeof(double), typeof(GotoTop), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double HidingHeight
+    {
+        get => (double) GetValue(HidingHeightProperty);
+        set => SetValue(HidingHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty AutoHidingProperty = DependencyProperty.Register(
+        "AutoHiding", typeof(bool), typeof(GotoTop), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool AutoHiding
+    {
+        get => (bool) GetValue(AutoHidingProperty);
+        set => SetValue(AutoHidingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override void OnClick()
+    {
+        base.OnClick();
+
+        _gotoTopAction?.Invoke();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
index 59350328..d361f828 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
@@ -4,55 +4,54 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Gravatar : ContentControl
 {
-    public class Gravatar : ContentControl
+    public static readonly DependencyProperty GeneratorProperty = DependencyProperty.Register(
+        "Generator", typeof(IGravatarGenerator), typeof(Gravatar), new PropertyMetadata(new GithubGravatarGenerator()));
+
+    public IGravatarGenerator Generator
     {
-        public static readonly DependencyProperty GeneratorProperty = DependencyProperty.Register(
-            "Generator", typeof(IGravatarGenerator), typeof(Gravatar), new PropertyMetadata(new GithubGravatarGenerator()));
-
-        public IGravatarGenerator Generator
-        {
-            get => (IGravatarGenerator) GetValue(GeneratorProperty);
-            set => SetValue(GeneratorProperty, value);
-        }
-
-        public static readonly DependencyProperty IdProperty = DependencyProperty.Register(
-            "Id", typeof(string), typeof(Gravatar), new PropertyMetadata(default(string), OnIdChanged));
-
-        private static void OnIdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Gravatar) d;
-            if (ctl.Source != null) return;
-            ctl.Content = ctl.Generator.GetGravatar((string) e.NewValue);
-        }
-
-        public string Id
-        {
-            get => (string) GetValue(IdProperty);
-            set => SetValue(IdProperty, value);
-        }
-
-        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(ImageSource), typeof(Gravatar), new PropertyMetadata(default(ImageSource), OnSourceChanged));
-
-        private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (Gravatar) d;
-            var v = (ImageSource) e.NewValue;
-
-            ctl.Background = v != null
-                ? new ImageBrush(v)
-                {
-                    Stretch = Stretch.UniformToFill
-                }
-                : ResourceHelper.GetResourceInternal<Brush>(ResourceToken.SecondaryRegionBrush);
-        }
-
-        public ImageSource Source
-        {
-            get => (ImageSource) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
+        get => (IGravatarGenerator) GetValue(GeneratorProperty);
+        set => SetValue(GeneratorProperty, value);
     }
-}
+
+    public static readonly DependencyProperty IdProperty = DependencyProperty.Register(
+        "Id", typeof(string), typeof(Gravatar), new PropertyMetadata(default(string), OnIdChanged));
+
+    private static void OnIdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (Gravatar) d;
+        if (ctl.Source != null) return;
+        ctl.Content = ctl.Generator.GetGravatar((string) e.NewValue);
+    }
+
+    public string Id
+    {
+        get => (string) GetValue(IdProperty);
+        set => SetValue(IdProperty, value);
+    }
+
+    public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+        "Source", typeof(ImageSource), typeof(Gravatar), new PropertyMetadata(default(ImageSource), OnSourceChanged));
+
+    private static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (Gravatar) d;
+        var v = (ImageSource) e.NewValue;
+
+        ctl.Background = v != null
+            ? new ImageBrush(v)
+            {
+                Stretch = Stretch.UniformToFill
+            }
+            : ResourceHelper.GetResourceInternal<Brush>(ResourceToken.SecondaryRegionBrush);
+    }
+
+    public ImageSource Source
+    {
+        get => (ImageSource) GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
index 4b1898ef..5d51b0cb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
@@ -7,154 +7,153 @@ using HandyControl.Interactivity;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementVisualBrush, Type = typeof(VisualBrush))]
+public class Magnifier : AdornerElement
 {
-    [TemplatePart(Name = ElementVisualBrush, Type = typeof(VisualBrush))]
-    public class Magnifier : AdornerElement
+    private AdornerContainer _adornerContainer;
+
+    private Size _viewboxSize;
+
+    private const string ElementVisualBrush = "PART_VisualBrush";
+
+    private VisualBrush _visualBrush = new();
+
+    private readonly TranslateTransform _translateTransform;
+
+    public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.Register(
+        "HorizontalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double HorizontalOffset
     {
-        private AdornerContainer _adornerContainer;
+        get => (double) GetValue(HorizontalOffsetProperty);
+        set => SetValue(HorizontalOffsetProperty, value);
+    }
 
-        private Size _viewboxSize;
+    public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.Register(
+        "VerticalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
 
-        private const string ElementVisualBrush = "PART_VisualBrush";
+    public double VerticalOffset
+    {
+        get => (double) GetValue(VerticalOffsetProperty);
+        set => SetValue(VerticalOffsetProperty, value);
+    }
 
-        private VisualBrush _visualBrush = new();
+    public static Magnifier Default => new();
 
-        private readonly TranslateTransform _translateTransform;
+    public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register(
+        "Scale", typeof(double), typeof(Magnifier), new PropertyMetadata(5.0, OnScaleChanged), ValidateHelper.IsInRangeOfPosDouble);
 
-        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.Register(
-            "HorizontalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
+    private static void OnScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((Magnifier) d).UpdateViewboxSize();
 
-        public double HorizontalOffset
+    public double Scale
+    {
+        get => (double) GetValue(ScaleProperty);
+        set => SetValue(ScaleProperty, value);
+    }
+
+    public Magnifier()
+    {
+        _translateTransform = new TranslateTransform();
+        RenderTransform = _translateTransform;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        var visualBrush = GetTemplateChild(ElementVisualBrush) as VisualBrush ?? new VisualBrush();
+        visualBrush.Viewbox = _visualBrush.Viewbox;
+        _visualBrush = visualBrush;
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        UpdateViewboxSize();
+    }
+
+    private void UpdateViewboxSize() => _viewboxSize = new Size(ActualWidth / Scale, ActualHeight / Scale);
+
+    protected sealed override void OnTargetChanged(FrameworkElement element, bool isNew)
+    {
+        base.OnTargetChanged(element, isNew);
+
+        if (element == null) return;
+
+        if (!isNew)
         {
-            get => (double) GetValue(HorizontalOffsetProperty);
-            set => SetValue(HorizontalOffsetProperty, value);
+            element.MouseEnter -= Element_MouseEnter;
+            element.MouseLeave -= Element_MouseLeave;
+            element.MouseMove -= Element_MouseMove;
+            ElementTarget = null;
         }
-
-        public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.Register(
-            "VerticalOffset", typeof(double), typeof(Magnifier), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double VerticalOffset
+        else
         {
-            get => (double) GetValue(VerticalOffsetProperty);
-            set => SetValue(VerticalOffsetProperty, value);
-        }
-
-        public static Magnifier Default => new();
-
-        public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register(
-            "Scale", typeof(double), typeof(Magnifier), new PropertyMetadata(5.0, OnScaleChanged), ValidateHelper.IsInRangeOfPosDouble);
-
-        private static void OnScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) => ((Magnifier) d).UpdateViewboxSize();
-
-        public double Scale
-        {
-            get => (double) GetValue(ScaleProperty);
-            set => SetValue(ScaleProperty, value);
-        }
-
-        public Magnifier()
-        {
-            _translateTransform = new TranslateTransform();
-            RenderTransform = _translateTransform;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            var visualBrush = GetTemplateChild(ElementVisualBrush) as VisualBrush ?? new VisualBrush();
-            visualBrush.Viewbox = _visualBrush.Viewbox;
-            _visualBrush = visualBrush;
-        }
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            UpdateViewboxSize();
-        }
-
-        private void UpdateViewboxSize() => _viewboxSize = new Size(ActualWidth / Scale, ActualHeight / Scale);
-
-        protected sealed override void OnTargetChanged(FrameworkElement element, bool isNew)
-        {
-            base.OnTargetChanged(element, isNew);
-
-            if (element == null) return;
-
-            if (!isNew)
-            {
-                element.MouseEnter -= Element_MouseEnter;
-                element.MouseLeave -= Element_MouseLeave;
-                element.MouseMove -= Element_MouseMove;
-                ElementTarget = null;
-            }
-            else
-            {
-                element.MouseEnter += Element_MouseEnter;
-                element.MouseLeave += Element_MouseLeave;
-                element.MouseMove += Element_MouseMove;
-                ElementTarget = element;
-            }
-        }
-
-        protected override void Dispose() => HideAdornerElement();
-
-        private void UpdateLocation()
-        {
-            var targetPoint = Mouse.GetPosition(Target);
-            var subX = targetPoint.X - _visualBrush.Viewbox.Width / 2;
-            var subY = targetPoint.Y - _visualBrush.Viewbox.Height / 2;
-
-            var targetVector = VisualTreeHelper.GetOffset(Target);
-            _visualBrush.Viewbox = new Rect(new Point(subX + targetVector.X, subY + targetVector.Y), _viewboxSize);
-
-            var adornerPoint = Mouse.GetPosition(_adornerContainer);
-            _translateTransform.X = adornerPoint.X + HorizontalOffset;
-            _translateTransform.Y = adornerPoint.Y + VerticalOffset;
-        }
-
-        private void Element_MouseMove(object sender, MouseEventArgs e) => UpdateLocation();
-
-        private void Element_MouseLeave(object sender, MouseEventArgs e) => HideAdornerElement();
-
-        private void Element_MouseEnter(object sender, MouseEventArgs e) => ShowAdornerElement();
-
-        private void HideAdornerElement()
-        {
-            if (_adornerContainer == null) return;
-            var layer = AdornerLayer.GetAdornerLayer(Target);
-
-            if (layer != null)
-            {
-                layer.Remove(_adornerContainer);
-            }
-            else if (_adornerContainer is { Parent: AdornerLayer parent })
-            {
-                parent.Remove(_adornerContainer);
-            }
-
-            if (_adornerContainer != null)
-            {
-                _adornerContainer.Child = null;
-                _adornerContainer = null;
-            }
-        }
-
-        private void ShowAdornerElement()
-        {
-            if (_adornerContainer == null)
-            {
-                var layer = AdornerLayer.GetAdornerLayer(Target);
-                if (layer == null) return;
-
-                _adornerContainer = new AdornerContainer(layer)
-                {
-                    Child = this
-                };
-                layer.Add(_adornerContainer);
-            }
-            this.Show();
+            element.MouseEnter += Element_MouseEnter;
+            element.MouseLeave += Element_MouseLeave;
+            element.MouseMove += Element_MouseMove;
+            ElementTarget = element;
         }
     }
-}
+
+    protected override void Dispose() => HideAdornerElement();
+
+    private void UpdateLocation()
+    {
+        var targetPoint = Mouse.GetPosition(Target);
+        var subX = targetPoint.X - _visualBrush.Viewbox.Width / 2;
+        var subY = targetPoint.Y - _visualBrush.Viewbox.Height / 2;
+
+        var targetVector = VisualTreeHelper.GetOffset(Target);
+        _visualBrush.Viewbox = new Rect(new Point(subX + targetVector.X, subY + targetVector.Y), _viewboxSize);
+
+        var adornerPoint = Mouse.GetPosition(_adornerContainer);
+        _translateTransform.X = adornerPoint.X + HorizontalOffset;
+        _translateTransform.Y = adornerPoint.Y + VerticalOffset;
+    }
+
+    private void Element_MouseMove(object sender, MouseEventArgs e) => UpdateLocation();
+
+    private void Element_MouseLeave(object sender, MouseEventArgs e) => HideAdornerElement();
+
+    private void Element_MouseEnter(object sender, MouseEventArgs e) => ShowAdornerElement();
+
+    private void HideAdornerElement()
+    {
+        if (_adornerContainer == null) return;
+        var layer = AdornerLayer.GetAdornerLayer(Target);
+
+        if (layer != null)
+        {
+            layer.Remove(_adornerContainer);
+        }
+        else if (_adornerContainer is { Parent: AdornerLayer parent })
+        {
+            parent.Remove(_adornerContainer);
+        }
+
+        if (_adornerContainer != null)
+        {
+            _adornerContainer.Child = null;
+            _adornerContainer = null;
+        }
+    }
+
+    private void ShowAdornerElement()
+    {
+        if (_adornerContainer == null)
+        {
+            var layer = AdornerLayer.GetAdornerLayer(Target);
+            if (layer == null) return;
+
+            _adornerContainer = new AdornerContainer(layer)
+            {
+                Child = this
+            };
+            layer.Add(_adornerContainer);
+        }
+        this.Show();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
index d7f411e2..a9d54868 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
@@ -5,150 +5,149 @@ using System.Windows.Threading;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public sealed class Notification : System.Windows.Window
 {
-    public sealed class Notification : System.Windows.Window
+    private const int WaitTime = 6;
+
+    /// <summary>
+    ///     计数
+    /// </summary>
+    private int _tickCount;
+
+    /// <summary>
+    ///     关闭计时器
+    /// </summary>
+    private DispatcherTimer _timerClose;
+
+    private ShowAnimation ShowAnimation { get; set; }
+
+    private bool _shouldBeClosed;
+
+    public Notification()
     {
-        private const int WaitTime = 6;
+        WindowStyle = WindowStyle.None;
+        AllowsTransparency = true;
+    }
 
-        /// <summary>
-        ///     计数
-        /// </summary>
-        private int _tickCount;
-
-        /// <summary>
-        ///     关闭计时器
-        /// </summary>
-        private DispatcherTimer _timerClose;
-
-        private ShowAnimation ShowAnimation { get; set; }
-
-        private bool _shouldBeClosed;
-
-        public Notification()
+    public static Notification Show(object content, ShowAnimation showAnimation = ShowAnimation.None, bool staysOpen = false)
+    {
+        var notification = new Notification
         {
-            WindowStyle = WindowStyle.None;
-            AllowsTransparency = true;
+            Content = content,
+            Opacity = 0,
+            ShowAnimation = showAnimation
+        };
+
+        notification.Show();
+
+        var desktopWorkingArea = SystemParameters.WorkArea;
+        var leftMax = desktopWorkingArea.Width - notification.ActualWidth;
+        var topMax = desktopWorkingArea.Height - notification.ActualHeight;
+
+        switch (showAnimation)
+        {
+            case ShowAnimation.None:
+                notification.Opacity = 1;
+                notification.Left = leftMax;
+                notification.Top = topMax;
+                break;
+            case ShowAnimation.HorizontalMove:
+                notification.Opacity = 1;
+                notification.Left = desktopWorkingArea.Width;
+                notification.Top = topMax;
+                notification.BeginAnimation(LeftProperty, AnimationHelper.CreateAnimation(leftMax));
+                break;
+            case ShowAnimation.VerticalMove:
+                notification.Opacity = 1;
+                notification.Left = leftMax;
+                notification.Top = desktopWorkingArea.Height;
+                notification.BeginAnimation(TopProperty, AnimationHelper.CreateAnimation(topMax));
+                break;
+            case ShowAnimation.Fade:
+                notification.Left = leftMax;
+                notification.Top = topMax;
+                notification.BeginAnimation(OpacityProperty, AnimationHelper.CreateAnimation(1));
+                break;
+            default:
+                notification.Opacity = 1;
+                notification.Left = leftMax;
+                notification.Top = topMax;
+                break;
         }
 
-        public static Notification Show(object content, ShowAnimation showAnimation = ShowAnimation.None, bool staysOpen = false)
+        if (!staysOpen) notification.StartTimer();
+
+        return notification;
+    }
+
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        base.OnClosing(e);
+
+        if (_shouldBeClosed)
         {
-            var notification = new Notification
-            {
-                Content = content,
-                Opacity = 0,
-                ShowAnimation = showAnimation
-            };
-
-            notification.Show();
-
-            var desktopWorkingArea = SystemParameters.WorkArea;
-            var leftMax = desktopWorkingArea.Width - notification.ActualWidth;
-            var topMax = desktopWorkingArea.Height - notification.ActualHeight;
-
-            switch (showAnimation)
-            {
-                case ShowAnimation.None:
-                    notification.Opacity = 1;
-                    notification.Left = leftMax;
-                    notification.Top = topMax;
-                    break;
-                case ShowAnimation.HorizontalMove:
-                    notification.Opacity = 1;
-                    notification.Left = desktopWorkingArea.Width;
-                    notification.Top = topMax;
-                    notification.BeginAnimation(LeftProperty, AnimationHelper.CreateAnimation(leftMax));
-                    break;
-                case ShowAnimation.VerticalMove:
-                    notification.Opacity = 1;
-                    notification.Left = leftMax;
-                    notification.Top = desktopWorkingArea.Height;
-                    notification.BeginAnimation(TopProperty, AnimationHelper.CreateAnimation(topMax));
-                    break;
-                case ShowAnimation.Fade:
-                    notification.Left = leftMax;
-                    notification.Top = topMax;
-                    notification.BeginAnimation(OpacityProperty, AnimationHelper.CreateAnimation(1));
-                    break;
-                default:
-                    notification.Opacity = 1;
-                    notification.Left = leftMax;
-                    notification.Top = topMax;
-                    break;
-            }
-
-            if (!staysOpen) notification.StartTimer();
-
-            return notification;
+            return;
         }
+        var desktopWorkingArea = SystemParameters.WorkArea;
 
-        protected override void OnClosing(CancelEventArgs e)
+        switch (ShowAnimation)
         {
-            base.OnClosing(e);
-
-            if (_shouldBeClosed)
+            case ShowAnimation.None:
+                break;
+            case ShowAnimation.HorizontalMove:
             {
-                return;
+                var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Width);
+                animation.Completed += Animation_Completed;
+                BeginAnimation(LeftProperty, animation);
+                e.Cancel = true;
+                _shouldBeClosed = true;
             }
-            var desktopWorkingArea = SystemParameters.WorkArea;
-
-            switch (ShowAnimation)
+                break;
+            case ShowAnimation.VerticalMove:
             {
-                case ShowAnimation.None:
-                    break;
-                case ShowAnimation.HorizontalMove:
-                    {
-                        var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Width);
-                        animation.Completed += Animation_Completed;
-                        BeginAnimation(LeftProperty, animation);
-                        e.Cancel = true;
-                        _shouldBeClosed = true;
-                    }
-                    break;
-                case ShowAnimation.VerticalMove:
-                    {
-                        var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Height);
-                        animation.Completed += Animation_Completed;
-                        BeginAnimation(TopProperty, animation);
-                        e.Cancel = true;
-                        _shouldBeClosed = true;
-                    }
-                    break;
-                case ShowAnimation.Fade:
-                    {
-                        var animation = AnimationHelper.CreateAnimation(0);
-                        animation.Completed += Animation_Completed;
-                        BeginAnimation(OpacityProperty, animation);
-                        e.Cancel = true;
-                        _shouldBeClosed = true;
-                    }
-                    break;
+                var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Height);
+                animation.Completed += Animation_Completed;
+                BeginAnimation(TopProperty, animation);
+                e.Cancel = true;
+                _shouldBeClosed = true;
             }
-        }
-
-        private void Animation_Completed(object sender, EventArgs e) => Close();
-
-        /// <summary>
-        ///     开始计时器
-        /// </summary>
-        private void StartTimer()
-        {
-            _timerClose = new DispatcherTimer
+                break;
+            case ShowAnimation.Fade:
             {
-                Interval = TimeSpan.FromSeconds(1)
-            };
-            _timerClose.Tick += delegate
-            {
-                if (IsMouseOver)
-                {
-                    _tickCount = 0;
-                    return;
-                }
-
-                _tickCount++;
-                if (_tickCount >= WaitTime) Close();
-            };
-            _timerClose.Start();
+                var animation = AnimationHelper.CreateAnimation(0);
+                animation.Completed += Animation_Completed;
+                BeginAnimation(OpacityProperty, animation);
+                e.Cancel = true;
+                _shouldBeClosed = true;
+            }
+                break;
         }
     }
-}
+
+    private void Animation_Completed(object sender, EventArgs e) => Close();
+
+    /// <summary>
+    ///     开始计时器
+    /// </summary>
+    private void StartTimer()
+    {
+        _timerClose = new DispatcherTimer
+        {
+            Interval = TimeSpan.FromSeconds(1)
+        };
+        _timerClose.Tick += delegate
+        {
+            if (IsMouseOver)
+            {
+                _tickCount = 0;
+                return;
+            }
+
+            _tickCount++;
+            if (_tickCount >= WaitTime) Close();
+        };
+        _timerClose.Start();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index d6da6d11..c9d0e17c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -14,709 +14,708 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class NotifyIcon : FrameworkElement, IDisposable
 {
-    public class NotifyIcon : FrameworkElement, IDisposable
+    private bool _isMouseOver;
+
+    private bool _added;
+
+    private readonly object _syncObj = new();
+
+    private readonly int _id;
+
+    private ImageSource _icon;
+
+    private IntPtr _iconCurrentHandle;
+
+    private IntPtr _iconDefaultHandle;
+
+    private IconHandle _iconHandle;
+
+    private const int WmTrayMouseMessage = InteropValues.WM_USER + 1024;
+
+    private string _windowClassName;
+
+    private int _wmTaskbarCreated;
+
+    private IntPtr _messageWindowHandle;
+
+    private readonly InteropValues.WndProc _callback;
+
+    private Popup _contextContent;
+
+    private bool _doubleClick;
+
+    private DispatcherTimer _dispatcherTimerBlink;
+
+    private DispatcherTimer _dispatcherTimerPos;
+
+    private bool _isTransparent;
+
+    private bool _isDisposed;
+
+    private static int NextId;
+
+    private static readonly Dictionary<string, NotifyIcon> NotifyIconDic = new();
+
+    static NotifyIcon()
     {
-        private bool _isMouseOver;
+        VisibilityProperty.OverrideMetadata(typeof(NotifyIcon), new PropertyMetadata(Visibility.Visible, OnVisibilityChanged));
+        DataContextProperty.OverrideMetadata(typeof(NotifyIcon), new FrameworkPropertyMetadata(DataContextPropertyChanged));
+        ContextMenuProperty.OverrideMetadata(typeof(NotifyIcon), new FrameworkPropertyMetadata(ContextMenuPropertyChanged));
+    }
 
-        private bool _added;
+    private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NotifyIcon) d;
+        var v = (Visibility) e.NewValue;
 
-        private readonly object _syncObj = new();
-
-        private readonly int _id;
-
-        private ImageSource _icon;
-
-        private IntPtr _iconCurrentHandle;
-
-        private IntPtr _iconDefaultHandle;
-
-        private IconHandle _iconHandle;
-
-        private const int WmTrayMouseMessage = InteropValues.WM_USER + 1024;
-
-        private string _windowClassName;
-
-        private int _wmTaskbarCreated;
-
-        private IntPtr _messageWindowHandle;
-
-        private readonly InteropValues.WndProc _callback;
-
-        private Popup _contextContent;
-
-        private bool _doubleClick;
-
-        private DispatcherTimer _dispatcherTimerBlink;
-
-        private DispatcherTimer _dispatcherTimerPos;
-
-        private bool _isTransparent;
-
-        private bool _isDisposed;
-
-        private static int NextId;
-
-        private static readonly Dictionary<string, NotifyIcon> NotifyIconDic = new();
-
-        static NotifyIcon()
+        if (v == Visibility.Visible)
         {
-            VisibilityProperty.OverrideMetadata(typeof(NotifyIcon), new PropertyMetadata(Visibility.Visible, OnVisibilityChanged));
-            DataContextProperty.OverrideMetadata(typeof(NotifyIcon), new FrameworkPropertyMetadata(DataContextPropertyChanged));
-            ContextMenuProperty.OverrideMetadata(typeof(NotifyIcon), new FrameworkPropertyMetadata(ContextMenuPropertyChanged));
-        }
-
-        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (NotifyIcon) d;
-            var v = (Visibility) e.NewValue;
-
-            if (v == Visibility.Visible)
+            if (ctl._iconCurrentHandle == IntPtr.Zero)
             {
-                if (ctl._iconCurrentHandle == IntPtr.Zero)
-                {
-                    ctl.OnIconChanged();
-                }
-                ctl.UpdateIcon(true);
-            }
-            else if (ctl._iconCurrentHandle != IntPtr.Zero)
-            {
-                ctl.UpdateIcon(false);
+                ctl.OnIconChanged();
             }
+            ctl.UpdateIcon(true);
+        }
+        else if (ctl._iconCurrentHandle != IntPtr.Zero)
+        {
+            ctl.UpdateIcon(false);
+        }
+    }
+
+    private static void DataContextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((NotifyIcon) d).OnDataContextPropertyChanged(e);
+
+    private void OnDataContextPropertyChanged(DependencyPropertyChangedEventArgs e)
+    {
+        UpdateDataContext(_contextContent, e.OldValue, e.NewValue);
+        UpdateDataContext(ContextMenu, e.OldValue, e.NewValue);
+    }
+
+    private static void ContextMenuPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NotifyIcon) d;
+        ctl.OnContextMenuPropertyChanged(e);
+    }
+
+    private void OnContextMenuPropertyChanged(DependencyPropertyChangedEventArgs e) =>
+        UpdateDataContext((ContextMenu) e.NewValue, null, DataContext);
+
+    public NotifyIcon()
+    {
+        _id = ++NextId;
+        _callback = Callback;
+
+        Loaded += (s, e) => Init();
+
+        if (Application.Current != null) Application.Current.Exit += (s, e) => Dispose();
+    }
+
+    ~NotifyIcon() => Dispose(false);
+
+    public void Init()
+    {
+        RegisterClass();
+        if (Visibility == Visibility.Visible)
+        {
+            OnIconChanged();
+            UpdateIcon(true);
         }
 
-        private static void DataContextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((NotifyIcon) d).OnDataContextPropertyChanged(e);
-
-        private void OnDataContextPropertyChanged(DependencyPropertyChangedEventArgs e)
+        _dispatcherTimerPos = new DispatcherTimer
         {
-            UpdateDataContext(_contextContent, e.OldValue, e.NewValue);
-            UpdateDataContext(ContextMenu, e.OldValue, e.NewValue);
-        }
+            Interval = TimeSpan.FromMilliseconds(200)
+        };
+        _dispatcherTimerPos.Tick += DispatcherTimerPos_Tick;
+    }
 
-        private static void ContextMenuPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    public static void Register(string token, NotifyIcon notifyIcon)
+    {
+        if (string.IsNullOrEmpty(token) || notifyIcon == null) return;
+        NotifyIconDic[token] = notifyIcon;
+    }
+
+    public static void Unregister(string token, NotifyIcon notifyIcon)
+    {
+        if (string.IsNullOrEmpty(token) || notifyIcon == null) return;
+
+        if (NotifyIconDic.ContainsKey(token))
         {
-            var ctl = (NotifyIcon) d;
-            ctl.OnContextMenuPropertyChanged(e);
-        }
-
-        private void OnContextMenuPropertyChanged(DependencyPropertyChangedEventArgs e) =>
-            UpdateDataContext((ContextMenu) e.NewValue, null, DataContext);
-
-        public NotifyIcon()
-        {
-            _id = ++NextId;
-            _callback = Callback;
-
-            Loaded += (s, e) => Init();
-
-            if (Application.Current != null) Application.Current.Exit += (s, e) => Dispose();
-        }
-
-        ~NotifyIcon() => Dispose(false);
-
-        public void Init()
-        {
-            RegisterClass();
-            if (Visibility == Visibility.Visible)
-            {
-                OnIconChanged();
-                UpdateIcon(true);
-            }
-
-            _dispatcherTimerPos = new DispatcherTimer
-            {
-                Interval = TimeSpan.FromMilliseconds(200)
-            };
-            _dispatcherTimerPos.Tick += DispatcherTimerPos_Tick;
-        }
-
-        public static void Register(string token, NotifyIcon notifyIcon)
-        {
-            if (string.IsNullOrEmpty(token) || notifyIcon == null) return;
-            NotifyIconDic[token] = notifyIcon;
-        }
-
-        public static void Unregister(string token, NotifyIcon notifyIcon)
-        {
-            if (string.IsNullOrEmpty(token) || notifyIcon == null) return;
-
-            if (NotifyIconDic.ContainsKey(token))
-            {
-                if (ReferenceEquals(NotifyIconDic[token], notifyIcon))
-                {
-                    NotifyIconDic.Remove(token);
-                }
-            }
-        }
-
-        public static void Unregister(NotifyIcon notifyIcon)
-        {
-            if (notifyIcon == null) return;
-            var first = NotifyIconDic.FirstOrDefault(item => ReferenceEquals(notifyIcon, item.Value));
-            if (!string.IsNullOrEmpty(first.Key))
-            {
-                NotifyIconDic.Remove(first.Key);
-            }
-        }
-
-        public static void Unregister(string token)
-        {
-            if (string.IsNullOrEmpty(token)) return;
-
-            if (NotifyIconDic.ContainsKey(token))
+            if (ReferenceEquals(NotifyIconDic[token], notifyIcon))
             {
                 NotifyIconDic.Remove(token);
             }
         }
+    }
 
-        public static void ShowBalloonTip(string title, string content, NotifyIconInfoType infoType, string token)
+    public static void Unregister(NotifyIcon notifyIcon)
+    {
+        if (notifyIcon == null) return;
+        var first = NotifyIconDic.FirstOrDefault(item => ReferenceEquals(notifyIcon, item.Value));
+        if (!string.IsNullOrEmpty(first.Key))
         {
-            if (NotifyIconDic.TryGetValue(token, out var notifyIcon))
+            NotifyIconDic.Remove(first.Key);
+        }
+    }
+
+    public static void Unregister(string token)
+    {
+        if (string.IsNullOrEmpty(token)) return;
+
+        if (NotifyIconDic.ContainsKey(token))
+        {
+            NotifyIconDic.Remove(token);
+        }
+    }
+
+    public static void ShowBalloonTip(string title, string content, NotifyIconInfoType infoType, string token)
+    {
+        if (NotifyIconDic.TryGetValue(token, out var notifyIcon))
+        {
+            notifyIcon.ShowBalloonTip(title, content, infoType);
+        }
+    }
+
+    public void ShowBalloonTip(string title, string content, NotifyIconInfoType infoType)
+    {
+        if (!_added || DesignerHelper.IsInDesignMode) return;
+
+        var data = new InteropValues.NOTIFYICONDATA
+        {
+            uFlags = InteropValues.NIF_INFO,
+            hWnd = _messageWindowHandle,
+            uID = _id,
+            szInfoTitle = title ?? string.Empty,
+            szInfo = content ?? string.Empty
+        };
+
+        data.dwInfoFlags = infoType switch
+        {
+            NotifyIconInfoType.Info => InteropValues.NIIF_INFO,
+            NotifyIconInfoType.Warning => InteropValues.NIIF_WARNING,
+            NotifyIconInfoType.Error => InteropValues.NIIF_ERROR,
+            NotifyIconInfoType.None => InteropValues.NIIF_NONE,
+            _ => data.dwInfoFlags
+        };
+
+        InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
+    }
+
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    public void CloseContextControl()
+    {
+        if (_contextContent != null)
+        {
+            _contextContent.IsOpen = false;
+        }
+        else if (ContextMenu != null)
+        {
+            ContextMenu.IsOpen = false;
+        }
+    }
+
+    public static readonly DependencyProperty TokenProperty = DependencyProperty.Register(
+        "Token", typeof(string), typeof(NotifyIcon), new PropertyMetadata(default(string), OnTokenChanged));
+
+    private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is NotifyIcon notifyIcon)
+        {
+            if (e.NewValue == null)
             {
-                notifyIcon.ShowBalloonTip(title, content, infoType);
+                Unregister(notifyIcon);
+            }
+            else
+            {
+                Register(e.NewValue.ToString(), notifyIcon);
+            }
+        }
+    }
+
+    public string Token
+    {
+        get => (string) GetValue(TokenProperty);
+        set => SetValue(TokenProperty, value);
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(NotifyIcon), new PropertyMetadata(default(string)));
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+        "Icon", typeof(ImageSource), typeof(NotifyIcon), new PropertyMetadata(default(ImageSource), OnIconChanged));
+
+    private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NotifyIcon) d;
+        ctl._icon = (ImageSource) e.NewValue;
+        ctl.OnIconChanged();
+
+        if (!string.IsNullOrEmpty(ctl._windowClassName) && !ctl.IsBlink && ctl.Visibility == Visibility.Visible)
+        {
+            ctl.UpdateIcon(true);
+        }
+    }
+
+    public ImageSource Icon
+    {
+        get => (ImageSource) GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public static readonly DependencyProperty ContextContentProperty = DependencyProperty.Register(
+        "ContextContent", typeof(object), typeof(NotifyIcon), new PropertyMetadata(default(object)));
+
+    public object ContextContent
+    {
+        get => GetValue(ContextContentProperty);
+        set => SetValue(ContextContentProperty, value);
+    }
+
+    public static readonly DependencyProperty BlinkIntervalProperty = DependencyProperty.Register(
+        "BlinkInterval", typeof(TimeSpan), typeof(NotifyIcon), new PropertyMetadata(TimeSpan.FromMilliseconds(500), OnBlinkIntervalChanged));
+
+    private static void OnBlinkIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NotifyIcon) d;
+        if (ctl._dispatcherTimerBlink != null)
+        {
+            ctl._dispatcherTimerBlink.Interval = (TimeSpan) e.NewValue;
+        }
+    }
+
+    public TimeSpan BlinkInterval
+    {
+        get => (TimeSpan) GetValue(BlinkIntervalProperty);
+        set => SetValue(BlinkIntervalProperty, value);
+    }
+
+    public static readonly DependencyProperty IsBlinkProperty = DependencyProperty.Register(
+        "IsBlink", typeof(bool), typeof(NotifyIcon), new PropertyMetadata(ValueBoxes.FalseBox, OnIsBlinkChanged));
+
+    private static void OnIsBlinkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (NotifyIcon) d;
+        if (ctl.Visibility != Visibility.Visible) return;
+        if ((bool) e.NewValue)
+        {
+            if (ctl._dispatcherTimerBlink == null)
+            {
+                ctl._dispatcherTimerBlink = new DispatcherTimer
+                {
+                    Interval = ctl.BlinkInterval
+                };
+                ctl._dispatcherTimerBlink.Tick += ctl.DispatcherTimerBlinkTick;
+            }
+            ctl._dispatcherTimerBlink.Start();
+        }
+        else
+        {
+            ctl._dispatcherTimerBlink?.Stop();
+            ctl._dispatcherTimerBlink = null;
+            ctl.UpdateIcon(true);
+        }
+    }
+
+    public bool IsBlink
+    {
+        get => (bool) GetValue(IsBlinkProperty);
+        set => SetValue(IsBlinkProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private void DispatcherTimerBlinkTick(object sender, EventArgs e)
+    {
+        if (Visibility != Visibility.Visible || _iconCurrentHandle == IntPtr.Zero) return;
+        UpdateIcon(true, !_isTransparent);
+    }
+
+    private bool CheckMouseIsEnter()
+    {
+        var isTrue = FindNotifyIcon(out var rectNotifyList);
+        if (!isTrue) return false;
+
+        InteropMethods.GetCursorPos(out var point);
+        return rectNotifyList.Any(rectNotify =>
+            point.X >= rectNotify.Left &&
+            point.X <= rectNotify.Right &&
+            point.Y >= rectNotify.Top &&
+            point.Y <= rectNotify.Bottom);
+    }
+
+    private void DispatcherTimerPos_Tick(object sender, EventArgs e)
+    {
+        if (CheckMouseIsEnter())
+        {
+            if (!_isMouseOver)
+            {
+                _isMouseOver = true;
+                RaiseEvent(new MouseEventArgs(Mouse.PrimaryDevice, Environment.TickCount)
+                {
+                    RoutedEvent = MouseEnterEvent
+                });
+                _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(500);
+            }
+        }
+        else
+        {
+            _dispatcherTimerPos.Stop();
+            _isMouseOver = false;
+            RaiseEvent(new MouseEventArgs(Mouse.PrimaryDevice, Environment.TickCount)
+            {
+                RoutedEvent = MouseLeaveEvent
+            });
+        }
+    }
+
+    //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
+    private IntPtr FindTrayToolbarWindow()
+    {
+        var hWnd = InteropMethods.FindWindow("Shell_TrayWnd", null);
+        if (hWnd != IntPtr.Zero)
+        {
+            hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "TrayNotifyWnd", null);
+            if (hWnd != IntPtr.Zero)
+            {
+                hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "SysPager", null);
+                if (hWnd != IntPtr.Zero)
+                {
+                    hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
+                }
             }
         }
 
-        public void ShowBalloonTip(string title, string content, NotifyIconInfoType infoType)
-        {
-            if (!_added || DesignerHelper.IsInDesignMode) return;
+        return hWnd;
+    }
 
+    //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
+    private IntPtr FindTrayToolbarOverFlowWindow()
+    {
+        var hWnd = InteropMethods.FindWindow("NotifyIconOverflowWindow", null);
+        if (hWnd != IntPtr.Zero)
+        {
+            hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
+        }
+        return hWnd;
+    }
+
+    private bool FindNotifyIcon(out List<InteropValues.RECT> rectList)
+    {
+        var rectNotifyList = new List<InteropValues.RECT>();
+        var hTrayWnd = FindTrayToolbarWindow();
+        var isTrue = FindNotifyIcon(hTrayWnd, ref rectNotifyList);
+        if (!isTrue)
+        {
+            hTrayWnd = FindTrayToolbarOverFlowWindow();
+            isTrue = FindNotifyIcon(hTrayWnd, ref rectNotifyList);
+        }
+        rectList = rectNotifyList;
+        return isTrue;
+    }
+
+    //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
+    private bool FindNotifyIcon(IntPtr hTrayWnd, ref List<InteropValues.RECT> rectNotifyList)
+    {
+        InteropMethods.GetWindowRect(hTrayWnd, out var rectTray);
+        var count = (int) InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_BUTTONCOUNT, 0, IntPtr.Zero);
+
+        var isFind = false;
+        if (count > 0)
+        {
+            InteropMethods.GetWindowThreadProcessId(hTrayWnd, out var trayPid);
+            var hProcess = InteropMethods.OpenProcess(InteropValues.ProcessAccess.VMOperation | InteropValues.ProcessAccess.VMRead | InteropValues.ProcessAccess.VMWrite, false, trayPid);
+            var address = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, 1024, InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
+
+            var btnData = new InteropValues.TBBUTTON();
+            var trayData = new InteropValues.TRAYDATA();
+            var handle = Process.GetCurrentProcess().Id;
+
+            for (uint i = 0; i < count; i++)
+            {
+                InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETBUTTON, i, address);
+                var isTrue = InteropMethods.ReadProcessMemory(hProcess, address, out btnData, Marshal.SizeOf(btnData), out _);
+                if (!isTrue) continue;
+
+                if (btnData.dwData == IntPtr.Zero)
+                {
+                    btnData.dwData = btnData.iString;
+                }
+
+                InteropMethods.ReadProcessMemory(hProcess, btnData.dwData, out trayData, Marshal.SizeOf(trayData), out _);
+                InteropMethods.GetWindowThreadProcessId(trayData.hwnd, out var dwProcessId);
+
+                if (dwProcessId == (uint) handle)
+                {
+                    var rect = new InteropValues.RECT();
+                    var lngRect = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, Marshal.SizeOf(typeof(Rect)), InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
+
+                    InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETITEMRECT, i, lngRect);
+                    InteropMethods.ReadProcessMemory(hProcess, lngRect, out rect, Marshal.SizeOf(rect), out _);
+
+                    InteropMethods.VirtualFreeEx(hProcess, lngRect, Marshal.SizeOf(rect), InteropValues.FreeType.Decommit);
+                    InteropMethods.VirtualFreeEx(hProcess, lngRect, 0, InteropValues.FreeType.Release);
+
+                    var left = rectTray.Left + rect.Left;
+                    var top = rectTray.Top + rect.Top;
+                    var botton = rectTray.Top + rect.Bottom;
+                    var right = rectTray.Left + rect.Right;
+                    rectNotifyList.Add(new InteropValues.RECT
+                    {
+                        Left = left,
+                        Right = right,
+                        Top = top,
+                        Bottom = botton
+                    });
+                    isFind = true;
+                }
+            }
+            InteropMethods.VirtualFreeEx(hProcess, address, 0x4096, InteropValues.FreeType.Decommit);
+            InteropMethods.VirtualFreeEx(hProcess, address, 0, InteropValues.FreeType.Release);
+            InteropMethods.CloseHandle(hProcess);
+        }
+        return isFind;
+    }
+
+    private void OnIconChanged()
+    {
+        if (_windowClassName == null) return;
+
+        if (_icon != null)
+        {
+            IconHelper.GetIconHandlesFromImageSource(_icon, out _, out _iconHandle);
+            _iconCurrentHandle = _iconHandle.CriticalGetHandle();
+        }
+        else
+        {
+            if (_iconDefaultHandle == IntPtr.Zero)
+            {
+                IconHelper.GetDefaultIconHandles(out _, out _iconHandle);
+                _iconDefaultHandle = _iconHandle.CriticalGetHandle();
+            }
+            _iconCurrentHandle = _iconDefaultHandle;
+        }
+    }
+
+    private void UpdateIcon(bool showIconInTray, bool isTransparent = false)
+    {
+        lock (_syncObj)
+        {
+            if (DesignerHelper.IsInDesignMode) return;
+
+            _isTransparent = isTransparent;
             var data = new InteropValues.NOTIFYICONDATA
             {
-                uFlags = InteropValues.NIF_INFO,
+                uCallbackMessage = WmTrayMouseMessage,
+                uFlags = InteropValues.NIF_MESSAGE | InteropValues.NIF_ICON | InteropValues.NIF_TIP,
                 hWnd = _messageWindowHandle,
                 uID = _id,
-                szInfoTitle = title ?? string.Empty,
-                szInfo = content ?? string.Empty
+                dwInfoFlags = InteropValues.NIF_TIP,
+                hIcon = isTransparent ? IntPtr.Zero : _iconCurrentHandle,
+                szTip = Text
             };
 
-            data.dwInfoFlags = infoType switch
+            if (showIconInTray)
             {
-                NotifyIconInfoType.Info => InteropValues.NIIF_INFO,
-                NotifyIconInfoType.Warning => InteropValues.NIIF_WARNING,
-                NotifyIconInfoType.Error => InteropValues.NIIF_ERROR,
-                NotifyIconInfoType.None => InteropValues.NIIF_NONE,
-                _ => data.dwInfoFlags
-            };
-
-            InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void CloseContextControl()
-        {
-            if (_contextContent != null)
-            {
-                _contextContent.IsOpen = false;
-            }
-            else if (ContextMenu != null)
-            {
-                ContextMenu.IsOpen = false;
-            }
-        }
-
-        public static readonly DependencyProperty TokenProperty = DependencyProperty.Register(
-            "Token", typeof(string), typeof(NotifyIcon), new PropertyMetadata(default(string), OnTokenChanged));
-
-        private static void OnTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is NotifyIcon notifyIcon)
-            {
-                if (e.NewValue == null)
+                if (!_added)
                 {
-                    Unregister(notifyIcon);
+                    InteropMethods.Shell_NotifyIcon(InteropValues.NIM_ADD, data);
+                    _added = true;
                 }
                 else
                 {
-                    Register(e.NewValue.ToString(), notifyIcon);
+                    InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
                 }
             }
-        }
-
-        public string Token
-        {
-            get => (string) GetValue(TokenProperty);
-            set => SetValue(TokenProperty, value);
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(NotifyIcon), new PropertyMetadata(default(string)));
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(ImageSource), typeof(NotifyIcon), new PropertyMetadata(default(ImageSource), OnIconChanged));
-
-        private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (NotifyIcon) d;
-            ctl._icon = (ImageSource) e.NewValue;
-            ctl.OnIconChanged();
-
-            if (!string.IsNullOrEmpty(ctl._windowClassName) && !ctl.IsBlink && ctl.Visibility == Visibility.Visible)
+            else if (_added)
             {
-                ctl.UpdateIcon(true);
+                InteropMethods.Shell_NotifyIcon(InteropValues.NIM_DELETE, data);
+                _added = false;
             }
         }
-
-        public ImageSource Icon
-        {
-            get => (ImageSource) GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public static readonly DependencyProperty ContextContentProperty = DependencyProperty.Register(
-            "ContextContent", typeof(object), typeof(NotifyIcon), new PropertyMetadata(default(object)));
-
-        public object ContextContent
-        {
-            get => GetValue(ContextContentProperty);
-            set => SetValue(ContextContentProperty, value);
-        }
-
-        public static readonly DependencyProperty BlinkIntervalProperty = DependencyProperty.Register(
-            "BlinkInterval", typeof(TimeSpan), typeof(NotifyIcon), new PropertyMetadata(TimeSpan.FromMilliseconds(500), OnBlinkIntervalChanged));
-
-        private static void OnBlinkIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (NotifyIcon) d;
-            if (ctl._dispatcherTimerBlink != null)
-            {
-                ctl._dispatcherTimerBlink.Interval = (TimeSpan) e.NewValue;
-            }
-        }
-
-        public TimeSpan BlinkInterval
-        {
-            get => (TimeSpan) GetValue(BlinkIntervalProperty);
-            set => SetValue(BlinkIntervalProperty, value);
-        }
-
-        public static readonly DependencyProperty IsBlinkProperty = DependencyProperty.Register(
-            "IsBlink", typeof(bool), typeof(NotifyIcon), new PropertyMetadata(ValueBoxes.FalseBox, OnIsBlinkChanged));
-
-        private static void OnIsBlinkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (NotifyIcon) d;
-            if (ctl.Visibility != Visibility.Visible) return;
-            if ((bool) e.NewValue)
-            {
-                if (ctl._dispatcherTimerBlink == null)
-                {
-                    ctl._dispatcherTimerBlink = new DispatcherTimer
-                    {
-                        Interval = ctl.BlinkInterval
-                    };
-                    ctl._dispatcherTimerBlink.Tick += ctl.DispatcherTimerBlinkTick;
-                }
-                ctl._dispatcherTimerBlink.Start();
-            }
-            else
-            {
-                ctl._dispatcherTimerBlink?.Stop();
-                ctl._dispatcherTimerBlink = null;
-                ctl.UpdateIcon(true);
-            }
-        }
-
-        public bool IsBlink
-        {
-            get => (bool) GetValue(IsBlinkProperty);
-            set => SetValue(IsBlinkProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private void DispatcherTimerBlinkTick(object sender, EventArgs e)
-        {
-            if (Visibility != Visibility.Visible || _iconCurrentHandle == IntPtr.Zero) return;
-            UpdateIcon(true, !_isTransparent);
-        }
-
-        private bool CheckMouseIsEnter()
-        {
-            var isTrue = FindNotifyIcon(out var rectNotifyList);
-            if (!isTrue) return false;
-
-            InteropMethods.GetCursorPos(out var point);
-            return rectNotifyList.Any(rectNotify =>
-                point.X >= rectNotify.Left &&
-                point.X <= rectNotify.Right &&
-                point.Y >= rectNotify.Top &&
-                point.Y <= rectNotify.Bottom);
-        }
-
-        private void DispatcherTimerPos_Tick(object sender, EventArgs e)
-        {
-            if (CheckMouseIsEnter())
-            {
-                if (!_isMouseOver)
-                {
-                    _isMouseOver = true;
-                    RaiseEvent(new MouseEventArgs(Mouse.PrimaryDevice, Environment.TickCount)
-                    {
-                        RoutedEvent = MouseEnterEvent
-                    });
-                    _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(500);
-                }
-            }
-            else
-            {
-                _dispatcherTimerPos.Stop();
-                _isMouseOver = false;
-                RaiseEvent(new MouseEventArgs(Mouse.PrimaryDevice, Environment.TickCount)
-                {
-                    RoutedEvent = MouseLeaveEvent
-                });
-            }
-        }
-
-        //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
-        private IntPtr FindTrayToolbarWindow()
-        {
-            var hWnd = InteropMethods.FindWindow("Shell_TrayWnd", null);
-            if (hWnd != IntPtr.Zero)
-            {
-                hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "TrayNotifyWnd", null);
-                if (hWnd != IntPtr.Zero)
-                {
-                    hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "SysPager", null);
-                    if (hWnd != IntPtr.Zero)
-                    {
-                        hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
-                    }
-                }
-            }
-
-            return hWnd;
-        }
-
-        //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
-        private IntPtr FindTrayToolbarOverFlowWindow()
-        {
-            var hWnd = InteropMethods.FindWindow("NotifyIconOverflowWindow", null);
-            if (hWnd != IntPtr.Zero)
-            {
-                hWnd = InteropMethods.FindWindowEx(hWnd, IntPtr.Zero, "ToolbarWindow32", null);
-            }
-            return hWnd;
-        }
-
-        private bool FindNotifyIcon(out List<InteropValues.RECT> rectList)
-        {
-            var rectNotifyList = new List<InteropValues.RECT>();
-            var hTrayWnd = FindTrayToolbarWindow();
-            var isTrue = FindNotifyIcon(hTrayWnd, ref rectNotifyList);
-            if (!isTrue)
-            {
-                hTrayWnd = FindTrayToolbarOverFlowWindow();
-                isTrue = FindNotifyIcon(hTrayWnd, ref rectNotifyList);
-            }
-            rectList = rectNotifyList;
-            return isTrue;
-        }
-
-        //referenced from http://www.cnblogs.com/sczmzx/p/5158127.html
-        private bool FindNotifyIcon(IntPtr hTrayWnd, ref List<InteropValues.RECT> rectNotifyList)
-        {
-            InteropMethods.GetWindowRect(hTrayWnd, out var rectTray);
-            var count = (int) InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_BUTTONCOUNT, 0, IntPtr.Zero);
-
-            var isFind = false;
-            if (count > 0)
-            {
-                InteropMethods.GetWindowThreadProcessId(hTrayWnd, out var trayPid);
-                var hProcess = InteropMethods.OpenProcess(InteropValues.ProcessAccess.VMOperation | InteropValues.ProcessAccess.VMRead | InteropValues.ProcessAccess.VMWrite, false, trayPid);
-                var address = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, 1024, InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
-
-                var btnData = new InteropValues.TBBUTTON();
-                var trayData = new InteropValues.TRAYDATA();
-                var handle = Process.GetCurrentProcess().Id;
-
-                for (uint i = 0; i < count; i++)
-                {
-                    InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETBUTTON, i, address);
-                    var isTrue = InteropMethods.ReadProcessMemory(hProcess, address, out btnData, Marshal.SizeOf(btnData), out _);
-                    if (!isTrue) continue;
-
-                    if (btnData.dwData == IntPtr.Zero)
-                    {
-                        btnData.dwData = btnData.iString;
-                    }
-
-                    InteropMethods.ReadProcessMemory(hProcess, btnData.dwData, out trayData, Marshal.SizeOf(trayData), out _);
-                    InteropMethods.GetWindowThreadProcessId(trayData.hwnd, out var dwProcessId);
-
-                    if (dwProcessId == (uint) handle)
-                    {
-                        var rect = new InteropValues.RECT();
-                        var lngRect = InteropMethods.VirtualAllocEx(hProcess, IntPtr.Zero, Marshal.SizeOf(typeof(Rect)), InteropValues.AllocationType.Commit, InteropValues.MemoryProtection.ReadWrite);
-
-                        InteropMethods.SendMessage(hTrayWnd, InteropValues.TB_GETITEMRECT, i, lngRect);
-                        InteropMethods.ReadProcessMemory(hProcess, lngRect, out rect, Marshal.SizeOf(rect), out _);
-
-                        InteropMethods.VirtualFreeEx(hProcess, lngRect, Marshal.SizeOf(rect), InteropValues.FreeType.Decommit);
-                        InteropMethods.VirtualFreeEx(hProcess, lngRect, 0, InteropValues.FreeType.Release);
-
-                        var left = rectTray.Left + rect.Left;
-                        var top = rectTray.Top + rect.Top;
-                        var botton = rectTray.Top + rect.Bottom;
-                        var right = rectTray.Left + rect.Right;
-                        rectNotifyList.Add(new InteropValues.RECT
-                        {
-                            Left = left,
-                            Right = right,
-                            Top = top,
-                            Bottom = botton
-                        });
-                        isFind = true;
-                    }
-                }
-                InteropMethods.VirtualFreeEx(hProcess, address, 0x4096, InteropValues.FreeType.Decommit);
-                InteropMethods.VirtualFreeEx(hProcess, address, 0, InteropValues.FreeType.Release);
-                InteropMethods.CloseHandle(hProcess);
-            }
-            return isFind;
-        }
-
-        private void OnIconChanged()
-        {
-            if (_windowClassName == null) return;
-
-            if (_icon != null)
-            {
-                IconHelper.GetIconHandlesFromImageSource(_icon, out _, out _iconHandle);
-                _iconCurrentHandle = _iconHandle.CriticalGetHandle();
-            }
-            else
-            {
-                if (_iconDefaultHandle == IntPtr.Zero)
-                {
-                    IconHelper.GetDefaultIconHandles(out _, out _iconHandle);
-                    _iconDefaultHandle = _iconHandle.CriticalGetHandle();
-                }
-                _iconCurrentHandle = _iconDefaultHandle;
-            }
-        }
-
-        private void UpdateIcon(bool showIconInTray, bool isTransparent = false)
-        {
-            lock (_syncObj)
-            {
-                if (DesignerHelper.IsInDesignMode) return;
-
-                _isTransparent = isTransparent;
-                var data = new InteropValues.NOTIFYICONDATA
-                {
-                    uCallbackMessage = WmTrayMouseMessage,
-                    uFlags = InteropValues.NIF_MESSAGE | InteropValues.NIF_ICON | InteropValues.NIF_TIP,
-                    hWnd = _messageWindowHandle,
-                    uID = _id,
-                    dwInfoFlags = InteropValues.NIF_TIP,
-                    hIcon = isTransparent ? IntPtr.Zero : _iconCurrentHandle,
-                    szTip = Text
-                };
-
-                if (showIconInTray)
-                {
-                    if (!_added)
-                    {
-                        InteropMethods.Shell_NotifyIcon(InteropValues.NIM_ADD, data);
-                        _added = true;
-                    }
-                    else
-                    {
-                        InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
-                    }
-                }
-                else if (_added)
-                {
-                    InteropMethods.Shell_NotifyIcon(InteropValues.NIM_DELETE, data);
-                    _added = false;
-                }
-            }
-        }
-
-        private void RegisterClass()
-        {
-            _windowClassName = $"HandyControl.Controls.NotifyIcon{Guid.NewGuid()}";
-            var wndclass = new InteropValues.WNDCLASS4ICON
-            {
-                style = 0,
-                lpfnWndProc = _callback,
-                cbClsExtra = 0,
-                cbWndExtra = 0,
-                hInstance = IntPtr.Zero,
-                hIcon = IntPtr.Zero,
-                hCursor = IntPtr.Zero,
-                hbrBackground = IntPtr.Zero,
-                lpszMenuName = "",
-                lpszClassName = _windowClassName
-            };
-
-            InteropMethods.RegisterClass(wndclass);
-            _wmTaskbarCreated = InteropMethods.RegisterWindowMessage("TaskbarCreated");
-            _messageWindowHandle = InteropMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1,
-                IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
-        }
-
-        private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
-        {
-            if (msg == _wmTaskbarCreated)
-            {
-                if (_messageWindowHandle == hWnd && Visibility == Visibility.Visible)
-                {
-                    UpdateIcon(true);
-                }
-            }
-            else
-            {
-                switch (lparam.ToInt64())
-                {
-                    case InteropValues.WM_LBUTTONDBLCLK:
-                        WmMouseDown(MouseButton.Left, 2);
-                        break;
-                    case InteropValues.WM_LBUTTONUP:
-                        WmMouseUp(MouseButton.Left);
-                        break;
-                    case InteropValues.WM_RBUTTONUP:
-                        ShowContextMenu();
-                        WmMouseUp(MouseButton.Right);
-                        break;
-                    case InteropValues.WM_MOUSEMOVE:
-                        if (!_dispatcherTimerPos.IsEnabled)
-                        {
-                            _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(200);
-                            _dispatcherTimerPos.Start();
-                        }
-                        break;
-                }
-            }
-
-            return InteropMethods.DefWindowProc(hWnd, msg, wparam, lparam);
-        }
-
-        private void WmMouseDown(MouseButton button, int clicks)
-        {
-            if (clicks == 2)
-            {
-                RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
-                {
-                    RoutedEvent = MouseDoubleClickEvent
-                });
-                _doubleClick = true;
-            }
-        }
-
-        private void WmMouseUp(MouseButton button)
-        {
-            if (!_doubleClick && button == MouseButton.Left)
-            {
-                RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
-                {
-                    RoutedEvent = ClickEvent
-                });
-            }
-            _doubleClick = false;
-        }
-
-        private void ShowContextMenu()
-        {
-
-            if (ContextContent != null)
-            {
-                _contextContent ??= new Popup
-                {
-                    Placement = PlacementMode.Mouse,
-                    AllowsTransparency = true,
-                    StaysOpen = false,
-                    UseLayoutRounding = true,
-                    SnapsToDevicePixels = true
-                };
-
-                _contextContent.Child = new ContentControl
-                {
-                    Content = ContextContent
-                };
-                _contextContent.IsOpen = true;
-                InteropMethods.SetForegroundWindow(_contextContent.Child.GetHandle());
-            }
-            else if (ContextMenu != null)
-            {
-                if (ContextMenu.Items.Count == 0) return;
-
-                ContextMenu.InvalidateProperty(StyleProperty);
-                foreach (var item in ContextMenu.Items)
-                {
-                    if (item is MenuItem menuItem)
-                    {
-                        menuItem.InvalidateProperty(StyleProperty);
-                    }
-                    else
-                    {
-                        var container = ContextMenu.ItemContainerGenerator.ContainerFromItem(item) as MenuItem;
-                        container?.InvalidateProperty(StyleProperty);
-                    }
-                }
-
-                ContextMenu.Placement = PlacementMode.Mouse;
-                ContextMenu.IsOpen = true;
-
-                InteropMethods.SetForegroundWindow(ContextMenu.GetHandle());
-            }
-        }
-
-        public static readonly RoutedEvent ClickEvent =
-            EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(NotifyIcon));
-
-        public event RoutedEventHandler Click
-        {
-            add => AddHandler(ClickEvent, value);
-            remove => RemoveHandler(ClickEvent, value);
-        }
-
-        public static readonly RoutedEvent MouseDoubleClickEvent =
-            EventManager.RegisterRoutedEvent("MouseDoubleClick", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(NotifyIcon));
-
-        public event RoutedEventHandler MouseDoubleClick
-        {
-            add => AddHandler(MouseDoubleClickEvent, value);
-            remove => RemoveHandler(MouseDoubleClickEvent, value);
-        }
-
-        private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)
-        {
-            if (target == null || BindingOperations.GetBindingExpression(target, DataContextProperty) != null) return;
-            if (ReferenceEquals(this, target.DataContext) || Equals(oldValue, target.DataContext))
-            {
-                target.DataContext = newValue ?? this;
-            }
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (_isDisposed) return;
-            if (disposing)
-            {
-                if (_dispatcherTimerBlink != null && IsBlink)
-                {
-                    _dispatcherTimerBlink.Stop();
-                }
-                UpdateIcon(false);
-            }
-
-            _isDisposed = true;
-        }
     }
-}
+
+    private void RegisterClass()
+    {
+        _windowClassName = $"HandyControl.Controls.NotifyIcon{Guid.NewGuid()}";
+        var wndclass = new InteropValues.WNDCLASS4ICON
+        {
+            style = 0,
+            lpfnWndProc = _callback,
+            cbClsExtra = 0,
+            cbWndExtra = 0,
+            hInstance = IntPtr.Zero,
+            hIcon = IntPtr.Zero,
+            hCursor = IntPtr.Zero,
+            hbrBackground = IntPtr.Zero,
+            lpszMenuName = "",
+            lpszClassName = _windowClassName
+        };
+
+        InteropMethods.RegisterClass(wndclass);
+        _wmTaskbarCreated = InteropMethods.RegisterWindowMessage("TaskbarCreated");
+        _messageWindowHandle = InteropMethods.CreateWindowEx(0, _windowClassName, "", 0, 0, 0, 1, 1,
+            IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+    }
+
+    private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
+    {
+        if (msg == _wmTaskbarCreated)
+        {
+            if (_messageWindowHandle == hWnd && Visibility == Visibility.Visible)
+            {
+                UpdateIcon(true);
+            }
+        }
+        else
+        {
+            switch (lparam.ToInt64())
+            {
+                case InteropValues.WM_LBUTTONDBLCLK:
+                    WmMouseDown(MouseButton.Left, 2);
+                    break;
+                case InteropValues.WM_LBUTTONUP:
+                    WmMouseUp(MouseButton.Left);
+                    break;
+                case InteropValues.WM_RBUTTONUP:
+                    ShowContextMenu();
+                    WmMouseUp(MouseButton.Right);
+                    break;
+                case InteropValues.WM_MOUSEMOVE:
+                    if (!_dispatcherTimerPos.IsEnabled)
+                    {
+                        _dispatcherTimerPos.Interval = TimeSpan.FromMilliseconds(200);
+                        _dispatcherTimerPos.Start();
+                    }
+                    break;
+            }
+        }
+
+        return InteropMethods.DefWindowProc(hWnd, msg, wparam, lparam);
+    }
+
+    private void WmMouseDown(MouseButton button, int clicks)
+    {
+        if (clicks == 2)
+        {
+            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
+            {
+                RoutedEvent = MouseDoubleClickEvent
+            });
+            _doubleClick = true;
+        }
+    }
+
+    private void WmMouseUp(MouseButton button)
+    {
+        if (!_doubleClick && button == MouseButton.Left)
+        {
+            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, button)
+            {
+                RoutedEvent = ClickEvent
+            });
+        }
+        _doubleClick = false;
+    }
+
+    private void ShowContextMenu()
+    {
+
+        if (ContextContent != null)
+        {
+            _contextContent ??= new Popup
+            {
+                Placement = PlacementMode.Mouse,
+                AllowsTransparency = true,
+                StaysOpen = false,
+                UseLayoutRounding = true,
+                SnapsToDevicePixels = true
+            };
+
+            _contextContent.Child = new ContentControl
+            {
+                Content = ContextContent
+            };
+            _contextContent.IsOpen = true;
+            InteropMethods.SetForegroundWindow(_contextContent.Child.GetHandle());
+        }
+        else if (ContextMenu != null)
+        {
+            if (ContextMenu.Items.Count == 0) return;
+
+            ContextMenu.InvalidateProperty(StyleProperty);
+            foreach (var item in ContextMenu.Items)
+            {
+                if (item is MenuItem menuItem)
+                {
+                    menuItem.InvalidateProperty(StyleProperty);
+                }
+                else
+                {
+                    var container = ContextMenu.ItemContainerGenerator.ContainerFromItem(item) as MenuItem;
+                    container?.InvalidateProperty(StyleProperty);
+                }
+            }
+
+            ContextMenu.Placement = PlacementMode.Mouse;
+            ContextMenu.IsOpen = true;
+
+            InteropMethods.SetForegroundWindow(ContextMenu.GetHandle());
+        }
+    }
+
+    public static readonly RoutedEvent ClickEvent =
+        EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(NotifyIcon));
+
+    public event RoutedEventHandler Click
+    {
+        add => AddHandler(ClickEvent, value);
+        remove => RemoveHandler(ClickEvent, value);
+    }
+
+    public static readonly RoutedEvent MouseDoubleClickEvent =
+        EventManager.RegisterRoutedEvent("MouseDoubleClick", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(NotifyIcon));
+
+    public event RoutedEventHandler MouseDoubleClick
+    {
+        add => AddHandler(MouseDoubleClickEvent, value);
+        remove => RemoveHandler(MouseDoubleClickEvent, value);
+    }
+
+    private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)
+    {
+        if (target == null || BindingOperations.GetBindingExpression(target, DataContextProperty) != null) return;
+        if (ReferenceEquals(this, target.DataContext) || Equals(oldValue, target.DataContext))
+        {
+            target.DataContext = newValue ?? this;
+        }
+    }
+
+    private void Dispose(bool disposing)
+    {
+        if (_isDisposed) return;
+        if (disposing)
+        {
+            if (_dispatcherTimerBlink != null && IsBlink)
+            {
+                _dispatcherTimerBlink.Stop();
+            }
+            UpdateIcon(false);
+        }
+
+        _isDisposed = true;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index ca01ba30..de94f289 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -7,396 +7,395 @@ using HandyControl.Interactivity;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     页码
+/// </summary>
+[TemplatePart(Name = ElementButtonLeft, Type = typeof(Button))]
+[TemplatePart(Name = ElementButtonRight, Type = typeof(Button))]
+[TemplatePart(Name = ElementButtonFirst, Type = typeof(RadioButton))]
+[TemplatePart(Name = ElementMoreLeft, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))]
+[TemplatePart(Name = ElementMoreRight, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementButtonLast, Type = typeof(RadioButton))]
+[TemplatePart(Name = ElementButtonLast, Type = typeof(NumericUpDown))]
+public class Pagination : Control
 {
+    #region Constants
+
+    private const string ElementButtonLeft = "PART_ButtonLeft";
+    private const string ElementButtonRight = "PART_ButtonRight";
+    private const string ElementButtonFirst = "PART_ButtonFirst";
+    private const string ElementMoreLeft = "PART_MoreLeft";
+    private const string ElementPanelMain = "PART_PanelMain";
+    private const string ElementMoreRight = "PART_MoreRight";
+    private const string ElementButtonLast = "PART_ButtonLast";
+    private const string ElementJump = "PART_Jump";
+
+    #endregion Constants
+
+    #region Data
+
+    private Button _buttonLeft;
+    private Button _buttonRight;
+    private RadioButton _buttonFirst;
+    private FrameworkElement _moreLeft;
+    private Panel _panelMain;
+    private FrameworkElement _moreRight;
+    private RadioButton _buttonLast;
+    private NumericUpDown _jumpNumericUpDown;
+
+    private bool _appliedTemplate;
+
+    #endregion Data
+
+    #region Public Events
+
     /// <summary>
-    ///     页码
+    ///     页面更新事件
     /// </summary>
-    [TemplatePart(Name = ElementButtonLeft, Type = typeof(Button))]
-    [TemplatePart(Name = ElementButtonRight, Type = typeof(Button))]
-    [TemplatePart(Name = ElementButtonFirst, Type = typeof(RadioButton))]
-    [TemplatePart(Name = ElementMoreLeft, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementPanelMain, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementMoreRight, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementButtonLast, Type = typeof(RadioButton))]
-    [TemplatePart(Name = ElementButtonLast, Type = typeof(NumericUpDown))]
-    public class Pagination : Control
+    public static readonly RoutedEvent PageUpdatedEvent =
+        EventManager.RegisterRoutedEvent("PageUpdated", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<int>>), typeof(Pagination));
+
+    /// <summary>
+    ///     页面更新事件
+    /// </summary>
+    public event EventHandler<FunctionEventArgs<int>> PageUpdated
     {
-        #region Constants
-
-        private const string ElementButtonLeft = "PART_ButtonLeft";
-        private const string ElementButtonRight = "PART_ButtonRight";
-        private const string ElementButtonFirst = "PART_ButtonFirst";
-        private const string ElementMoreLeft = "PART_MoreLeft";
-        private const string ElementPanelMain = "PART_PanelMain";
-        private const string ElementMoreRight = "PART_MoreRight";
-        private const string ElementButtonLast = "PART_ButtonLast";
-        private const string ElementJump = "PART_Jump";
-
-        #endregion Constants
-
-        #region Data
-
-        private Button _buttonLeft;
-        private Button _buttonRight;
-        private RadioButton _buttonFirst;
-        private FrameworkElement _moreLeft;
-        private Panel _panelMain;
-        private FrameworkElement _moreRight;
-        private RadioButton _buttonLast;
-        private NumericUpDown _jumpNumericUpDown;
-
-        private bool _appliedTemplate;
-
-        #endregion Data
-
-        #region Public Events
-
-        /// <summary>
-        ///     页面更新事件
-        /// </summary>
-        public static readonly RoutedEvent PageUpdatedEvent =
-            EventManager.RegisterRoutedEvent("PageUpdated", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<int>>), typeof(Pagination));
-
-        /// <summary>
-        ///     页面更新事件
-        /// </summary>
-        public event EventHandler<FunctionEventArgs<int>> PageUpdated
-        {
-            add => AddHandler(PageUpdatedEvent, value);
-            remove => RemoveHandler(PageUpdatedEvent, value);
-        }
-
-        #endregion Public Events
-
-        public Pagination()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ToggleButton_OnChecked));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Jump, (s, e) => PageIndex = (int) _jumpNumericUpDown.Value));
-
-            OnAutoHidingChanged(AutoHiding);
-            Update();
-        }
-
-        #region Public Properties
-
-        #region MaxPageCount
-
-        /// <summary>
-        ///     最大页数
-        /// </summary>
-        public static readonly DependencyProperty MaxPageCountProperty = DependencyProperty.Register(
-            "MaxPageCount", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnMaxPageCountChanged, CoerceMaxPageCount), ValidateHelper.IsInRangeOfPosIntIncludeZero);
-
-        private static object CoerceMaxPageCount(DependencyObject d, object basevalue)
-        {
-            var intValue = (int) basevalue;
-            return intValue < 1 ? 1 : intValue;
-        }
-
-        private static void OnMaxPageCountChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Pagination pagination)
-            {
-                if (pagination.PageIndex > pagination.MaxPageCount)
-                {
-                    pagination.PageIndex = pagination.MaxPageCount;
-                }
-
-                pagination.CoerceValue(PageIndexProperty);
-                pagination.OnAutoHidingChanged(pagination.AutoHiding);
-                pagination.Update();
-            }
-        }
-
-        /// <summary>
-        ///     最大页数
-        /// </summary>
-        public int MaxPageCount
-        {
-            get => (int) GetValue(MaxPageCountProperty);
-            set => SetValue(MaxPageCountProperty, value);
-        }
-
-        #endregion MaxPageCount
-
-        #region DataCountPerPage
-
-        /// <summary>
-        ///     每页的数据量
-        /// </summary>
-        public static readonly DependencyProperty DataCountPerPageProperty = DependencyProperty.Register(
-            "DataCountPerPage", typeof(int), typeof(Pagination), new PropertyMetadata(20, OnDataCountPerPageChanged),
-            ValidateHelper.IsInRangeOfPosInt);
-
-        private static void OnDataCountPerPageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Pagination pagination)
-            {
-                pagination.Update();
-            }
-        }
-
-        /// <summary>
-        ///     每页的数据量
-        /// </summary>
-        public int DataCountPerPage
-        {
-            get => (int) GetValue(DataCountPerPageProperty);
-            set => SetValue(DataCountPerPageProperty, value);
-        }
-
-        #endregion
-
-        #region PageIndex
-
-        /// <summary>
-        ///     当前页
-        /// </summary>
-        public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
-            "PageIndex", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnPageIndexChanged, CoercePageIndex), ValidateHelper.IsInRangeOfPosIntIncludeZero);
-
-        private static object CoercePageIndex(DependencyObject d, object basevalue)
-        {
-            if (d is not Pagination pagination) return 1;
-
-            var intValue = (int) basevalue;
-            return intValue < 1
-                ? 1
-                : intValue > pagination.MaxPageCount
-                    ? pagination.MaxPageCount
-                    : intValue;
-        }
-
-        private static void OnPageIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Pagination pagination && e.NewValue is int value)
-            {
-                pagination.Update();
-                pagination.RaiseEvent(new FunctionEventArgs<int>(PageUpdatedEvent, pagination)
-                {
-                    Info = value
-                });
-            }
-        }
-
-        /// <summary>
-        ///     当前页
-        /// </summary>
-        public int PageIndex
-        {
-            get => (int) GetValue(PageIndexProperty);
-            set => SetValue(PageIndexProperty, value);
-        }
-
-        #endregion PageIndex
-
-        #region MaxPageInterval
-
-        /// <summary>
-        ///     表示当前选中的按钮距离左右两个方向按钮的最大间隔（4表示间隔4个按钮，如果超过则用省略号表示）
-        /// </summary>       
-        public static readonly DependencyProperty MaxPageIntervalProperty = DependencyProperty.Register(
-            "MaxPageInterval", typeof(int), typeof(Pagination), new PropertyMetadata(3, OnMaxPageIntervalChanged), ValidateHelper.IsInRangeOfPosIntIncludeZero);
-
-        private static void OnMaxPageIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Pagination pagination)
-            {
-                pagination.Update();
-            }
-        }
-
-        /// <summary>
-        ///     表示当前选中的按钮距离左右两个方向按钮的最大间隔（4表示间隔4个按钮，如果超过则用省略号表示）
-        /// </summary>   
-        public int MaxPageInterval
-        {
-            get => (int) GetValue(MaxPageIntervalProperty);
-            set => SetValue(MaxPageIntervalProperty, value);
-        }
-
-        #endregion MaxPageInterval
-
-        #region IsJumpEnabled
-
-        public static readonly DependencyProperty IsJumpEnabledProperty = DependencyProperty.Register(
-            "IsJumpEnabled", typeof(bool), typeof(Pagination), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsJumpEnabled
-        {
-            get => (bool) GetValue(IsJumpEnabledProperty);
-            set => SetValue(IsJumpEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        #endregion
-
-        #region AutoHiding
-
-        public static readonly DependencyProperty AutoHidingProperty = DependencyProperty.Register(
-            "AutoHiding", typeof(bool), typeof(Pagination), new PropertyMetadata(ValueBoxes.TrueBox, OnAutoHidingChanged));
-
-        private static void OnAutoHidingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Pagination pagination)
-            {
-                pagination.OnAutoHidingChanged((bool) e.NewValue);
-            }
-        }
-
-        private void OnAutoHidingChanged(bool newValue) => this.Show(!newValue || MaxPageCount > 1);
-
-        public bool AutoHiding
-        {
-            get => (bool) GetValue(AutoHidingProperty);
-            set => SetValue(AutoHidingProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        #endregion
-
-        #endregion
-
-        #region Public Methods
-
-        public override void OnApplyTemplate()
-        {
-            _appliedTemplate = false;
-            base.OnApplyTemplate();
-
-            _buttonLeft = GetTemplateChild(ElementButtonLeft) as Button;
-            _buttonRight = GetTemplateChild(ElementButtonRight) as Button;
-            _buttonFirst = GetTemplateChild(ElementButtonFirst) as RadioButton;
-            _moreLeft = GetTemplateChild(ElementMoreLeft) as FrameworkElement;
-            _panelMain = GetTemplateChild(ElementPanelMain) as Panel;
-            _moreRight = GetTemplateChild(ElementMoreRight) as FrameworkElement;
-            _buttonLast = GetTemplateChild(ElementButtonLast) as RadioButton;
-            _jumpNumericUpDown = GetTemplateChild(ElementJump) as NumericUpDown;
-
-            CheckNull();
-
-            _appliedTemplate = true;
-            Update();
-        }
-
-        #endregion Public Methods
-
-        #region Private Methods
-
-        private void CheckNull()
-        {
-            if (_buttonLeft == null || _buttonRight == null || _buttonFirst == null ||
-                _moreLeft == null || _panelMain == null || _moreRight == null ||
-                _buttonLast == null) throw new Exception();
-        }
-
-        /// <summary>
-        ///     更新
-        /// </summary>
-        private void Update()
-        {
-            if (!_appliedTemplate) return;
-            _buttonLeft.IsEnabled = PageIndex > 1;
-            _buttonRight.IsEnabled = PageIndex < MaxPageCount;
-            if (MaxPageInterval == 0)
-            {
-                _buttonFirst.Collapse();
-                _buttonLast.Collapse();
-                _moreLeft.Collapse();
-                _moreRight.Collapse();
-                _panelMain.Children.Clear();
-                var selectButton = CreateButton(PageIndex);
-                _panelMain.Children.Add(selectButton);
-                selectButton.IsChecked = true;
-                return;
-            }
-            _buttonFirst.Show();
-            _buttonLast.Show();
-            _moreLeft.Show();
-            _moreRight.Show();
-
-            //更新最后一页
-            if (MaxPageCount == 1)
-            {
-                _buttonLast.Collapse();
-            }
-            else
-            {
-                _buttonLast.Show();
-                _buttonLast.Content = MaxPageCount.ToString();
-            }
-
-            //更新省略号
-            var right = MaxPageCount - PageIndex;
-            var left = PageIndex - 1;
-            _moreRight.Show(right > MaxPageInterval);
-            _moreLeft.Show(left > MaxPageInterval);
-
-            //更新中间部分
-            _panelMain.Children.Clear();
-            if (PageIndex > 1 && PageIndex < MaxPageCount)
-            {
-                var selectButton = CreateButton(PageIndex);
-                _panelMain.Children.Add(selectButton);
-                selectButton.IsChecked = true;
-            }
-            else if (PageIndex == 1)
-            {
-                _buttonFirst.IsChecked = true;
-            }
-            else
-            {
-                _buttonLast.IsChecked = true;
-            }
-
-            var sub = PageIndex;
-            for (var i = 0; i < MaxPageInterval - 1; i++)
-            {
-                if (--sub > 1)
-                {
-                    _panelMain.Children.Insert(0, CreateButton(sub));
-                }
-                else
-                {
-                    break;
-                }
-            }
-            var add = PageIndex;
-            for (var i = 0; i < MaxPageInterval - 1; i++)
-            {
-                if (++add < MaxPageCount)
-                {
-                    _panelMain.Children.Add(CreateButton(add));
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-
-        private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
-
-        private void ButtonNext_OnClick(object sender, RoutedEventArgs e) => PageIndex++;
-
-        private RadioButton CreateButton(int page)
-        {
-            return new()
-            {
-                Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.PaginationButtonStyle),
-                Content = page.ToString()
-            };
-        }
-
-        private void ToggleButton_OnChecked(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is not RadioButton button) return;
-            if (button.IsChecked == false) return;
-            PageIndex = int.Parse(button.Content.ToString());
-        }
-
-        #endregion Private Methods       
+        add => AddHandler(PageUpdatedEvent, value);
+        remove => RemoveHandler(PageUpdatedEvent, value);
     }
-}
+
+    #endregion Public Events
+
+    public Pagination()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ToggleButton_OnChecked));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Jump, (s, e) => PageIndex = (int) _jumpNumericUpDown.Value));
+
+        OnAutoHidingChanged(AutoHiding);
+        Update();
+    }
+
+    #region Public Properties
+
+    #region MaxPageCount
+
+    /// <summary>
+    ///     最大页数
+    /// </summary>
+    public static readonly DependencyProperty MaxPageCountProperty = DependencyProperty.Register(
+        "MaxPageCount", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnMaxPageCountChanged, CoerceMaxPageCount), ValidateHelper.IsInRangeOfPosIntIncludeZero);
+
+    private static object CoerceMaxPageCount(DependencyObject d, object basevalue)
+    {
+        var intValue = (int) basevalue;
+        return intValue < 1 ? 1 : intValue;
+    }
+
+    private static void OnMaxPageCountChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Pagination pagination)
+        {
+            if (pagination.PageIndex > pagination.MaxPageCount)
+            {
+                pagination.PageIndex = pagination.MaxPageCount;
+            }
+
+            pagination.CoerceValue(PageIndexProperty);
+            pagination.OnAutoHidingChanged(pagination.AutoHiding);
+            pagination.Update();
+        }
+    }
+
+    /// <summary>
+    ///     最大页数
+    /// </summary>
+    public int MaxPageCount
+    {
+        get => (int) GetValue(MaxPageCountProperty);
+        set => SetValue(MaxPageCountProperty, value);
+    }
+
+    #endregion MaxPageCount
+
+    #region DataCountPerPage
+
+    /// <summary>
+    ///     每页的数据量
+    /// </summary>
+    public static readonly DependencyProperty DataCountPerPageProperty = DependencyProperty.Register(
+        "DataCountPerPage", typeof(int), typeof(Pagination), new PropertyMetadata(20, OnDataCountPerPageChanged),
+        ValidateHelper.IsInRangeOfPosInt);
+
+    private static void OnDataCountPerPageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Pagination pagination)
+        {
+            pagination.Update();
+        }
+    }
+
+    /// <summary>
+    ///     每页的数据量
+    /// </summary>
+    public int DataCountPerPage
+    {
+        get => (int) GetValue(DataCountPerPageProperty);
+        set => SetValue(DataCountPerPageProperty, value);
+    }
+
+    #endregion
+
+    #region PageIndex
+
+    /// <summary>
+    ///     当前页
+    /// </summary>
+    public static readonly DependencyProperty PageIndexProperty = DependencyProperty.Register(
+        "PageIndex", typeof(int), typeof(Pagination), new PropertyMetadata(ValueBoxes.Int1Box, OnPageIndexChanged, CoercePageIndex), ValidateHelper.IsInRangeOfPosIntIncludeZero);
+
+    private static object CoercePageIndex(DependencyObject d, object basevalue)
+    {
+        if (d is not Pagination pagination) return 1;
+
+        var intValue = (int) basevalue;
+        return intValue < 1
+            ? 1
+            : intValue > pagination.MaxPageCount
+                ? pagination.MaxPageCount
+                : intValue;
+    }
+
+    private static void OnPageIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Pagination pagination && e.NewValue is int value)
+        {
+            pagination.Update();
+            pagination.RaiseEvent(new FunctionEventArgs<int>(PageUpdatedEvent, pagination)
+            {
+                Info = value
+            });
+        }
+    }
+
+    /// <summary>
+    ///     当前页
+    /// </summary>
+    public int PageIndex
+    {
+        get => (int) GetValue(PageIndexProperty);
+        set => SetValue(PageIndexProperty, value);
+    }
+
+    #endregion PageIndex
+
+    #region MaxPageInterval
+
+    /// <summary>
+    ///     表示当前选中的按钮距离左右两个方向按钮的最大间隔（4表示间隔4个按钮，如果超过则用省略号表示）
+    /// </summary>       
+    public static readonly DependencyProperty MaxPageIntervalProperty = DependencyProperty.Register(
+        "MaxPageInterval", typeof(int), typeof(Pagination), new PropertyMetadata(3, OnMaxPageIntervalChanged), ValidateHelper.IsInRangeOfPosIntIncludeZero);
+
+    private static void OnMaxPageIntervalChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Pagination pagination)
+        {
+            pagination.Update();
+        }
+    }
+
+    /// <summary>
+    ///     表示当前选中的按钮距离左右两个方向按钮的最大间隔（4表示间隔4个按钮，如果超过则用省略号表示）
+    /// </summary>   
+    public int MaxPageInterval
+    {
+        get => (int) GetValue(MaxPageIntervalProperty);
+        set => SetValue(MaxPageIntervalProperty, value);
+    }
+
+    #endregion MaxPageInterval
+
+    #region IsJumpEnabled
+
+    public static readonly DependencyProperty IsJumpEnabledProperty = DependencyProperty.Register(
+        "IsJumpEnabled", typeof(bool), typeof(Pagination), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsJumpEnabled
+    {
+        get => (bool) GetValue(IsJumpEnabledProperty);
+        set => SetValue(IsJumpEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    #endregion
+
+    #region AutoHiding
+
+    public static readonly DependencyProperty AutoHidingProperty = DependencyProperty.Register(
+        "AutoHiding", typeof(bool), typeof(Pagination), new PropertyMetadata(ValueBoxes.TrueBox, OnAutoHidingChanged));
+
+    private static void OnAutoHidingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Pagination pagination)
+        {
+            pagination.OnAutoHidingChanged((bool) e.NewValue);
+        }
+    }
+
+    private void OnAutoHidingChanged(bool newValue) => this.Show(!newValue || MaxPageCount > 1);
+
+    public bool AutoHiding
+    {
+        get => (bool) GetValue(AutoHidingProperty);
+        set => SetValue(AutoHidingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    #endregion
+
+    #endregion
+
+    #region Public Methods
+
+    public override void OnApplyTemplate()
+    {
+        _appliedTemplate = false;
+        base.OnApplyTemplate();
+
+        _buttonLeft = GetTemplateChild(ElementButtonLeft) as Button;
+        _buttonRight = GetTemplateChild(ElementButtonRight) as Button;
+        _buttonFirst = GetTemplateChild(ElementButtonFirst) as RadioButton;
+        _moreLeft = GetTemplateChild(ElementMoreLeft) as FrameworkElement;
+        _panelMain = GetTemplateChild(ElementPanelMain) as Panel;
+        _moreRight = GetTemplateChild(ElementMoreRight) as FrameworkElement;
+        _buttonLast = GetTemplateChild(ElementButtonLast) as RadioButton;
+        _jumpNumericUpDown = GetTemplateChild(ElementJump) as NumericUpDown;
+
+        CheckNull();
+
+        _appliedTemplate = true;
+        Update();
+    }
+
+    #endregion Public Methods
+
+    #region Private Methods
+
+    private void CheckNull()
+    {
+        if (_buttonLeft == null || _buttonRight == null || _buttonFirst == null ||
+            _moreLeft == null || _panelMain == null || _moreRight == null ||
+            _buttonLast == null) throw new Exception();
+    }
+
+    /// <summary>
+    ///     更新
+    /// </summary>
+    private void Update()
+    {
+        if (!_appliedTemplate) return;
+        _buttonLeft.IsEnabled = PageIndex > 1;
+        _buttonRight.IsEnabled = PageIndex < MaxPageCount;
+        if (MaxPageInterval == 0)
+        {
+            _buttonFirst.Collapse();
+            _buttonLast.Collapse();
+            _moreLeft.Collapse();
+            _moreRight.Collapse();
+            _panelMain.Children.Clear();
+            var selectButton = CreateButton(PageIndex);
+            _panelMain.Children.Add(selectButton);
+            selectButton.IsChecked = true;
+            return;
+        }
+        _buttonFirst.Show();
+        _buttonLast.Show();
+        _moreLeft.Show();
+        _moreRight.Show();
+
+        //更新最后一页
+        if (MaxPageCount == 1)
+        {
+            _buttonLast.Collapse();
+        }
+        else
+        {
+            _buttonLast.Show();
+            _buttonLast.Content = MaxPageCount.ToString();
+        }
+
+        //更新省略号
+        var right = MaxPageCount - PageIndex;
+        var left = PageIndex - 1;
+        _moreRight.Show(right > MaxPageInterval);
+        _moreLeft.Show(left > MaxPageInterval);
+
+        //更新中间部分
+        _panelMain.Children.Clear();
+        if (PageIndex > 1 && PageIndex < MaxPageCount)
+        {
+            var selectButton = CreateButton(PageIndex);
+            _panelMain.Children.Add(selectButton);
+            selectButton.IsChecked = true;
+        }
+        else if (PageIndex == 1)
+        {
+            _buttonFirst.IsChecked = true;
+        }
+        else
+        {
+            _buttonLast.IsChecked = true;
+        }
+
+        var sub = PageIndex;
+        for (var i = 0; i < MaxPageInterval - 1; i++)
+        {
+            if (--sub > 1)
+            {
+                _panelMain.Children.Insert(0, CreateButton(sub));
+            }
+            else
+            {
+                break;
+            }
+        }
+        var add = PageIndex;
+        for (var i = 0; i < MaxPageInterval - 1; i++)
+        {
+            if (++add < MaxPageCount)
+            {
+                _panelMain.Children.Add(CreateButton(add));
+            }
+            else
+            {
+                break;
+            }
+        }
+    }
+
+    private void ButtonPrev_OnClick(object sender, RoutedEventArgs e) => PageIndex--;
+
+    private void ButtonNext_OnClick(object sender, RoutedEventArgs e) => PageIndex++;
+
+    private RadioButton CreateButton(int page)
+    {
+        return new()
+        {
+            Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.PaginationButtonStyle),
+            Content = page.ToString()
+        };
+    }
+
+    private void ToggleButton_OnChecked(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is not RadioButton button) return;
+        if (button.IsChecked == false) return;
+        PageIndex = int.Parse(button.Content.ToString());
+    }
+
+    #endregion Private Methods       
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
index 425b536f..62b5925c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
@@ -7,323 +7,322 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Data.Enum;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Poptip : AdornerElement
 {
-    public class Poptip : AdornerElement
+    private readonly Popup _popup;
+
+    public Poptip()
     {
-        private readonly Popup _popup;
-
-        public Poptip()
+        _popup = new Popup
         {
-            _popup = new Popup
-            {
-                AllowsTransparency = true,
-                Child = this,
-                Placement = PlacementMode.Relative
-            };
+            AllowsTransparency = true,
+            Child = this,
+            Placement = PlacementMode.Relative
+        };
 
-            _popup.SetBinding(DataContextProperty, new Binding(DataContextProperty.Name) { Source = this });
-        }
+        _popup.SetBinding(DataContextProperty, new Binding(DataContextProperty.Name) { Source = this });
+    }
 
-        public static readonly DependencyProperty HitModeProperty = DependencyProperty.RegisterAttached(
-            "HitMode", typeof(HitMode), typeof(Poptip), new PropertyMetadata(HitMode.Hover));
+    public static readonly DependencyProperty HitModeProperty = DependencyProperty.RegisterAttached(
+        "HitMode", typeof(HitMode), typeof(Poptip), new PropertyMetadata(HitMode.Hover));
 
-        public static void SetHitMode(DependencyObject element, HitMode value)
-            => element.SetValue(HitModeProperty, value);
+    public static void SetHitMode(DependencyObject element, HitMode value)
+        => element.SetValue(HitModeProperty, value);
 
-        public static HitMode GetHitMode(DependencyObject element)
-            => (HitMode) element.GetValue(HitModeProperty);
+    public static HitMode GetHitMode(DependencyObject element)
+        => (HitMode) element.GetValue(HitModeProperty);
 
-        public HitMode HitMode
+    public HitMode HitMode
+    {
+        get => (HitMode) GetValue(HitModeProperty);
+        set => SetValue(HitModeProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached(
+        "Content", typeof(object), typeof(Poptip), new PropertyMetadata(default, OnContentChanged));
+
+    private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Poptip) return;
+        if (GetInstance(d) == null)
         {
-            get => (HitMode) GetValue(HitModeProperty);
-            set => SetValue(HitModeProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.RegisterAttached(
-            "Content", typeof(object), typeof(Poptip), new PropertyMetadata(default, OnContentChanged));
-
-        private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Poptip) return;
-            if (GetInstance(d) == null)
-            {
-                SetInstance(d, Default);
-                SetIsInstance(d, false);
-            }
-        }
-
-        public static void SetContent(DependencyObject element, object value)
-            => element.SetValue(ContentProperty, value);
-
-        public static object GetContent(DependencyObject element)
-            => element.GetValue(ContentProperty);
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(
-            "ContentTemplate", typeof(DataTemplate), typeof(Poptip), new PropertyMetadata(default(DataTemplate)));
-
-        public DataTemplate ContentTemplate
-        {
-            get => (DataTemplate) GetValue(ContentTemplateProperty);
-            set => SetValue(ContentTemplateProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register(
-            "ContentStringFormat", typeof(string), typeof(Poptip), new PropertyMetadata(default(string)));
-
-        public string ContentStringFormat
-        {
-            get => (string) GetValue(ContentStringFormatProperty);
-            set => SetValue(ContentStringFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register(
-            "ContentTemplateSelector", typeof(DataTemplateSelector), typeof(Poptip), new PropertyMetadata(default(DataTemplateSelector)));
-
-        public DataTemplateSelector ContentTemplateSelector
-        {
-            get => (DataTemplateSelector) GetValue(ContentTemplateSelectorProperty);
-            set => SetValue(ContentTemplateSelectorProperty, value);
-        }
-
-        public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
-            "VerticalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public static void SetVerticalOffset(DependencyObject element, double value)
-        {
-            element.SetValue(VerticalOffsetProperty, value);
-        }
-
-        public static double GetVerticalOffset(DependencyObject element)
-        {
-            return (double) element.GetValue(VerticalOffsetProperty);
-        }
-
-        public double VerticalOffset
-        {
-            get => (double) GetValue(VerticalOffsetProperty);
-            set => SetValue(VerticalOffsetProperty, value);
-        }
-
-        public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
-            "HorizontalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public static void SetHorizontalOffset(DependencyObject element, double value)
-        {
-            element.SetValue(HorizontalOffsetProperty, value);
-        }
-
-        public static double GetHorizontalOffset(DependencyObject element)
-        {
-            return (double) element.GetValue(HorizontalOffsetProperty);
-        }
-
-        public double HorizontalOffset
-        {
-            get => (double) GetValue(HorizontalOffsetProperty);
-            set => SetValue(HorizontalOffsetProperty, value);
-        }
-
-        public static readonly DependencyProperty PlacementTypeProperty = DependencyProperty.RegisterAttached(
-            "PlacementType", typeof(PlacementType), typeof(Poptip), new PropertyMetadata(PlacementType.Top));
-
-        public static void SetPlacement(DependencyObject element, PlacementType value)
-            => element.SetValue(PlacementTypeProperty, value);
-
-        public static PlacementType GetPlacement(DependencyObject element)
-            => (PlacementType) element.GetValue(PlacementTypeProperty);
-
-        public PlacementType PlacementType
-        {
-            get => (PlacementType) GetValue(PlacementTypeProperty);
-            set => SetValue(PlacementTypeProperty, value);
-        }
-
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.RegisterAttached(
-            "IsOpen", typeof(bool), typeof(Poptip), new PropertyMetadata(ValueBoxes.FalseBox, OnIsOpenChanged));
-
-        private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is Poptip poptip)
-            {
-                poptip.SwitchPoptip((bool) e.NewValue);
-            }
-            else
-            {
-                ((Poptip) GetInstance(d))?.SwitchPoptip((bool) e.NewValue);
-            }
-        }
-
-        public static void SetIsOpen(DependencyObject element, bool value)
-            => element.SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIsOpen(DependencyObject element)
-            => (bool) element.GetValue(IsOpenProperty);
-
-        public bool IsOpen
-        {
-            get => (bool) GetValue(IsOpenProperty);
-            set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static Poptip Default => new();
-
-        protected sealed override void OnTargetChanged(FrameworkElement element, bool isNew)
-        {
-            base.OnTargetChanged(element, isNew);
-
-            if (element == null) return;
-
-            if (!isNew)
-            {
-                element.MouseEnter -= Element_MouseEnter;
-                element.MouseLeave -= Element_MouseLeave;
-                element.GotFocus -= Element_GotFocus;
-                element.LostFocus -= Element_LostFocus;
-                ElementTarget = null;
-            }
-            else
-            {
-                element.MouseEnter += Element_MouseEnter;
-                element.MouseLeave += Element_MouseLeave;
-                element.GotFocus += Element_GotFocus;
-                element.LostFocus += Element_LostFocus;
-                ElementTarget = element;
-                _popup.PlacementTarget = ElementTarget;
-            }
-        }
-
-        protected override void Dispose() => SwitchPoptip(false);
-
-        private void UpdateLocation()
-        {
-            var targetWidth = Target.RenderSize.Width;
-            var targetHeight = Target.RenderSize.Height;
-
-            Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-            var size = DesiredSize;
-
-            var width = size.Width;
-            var height = size.Height;
-
-            var offsetX = .0;
-            var offsetY = .0;
-
-            var poptip = (Poptip) GetInstance(Target);
-            var popupPlacement = poptip.PlacementType;
-            var popupOffsetX = poptip.HorizontalOffset;
-            var popupOffsetY = poptip.VerticalOffset;
-
-            switch (popupPlacement)
-            {
-                case PlacementType.LeftTop:
-                    break;
-                case PlacementType.Left:
-                    offsetY = -(height - targetHeight) * 0.5;
-                    break;
-                case PlacementType.LeftBottom:
-                    offsetY = -(height - targetHeight);
-                    break;
-                case PlacementType.TopLeft:
-                    offsetX = width;
-                    offsetY = -height;
-                    break;
-                case PlacementType.Top:
-                    offsetX = (width + targetWidth) * 0.5;
-                    offsetY = -height;
-                    break;
-                case PlacementType.TopRight:
-                    offsetX = targetWidth;
-                    offsetY = -height;
-                    break;
-                case PlacementType.RightTop:
-                    offsetX = width + targetWidth;
-                    break;
-                case PlacementType.Right:
-                    offsetX = width + targetWidth;
-                    offsetY = -(height - targetHeight) * 0.5;
-                    break;
-                case PlacementType.RightBottom:
-                    offsetX = width + targetWidth;
-                    offsetY = -(height - targetHeight);
-                    break;
-                case PlacementType.BottomLeft:
-                    offsetX = width;
-                    offsetY = targetHeight;
-                    break;
-                case PlacementType.Bottom:
-                    offsetX = (width + targetWidth) * 0.5;
-                    offsetY = targetHeight;
-                    break;
-                case PlacementType.BottomRight:
-                    offsetX = targetWidth;
-                    offsetY = targetHeight;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            _popup.HorizontalOffset = offsetX + popupOffsetX;
-            _popup.VerticalOffset = offsetY + popupOffsetY;
-        }
-
-        private void SwitchPoptip(bool isShow)
-        {
-            if (isShow)
-            {
-                if (!GetIsInstance(Target))
-                {
-                    SetCurrentValue(ContentProperty, GetContent(Target));
-                    SetCurrentValue(PlacementTypeProperty, GetPlacement(Target));
-                    SetCurrentValue(HitModeProperty, GetHitMode(Target));
-                    SetCurrentValue(HorizontalOffsetProperty, GetHorizontalOffset(Target));
-                    SetCurrentValue(VerticalOffsetProperty, GetVerticalOffset(Target));
-                    SetCurrentValue(IsOpenProperty, GetIsOpen(Target));
-                }
-
-                _popup.PlacementTarget = Target;
-                UpdateLocation();
-            }
-            _popup.IsOpen = isShow;
-            Target.SetCurrentValue(IsOpenProperty, isShow);
-        }
-
-        private void Element_MouseEnter(object sender, MouseEventArgs e)
-        {
-            var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
-            if (hitMode != HitMode.Hover) return;
-
-            SwitchPoptip(true);
-        }
-
-        private void Element_MouseLeave(object sender, MouseEventArgs e)
-        {
-            var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
-            if (hitMode != HitMode.Hover) return;
-
-            SwitchPoptip(false);
-        }
-
-        private void Element_GotFocus(object sender, RoutedEventArgs e)
-        {
-            var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
-            if (hitMode != HitMode.Focus) return;
-
-            SwitchPoptip(true);
-        }
-
-        private void Element_LostFocus(object sender, RoutedEventArgs e)
-        {
-            var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
-            if (hitMode != HitMode.Focus) return;
-
-            SwitchPoptip(false);
+            SetInstance(d, Default);
+            SetIsInstance(d, false);
         }
     }
-}
+
+    public static void SetContent(DependencyObject element, object value)
+        => element.SetValue(ContentProperty, value);
+
+    public static object GetContent(DependencyObject element)
+        => element.GetValue(ContentProperty);
+
+    public object Content
+    {
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentTemplateProperty = DependencyProperty.Register(
+        "ContentTemplate", typeof(DataTemplate), typeof(Poptip), new PropertyMetadata(default(DataTemplate)));
+
+    public DataTemplate ContentTemplate
+    {
+        get => (DataTemplate) GetValue(ContentTemplateProperty);
+        set => SetValue(ContentTemplateProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentStringFormatProperty = DependencyProperty.Register(
+        "ContentStringFormat", typeof(string), typeof(Poptip), new PropertyMetadata(default(string)));
+
+    public string ContentStringFormat
+    {
+        get => (string) GetValue(ContentStringFormatProperty);
+        set => SetValue(ContentStringFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty ContentTemplateSelectorProperty = DependencyProperty.Register(
+        "ContentTemplateSelector", typeof(DataTemplateSelector), typeof(Poptip), new PropertyMetadata(default(DataTemplateSelector)));
+
+    public DataTemplateSelector ContentTemplateSelector
+    {
+        get => (DataTemplateSelector) GetValue(ContentTemplateSelectorProperty);
+        set => SetValue(ContentTemplateSelectorProperty, value);
+    }
+
+    public static readonly DependencyProperty VerticalOffsetProperty = DependencyProperty.RegisterAttached(
+        "VerticalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static void SetVerticalOffset(DependencyObject element, double value)
+    {
+        element.SetValue(VerticalOffsetProperty, value);
+    }
+
+    public static double GetVerticalOffset(DependencyObject element)
+    {
+        return (double) element.GetValue(VerticalOffsetProperty);
+    }
+
+    public double VerticalOffset
+    {
+        get => (double) GetValue(VerticalOffsetProperty);
+        set => SetValue(VerticalOffsetProperty, value);
+    }
+
+    public static readonly DependencyProperty HorizontalOffsetProperty = DependencyProperty.RegisterAttached(
+        "HorizontalOffset", typeof(double), typeof(Poptip), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static void SetHorizontalOffset(DependencyObject element, double value)
+    {
+        element.SetValue(HorizontalOffsetProperty, value);
+    }
+
+    public static double GetHorizontalOffset(DependencyObject element)
+    {
+        return (double) element.GetValue(HorizontalOffsetProperty);
+    }
+
+    public double HorizontalOffset
+    {
+        get => (double) GetValue(HorizontalOffsetProperty);
+        set => SetValue(HorizontalOffsetProperty, value);
+    }
+
+    public static readonly DependencyProperty PlacementTypeProperty = DependencyProperty.RegisterAttached(
+        "PlacementType", typeof(PlacementType), typeof(Poptip), new PropertyMetadata(PlacementType.Top));
+
+    public static void SetPlacement(DependencyObject element, PlacementType value)
+        => element.SetValue(PlacementTypeProperty, value);
+
+    public static PlacementType GetPlacement(DependencyObject element)
+        => (PlacementType) element.GetValue(PlacementTypeProperty);
+
+    public PlacementType PlacementType
+    {
+        get => (PlacementType) GetValue(PlacementTypeProperty);
+        set => SetValue(PlacementTypeProperty, value);
+    }
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.RegisterAttached(
+        "IsOpen", typeof(bool), typeof(Poptip), new PropertyMetadata(ValueBoxes.FalseBox, OnIsOpenChanged));
+
+    private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is Poptip poptip)
+        {
+            poptip.SwitchPoptip((bool) e.NewValue);
+        }
+        else
+        {
+            ((Poptip) GetInstance(d))?.SwitchPoptip((bool) e.NewValue);
+        }
+    }
+
+    public static void SetIsOpen(DependencyObject element, bool value)
+        => element.SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsOpen(DependencyObject element)
+        => (bool) element.GetValue(IsOpenProperty);
+
+    public bool IsOpen
+    {
+        get => (bool) GetValue(IsOpenProperty);
+        set => SetValue(IsOpenProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static Poptip Default => new();
+
+    protected sealed override void OnTargetChanged(FrameworkElement element, bool isNew)
+    {
+        base.OnTargetChanged(element, isNew);
+
+        if (element == null) return;
+
+        if (!isNew)
+        {
+            element.MouseEnter -= Element_MouseEnter;
+            element.MouseLeave -= Element_MouseLeave;
+            element.GotFocus -= Element_GotFocus;
+            element.LostFocus -= Element_LostFocus;
+            ElementTarget = null;
+        }
+        else
+        {
+            element.MouseEnter += Element_MouseEnter;
+            element.MouseLeave += Element_MouseLeave;
+            element.GotFocus += Element_GotFocus;
+            element.LostFocus += Element_LostFocus;
+            ElementTarget = element;
+            _popup.PlacementTarget = ElementTarget;
+        }
+    }
+
+    protected override void Dispose() => SwitchPoptip(false);
+
+    private void UpdateLocation()
+    {
+        var targetWidth = Target.RenderSize.Width;
+        var targetHeight = Target.RenderSize.Height;
+
+        Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+        var size = DesiredSize;
+
+        var width = size.Width;
+        var height = size.Height;
+
+        var offsetX = .0;
+        var offsetY = .0;
+
+        var poptip = (Poptip) GetInstance(Target);
+        var popupPlacement = poptip.PlacementType;
+        var popupOffsetX = poptip.HorizontalOffset;
+        var popupOffsetY = poptip.VerticalOffset;
+
+        switch (popupPlacement)
+        {
+            case PlacementType.LeftTop:
+                break;
+            case PlacementType.Left:
+                offsetY = -(height - targetHeight) * 0.5;
+                break;
+            case PlacementType.LeftBottom:
+                offsetY = -(height - targetHeight);
+                break;
+            case PlacementType.TopLeft:
+                offsetX = width;
+                offsetY = -height;
+                break;
+            case PlacementType.Top:
+                offsetX = (width + targetWidth) * 0.5;
+                offsetY = -height;
+                break;
+            case PlacementType.TopRight:
+                offsetX = targetWidth;
+                offsetY = -height;
+                break;
+            case PlacementType.RightTop:
+                offsetX = width + targetWidth;
+                break;
+            case PlacementType.Right:
+                offsetX = width + targetWidth;
+                offsetY = -(height - targetHeight) * 0.5;
+                break;
+            case PlacementType.RightBottom:
+                offsetX = width + targetWidth;
+                offsetY = -(height - targetHeight);
+                break;
+            case PlacementType.BottomLeft:
+                offsetX = width;
+                offsetY = targetHeight;
+                break;
+            case PlacementType.Bottom:
+                offsetX = (width + targetWidth) * 0.5;
+                offsetY = targetHeight;
+                break;
+            case PlacementType.BottomRight:
+                offsetX = targetWidth;
+                offsetY = targetHeight;
+                break;
+            default:
+                throw new ArgumentOutOfRangeException();
+        }
+
+        _popup.HorizontalOffset = offsetX + popupOffsetX;
+        _popup.VerticalOffset = offsetY + popupOffsetY;
+    }
+
+    private void SwitchPoptip(bool isShow)
+    {
+        if (isShow)
+        {
+            if (!GetIsInstance(Target))
+            {
+                SetCurrentValue(ContentProperty, GetContent(Target));
+                SetCurrentValue(PlacementTypeProperty, GetPlacement(Target));
+                SetCurrentValue(HitModeProperty, GetHitMode(Target));
+                SetCurrentValue(HorizontalOffsetProperty, GetHorizontalOffset(Target));
+                SetCurrentValue(VerticalOffsetProperty, GetVerticalOffset(Target));
+                SetCurrentValue(IsOpenProperty, GetIsOpen(Target));
+            }
+
+            _popup.PlacementTarget = Target;
+            UpdateLocation();
+        }
+        _popup.IsOpen = isShow;
+        Target.SetCurrentValue(IsOpenProperty, isShow);
+    }
+
+    private void Element_MouseEnter(object sender, MouseEventArgs e)
+    {
+        var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
+        if (hitMode != HitMode.Hover) return;
+
+        SwitchPoptip(true);
+    }
+
+    private void Element_MouseLeave(object sender, MouseEventArgs e)
+    {
+        var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
+        if (hitMode != HitMode.Hover) return;
+
+        SwitchPoptip(false);
+    }
+
+    private void Element_GotFocus(object sender, RoutedEventArgs e)
+    {
+        var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
+        if (hitMode != HitMode.Focus) return;
+
+        SwitchPoptip(true);
+    }
+
+    private void Element_LostFocus(object sender, RoutedEventArgs e)
+    {
+        var hitMode = GetIsInstance(Target) ? HitMode : GetHitMode(Target);
+        if (hitMode != HitMode.Focus) return;
+
+        SwitchPoptip(false);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
index 9b0e794d..c12aedbf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
@@ -7,206 +7,205 @@ using System.Windows.Media.Animation;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ScrollViewer : System.Windows.Controls.ScrollViewer
 {
-    public class ScrollViewer : System.Windows.Controls.ScrollViewer
+    private double _totalVerticalOffset;
+
+    private double _totalHorizontalOffset;
+
+    private bool _isRunning;
+
+    /// <summary>
+    ///     是否响应鼠标滚轮操作
+    /// </summary>
+    public static readonly DependencyProperty CanMouseWheelProperty = DependencyProperty.Register(
+        "CanMouseWheel", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    /// <summary>
+    ///     是否响应鼠标滚轮操作
+    /// </summary>
+    public bool CanMouseWheel
     {
-        private double _totalVerticalOffset;
+        get => (bool) GetValue(CanMouseWheelProperty);
+        set => SetValue(CanMouseWheelProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private double _totalHorizontalOffset;
+    protected override void OnMouseWheel(MouseWheelEventArgs e)
+    {
+        if (!CanMouseWheel) return;
 
-        private bool _isRunning;
-
-        /// <summary>
-        ///     是否响应鼠标滚轮操作
-        /// </summary>
-        public static readonly DependencyProperty CanMouseWheelProperty = DependencyProperty.Register(
-            "CanMouseWheel", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        /// <summary>
-        ///     是否响应鼠标滚轮操作
-        /// </summary>
-        public bool CanMouseWheel
+        if (!IsInertiaEnabled)
         {
-            get => (bool) GetValue(CanMouseWheelProperty);
-            set => SetValue(CanMouseWheelProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
-        {
-            if (!CanMouseWheel) return;
-
-            if (!IsInertiaEnabled)
-            {
-                if (ScrollViewerAttach.GetOrientation(this) == Orientation.Vertical)
-                {
-                    base.OnMouseWheel(e);
-                }
-                else
-                {
-                    _totalHorizontalOffset = HorizontalOffset;
-                    CurrentHorizontalOffset = HorizontalOffset;
-                    _totalHorizontalOffset = Math.Min(Math.Max(0, _totalHorizontalOffset - e.Delta), ScrollableWidth);
-                    CurrentHorizontalOffset = _totalHorizontalOffset;
-                }
-                return;
-            }
-            e.Handled = true;
-
             if (ScrollViewerAttach.GetOrientation(this) == Orientation.Vertical)
             {
-                if (!_isRunning)
-                {
-                    _totalVerticalOffset = VerticalOffset;
-                    CurrentVerticalOffset = VerticalOffset;
-                }
-                _totalVerticalOffset = Math.Min(Math.Max(0, _totalVerticalOffset - e.Delta), ScrollableHeight);
-                ScrollToVerticalOffsetWithAnimation(_totalVerticalOffset);
+                base.OnMouseWheel(e);
             }
             else
             {
-                if (!_isRunning)
-                {
-                    _totalHorizontalOffset = HorizontalOffset;
-                    CurrentHorizontalOffset = HorizontalOffset;
-                }
+                _totalHorizontalOffset = HorizontalOffset;
+                CurrentHorizontalOffset = HorizontalOffset;
                 _totalHorizontalOffset = Math.Min(Math.Max(0, _totalHorizontalOffset - e.Delta), ScrollableWidth);
-                ScrollToHorizontalOffsetWithAnimation(_totalHorizontalOffset);
+                CurrentHorizontalOffset = _totalHorizontalOffset;
             }
+            return;
         }
+        e.Handled = true;
 
-        internal void ScrollToTopInternal(double milliseconds = 500)
+        if (ScrollViewerAttach.GetOrientation(this) == Orientation.Vertical)
         {
             if (!_isRunning)
             {
                 _totalVerticalOffset = VerticalOffset;
                 CurrentVerticalOffset = VerticalOffset;
             }
-            ScrollToVerticalOffsetWithAnimation(0, milliseconds);
+            _totalVerticalOffset = Math.Min(Math.Max(0, _totalVerticalOffset - e.Delta), ScrollableHeight);
+            ScrollToVerticalOffsetWithAnimation(_totalVerticalOffset);
         }
-
-        public void ScrollToVerticalOffsetWithAnimation(double offset, double milliseconds = 500)
+        else
         {
-            var animation = AnimationHelper.CreateAnimation(offset, milliseconds);
-            animation.EasingFunction = new CubicEase
+            if (!_isRunning)
             {
-                EasingMode = EasingMode.EaseOut
-            };
-            animation.FillBehavior = FillBehavior.Stop;
-            animation.Completed += (s, e1) =>
-            {
-                CurrentVerticalOffset = offset;
-                _isRunning = false;
-            };
-            _isRunning = true;
-
-            BeginAnimation(CurrentVerticalOffsetProperty, animation, HandoffBehavior.Compose);
-        }
-
-        public void ScrollToHorizontalOffsetWithAnimation(double offset, double milliseconds = 500)
-        {
-            var animation = AnimationHelper.CreateAnimation(offset, milliseconds);
-            animation.EasingFunction = new CubicEase
-            {
-                EasingMode = EasingMode.EaseOut
-            };
-            animation.FillBehavior = FillBehavior.Stop;
-            animation.Completed += (s, e1) =>
-            {
-                CurrentHorizontalOffset = offset;
-                _isRunning = false;
-            };
-            _isRunning = true;
-
-            BeginAnimation(CurrentHorizontalOffsetProperty, animation, HandoffBehavior.Compose);
-        }
-
-        protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParameters) =>
-            IsPenetrating ? null : base.HitTestCore(hitTestParameters);
-
-        /// <summary>
-        ///     是否支持惯性
-        /// </summary>
-        public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached(
-            "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public static void SetIsInertiaEnabled(DependencyObject element, bool value) => element.SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIsInertiaEnabled(DependencyObject element) => (bool) element.GetValue(IsInertiaEnabledProperty);
-
-        /// <summary>
-        ///     是否支持惯性
-        /// </summary>
-        public bool IsInertiaEnabled
-        {
-            get => (bool) GetValue(IsInertiaEnabledProperty);
-            set => SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     控件是否可以穿透点击
-        /// </summary>
-        public static readonly DependencyProperty IsPenetratingProperty = DependencyProperty.RegisterAttached(
-            "IsPenetrating", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     控件是否可以穿透点击
-        /// </summary>
-        public bool IsPenetrating
-        {
-            get => (bool) GetValue(IsPenetratingProperty);
-            set => SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static void SetIsPenetrating(DependencyObject element, bool value) => element.SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetIsPenetrating(DependencyObject element) => (bool) element.GetValue(IsPenetratingProperty);
-
-        /// <summary>
-        ///     当前垂直滚动偏移
-        /// </summary>
-        internal static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
-            "CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
-
-        private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is ScrollViewer ctl && e.NewValue is double v)
-            {
-                ctl.ScrollToVerticalOffset(v);
+                _totalHorizontalOffset = HorizontalOffset;
+                CurrentHorizontalOffset = HorizontalOffset;
             }
-        }
-
-        /// <summary>
-        ///     当前垂直滚动偏移
-        /// </summary>
-        internal double CurrentVerticalOffset
-        {
-            // ReSharper disable once UnusedMember.Local
-            get => (double) GetValue(CurrentVerticalOffsetProperty);
-            set => SetValue(CurrentVerticalOffsetProperty, value);
-        }
-
-        /// <summary>
-        ///     当前水平滚动偏移
-        /// </summary>
-        internal static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
-            "CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
-
-        private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is ScrollViewer ctl && e.NewValue is double v)
-            {
-                ctl.ScrollToHorizontalOffset(v);
-            }
-        }
-
-        /// <summary>
-        ///     当前水平滚动偏移
-        /// </summary>
-        internal double CurrentHorizontalOffset
-        {
-            get => (double) GetValue(CurrentHorizontalOffsetProperty);
-            set => SetValue(CurrentHorizontalOffsetProperty, value);
+            _totalHorizontalOffset = Math.Min(Math.Max(0, _totalHorizontalOffset - e.Delta), ScrollableWidth);
+            ScrollToHorizontalOffsetWithAnimation(_totalHorizontalOffset);
         }
     }
-}
+
+    internal void ScrollToTopInternal(double milliseconds = 500)
+    {
+        if (!_isRunning)
+        {
+            _totalVerticalOffset = VerticalOffset;
+            CurrentVerticalOffset = VerticalOffset;
+        }
+        ScrollToVerticalOffsetWithAnimation(0, milliseconds);
+    }
+
+    public void ScrollToVerticalOffsetWithAnimation(double offset, double milliseconds = 500)
+    {
+        var animation = AnimationHelper.CreateAnimation(offset, milliseconds);
+        animation.EasingFunction = new CubicEase
+        {
+            EasingMode = EasingMode.EaseOut
+        };
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s, e1) =>
+        {
+            CurrentVerticalOffset = offset;
+            _isRunning = false;
+        };
+        _isRunning = true;
+
+        BeginAnimation(CurrentVerticalOffsetProperty, animation, HandoffBehavior.Compose);
+    }
+
+    public void ScrollToHorizontalOffsetWithAnimation(double offset, double milliseconds = 500)
+    {
+        var animation = AnimationHelper.CreateAnimation(offset, milliseconds);
+        animation.EasingFunction = new CubicEase
+        {
+            EasingMode = EasingMode.EaseOut
+        };
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s, e1) =>
+        {
+            CurrentHorizontalOffset = offset;
+            _isRunning = false;
+        };
+        _isRunning = true;
+
+        BeginAnimation(CurrentHorizontalOffsetProperty, animation, HandoffBehavior.Compose);
+    }
+
+    protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParameters) =>
+        IsPenetrating ? null : base.HitTestCore(hitTestParameters);
+
+    /// <summary>
+    ///     是否支持惯性
+    /// </summary>
+    public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached(
+        "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static void SetIsInertiaEnabled(DependencyObject element, bool value) => element.SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsInertiaEnabled(DependencyObject element) => (bool) element.GetValue(IsInertiaEnabledProperty);
+
+    /// <summary>
+    ///     是否支持惯性
+    /// </summary>
+    public bool IsInertiaEnabled
+    {
+        get => (bool) GetValue(IsInertiaEnabledProperty);
+        set => SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     控件是否可以穿透点击
+    /// </summary>
+    public static readonly DependencyProperty IsPenetratingProperty = DependencyProperty.RegisterAttached(
+        "IsPenetrating", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     控件是否可以穿透点击
+    /// </summary>
+    public bool IsPenetrating
+    {
+        get => (bool) GetValue(IsPenetratingProperty);
+        set => SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static void SetIsPenetrating(DependencyObject element, bool value) => element.SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsPenetrating(DependencyObject element) => (bool) element.GetValue(IsPenetratingProperty);
+
+    /// <summary>
+    ///     当前垂直滚动偏移
+    /// </summary>
+    internal static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
+        "CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
+
+    private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ScrollViewer ctl && e.NewValue is double v)
+        {
+            ctl.ScrollToVerticalOffset(v);
+        }
+    }
+
+    /// <summary>
+    ///     当前垂直滚动偏移
+    /// </summary>
+    internal double CurrentVerticalOffset
+    {
+        // ReSharper disable once UnusedMember.Local
+        get => (double) GetValue(CurrentVerticalOffsetProperty);
+        set => SetValue(CurrentVerticalOffsetProperty, value);
+    }
+
+    /// <summary>
+    ///     当前水平滚动偏移
+    /// </summary>
+    internal static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
+        "CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
+
+    private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ScrollViewer ctl && e.NewValue is double v)
+        {
+            ctl.ScrollToHorizontalOffset(v);
+        }
+    }
+
+    /// <summary>
+    ///     当前水平滚动偏移
+    /// </summary>
+    internal double CurrentHorizontalOffset
+    {
+        get => (double) GetValue(CurrentHorizontalOffsetProperty);
+        set => SetValue(CurrentHorizontalOffsetProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs b/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
index e6e400c9..ab88ae75 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
@@ -3,36 +3,35 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Markup;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[ContentProperty(nameof(Status))]
+public class Shield : ButtonBase
 {
-    [ContentProperty(nameof(Status))]
-    public class Shield : ButtonBase
+    public static readonly DependencyProperty SubjectProperty = DependencyProperty.Register(
+        "Subject", typeof(string), typeof(Shield), new PropertyMetadata(default(string)));
+
+    public string Subject
     {
-        public static readonly DependencyProperty SubjectProperty = DependencyProperty.Register(
-            "Subject", typeof(string), typeof(Shield), new PropertyMetadata(default(string)));
-
-        public string Subject
-        {
-            get => (string) GetValue(SubjectProperty);
-            set => SetValue(SubjectProperty, value);
-        }
-
-        public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
-            "Status", typeof(object), typeof(Shield), new PropertyMetadata(default(object)));
-
-        public object Status
-        {
-            get => GetValue(StatusProperty);
-            set => SetValue(StatusProperty, value);
-        }
-
-        public static readonly DependencyProperty ColorProperty = DependencyProperty.Register(
-            "Color", typeof(Brush), typeof(Shield), new PropertyMetadata(default(Brush)));
-
-        public Brush Color
-        {
-            get => (Brush) GetValue(ColorProperty);
-            set => SetValue(ColorProperty, value);
-        }
+        get => (string) GetValue(SubjectProperty);
+        set => SetValue(SubjectProperty, value);
     }
-}
+
+    public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
+        "Status", typeof(object), typeof(Shield), new PropertyMetadata(default(object)));
+
+    public object Status
+    {
+        get => GetValue(StatusProperty);
+        set => SetValue(StatusProperty, value);
+    }
+
+    public static readonly DependencyProperty ColorProperty = DependencyProperty.Register(
+        "Color", typeof(Brush), typeof(Shield), new PropertyMetadata(default(Brush)));
+
+    public Brush Color
+    {
+        get => (Brush) GetValue(ColorProperty);
+        set => SetValue(ColorProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs b/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
index 3d1c8f78..da6380a7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
@@ -1,29 +1,28 @@
 using System.Windows;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public sealed class Sprite : System.Windows.Window
 {
-    public sealed class Sprite : System.Windows.Window
+    private Sprite()
     {
-        private Sprite()
-        {
-            WindowStyle = WindowStyle.None;
-            AllowsTransparency = true;
-        }
-
-        public static Sprite Show(object content)
-        {
-            var sprite = new Sprite
-            {
-                Content = content
-            };
-
-            sprite.Show();
-
-            var desktopWorkingArea = SystemParameters.WorkArea;
-            sprite.Left = desktopWorkingArea.Width - sprite.ActualWidth - 50;
-            sprite.Top = 50 - sprite.Padding.Top;
-
-            return sprite;
-        }
+        WindowStyle = WindowStyle.None;
+        AllowsTransparency = true;
     }
-}
+
+    public static Sprite Show(object content)
+    {
+        var sprite = new Sprite
+        {
+            Content = content
+        };
+
+        sprite.Show();
+
+        var desktopWorkingArea = SystemParameters.WorkArea;
+        sprite.Left = desktopWorkingArea.Width - sprite.ActualWidth - 50;
+        sprite.Top = 50 - sprite.Padding.Top;
+
+        return sprite;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
index 8d33d18a..6468cad3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
@@ -5,104 +5,103 @@ using System.Windows.Media.Animation;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TransitioningContentControl : ContentControl
 {
-    public class TransitioningContentControl : ContentControl
+    private FrameworkElement _contentPresenter;
+
+    private static Storyboard StoryboardBuildInDefault;
+
+    private Storyboard _storyboardBuildIn;
+
+    public TransitioningContentControl()
     {
-        private FrameworkElement _contentPresenter;
+        Loaded += TransitioningContentControl_Loaded;
+        Unloaded += TransitioningContentControl_Unloaded;
+    }
 
-        private static Storyboard StoryboardBuildInDefault;
+    public static readonly DependencyProperty TransitionModeProperty = DependencyProperty.Register(
+        "TransitionMode", typeof(TransitionMode), typeof(TransitioningContentControl), new PropertyMetadata(default(TransitionMode), OnTransitionModeChanged));
 
-        private Storyboard _storyboardBuildIn;
+    private static void OnTransitionModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TransitioningContentControl) d;
+        ctl.OnTransitionModeChanged((TransitionMode) e.NewValue);
+    }
 
-        public TransitioningContentControl()
+    private void OnTransitionModeChanged(TransitionMode newValue)
+    {
+        _storyboardBuildIn = ResourceHelper.GetResourceInternal<Storyboard>($"{newValue}Transition");
+        StartTransition();
+    }
+
+    public TransitionMode TransitionMode
+    {
+        get => (TransitionMode) GetValue(TransitionModeProperty);
+        set => SetValue(TransitionModeProperty, value);
+    }
+
+    public static readonly DependencyProperty TransitionStoryboardProperty = DependencyProperty.Register(
+        "TransitionStoryboard", typeof(Storyboard), typeof(TransitioningContentControl), new PropertyMetadata(default(Storyboard)));
+
+    public Storyboard TransitionStoryboard
+    {
+        get => (Storyboard) GetValue(TransitionStoryboardProperty);
+        set => SetValue(TransitionStoryboardProperty, value);
+    }
+
+    private void TransitioningContentControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => StartTransition();
+
+    private void TransitioningContentControl_Loaded(object sender, RoutedEventArgs e)
+    {
+        IsVisibleChanged += TransitioningContentControl_IsVisibleChanged;
+    }
+
+    private void TransitioningContentControl_Unloaded(object sender, RoutedEventArgs e)
+    {
+        IsVisibleChanged -= TransitioningContentControl_IsVisibleChanged;
+    }
+
+    private void StartTransition()
+    {
+        if (_contentPresenter == null || !IsVisible) return;
+
+        if (TransitionStoryboard != null)
         {
-            Loaded += TransitioningContentControl_Loaded;
-            Unloaded += TransitioningContentControl_Unloaded;
+            TransitionStoryboard.Begin(_contentPresenter);
         }
-
-        public static readonly DependencyProperty TransitionModeProperty = DependencyProperty.Register(
-            "TransitionMode", typeof(TransitionMode), typeof(TransitioningContentControl), new PropertyMetadata(default(TransitionMode), OnTransitionModeChanged));
-
-        private static void OnTransitionModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else if (_storyboardBuildIn != null)
         {
-            var ctl = (TransitioningContentControl) d;
-            ctl.OnTransitionModeChanged((TransitionMode) e.NewValue);
+            _storyboardBuildIn?.Begin(_contentPresenter);
         }
-
-        private void OnTransitionModeChanged(TransitionMode newValue)
+        else
         {
-            _storyboardBuildIn = ResourceHelper.GetResourceInternal<Storyboard>($"{newValue}Transition");
-            StartTransition();
-        }
-
-        public TransitionMode TransitionMode
-        {
-            get => (TransitionMode) GetValue(TransitionModeProperty);
-            set => SetValue(TransitionModeProperty, value);
-        }
-
-        public static readonly DependencyProperty TransitionStoryboardProperty = DependencyProperty.Register(
-            "TransitionStoryboard", typeof(Storyboard), typeof(TransitioningContentControl), new PropertyMetadata(default(Storyboard)));
-
-        public Storyboard TransitionStoryboard
-        {
-            get => (Storyboard) GetValue(TransitionStoryboardProperty);
-            set => SetValue(TransitionStoryboardProperty, value);
-        }
-
-        private void TransitioningContentControl_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => StartTransition();
-
-        private void TransitioningContentControl_Loaded(object sender, RoutedEventArgs e)
-        {
-            IsVisibleChanged += TransitioningContentControl_IsVisibleChanged;
-        }
-
-        private void TransitioningContentControl_Unloaded(object sender, RoutedEventArgs e)
-        {
-            IsVisibleChanged -= TransitioningContentControl_IsVisibleChanged;
-        }
-
-        private void StartTransition()
-        {
-            if (_contentPresenter == null || !IsVisible) return;
-
-            if (TransitionStoryboard != null)
-            {
-                TransitionStoryboard.Begin(_contentPresenter);
-            }
-            else if (_storyboardBuildIn != null)
-            {
-                _storyboardBuildIn?.Begin(_contentPresenter);
-            }
-            else
-            {
-                StoryboardBuildInDefault ??= ResourceHelper.GetResourceInternal<Storyboard>($"{default(TransitionMode)}Transition");
-                StoryboardBuildInDefault?.Begin(_contentPresenter);
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _contentPresenter = VisualTreeHelper.GetChild(this, 0) as FrameworkElement;
-            if (_contentPresenter != null)
-            {
-                _contentPresenter.RenderTransformOrigin = new Point(0.5, 0.5);
-                _contentPresenter.RenderTransform = new TransformGroup
-                {
-                    Children =
-                    {
-                        new ScaleTransform(),
-                        new SkewTransform(),
-                        new RotateTransform(),
-                        new TranslateTransform()
-                    }
-                };
-            }
-
-            StartTransition();
+            StoryboardBuildInDefault ??= ResourceHelper.GetResourceInternal<Storyboard>($"{default(TransitionMode)}Transition");
+            StoryboardBuildInDefault?.Begin(_contentPresenter);
         }
     }
-}
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _contentPresenter = VisualTreeHelper.GetChild(this, 0) as FrameworkElement;
+        if (_contentPresenter != null)
+        {
+            _contentPresenter.RenderTransformOrigin = new Point(0.5, 0.5);
+            _contentPresenter.RenderTransform = new TransformGroup
+            {
+                Children =
+                {
+                    new ScaleTransform(),
+                    new SkewTransform(),
+                    new RotateTransform(),
+                    new TranslateTransform()
+                }
+            };
+        }
+
+        StartTransition();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
index e5a7a048..67b0dcf0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
@@ -5,161 +5,160 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementRoot, Type = typeof(Border))]
+[ContentProperty(nameof(Content))]
+public class Watermark : Control
 {
-    [TemplatePart(Name = ElementRoot, Type = typeof(Border))]
-    [ContentProperty(nameof(Content))]
-    public class Watermark : Control
+    private const string ElementRoot = "PART_Root";
+
+    private Border _borderRoot;
+
+    private DrawingBrush _brush;
+
+    public static readonly DependencyProperty AngleProperty = DependencyProperty.Register(
+        "Angle", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double Angle
     {
-        private const string ElementRoot = "PART_Root";
-
-        private Border _borderRoot;
-
-        private DrawingBrush _brush;
-
-        public static readonly DependencyProperty AngleProperty = DependencyProperty.Register(
-            "Angle", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public double Angle
-        {
-            get => (double) GetValue(AngleProperty);
-            set => SetValue(AngleProperty, value);
-        }
-
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
-            "Content", typeof(object), typeof(Watermark), new PropertyMetadata(default));
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        public static readonly DependencyProperty MarkProperty = DependencyProperty.Register(
-            "Mark", typeof(object), typeof(Watermark), new FrameworkPropertyMetadata(default, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public object Mark
-        {
-            get => GetValue(MarkProperty);
-            set => SetValue(MarkProperty, value);
-        }
-
-        public static readonly DependencyProperty MarkWidthProperty = DependencyProperty.Register(
-            "MarkWidth", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public double MarkWidth
-        {
-            get => (double) GetValue(MarkWidthProperty);
-            set => SetValue(MarkWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty MarkHeightProperty = DependencyProperty.Register(
-            "MarkHeight", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public double MarkHeight
-        {
-            get => (double) GetValue(MarkHeightProperty);
-            set => SetValue(MarkHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty MarkBrushProperty = DependencyProperty.Register(
-            "MarkBrush", typeof(Brush), typeof(Watermark), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public Brush MarkBrush
-        {
-            get => (Brush) GetValue(MarkBrushProperty);
-            set => SetValue(MarkBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty AutoSizeEnabledProperty = DependencyProperty.Register(
-            "AutoSizeEnabled", typeof(bool), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public bool AutoSizeEnabled
-        {
-            get => (bool) GetValue(AutoSizeEnabledProperty);
-            set => SetValue(AutoSizeEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty MarkMarginProperty = DependencyProperty.Register(
-            "MarkMargin", typeof(Thickness), typeof(Watermark), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public Thickness MarkMargin
-        {
-            get => (Thickness) GetValue(MarkMarginProperty);
-            set => SetValue(MarkMarginProperty, value);
-        }
-
-        public override void OnApplyTemplate() => _borderRoot = GetTemplateChild(ElementRoot) as Border;
-
-        private void EnsureBrush()
-        {
-            var presenter = new ContentPresenter();
-
-            if (Mark is Geometry geometry)
-            {
-                presenter.Content = new Path
-                {
-                    Width = MarkWidth,
-                    Height = MarkHeight,
-                    Fill = MarkBrush,
-                    Stretch = Stretch.Uniform,
-                    Data = geometry
-                };
-            }
-            else if (Mark is string str)
-            {
-                presenter.Content = new TextBlock
-                {
-                    Text = str,
-                    FontSize = FontSize,
-                    Foreground = MarkBrush
-                };
-            }
-            else
-            {
-                presenter.Content = Mark;
-            }
-
-            Size markSize;
-            if (AutoSizeEnabled)
-            {
-                presenter.Measure(new Size(double.MaxValue, double.MaxValue));
-                markSize = presenter.DesiredSize;
-            }
-            else
-            {
-                markSize = new Size(MarkWidth, MarkHeight);
-            }
-
-            _brush = new DrawingBrush
-            {
-                ViewportUnits = BrushMappingMode.Absolute,
-                Stretch = Stretch.Uniform,
-                TileMode = TileMode.Tile,
-                Transform = new RotateTransform(Angle),
-                Drawing = new GeometryDrawing
-                {
-                    Brush = new VisualBrush(new Border
-                    {
-                        Background = Brushes.Transparent,
-                        Padding = MarkMargin,
-                        Child = presenter
-                    }),
-                    Geometry = new RectangleGeometry(new Rect(markSize))
-                },
-                Viewport = new Rect(markSize)
-            };
-
-            RenderOptions.SetCacheInvalidationThresholdMinimum(_brush, 0.5);
-            RenderOptions.SetCacheInvalidationThresholdMaximum(_brush, 2);
-            RenderOptions.SetCachingHint(_brush, CachingHint.Cache);
-
-            if (_borderRoot != null)
-            {
-                _borderRoot.Background = _brush;
-            }
-        }
-
-        protected override void OnRender(DrawingContext drawingContext) => EnsureBrush();
+        get => (double) GetValue(AngleProperty);
+        set => SetValue(AngleProperty, value);
     }
-}
+
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+        "Content", typeof(object), typeof(Watermark), new PropertyMetadata(default));
+
+    public object Content
+    {
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
+    }
+
+    public static readonly DependencyProperty MarkProperty = DependencyProperty.Register(
+        "Mark", typeof(object), typeof(Watermark), new FrameworkPropertyMetadata(default, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public object Mark
+    {
+        get => GetValue(MarkProperty);
+        set => SetValue(MarkProperty, value);
+    }
+
+    public static readonly DependencyProperty MarkWidthProperty = DependencyProperty.Register(
+        "MarkWidth", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double MarkWidth
+    {
+        get => (double) GetValue(MarkWidthProperty);
+        set => SetValue(MarkWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty MarkHeightProperty = DependencyProperty.Register(
+        "MarkHeight", typeof(double), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public double MarkHeight
+    {
+        get => (double) GetValue(MarkHeightProperty);
+        set => SetValue(MarkHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty MarkBrushProperty = DependencyProperty.Register(
+        "MarkBrush", typeof(Brush), typeof(Watermark), new FrameworkPropertyMetadata(default(Brush), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public Brush MarkBrush
+    {
+        get => (Brush) GetValue(MarkBrushProperty);
+        set => SetValue(MarkBrushProperty, value);
+    }
+
+    public static readonly DependencyProperty AutoSizeEnabledProperty = DependencyProperty.Register(
+        "AutoSizeEnabled", typeof(bool), typeof(Watermark), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public bool AutoSizeEnabled
+    {
+        get => (bool) GetValue(AutoSizeEnabledProperty);
+        set => SetValue(AutoSizeEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty MarkMarginProperty = DependencyProperty.Register(
+        "MarkMargin", typeof(Thickness), typeof(Watermark), new FrameworkPropertyMetadata(default(Thickness), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public Thickness MarkMargin
+    {
+        get => (Thickness) GetValue(MarkMarginProperty);
+        set => SetValue(MarkMarginProperty, value);
+    }
+
+    public override void OnApplyTemplate() => _borderRoot = GetTemplateChild(ElementRoot) as Border;
+
+    private void EnsureBrush()
+    {
+        var presenter = new ContentPresenter();
+
+        if (Mark is Geometry geometry)
+        {
+            presenter.Content = new Path
+            {
+                Width = MarkWidth,
+                Height = MarkHeight,
+                Fill = MarkBrush,
+                Stretch = Stretch.Uniform,
+                Data = geometry
+            };
+        }
+        else if (Mark is string str)
+        {
+            presenter.Content = new TextBlock
+            {
+                Text = str,
+                FontSize = FontSize,
+                Foreground = MarkBrush
+            };
+        }
+        else
+        {
+            presenter.Content = Mark;
+        }
+
+        Size markSize;
+        if (AutoSizeEnabled)
+        {
+            presenter.Measure(new Size(double.MaxValue, double.MaxValue));
+            markSize = presenter.DesiredSize;
+        }
+        else
+        {
+            markSize = new Size(MarkWidth, MarkHeight);
+        }
+
+        _brush = new DrawingBrush
+        {
+            ViewportUnits = BrushMappingMode.Absolute,
+            Stretch = Stretch.Uniform,
+            TileMode = TileMode.Tile,
+            Transform = new RotateTransform(Angle),
+            Drawing = new GeometryDrawing
+            {
+                Brush = new VisualBrush(new Border
+                {
+                    Background = Brushes.Transparent,
+                    Padding = MarkMargin,
+                    Child = presenter
+                }),
+                Geometry = new RectangleGeometry(new Rect(markSize))
+            },
+            Viewport = new Rect(markSize)
+        };
+
+        RenderOptions.SetCacheInvalidationThresholdMinimum(_brush, 0.5);
+        RenderOptions.SetCacheInvalidationThresholdMaximum(_brush, 2);
+        RenderOptions.SetCachingHint(_brush, CachingHint.Cache);
+
+        if (_borderRoot != null)
+        {
+            _borderRoot.Background = _brush;
+        }
+    }
+
+    protected override void OnRender(DrawingContext drawingContext) => EnsureBrush();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs b/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
index c1c68acd..63cbf64e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
@@ -1,64 +1,63 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class AxleCanvas : Canvas
 {
-    public class AxleCanvas : Canvas
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(AxleCanvas), new PropertyMetadata(default(Orientation)));
+
+    public Orientation Orientation
     {
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(AxleCanvas), new PropertyMetadata(default(Orientation)));
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
 
-        public Orientation Orientation
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        foreach (UIElement internalChild in InternalChildren)
         {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
+            if (internalChild == null) continue;
 
-        protected override Size ArrangeOverride(Size arrangeSize)
-        {
-            foreach (UIElement internalChild in InternalChildren)
+            var x = 0.0;
+            var y = 0.0;
+
+            if (Orientation == Orientation.Horizontal)
             {
-                if (internalChild == null) continue;
+                x = (arrangeSize.Width - internalChild.DesiredSize.Width) / 2;
 
-                var x = 0.0;
-                var y = 0.0;
-
-                if (Orientation == Orientation.Horizontal)
+                var top = GetTop(internalChild);
+                if (!double.IsNaN(top))
                 {
-                    x = (arrangeSize.Width - internalChild.DesiredSize.Width) / 2;
-
-                    var top = GetTop(internalChild);
-                    if (!double.IsNaN(top))
-                    {
-                        y = top;
-                    }
-                    else
-                    {
-                        var bottom = GetBottom(internalChild);
-                        if (!double.IsNaN(bottom))
-                            y = arrangeSize.Height - internalChild.DesiredSize.Height - bottom;
-                    }
+                    y = top;
                 }
                 else
                 {
-                    y = (arrangeSize.Height - internalChild.DesiredSize.Height) / 2;
-
-                    var left = GetLeft(internalChild);
-                    if (!double.IsNaN(left))
-                    {
-                        x = left;
-                    }
-                    else
-                    {
-                        var right = GetRight(internalChild);
-                        if (!double.IsNaN(right))
-                            x = arrangeSize.Width - internalChild.DesiredSize.Width - right;
-                    }
+                    var bottom = GetBottom(internalChild);
+                    if (!double.IsNaN(bottom))
+                        y = arrangeSize.Height - internalChild.DesiredSize.Height - bottom;
                 }
-
-                internalChild.Arrange(new Rect(new Point(x, y), internalChild.DesiredSize));
             }
-            return arrangeSize;
+            else
+            {
+                y = (arrangeSize.Height - internalChild.DesiredSize.Height) / 2;
+
+                var left = GetLeft(internalChild);
+                if (!double.IsNaN(left))
+                {
+                    x = left;
+                }
+                else
+                {
+                    var right = GetRight(internalChild);
+                    if (!double.IsNaN(right))
+                        x = arrangeSize.Width - internalChild.DesiredSize.Width - right;
+                }
+            }
+
+            internalChild.Arrange(new Rect(new Point(x, y), internalChild.DesiredSize));
         }
+        return arrangeSize;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
index 49548511..fbc714aa 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
@@ -4,87 +4,86 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CirclePanel : Panel
 {
-    public class CirclePanel : Panel
+    public static readonly DependencyProperty DiameterProperty = DependencyProperty.Register(
+        "Diameter", typeof(double), typeof(CirclePanel), new FrameworkPropertyMetadata(170.0, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public double Diameter
     {
-        public static readonly DependencyProperty DiameterProperty = DependencyProperty.Register(
-            "Diameter", typeof(double), typeof(CirclePanel), new FrameworkPropertyMetadata(170.0, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public double Diameter
-        {
-            get => (double) GetValue(DiameterProperty);
-            set => SetValue(DiameterProperty, value);
-        }
-
-        public static readonly DependencyProperty KeepVerticalProperty = DependencyProperty.Register(
-            "KeepVertical", typeof(bool), typeof(CirclePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public bool KeepVertical
-        {
-            get => (bool) GetValue(KeepVerticalProperty);
-            set => SetValue(KeepVerticalProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty OffsetAngleProperty = DependencyProperty.Register(
-            "OffsetAngle", typeof(double), typeof(CirclePanel), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public double OffsetAngle
-        {
-            get => (double) GetValue(OffsetAngleProperty);
-            set => SetValue(OffsetAngleProperty, value);
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            var diameter = Diameter;
-
-            if (Children.Count == 0) return new Size(diameter, diameter);
-
-            var newSize = new Size(diameter, diameter);
-
-            foreach (UIElement element in Children)
-            {
-                element.Measure(newSize);
-            }
-
-            return newSize;
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var keepVertical = KeepVertical;
-            var offsetAngle = OffsetAngle;
-
-            var i = 0;
-            var perDeg = 360.0 / Children.Count;
-            var radius = Diameter / 2;
-
-            foreach (UIElement element in Children)
-            {
-                var centerX = element.DesiredSize.Width / 2.0;
-                var centerY = element.DesiredSize.Height / 2.0;
-                var angle = perDeg * i++ + offsetAngle;
-
-                var transform = new RotateTransform
-                {
-                    CenterX = centerX,
-                    CenterY = centerY,
-                    Angle = keepVertical ? 0 : angle
-                };
-                element.RenderTransform = transform;
-
-                var r = Math.PI * angle / 180.0;
-                var x = radius * Math.Cos(r);
-                var y = radius * Math.Sin(r);
-
-                var rectX = x + finalSize.Width / 2 - centerX;
-                var rectY = y + finalSize.Height / 2 - centerY;
-
-                element.Arrange(new Rect(rectX, rectY, element.DesiredSize.Width, element.DesiredSize.Height));
-            }
-
-            return finalSize;
-        }
+        get => (double) GetValue(DiameterProperty);
+        set => SetValue(DiameterProperty, value);
     }
-}
+
+    public static readonly DependencyProperty KeepVerticalProperty = DependencyProperty.Register(
+        "KeepVertical", typeof(bool), typeof(CirclePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public bool KeepVertical
+    {
+        get => (bool) GetValue(KeepVerticalProperty);
+        set => SetValue(KeepVerticalProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty OffsetAngleProperty = DependencyProperty.Register(
+        "OffsetAngle", typeof(double), typeof(CirclePanel), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public double OffsetAngle
+    {
+        get => (double) GetValue(OffsetAngleProperty);
+        set => SetValue(OffsetAngleProperty, value);
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var diameter = Diameter;
+
+        if (Children.Count == 0) return new Size(diameter, diameter);
+
+        var newSize = new Size(diameter, diameter);
+
+        foreach (UIElement element in Children)
+        {
+            element.Measure(newSize);
+        }
+
+        return newSize;
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var keepVertical = KeepVertical;
+        var offsetAngle = OffsetAngle;
+
+        var i = 0;
+        var perDeg = 360.0 / Children.Count;
+        var radius = Diameter / 2;
+
+        foreach (UIElement element in Children)
+        {
+            var centerX = element.DesiredSize.Width / 2.0;
+            var centerY = element.DesiredSize.Height / 2.0;
+            var angle = perDeg * i++ + offsetAngle;
+
+            var transform = new RotateTransform
+            {
+                CenterX = centerX,
+                CenterY = centerY,
+                Angle = keepVertical ? 0 : angle
+            };
+            element.RenderTransform = transform;
+
+            var r = Math.PI * angle / 180.0;
+            var x = radius * Math.Cos(r);
+            var y = radius * Math.Sin(r);
+
+            var rectX = x + finalSize.Width / 2 - centerX;
+            var rectY = y + finalSize.Height / 2 - centerY;
+
+            element.Arrange(new Rect(rectX, rectY, element.DesiredSize.Width, element.DesiredSize.Height));
+        }
+
+        return finalSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
index 9dd90545..20f1232b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
@@ -7,147 +7,146 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ElementGroup : ItemsControl
 {
-    public class ElementGroup : ItemsControl
+    private static readonly Dictionary<Orientation, Dictionary<ChildLocation, CornerRadius>> CornerRadiusDict;
+
+    public static readonly DependencyProperty OrientationProperty =
+        StackPanel.OrientationProperty.AddOwner(typeof(ElementGroup),
+            new FrameworkPropertyMetadata(ValueBoxes.HorizontalBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public Orientation Orientation
     {
-        private static readonly Dictionary<Orientation, Dictionary<ChildLocation, CornerRadius>> CornerRadiusDict;
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
+    }
 
-        public static readonly DependencyProperty OrientationProperty =
-            StackPanel.OrientationProperty.AddOwner(typeof(ElementGroup),
-                new FrameworkPropertyMetadata(ValueBoxes.HorizontalBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
+    public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+        "Layout", typeof(LinearLayout), typeof(ElementGroup),
+        new FrameworkPropertyMetadata(LinearLayout.Uniform, FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public Orientation Orientation
+    public LinearLayout Layout
+    {
+        get => (LinearLayout) GetValue(LayoutProperty);
+        set => SetValue(LayoutProperty, value);
+    }
+
+    static ElementGroup()
+    {
+        var defaultCornerRadius = ResourceHelper.GetResourceInternal<CornerRadius>("DefaultCornerRadius");
+
+        CornerRadiusDict = new Dictionary<Orientation, Dictionary<ChildLocation, CornerRadius>>
         {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
+            [Orientation.Horizontal] = new()
+            {
+                [ChildLocation.Single] = defaultCornerRadius,
+                [ChildLocation.First] = new CornerRadius(defaultCornerRadius.TopLeft, 0, 0, defaultCornerRadius.BottomLeft),
+                [ChildLocation.Middle] = new CornerRadius(),
+                [ChildLocation.Last] = new CornerRadius(0, defaultCornerRadius.TopRight, defaultCornerRadius.BottomRight, 0)
+            },
+            [Orientation.Vertical] = new()
+            {
+                [ChildLocation.Single] = defaultCornerRadius,
+                [ChildLocation.First] = new CornerRadius(defaultCornerRadius.TopLeft, defaultCornerRadius.TopRight, 0, 0),
+                [ChildLocation.Middle] = new CornerRadius(),
+                [ChildLocation.Last] = new CornerRadius(0, 0, defaultCornerRadius.BottomRight, defaultCornerRadius.BottomLeft)
+            }
+        };
+    }
+
+    protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
+    {
+        base.OnVisualChildrenChanged(visualAdded, visualRemoved);
+
+        if (visualAdded is UIElement elementAdded)
+        {
+            elementAdded.GotFocus += ElementAdded_GotFocus;
+            elementAdded.LostFocus += ElementAdded_LostFocus;
+            elementAdded.IsVisibleChanged += ElementAdded_IsVisibleChanged;
         }
 
-        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
-            "Layout", typeof(LinearLayout), typeof(ElementGroup),
-            new FrameworkPropertyMetadata(LinearLayout.Uniform, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public LinearLayout Layout
+        if (visualRemoved is UIElement elementRemoved)
         {
-            get => (LinearLayout) GetValue(LayoutProperty);
-            set => SetValue(LayoutProperty, value);
-        }
-
-        static ElementGroup()
-        {
-            var defaultCornerRadius = ResourceHelper.GetResourceInternal<CornerRadius>("DefaultCornerRadius");
-
-            CornerRadiusDict = new Dictionary<Orientation, Dictionary<ChildLocation, CornerRadius>>
-            {
-                [Orientation.Horizontal] = new()
-                {
-                    [ChildLocation.Single] = defaultCornerRadius,
-                    [ChildLocation.First] = new CornerRadius(defaultCornerRadius.TopLeft, 0, 0, defaultCornerRadius.BottomLeft),
-                    [ChildLocation.Middle] = new CornerRadius(),
-                    [ChildLocation.Last] = new CornerRadius(0, defaultCornerRadius.TopRight, defaultCornerRadius.BottomRight, 0)
-                },
-                [Orientation.Vertical] = new()
-                {
-                    [ChildLocation.Single] = defaultCornerRadius,
-                    [ChildLocation.First] = new CornerRadius(defaultCornerRadius.TopLeft, defaultCornerRadius.TopRight, 0, 0),
-                    [ChildLocation.Middle] = new CornerRadius(),
-                    [ChildLocation.Last] = new CornerRadius(0, 0, defaultCornerRadius.BottomRight, defaultCornerRadius.BottomLeft)
-                }
-            };
-        }
-
-        protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
-        {
-            base.OnVisualChildrenChanged(visualAdded, visualRemoved);
-
-            if (visualAdded is UIElement elementAdded)
-            {
-                elementAdded.GotFocus += ElementAdded_GotFocus;
-                elementAdded.LostFocus += ElementAdded_LostFocus;
-                elementAdded.IsVisibleChanged += ElementAdded_IsVisibleChanged;
-            }
-
-            if (visualRemoved is UIElement elementRemoved)
-            {
-                elementRemoved.GotFocus -= ElementAdded_GotFocus;
-                elementRemoved.LostFocus -= ElementAdded_LostFocus;
-                elementRemoved.IsVisibleChanged -= ElementAdded_IsVisibleChanged;
-            }
-        }
-
-        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) => UpdateChildrenCornerRadius();
-
-        protected override void OnRender(DrawingContext drawingContext) => UpdateChildrenCornerRadius();
-
-        private void UpdateChildrenCornerRadius()
-        {
-            var visibleChildren = GetVisibleChildrenCount();
-            var count = visibleChildren.Count;
-            if (count == 0)
-            {
-                return;
-            }
-
-            var orientation = Orientation;
-
-            if (count == 1)
-            {
-                UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.Single]);
-            }
-            else
-            {
-                UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.First]);
-
-                var childMargin = orientation == Orientation.Horizontal
-                    ? new Thickness(-1, 0, 0, 0)
-                    : new Thickness(0, -1, 0, 0);
-
-                for (var childIndex = 1; childIndex < count; childIndex++)
-                {
-                    var child = visibleChildren[childIndex];
-                    child.SetCurrentValue(MarginProperty, childMargin);
-                    UpdateChildCornerRadius(child, CornerRadiusDict[orientation][ChildLocation.Middle]);
-                }
-
-                var lastChild = visibleChildren[count - 1];
-                lastChild.SetCurrentValue(MarginProperty, childMargin);
-                UpdateChildCornerRadius(lastChild, CornerRadiusDict[orientation][ChildLocation.Last]);
-            }
-        }
-
-        private List<UIElement> GetVisibleChildrenCount()
-        {
-            return Items.OfType<UIElement>().Where(element => element.Visibility == Visibility.Visible).ToList();
-        }
-
-        private static void UpdateChildCornerRadius(DependencyObject child, CornerRadius cornerRadius)
-        {
-            if (child is Border border)
-            {
-                border.SetCurrentValue(Border.CornerRadiusProperty, cornerRadius);
-            }
-            else
-            {
-                BorderElement.SetCornerRadius(child, cornerRadius);
-            }
-        }
-
-        private void ElementAdded_LostFocus(object sender, RoutedEventArgs e) => ResetElementZIndex(e.OriginalSource);
-
-        private void ElementAdded_GotFocus(object sender, RoutedEventArgs e) => MaximizeElementZIndex(e.OriginalSource);
-
-        private static void ResetElementZIndex(object element) => Panel.SetZIndex((UIElement) element, 0);
-
-        private static void MaximizeElementZIndex(object element) => Panel.SetZIndex((UIElement) element, int.MaxValue);
-
-        private void ElementAdded_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => UpdateChildrenCornerRadius();
-
-        private enum ChildLocation
-        {
-            Single,
-            First,
-            Middle,
-            Last
+            elementRemoved.GotFocus -= ElementAdded_GotFocus;
+            elementRemoved.LostFocus -= ElementAdded_LostFocus;
+            elementRemoved.IsVisibleChanged -= ElementAdded_IsVisibleChanged;
         }
     }
-}
+
+    protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e) => UpdateChildrenCornerRadius();
+
+    protected override void OnRender(DrawingContext drawingContext) => UpdateChildrenCornerRadius();
+
+    private void UpdateChildrenCornerRadius()
+    {
+        var visibleChildren = GetVisibleChildrenCount();
+        var count = visibleChildren.Count;
+        if (count == 0)
+        {
+            return;
+        }
+
+        var orientation = Orientation;
+
+        if (count == 1)
+        {
+            UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.Single]);
+        }
+        else
+        {
+            UpdateChildCornerRadius(visibleChildren[0], CornerRadiusDict[orientation][ChildLocation.First]);
+
+            var childMargin = orientation == Orientation.Horizontal
+                ? new Thickness(-1, 0, 0, 0)
+                : new Thickness(0, -1, 0, 0);
+
+            for (var childIndex = 1; childIndex < count; childIndex++)
+            {
+                var child = visibleChildren[childIndex];
+                child.SetCurrentValue(MarginProperty, childMargin);
+                UpdateChildCornerRadius(child, CornerRadiusDict[orientation][ChildLocation.Middle]);
+            }
+
+            var lastChild = visibleChildren[count - 1];
+            lastChild.SetCurrentValue(MarginProperty, childMargin);
+            UpdateChildCornerRadius(lastChild, CornerRadiusDict[orientation][ChildLocation.Last]);
+        }
+    }
+
+    private List<UIElement> GetVisibleChildrenCount()
+    {
+        return Items.OfType<UIElement>().Where(element => element.Visibility == Visibility.Visible).ToList();
+    }
+
+    private static void UpdateChildCornerRadius(DependencyObject child, CornerRadius cornerRadius)
+    {
+        if (child is Border border)
+        {
+            border.SetCurrentValue(Border.CornerRadiusProperty, cornerRadius);
+        }
+        else
+        {
+            BorderElement.SetCornerRadius(child, cornerRadius);
+        }
+    }
+
+    private void ElementAdded_LostFocus(object sender, RoutedEventArgs e) => ResetElementZIndex(e.OriginalSource);
+
+    private void ElementAdded_GotFocus(object sender, RoutedEventArgs e) => MaximizeElementZIndex(e.OriginalSource);
+
+    private static void ResetElementZIndex(object element) => Panel.SetZIndex((UIElement) element, 0);
+
+    private static void MaximizeElementZIndex(object element) => Panel.SetZIndex((UIElement) element, int.MaxValue);
+
+    private void ElementAdded_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e) => UpdateChildrenCornerRadius();
+
+    private enum ChildLocation
+    {
+        Single,
+        First,
+        Middle,
+        Last
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
index 93859a2d..09301afd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
@@ -8,381 +8,400 @@ using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class FlexPanel : Panel
 {
-    public class FlexPanel : Panel
+    private UVSize _uvConstraint;
+
+    private int _lineCount;
+
+    private readonly List<FlexItemInfo> _orderList = new();
+
+    #region Item
+
+    public static readonly DependencyProperty OrderProperty = DependencyProperty.RegisterAttached(
+        "Order", typeof(int), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(ValueBoxes.Int0Box, OnItemPropertyChanged));
+
+    public static void SetOrder(DependencyObject element, int value)
+        => element.SetValue(OrderProperty, value);
+
+    public static int GetOrder(DependencyObject element)
+        => (int) element.GetValue(OrderProperty);
+
+    public static readonly DependencyProperty FlexGrowProperty = DependencyProperty.RegisterAttached(
+        "FlexGrow", typeof(double), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box, OnItemPropertyChanged),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public static void SetFlexGrow(DependencyObject element, double value)
+        => element.SetValue(FlexGrowProperty, value);
+
+    public static double GetFlexGrow(DependencyObject element)
+        => (double) element.GetValue(FlexGrowProperty);
+
+    public static readonly DependencyProperty FlexShrinkProperty = DependencyProperty.RegisterAttached(
+        "FlexShrink", typeof(double), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(ValueBoxes.Double1Box, OnItemPropertyChanged),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public static void SetFlexShrink(DependencyObject element, double value)
+        => element.SetValue(FlexShrinkProperty, value);
+
+    public static double GetFlexShrink(DependencyObject element)
+        => (double) element.GetValue(FlexShrinkProperty);
+
+    public static readonly DependencyProperty FlexBasisProperty = DependencyProperty.RegisterAttached(
+        "FlexBasis", typeof(double), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(double.NaN, OnItemPropertyChanged));
+
+    public static void SetFlexBasis(DependencyObject element, double value)
+        => element.SetValue(FlexBasisProperty, value);
+
+    public static double GetFlexBasis(DependencyObject element)
+        => (double) element.GetValue(FlexBasisProperty);
+
+    public static readonly DependencyProperty AlignSelfProperty = DependencyProperty.RegisterAttached(
+        "AlignSelf", typeof(FlexItemAlignment), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexItemAlignment), OnItemPropertyChanged));
+
+    public static void SetAlignSelf(DependencyObject element, FlexItemAlignment value)
+        => element.SetValue(AlignSelfProperty, value);
+
+    #endregion
+
+    #region Panel
+
+    public static FlexItemAlignment GetAlignSelf(DependencyObject element)
+        => (FlexItemAlignment) element.GetValue(AlignSelfProperty);
+
+    public static readonly DependencyProperty FlexDirectionProperty = DependencyProperty.Register(
+        "FlexDirection", typeof(FlexDirection), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexDirection), FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public FlexDirection FlexDirection
     {
-        private UVSize _uvConstraint;
+        get => (FlexDirection) GetValue(FlexDirectionProperty);
+        set => SetValue(FlexDirectionProperty, value);
+    }
 
-        private int _lineCount;
+    public static readonly DependencyProperty FlexWrapProperty = DependencyProperty.Register(
+        "FlexWrap", typeof(FlexWrap), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexWrap), FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        private readonly List<FlexItemInfo> _orderList = new();
+    public FlexWrap FlexWrap
+    {
+        get => (FlexWrap) GetValue(FlexWrapProperty);
+        set => SetValue(FlexWrapProperty, value);
+    }
 
-        #region Item
+    public static readonly DependencyProperty JustifyContentProperty = DependencyProperty.Register(
+        "JustifyContent", typeof(FlexContentJustify), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexContentJustify),
+            FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public static readonly DependencyProperty OrderProperty = DependencyProperty.RegisterAttached(
-            "Order", typeof(int), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(ValueBoxes.Int0Box, OnItemPropertyChanged));
+    public FlexContentJustify JustifyContent
+    {
+        get => (FlexContentJustify) GetValue(JustifyContentProperty);
+        set => SetValue(JustifyContentProperty, value);
+    }
 
-        public static void SetOrder(DependencyObject element, int value)
-            => element.SetValue(OrderProperty, value);
+    public static readonly DependencyProperty AlignItemsProperty = DependencyProperty.Register(
+        "AlignItems", typeof(FlexItemsAlignment), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexItemsAlignment),
+            FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public static int GetOrder(DependencyObject element)
-            => (int) element.GetValue(OrderProperty);
+    public FlexItemsAlignment AlignItems
+    {
+        get => (FlexItemsAlignment) GetValue(AlignItemsProperty);
+        set => SetValue(AlignItemsProperty, value);
+    }
 
-        public static readonly DependencyProperty FlexGrowProperty = DependencyProperty.RegisterAttached(
-            "FlexGrow", typeof(double), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box, OnItemPropertyChanged),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+    public static readonly DependencyProperty AlignContentProperty = DependencyProperty.Register(
+        "AlignContent", typeof(FlexContentAlignment), typeof(FlexPanel),
+        new FrameworkPropertyMetadata(default(FlexContentAlignment),
+            FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        public static void SetFlexGrow(DependencyObject element, double value)
-            => element.SetValue(FlexGrowProperty, value);
+    public FlexContentAlignment AlignContent
+    {
+        get => (FlexContentAlignment) GetValue(AlignContentProperty);
+        set => SetValue(AlignContentProperty, value);
+    }
 
-        public static double GetFlexGrow(DependencyObject element)
-            => (double) element.GetValue(FlexGrowProperty);
+    #endregion
 
-        public static readonly DependencyProperty FlexShrinkProperty = DependencyProperty.RegisterAttached(
-            "FlexShrink", typeof(double), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(ValueBoxes.Double1Box, OnItemPropertyChanged),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public static void SetFlexShrink(DependencyObject element, double value)
-            => element.SetValue(FlexShrinkProperty, value);
-
-        public static double GetFlexShrink(DependencyObject element)
-            => (double) element.GetValue(FlexShrinkProperty);
-
-        public static readonly DependencyProperty FlexBasisProperty = DependencyProperty.RegisterAttached(
-            "FlexBasis", typeof(double), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(double.NaN, OnItemPropertyChanged));
-
-        public static void SetFlexBasis(DependencyObject element, double value)
-            => element.SetValue(FlexBasisProperty, value);
-
-        public static double GetFlexBasis(DependencyObject element)
-            => (double) element.GetValue(FlexBasisProperty);
-
-        public static readonly DependencyProperty AlignSelfProperty = DependencyProperty.RegisterAttached(
-            "AlignSelf", typeof(FlexItemAlignment), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexItemAlignment), OnItemPropertyChanged));
-
-        public static void SetAlignSelf(DependencyObject element, FlexItemAlignment value)
-            => element.SetValue(AlignSelfProperty, value);
-
-        #endregion
-
-        #region Panel
-
-        public static FlexItemAlignment GetAlignSelf(DependencyObject element)
-            => (FlexItemAlignment) element.GetValue(AlignSelfProperty);
-
-        public static readonly DependencyProperty FlexDirectionProperty = DependencyProperty.Register(
-            "FlexDirection", typeof(FlexDirection), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexDirection), FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public FlexDirection FlexDirection
+    private static void OnItemPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is UIElement element)
         {
-            get => (FlexDirection) GetValue(FlexDirectionProperty);
-            set => SetValue(FlexDirectionProperty, value);
-        }
-
-        public static readonly DependencyProperty FlexWrapProperty = DependencyProperty.Register(
-            "FlexWrap", typeof(FlexWrap), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexWrap), FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public FlexWrap FlexWrap
-        {
-            get => (FlexWrap) GetValue(FlexWrapProperty);
-            set => SetValue(FlexWrapProperty, value);
-        }
-
-        public static readonly DependencyProperty JustifyContentProperty = DependencyProperty.Register(
-            "JustifyContent", typeof(FlexContentJustify), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexContentJustify),
-                FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public FlexContentJustify JustifyContent
-        {
-            get => (FlexContentJustify) GetValue(JustifyContentProperty);
-            set => SetValue(JustifyContentProperty, value);
-        }
-
-        public static readonly DependencyProperty AlignItemsProperty = DependencyProperty.Register(
-            "AlignItems", typeof(FlexItemsAlignment), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexItemsAlignment),
-                FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public FlexItemsAlignment AlignItems
-        {
-            get => (FlexItemsAlignment) GetValue(AlignItemsProperty);
-            set => SetValue(AlignItemsProperty, value);
-        }
-
-        public static readonly DependencyProperty AlignContentProperty = DependencyProperty.Register(
-            "AlignContent", typeof(FlexContentAlignment), typeof(FlexPanel),
-            new FrameworkPropertyMetadata(default(FlexContentAlignment),
-                FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public FlexContentAlignment AlignContent
-        {
-            get => (FlexContentAlignment) GetValue(AlignContentProperty);
-            set => SetValue(AlignContentProperty, value);
-        }
-
-        #endregion
-
-        private static void OnItemPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is UIElement element)
+            if (VisualTreeHelper.GetParent(element) is FlexPanel p)
             {
-                if (VisualTreeHelper.GetParent(element) is FlexPanel p)
-                {
-                    p.InvalidateMeasure();
-                }
+                p.InvalidateMeasure();
             }
         }
+    }
 
-        protected override Size MeasureOverride(Size constraint)
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var flexDirection = FlexDirection;
+        var flexWrap = FlexWrap;
+
+        var curLineSize = new UVSize(flexDirection);
+        var panelSize = new UVSize(flexDirection);
+        _uvConstraint = new UVSize(flexDirection, constraint);
+        var childConstraint = new Size(constraint.Width, constraint.Height);
+        _lineCount = 1;
+        var children = InternalChildren;
+
+        _orderList.Clear();
+        for (var i = 0; i < children.Count; i++)
         {
-            var flexDirection = FlexDirection;
-            var flexWrap = FlexWrap;
+            var child = children[i];
+            if (child == null) continue;
 
-            var curLineSize = new UVSize(flexDirection);
-            var panelSize = new UVSize(flexDirection);
-            _uvConstraint = new UVSize(flexDirection, constraint);
-            var childConstraint = new Size(constraint.Width, constraint.Height);
-            _lineCount = 1;
-            var children = InternalChildren;
+            _orderList.Add(new FlexItemInfo(i, GetOrder(child)));
+        }
 
-            _orderList.Clear();
-            for (var i = 0; i < children.Count; i++)
+        _orderList.Sort();
+
+        for (var i = 0; i < children.Count; i++)
+        {
+            var child = children[_orderList[i].Index];
+            if (child == null) continue;
+
+            var flexBasis = GetFlexBasis(child);
+            if (!flexBasis.IsNaN())
             {
-                var child = children[i];
-                if (child == null) continue;
-
-                _orderList.Add(new FlexItemInfo(i, GetOrder(child)));
+                child.SetCurrentValue(WidthProperty, flexBasis);
             }
+            child.Measure(childConstraint);
 
-            _orderList.Sort();
+            var sz = new UVSize(flexDirection, child.DesiredSize);
 
-            for (var i = 0; i < children.Count; i++)
+            if (flexWrap == FlexWrap.NoWrap) //continue to accumulate a line
             {
-                var child = children[_orderList[i].Index];
-                if (child == null) continue;
-
-                var flexBasis = GetFlexBasis(child);
-                if (!flexBasis.IsNaN())
+                curLineSize.U += sz.U;
+                curLineSize.V = Math.Max(sz.V, curLineSize.V);
+            }
+            else
+            {
+                if (MathHelper.GreaterThan(curLineSize.U + sz.U, _uvConstraint.U)) //need to switch to another line
                 {
-                    child.SetCurrentValue(WidthProperty, flexBasis);
+                    panelSize.U = Math.Max(curLineSize.U, panelSize.U);
+                    panelSize.V += curLineSize.V;
+                    curLineSize = sz;
+                    _lineCount++;
+
+                    if (MathHelper.GreaterThan(sz.U, _uvConstraint.U)) //the element is wider then the constrint - give it a separate line
+                    {
+                        panelSize.U = Math.Max(sz.U, panelSize.U);
+                        panelSize.V += sz.V;
+                        curLineSize = new UVSize(flexDirection);
+                        _lineCount++;
+                    }
                 }
-                child.Measure(childConstraint);
-
-                var sz = new UVSize(flexDirection, child.DesiredSize);
-
-                if (flexWrap == FlexWrap.NoWrap) //continue to accumulate a line
+                else //continue to accumulate a line
                 {
                     curLineSize.U += sz.U;
                     curLineSize.V = Math.Max(sz.V, curLineSize.V);
                 }
-                else
-                {
-                    if (MathHelper.GreaterThan(curLineSize.U + sz.U, _uvConstraint.U)) //need to switch to another line
-                    {
-                        panelSize.U = Math.Max(curLineSize.U, panelSize.U);
-                        panelSize.V += curLineSize.V;
-                        curLineSize = sz;
-                        _lineCount++;
-
-                        if (MathHelper.GreaterThan(sz.U, _uvConstraint.U)) //the element is wider then the constrint - give it a separate line
-                        {
-                            panelSize.U = Math.Max(sz.U, panelSize.U);
-                            panelSize.V += sz.V;
-                            curLineSize = new UVSize(flexDirection);
-                            _lineCount++;
-                        }
-                    }
-                    else //continue to accumulate a line
-                    {
-                        curLineSize.U += sz.U;
-                        curLineSize.V = Math.Max(sz.V, curLineSize.V);
-                    }
-                }
             }
-
-            //the last line size, if any should be added
-            panelSize.U = Math.Max(curLineSize.U, panelSize.U);
-            panelSize.V += curLineSize.V;
-
-            //go from UV space to W/H space
-            return new Size(panelSize.Width, panelSize.Height);
         }
 
-        protected override Size ArrangeOverride(Size arrangeSize)
+        //the last line size, if any should be added
+        panelSize.U = Math.Max(curLineSize.U, panelSize.U);
+        panelSize.V += curLineSize.V;
+
+        //go from UV space to W/H space
+        return new Size(panelSize.Width, panelSize.Height);
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        var flexDirection = FlexDirection;
+        var flexWrap = FlexWrap;
+        var alignContent = AlignContent;
+
+        var uvFinalSize = new UVSize(flexDirection, arrangeSize);
+        if (MathHelper.IsZero(uvFinalSize.U) || MathHelper.IsZero(uvFinalSize.V)) return arrangeSize;
+
+        // init status
+        var children = InternalChildren;
+        var lineIndex = 0;
+
+        var curLineSizeArr = new UVSize[_lineCount];
+        curLineSizeArr[0] = new UVSize(flexDirection);
+
+        var lastInLineArr = new int[_lineCount];
+        for (var i = 0; i < _lineCount; i++)
         {
-            var flexDirection = FlexDirection;
-            var flexWrap = FlexWrap;
-            var alignContent = AlignContent;
+            lastInLineArr[i] = int.MaxValue;
+        }
 
-            var uvFinalSize = new UVSize(flexDirection, arrangeSize);
-            if (MathHelper.IsZero(uvFinalSize.U) || MathHelper.IsZero(uvFinalSize.V)) return arrangeSize;
+        // calculate line max U space
+        for (var i = 0; i < children.Count; i++)
+        {
+            var child = children[_orderList[i].Index];
+            if (child == null) continue;
 
-            // init status
-            var children = InternalChildren;
-            var lineIndex = 0;
+            var sz = new UVSize(flexDirection, child.DesiredSize);
 
-            var curLineSizeArr = new UVSize[_lineCount];
-            curLineSizeArr[0] = new UVSize(flexDirection);
-
-            var lastInLineArr = new int[_lineCount];
-            for (var i = 0; i < _lineCount; i++)
+            if (flexWrap == FlexWrap.NoWrap)
             {
-                lastInLineArr[i] = int.MaxValue;
+                curLineSizeArr[lineIndex].U += sz.U;
+                curLineSizeArr[lineIndex].V = Math.Max(sz.V, curLineSizeArr[lineIndex].V);
             }
-
-            // calculate line max U space
-            for (var i = 0; i < children.Count; i++)
+            else
             {
-                var child = children[_orderList[i].Index];
-                if (child == null) continue;
+                if (MathHelper.GreaterThan(curLineSizeArr[lineIndex].U + sz.U, uvFinalSize.U)) //need to switch to another line
+                {
+                    lastInLineArr[lineIndex] = i;
+                    lineIndex++;
+                    curLineSizeArr[lineIndex] = sz;
 
-                var sz = new UVSize(flexDirection, child.DesiredSize);
-
-                if (flexWrap == FlexWrap.NoWrap)
+                    if (MathHelper.GreaterThan(sz.U, uvFinalSize.U)) //the element is wider then the constraint - give it a separate line
+                    {
+                        //switch to next line which only contain one element
+                        lastInLineArr[lineIndex] = i;
+                        lineIndex++;
+                        curLineSizeArr[lineIndex] = new UVSize(flexDirection);
+                    }
+                }
+                else //continue to accumulate a line
                 {
                     curLineSizeArr[lineIndex].U += sz.U;
                     curLineSizeArr[lineIndex].V = Math.Max(sz.V, curLineSizeArr[lineIndex].V);
                 }
+            }
+        }
+
+        // init status
+        var scaleU = Math.Min(_uvConstraint.U / uvFinalSize.U, 1);
+        var firstInLine = 0;
+        var wrapReverseAdd = 0;
+        var wrapReverseFlag = flexWrap == FlexWrap.WrapReverse ? -1 : 1;
+        var accumulatedFlag = flexWrap == FlexWrap.WrapReverse ? 1 : 0;
+        var itemsU = .0;
+        var accumulatedV = .0;
+        var freeV = uvFinalSize.V;
+        foreach (var flexSize in curLineSizeArr)
+        {
+            freeV -= flexSize.V;
+        }
+
+        var freeItemV = freeV;
+
+        // calculate status
+        var lineFreeVArr = new double[_lineCount];
+        switch (alignContent)
+        {
+            case FlexContentAlignment.Stretch:
+                if (_lineCount > 1)
+                {
+                    freeItemV = freeV / _lineCount;
+                    for (var i = 0; i < _lineCount; i++)
+                    {
+                        lineFreeVArr[i] = freeItemV;
+                    }
+
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - lineFreeVArr[0] : 0;
+                }
+
+                break;
+            case FlexContentAlignment.FlexStart:
+                wrapReverseAdd = flexWrap == FlexWrap.WrapReverse ? 0 : 1;
+                if (_lineCount > 1)
+                {
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V : 0;
+                }
                 else
                 {
-                    if (MathHelper.GreaterThan(curLineSizeArr[lineIndex].U + sz.U, uvFinalSize.U)) //need to switch to another line
-                    {
-                        lastInLineArr[lineIndex] = i;
-                        lineIndex++;
-                        curLineSizeArr[lineIndex] = sz;
-
-                        if (MathHelper.GreaterThan(sz.U, uvFinalSize.U)) //the element is wider then the constraint - give it a separate line
-                        {
-                            //switch to next line which only contain one element
-                            lastInLineArr[lineIndex] = i;
-                            lineIndex++;
-                            curLineSizeArr[lineIndex] = new UVSize(flexDirection);
-                        }
-                    }
-                    else //continue to accumulate a line
-                    {
-                        curLineSizeArr[lineIndex].U += sz.U;
-                        curLineSizeArr[lineIndex].V = Math.Max(sz.V, curLineSizeArr[lineIndex].V);
-                    }
+                    wrapReverseAdd = 0;
                 }
-            }
 
-            // init status
-            var scaleU = Math.Min(_uvConstraint.U / uvFinalSize.U, 1);
-            var firstInLine = 0;
-            var wrapReverseAdd = 0;
-            var wrapReverseFlag = flexWrap == FlexWrap.WrapReverse ? -1 : 1;
-            var accumulatedFlag = flexWrap == FlexWrap.WrapReverse ? 1 : 0;
-            var itemsU = .0;
-            var accumulatedV = .0;
-            var freeV = uvFinalSize.V;
-            foreach (var flexSize in curLineSizeArr)
-            {
-                freeV -= flexSize.V;
-            }
-
-            var freeItemV = freeV;
-
-            // calculate status
-            var lineFreeVArr = new double[_lineCount];
-            switch (alignContent)
-            {
-                case FlexContentAlignment.Stretch:
-                    if (_lineCount > 1)
-                    {
-                        freeItemV = freeV / _lineCount;
-                        for (var i = 0; i < _lineCount; i++)
-                        {
-                            lineFreeVArr[i] = freeItemV;
-                        }
-
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - lineFreeVArr[0] : 0;
-                    }
-
-                    break;
-                case FlexContentAlignment.FlexStart:
-                    wrapReverseAdd = flexWrap == FlexWrap.WrapReverse ? 0 : 1;
-                    if (_lineCount > 1)
-                    {
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V : 0;
-                    }
-                    else
-                    {
-                        wrapReverseAdd = 0;
-                    }
-
-                    break;
-                case FlexContentAlignment.FlexEnd:
-                    wrapReverseAdd = flexWrap == FlexWrap.WrapReverse ? 1 : 0;
-                    if (_lineCount > 1)
-                    {
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeV : freeV;
-                    }
-                    else
-                    {
-                        wrapReverseAdd = 0;
-                    }
-
-                    break;
-                case FlexContentAlignment.Center:
-                    if (_lineCount > 1)
-                    {
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeV * 0.5 : freeV * 0.5;
-                    }
-
-                    break;
-                case FlexContentAlignment.SpaceBetween:
-                    if (_lineCount > 1)
-                    {
-                        freeItemV = freeV / (_lineCount - 1);
-                        for (var i = 0; i < _lineCount - 1; i++)
-                        {
-                            lineFreeVArr[i] = freeItemV;
-                        }
-
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V : 0;
-                    }
-
-                    break;
-                case FlexContentAlignment.SpaceAround:
-                    if (_lineCount > 1)
-                    {
-                        freeItemV = freeV / _lineCount * 0.5;
-                        for (var i = 0; i < _lineCount - 1; i++)
-                        {
-                            lineFreeVArr[i] = freeItemV * 2;
-                        }
-
-                        accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeItemV : freeItemV;
-                    }
-
-                    break;
-            }
-
-            // clear status
-            lineIndex = 0;
-
-            // arrange line
-            for (var i = 0; i < children.Count; i++)
-            {
-                var child = children[_orderList[i].Index];
-                if (child == null) continue;
-
-                var sz = new UVSize(flexDirection, child.DesiredSize);
-
-                if (flexWrap != FlexWrap.NoWrap)
+                break;
+            case FlexContentAlignment.FlexEnd:
+                wrapReverseAdd = flexWrap == FlexWrap.WrapReverse ? 1 : 0;
+                if (_lineCount > 1)
                 {
-                    if (i >= lastInLineArr[lineIndex]) //need to switch to another line
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeV : freeV;
+                }
+                else
+                {
+                    wrapReverseAdd = 0;
+                }
+
+                break;
+            case FlexContentAlignment.Center:
+                if (_lineCount > 1)
+                {
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeV * 0.5 : freeV * 0.5;
+                }
+
+                break;
+            case FlexContentAlignment.SpaceBetween:
+                if (_lineCount > 1)
+                {
+                    freeItemV = freeV / (_lineCount - 1);
+                    for (var i = 0; i < _lineCount - 1; i++)
                     {
+                        lineFreeVArr[i] = freeItemV;
+                    }
+
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V : 0;
+                }
+
+                break;
+            case FlexContentAlignment.SpaceAround:
+                if (_lineCount > 1)
+                {
+                    freeItemV = freeV / _lineCount * 0.5;
+                    for (var i = 0; i < _lineCount - 1; i++)
+                    {
+                        lineFreeVArr[i] = freeItemV * 2;
+                    }
+
+                    accumulatedV = flexWrap == FlexWrap.WrapReverse ? uvFinalSize.V - curLineSizeArr[0].V - freeItemV : freeItemV;
+                }
+
+                break;
+        }
+
+        // clear status
+        lineIndex = 0;
+
+        // arrange line
+        for (var i = 0; i < children.Count; i++)
+        {
+            var child = children[_orderList[i].Index];
+            if (child == null) continue;
+
+            var sz = new UVSize(flexDirection, child.DesiredSize);
+
+            if (flexWrap != FlexWrap.NoWrap)
+            {
+                if (i >= lastInLineArr[lineIndex]) //need to switch to another line
+                {
+                    ArrangeLine(new FlexLineInfo
+                    {
+                        ItemsU = itemsU,
+                        OffsetV = accumulatedV + freeItemV * wrapReverseAdd,
+                        LineV = curLineSizeArr[lineIndex].V,
+                        LineFreeV = freeItemV,
+                        LineU = uvFinalSize.U,
+                        ItemStartIndex = firstInLine,
+                        ItemEndIndex = i,
+                        ScaleU = scaleU
+                    });
+
+                    accumulatedV += (lineFreeVArr[lineIndex] + curLineSizeArr[lineIndex + accumulatedFlag].V) * wrapReverseFlag;
+                    lineIndex++;
+                    itemsU = 0;
+
+                    if (i >= lastInLineArr[lineIndex]) //the element is wider then the constraint - give it a separate line
+                    {
+                        //switch to next line which only contain one element
                         ArrangeLine(new FlexLineInfo
                         {
                             ItemsU = itemsU,
@@ -390,344 +409,324 @@ namespace HandyControl.Controls
                             LineV = curLineSizeArr[lineIndex].V,
                             LineFreeV = freeItemV,
                             LineU = uvFinalSize.U,
-                            ItemStartIndex = firstInLine,
-                            ItemEndIndex = i,
+                            ItemStartIndex = i,
+                            ItemEndIndex = ++i,
                             ScaleU = scaleU
                         });
 
                         accumulatedV += (lineFreeVArr[lineIndex] + curLineSizeArr[lineIndex + accumulatedFlag].V) * wrapReverseFlag;
                         lineIndex++;
                         itemsU = 0;
-
-                        if (i >= lastInLineArr[lineIndex]) //the element is wider then the constraint - give it a separate line
-                        {
-                            //switch to next line which only contain one element
-                            ArrangeLine(new FlexLineInfo
-                            {
-                                ItemsU = itemsU,
-                                OffsetV = accumulatedV + freeItemV * wrapReverseAdd,
-                                LineV = curLineSizeArr[lineIndex].V,
-                                LineFreeV = freeItemV,
-                                LineU = uvFinalSize.U,
-                                ItemStartIndex = i,
-                                ItemEndIndex = ++i,
-                                ScaleU = scaleU
-                            });
-
-                            accumulatedV += (lineFreeVArr[lineIndex] + curLineSizeArr[lineIndex + accumulatedFlag].V) * wrapReverseFlag;
-                            lineIndex++;
-                            itemsU = 0;
-                        }
-
-                        firstInLine = i;
                     }
+
+                    firstInLine = i;
                 }
-
-                itemsU += sz.U;
             }
 
-            // arrange the last line, if any
-            if (firstInLine < children.Count)
-            {
-                ArrangeLine(new FlexLineInfo
-                {
-                    ItemsU = itemsU,
-                    OffsetV = accumulatedV + freeItemV * wrapReverseAdd,
-                    LineV = curLineSizeArr[lineIndex].V,
-                    LineFreeV = freeItemV,
-                    LineU = uvFinalSize.U,
-                    ItemStartIndex = firstInLine,
-                    ItemEndIndex = children.Count,
-                    ScaleU = scaleU
-                });
-            }
-
-            return arrangeSize;
+            itemsU += sz.U;
         }
 
-        private void ArrangeLine(FlexLineInfo lineInfo)
+        // arrange the last line, if any
+        if (firstInLine < children.Count)
         {
-            var flexDirection = FlexDirection;
-            var flexWrap = FlexWrap;
-            var justifyContent = JustifyContent;
-            var alignItems = AlignItems;
-
-            var isHorizontal = flexDirection == FlexDirection.Row || flexDirection == FlexDirection.RowReverse;
-            var isReverse = flexDirection == FlexDirection.RowReverse || flexDirection == FlexDirection.ColumnReverse;
-            var itemCount = lineInfo.ItemEndIndex - lineInfo.ItemStartIndex;
-            var children = InternalChildren;
-            var lineFreeU = lineInfo.LineU - lineInfo.ItemsU;
-            var constraintFreeU = _uvConstraint.U - lineInfo.ItemsU;
-
-            // calculate initial u
-            var u = .0;
-            if (isReverse)
+            ArrangeLine(new FlexLineInfo
             {
-                u = justifyContent switch
+                ItemsU = itemsU,
+                OffsetV = accumulatedV + freeItemV * wrapReverseAdd,
+                LineV = curLineSizeArr[lineIndex].V,
+                LineFreeV = freeItemV,
+                LineU = uvFinalSize.U,
+                ItemStartIndex = firstInLine,
+                ItemEndIndex = children.Count,
+                ScaleU = scaleU
+            });
+        }
+
+        return arrangeSize;
+    }
+
+    private void ArrangeLine(FlexLineInfo lineInfo)
+    {
+        var flexDirection = FlexDirection;
+        var flexWrap = FlexWrap;
+        var justifyContent = JustifyContent;
+        var alignItems = AlignItems;
+
+        var isHorizontal = flexDirection == FlexDirection.Row || flexDirection == FlexDirection.RowReverse;
+        var isReverse = flexDirection == FlexDirection.RowReverse || flexDirection == FlexDirection.ColumnReverse;
+        var itemCount = lineInfo.ItemEndIndex - lineInfo.ItemStartIndex;
+        var children = InternalChildren;
+        var lineFreeU = lineInfo.LineU - lineInfo.ItemsU;
+        var constraintFreeU = _uvConstraint.U - lineInfo.ItemsU;
+
+        // calculate initial u
+        var u = .0;
+        if (isReverse)
+        {
+            u = justifyContent switch
+            {
+                FlexContentJustify.FlexStart => lineInfo.LineU,
+                FlexContentJustify.SpaceBetween => lineInfo.LineU,
+                FlexContentJustify.SpaceAround => lineInfo.LineU,
+                FlexContentJustify.FlexEnd => lineInfo.ItemsU,
+                FlexContentJustify.Center => (lineInfo.LineU + lineInfo.ItemsU) * 0.5,
+                _ => u
+            };
+        }
+        else
+        {
+            u = justifyContent switch
+            {
+                FlexContentJustify.FlexEnd => lineFreeU,
+                FlexContentJustify.Center => lineFreeU * 0.5,
+                _ => u
+            };
+        }
+
+        u *= lineInfo.ScaleU;
+
+        // apply FlexGrow
+        var flexGrowUArr = new double[itemCount];
+        if (constraintFreeU > 0)
+        {
+            var ignoreFlexGrow = true;
+            var flexGrowSum = .0;
+
+            for (var i = 0; i < itemCount; i++)
+            {
+                var flexGrow = GetFlexGrow(children[_orderList[i].Index]);
+                ignoreFlexGrow &= MathHelper.IsVerySmall(flexGrow);
+                flexGrowUArr[i] = flexGrow;
+                flexGrowSum += flexGrow;
+            }
+
+            if (!ignoreFlexGrow)
+            {
+                var flexGrowItem = .0;
+                if (flexGrowSum > 0)
                 {
-                    FlexContentJustify.FlexStart => lineInfo.LineU,
-                    FlexContentJustify.SpaceBetween => lineInfo.LineU,
-                    FlexContentJustify.SpaceAround => lineInfo.LineU,
-                    FlexContentJustify.FlexEnd => lineInfo.ItemsU,
-                    FlexContentJustify.Center => (lineInfo.LineU + lineInfo.ItemsU) * 0.5,
-                    _ => u
-                };
+                    flexGrowItem = constraintFreeU / flexGrowSum;
+                    lineInfo.ScaleU = 1;
+                    lineFreeU = 0; //line free U was used up
+                }
+
+                for (var i = 0; i < itemCount; i++)
+                {
+                    flexGrowUArr[i] *= flexGrowItem;
+                }
             }
             else
             {
-                u = justifyContent switch
-                {
-                    FlexContentJustify.FlexEnd => lineFreeU,
-                    FlexContentJustify.Center => lineFreeU * 0.5,
-                    _ => u
-                };
+                flexGrowUArr = new double[itemCount];
+            }
+        }
+
+        // apply FlexShrink
+        var flexShrinkUArr = new double[itemCount];
+        if (constraintFreeU < 0)
+        {
+            var ignoreFlexShrink = true;
+            var flexShrinkSum = .0;
+
+            for (var i = 0; i < itemCount; i++)
+            {
+                var flexShrink = GetFlexShrink(children[_orderList[i].Index]);
+                ignoreFlexShrink &= MathHelper.IsVerySmall(flexShrink - 1);
+                flexShrinkUArr[i] = flexShrink;
+                flexShrinkSum += flexShrink;
             }
 
-            u *= lineInfo.ScaleU;
-
-            // apply FlexGrow
-            var flexGrowUArr = new double[itemCount];
-            if (constraintFreeU > 0)
+            if (!ignoreFlexShrink)
             {
-                var ignoreFlexGrow = true;
-                var flexGrowSum = .0;
+                var flexShrinkItem = .0;
+                if (flexShrinkSum > 0)
+                {
+                    flexShrinkItem = constraintFreeU / flexShrinkSum;
+                    lineInfo.ScaleU = 1;
+                    lineFreeU = 0; //line free U was used up
+                }
 
                 for (var i = 0; i < itemCount; i++)
                 {
-                    var flexGrow = GetFlexGrow(children[_orderList[i].Index]);
-                    ignoreFlexGrow &= MathHelper.IsVerySmall(flexGrow);
-                    flexGrowUArr[i] = flexGrow;
-                    flexGrowSum += flexGrow;
-                }
-
-                if (!ignoreFlexGrow)
-                {
-                    var flexGrowItem = .0;
-                    if (flexGrowSum > 0)
-                    {
-                        flexGrowItem = constraintFreeU / flexGrowSum;
-                        lineInfo.ScaleU = 1;
-                        lineFreeU = 0; //line free U was used up
-                    }
-
-                    for (var i = 0; i < itemCount; i++)
-                    {
-                        flexGrowUArr[i] *= flexGrowItem;
-                    }
-                }
-                else
-                {
-                    flexGrowUArr = new double[itemCount];
+                    flexShrinkUArr[i] *= flexShrinkItem;
                 }
             }
-
-            // apply FlexShrink
-            var flexShrinkUArr = new double[itemCount];
-            if (constraintFreeU < 0)
+            else
             {
-                var ignoreFlexShrink = true;
-                var flexShrinkSum = .0;
+                flexShrinkUArr = new double[itemCount];
+            }
+        }
 
-                for (var i = 0; i < itemCount; i++)
+        // calculate offset u
+        var offsetUArr = new double[itemCount];
+        if (lineFreeU > 0)
+        {
+            if (justifyContent == FlexContentJustify.SpaceBetween)
+            {
+                var freeItemU = lineFreeU / (itemCount - 1);
+                for (var i = 1; i < itemCount; i++)
                 {
-                    var flexShrink = GetFlexShrink(children[_orderList[i].Index]);
-                    ignoreFlexShrink &= MathHelper.IsVerySmall(flexShrink - 1);
-                    flexShrinkUArr[i] = flexShrink;
-                    flexShrinkSum += flexShrink;
-                }
-
-                if (!ignoreFlexShrink)
-                {
-                    var flexShrinkItem = .0;
-                    if (flexShrinkSum > 0)
-                    {
-                        flexShrinkItem = constraintFreeU / flexShrinkSum;
-                        lineInfo.ScaleU = 1;
-                        lineFreeU = 0; //line free U was used up
-                    }
-
-                    for (var i = 0; i < itemCount; i++)
-                    {
-                        flexShrinkUArr[i] *= flexShrinkItem;
-                    }
-                }
-                else
-                {
-                    flexShrinkUArr = new double[itemCount];
+                    offsetUArr[i] = freeItemU;
                 }
             }
-
-            // calculate offset u
-            var offsetUArr = new double[itemCount];
-            if (lineFreeU > 0)
+            else if (justifyContent == FlexContentJustify.SpaceAround)
             {
-                if (justifyContent == FlexContentJustify.SpaceBetween)
+                var freeItemU = lineFreeU / itemCount * 0.5;
+                offsetUArr[0] = freeItemU;
+                for (var i = 1; i < itemCount; i++)
                 {
-                    var freeItemU = lineFreeU / (itemCount - 1);
-                    for (var i = 1; i < itemCount; i++)
-                    {
-                        offsetUArr[i] = freeItemU;
-                    }
-                }
-                else if (justifyContent == FlexContentJustify.SpaceAround)
-                {
-                    var freeItemU = lineFreeU / itemCount * 0.5;
-                    offsetUArr[0] = freeItemU;
-                    for (var i = 1; i < itemCount; i++)
-                    {
-                        offsetUArr[i] = freeItemU * 2;
-                    }
-                }
-            }
-
-            // arrange item
-            for (int i = lineInfo.ItemStartIndex, j = 0; i < lineInfo.ItemEndIndex; i++, j++)
-            {
-                var child = children[_orderList[i].Index];
-                if (child == null) continue;
-
-                var childSize = new UVSize(flexDirection, isHorizontal
-                    ? new Size(child.DesiredSize.Width * lineInfo.ScaleU, child.DesiredSize.Height)
-                    : new Size(child.DesiredSize.Width, child.DesiredSize.Height * lineInfo.ScaleU));
-
-                childSize.U += flexGrowUArr[j] + flexShrinkUArr[j];
-
-                if (isReverse)
-                {
-                    u -= childSize.U;
-                    u -= offsetUArr[j];
-                }
-                else
-                {
-                    u += offsetUArr[j];
-                }
-
-                var v = lineInfo.OffsetV;
-                var alignSelf = GetAlignSelf(child);
-                var alignment = alignSelf == FlexItemAlignment.Auto ? alignItems : (FlexItemsAlignment) alignSelf;
-
-                switch (alignment)
-                {
-                    case FlexItemsAlignment.Stretch:
-                        if (_lineCount == 1 && flexWrap == FlexWrap.NoWrap)
-                        {
-                            childSize.V = lineInfo.LineV + lineInfo.LineFreeV;
-                        }
-                        else
-                        {
-                            childSize.V = lineInfo.LineV;
-                        }
-
-                        break;
-                    case FlexItemsAlignment.FlexEnd:
-                        v += lineInfo.LineV - childSize.V;
-                        break;
-                    case FlexItemsAlignment.Center:
-                        v += (lineInfo.LineV - childSize.V) * 0.5;
-                        break;
-                }
-
-                child.Arrange(isHorizontal ? new Rect(u, v, childSize.U, childSize.V) : new Rect(v, u, childSize.V, childSize.U));
-
-                if (!isReverse)
-                {
-                    u += childSize.U;
+                    offsetUArr[i] = freeItemU * 2;
                 }
             }
         }
 
-        private readonly struct FlexItemInfo : IComparable<FlexItemInfo>
+        // arrange item
+        for (int i = lineInfo.ItemStartIndex, j = 0; i < lineInfo.ItemEndIndex; i++, j++)
         {
-            public FlexItemInfo(int index, int order)
+            var child = children[_orderList[i].Index];
+            if (child == null) continue;
+
+            var childSize = new UVSize(flexDirection, isHorizontal
+                ? new Size(child.DesiredSize.Width * lineInfo.ScaleU, child.DesiredSize.Height)
+                : new Size(child.DesiredSize.Width, child.DesiredSize.Height * lineInfo.ScaleU));
+
+            childSize.U += flexGrowUArr[j] + flexShrinkUArr[j];
+
+            if (isReverse)
             {
-                Index = index;
-                Order = order;
+                u -= childSize.U;
+                u -= offsetUArr[j];
+            }
+            else
+            {
+                u += offsetUArr[j];
             }
 
-            private int Order { get; }
+            var v = lineInfo.OffsetV;
+            var alignSelf = GetAlignSelf(child);
+            var alignment = alignSelf == FlexItemAlignment.Auto ? alignItems : (FlexItemsAlignment) alignSelf;
 
-            public int Index { get; }
-
-            public int CompareTo(FlexItemInfo other)
+            switch (alignment)
             {
-                var orderCompare = Order.CompareTo(other.Order);
-                if (orderCompare != 0) return orderCompare;
-                return Index.CompareTo(other.Index);
-            }
-        }
-
-        private struct FlexLineInfo
-        {
-            public double ItemsU { get; set; }
-
-            public double OffsetV { get; set; }
-
-            public double LineU { get; set; }
-
-            public double LineV { get; set; }
-
-            public double LineFreeV { get; set; }
-
-            public int ItemStartIndex { get; set; }
-
-            public int ItemEndIndex { get; set; }
-
-            public double ScaleU { get; set; }
-        }
-
-        private struct UVSize
-        {
-            public UVSize(FlexDirection direction, Size size)
-            {
-                U = V = 0d;
-                FlexDirection = direction;
-                Width = size.Width;
-                Height = size.Height;
-            }
-
-            public UVSize(FlexDirection direction)
-            {
-                U = V = 0d;
-                FlexDirection = direction;
-            }
-
-            public double U { get; set; }
-
-            public double V { get; set; }
-
-            private FlexDirection FlexDirection { get; }
-
-            public double Width
-            {
-                get => FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse ? U : V;
-                private set
-                {
-                    if (FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse)
+                case FlexItemsAlignment.Stretch:
+                    if (_lineCount == 1 && flexWrap == FlexWrap.NoWrap)
                     {
-                        U = value;
+                        childSize.V = lineInfo.LineV + lineInfo.LineFreeV;
                     }
                     else
                     {
-                        V = value;
+                        childSize.V = lineInfo.LineV;
                     }
-                }
+
+                    break;
+                case FlexItemsAlignment.FlexEnd:
+                    v += lineInfo.LineV - childSize.V;
+                    break;
+                case FlexItemsAlignment.Center:
+                    v += (lineInfo.LineV - childSize.V) * 0.5;
+                    break;
             }
 
-            public double Height
+            child.Arrange(isHorizontal ? new Rect(u, v, childSize.U, childSize.V) : new Rect(v, u, childSize.V, childSize.U));
+
+            if (!isReverse)
             {
-                get => FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse ? V : U;
-                private set
+                u += childSize.U;
+            }
+        }
+    }
+
+    private readonly struct FlexItemInfo : IComparable<FlexItemInfo>
+    {
+        public FlexItemInfo(int index, int order)
+        {
+            Index = index;
+            Order = order;
+        }
+
+        private int Order { get; }
+
+        public int Index { get; }
+
+        public int CompareTo(FlexItemInfo other)
+        {
+            var orderCompare = Order.CompareTo(other.Order);
+            if (orderCompare != 0) return orderCompare;
+            return Index.CompareTo(other.Index);
+        }
+    }
+
+    private struct FlexLineInfo
+    {
+        public double ItemsU { get; set; }
+
+        public double OffsetV { get; set; }
+
+        public double LineU { get; set; }
+
+        public double LineV { get; set; }
+
+        public double LineFreeV { get; set; }
+
+        public int ItemStartIndex { get; set; }
+
+        public int ItemEndIndex { get; set; }
+
+        public double ScaleU { get; set; }
+    }
+
+    private struct UVSize
+    {
+        public UVSize(FlexDirection direction, Size size)
+        {
+            U = V = 0d;
+            FlexDirection = direction;
+            Width = size.Width;
+            Height = size.Height;
+        }
+
+        public UVSize(FlexDirection direction)
+        {
+            U = V = 0d;
+            FlexDirection = direction;
+        }
+
+        public double U { get; set; }
+
+        public double V { get; set; }
+
+        private FlexDirection FlexDirection { get; }
+
+        public double Width
+        {
+            get => FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse ? U : V;
+            private set
+            {
+                if (FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse)
                 {
-                    if (FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse)
-                    {
-                        V = value;
-                    }
-                    else
-                    {
-                        U = value;
-                    }
+                    U = value;
+                }
+                else
+                {
+                    V = value;
+                }
+            }
+        }
+
+        public double Height
+        {
+            get => FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse ? V : U;
+            private set
+            {
+                if (FlexDirection == FlexDirection.Row || FlexDirection == FlexDirection.RowReverse)
+                {
+                    V = value;
+                }
+                else
+                {
+                    U = value;
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
index 120af859..08dbf10d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
@@ -4,93 +4,92 @@ using System.Windows.Controls;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Col : ContentControl
 {
-    public class Col : ContentControl
+    public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
+        "Layout", typeof(ColLayout), typeof(Col), new PropertyMetadata(default(ColLayout)));
+
+    public ColLayout Layout
     {
-        public static readonly DependencyProperty LayoutProperty = DependencyProperty.Register(
-            "Layout", typeof(ColLayout), typeof(Col), new PropertyMetadata(default(ColLayout)));
+        get => (ColLayout) GetValue(LayoutProperty);
+        set => SetValue(LayoutProperty, value);
+    }
 
-        public ColLayout Layout
+    public static readonly DependencyProperty OffsetProperty = DependencyProperty.Register(
+        "Offset", typeof(int), typeof(Col), new PropertyMetadata(ValueBoxes.Int0Box));
+
+    public int Offset
+    {
+        get => (int) GetValue(OffsetProperty);
+        set => SetValue(OffsetProperty, value);
+    }
+
+    public static readonly DependencyProperty SpanProperty = DependencyProperty.Register(
+        "Span", typeof(int), typeof(Col), new PropertyMetadata(24), OnSpanValidate);
+
+    private static bool OnSpanValidate(object value)
+    {
+        var v = (int) value;
+        return v is >= 1 and <= 24;
+    }
+
+    public int Span
+    {
+        get => (int) GetValue(SpanProperty);
+        set => SetValue(SpanProperty, value);
+    }
+
+    public static readonly DependencyProperty IsFixedProperty = DependencyProperty.Register(
+        "IsFixed", typeof(bool), typeof(Col), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsFixed
+    {
+        get => (bool) GetValue(IsFixedProperty);
+        set => SetValue(IsFixedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal int GetLayoutCellCount(ColLayoutStatus status)
+    {
+        var result = 0;
+
+        if (Layout != null)
         {
-            get => (ColLayout) GetValue(LayoutProperty);
-            set => SetValue(LayoutProperty, value);
-        }
-
-        public static readonly DependencyProperty OffsetProperty = DependencyProperty.Register(
-            "Offset", typeof(int), typeof(Col), new PropertyMetadata(ValueBoxes.Int0Box));
-
-        public int Offset
-        {
-            get => (int) GetValue(OffsetProperty);
-            set => SetValue(OffsetProperty, value);
-        }
-
-        public static readonly DependencyProperty SpanProperty = DependencyProperty.Register(
-            "Span", typeof(int), typeof(Col), new PropertyMetadata(24), OnSpanValidate);
-
-        private static bool OnSpanValidate(object value)
-        {
-            var v = (int) value;
-            return v is >= 1 and <= 24;
-        }
-
-        public int Span
-        {
-            get => (int) GetValue(SpanProperty);
-            set => SetValue(SpanProperty, value);
-        }
-
-        public static readonly DependencyProperty IsFixedProperty = DependencyProperty.Register(
-            "IsFixed", typeof(bool), typeof(Col), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsFixed
-        {
-            get => (bool) GetValue(IsFixedProperty);
-            set => SetValue(IsFixedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal int GetLayoutCellCount(ColLayoutStatus status)
-        {
-            var result = 0;
-
-            if (Layout != null)
+            if (!IsFixed)
             {
-                if (!IsFixed)
+                switch (status)
                 {
-                    switch (status)
-                    {
-                        case ColLayoutStatus.Xs:
-                            result = Layout.Xs;
-                            break;
-                        case ColLayoutStatus.Sm:
-                            result = Layout.Sm;
-                            break;
-                        case ColLayoutStatus.Md:
-                            result = Layout.Md;
-                            break;
-                        case ColLayoutStatus.Lg:
-                            result = Layout.Lg;
-                            break;
-                        case ColLayoutStatus.Xl:
-                            result = Layout.Xl;
-                            break;
-                        case ColLayoutStatus.Xxl:
-                            result = Layout.Xxl;
-                            break;
-                        case ColLayoutStatus.Auto:
-                            break;
-                        default:
-                            throw new ArgumentOutOfRangeException(nameof(status), status, null);
-                    }
+                    case ColLayoutStatus.Xs:
+                        result = Layout.Xs;
+                        break;
+                    case ColLayoutStatus.Sm:
+                        result = Layout.Sm;
+                        break;
+                    case ColLayoutStatus.Md:
+                        result = Layout.Md;
+                        break;
+                    case ColLayoutStatus.Lg:
+                        result = Layout.Lg;
+                        break;
+                    case ColLayoutStatus.Xl:
+                        result = Layout.Xl;
+                        break;
+                    case ColLayoutStatus.Xxl:
+                        result = Layout.Xxl;
+                        break;
+                    case ColLayoutStatus.Auto:
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(status), status, null);
                 }
             }
-            else
-            {
-                result = Span;
-            }
-
-            return result;
         }
+        else
+        {
+            result = Span;
+        }
+
+        return result;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
index 43f09573..0f9a3551 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
@@ -6,94 +6,93 @@ using HandyControl.Data;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Row : Panel
 {
-    public class Row : Panel
+    private ColLayoutStatus _layoutStatus;
+
+    private double _maxChildDesiredHeight;
+
+    private double _totalAutoWidth;
+
+    public static readonly DependencyProperty GutterProperty = DependencyProperty.Register(
+        "Gutter", typeof(double), typeof(Row), new PropertyMetadata(ValueBoxes.Double0Box, null, OnGutterCoerce), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    private static object OnGutterCoerce(DependencyObject d, object basevalue) => ValidateHelper.IsInRangeOfPosDoubleIncludeZero(basevalue) ? basevalue : .0;
+
+    public double Gutter
     {
-        private ColLayoutStatus _layoutStatus;
-
-        private double _maxChildDesiredHeight;
-
-        private double _totalAutoWidth;
-
-        public static readonly DependencyProperty GutterProperty = DependencyProperty.Register(
-            "Gutter", typeof(double), typeof(Row), new PropertyMetadata(ValueBoxes.Double0Box, null, OnGutterCoerce), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        private static object OnGutterCoerce(DependencyObject d, object basevalue) => ValidateHelper.IsInRangeOfPosDoubleIncludeZero(basevalue) ? basevalue : .0;
-
-        public double Gutter
-        {
-            get => (double) GetValue(GutterProperty);
-            set => SetValue(GutterProperty, value);
-        }
-
-        protected override Size MeasureOverride(Size constraint)
-        {
-            var totalCellCount = 0;
-            var totalRowCount = 1;
-            var gutterHalf = Gutter / 2;
-            _totalAutoWidth = 0;
-
-            foreach (var child in InternalChildren.OfType<Col>())
-            {
-                child.Margin = new Thickness(gutterHalf);
-                child.Measure(constraint);
-                var childDesiredSize = child.DesiredSize;
-
-                if (_maxChildDesiredHeight < childDesiredSize.Height)
-                {
-                    _maxChildDesiredHeight = childDesiredSize.Height;
-                }
-
-                var cellCount = child.GetLayoutCellCount(_layoutStatus);
-                totalCellCount += cellCount;
-
-                if (totalCellCount > ColLayout.ColMaxCellCount)
-                {
-                    totalCellCount = cellCount;
-                    totalRowCount++;
-                }
-
-                if (cellCount == 0 || child.IsFixed)
-                {
-                    _totalAutoWidth += childDesiredSize.Width;
-                }
-            }
-
-            return new Size(0, _maxChildDesiredHeight * totalRowCount - Gutter);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var totalCellCount = 0;
-            var gutterHalf = Gutter / 2;
-            var itemWidth = (finalSize.Width - _totalAutoWidth + Gutter) / ColLayout.ColMaxCellCount;
-            itemWidth = Math.Max(0, itemWidth);
-
-            var childBounds = new Rect(-gutterHalf, -gutterHalf, 0, _maxChildDesiredHeight);
-            _layoutStatus = ColLayout.GetLayoutStatus(finalSize.Width);
-
-            foreach (var child in InternalChildren.OfType<Col>())
-            {
-                var cellCount = child.GetLayoutCellCount(_layoutStatus);
-                totalCellCount += cellCount;
-
-                var childWidth = cellCount > 0 ? cellCount * itemWidth : child.DesiredSize.Width;
-
-                childBounds.Width = childWidth;
-                childBounds.X += child.Offset * itemWidth;
-                if (totalCellCount > ColLayout.ColMaxCellCount)
-                {
-                    childBounds.X = -gutterHalf;
-                    childBounds.Y += _maxChildDesiredHeight;
-                    totalCellCount = cellCount;
-                }
-
-                child.Arrange(childBounds);
-                childBounds.X += childWidth;
-            }
-
-            return finalSize;
-        }
+        get => (double) GetValue(GutterProperty);
+        set => SetValue(GutterProperty, value);
     }
-}
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var totalCellCount = 0;
+        var totalRowCount = 1;
+        var gutterHalf = Gutter / 2;
+        _totalAutoWidth = 0;
+
+        foreach (var child in InternalChildren.OfType<Col>())
+        {
+            child.Margin = new Thickness(gutterHalf);
+            child.Measure(constraint);
+            var childDesiredSize = child.DesiredSize;
+
+            if (_maxChildDesiredHeight < childDesiredSize.Height)
+            {
+                _maxChildDesiredHeight = childDesiredSize.Height;
+            }
+
+            var cellCount = child.GetLayoutCellCount(_layoutStatus);
+            totalCellCount += cellCount;
+
+            if (totalCellCount > ColLayout.ColMaxCellCount)
+            {
+                totalCellCount = cellCount;
+                totalRowCount++;
+            }
+
+            if (cellCount == 0 || child.IsFixed)
+            {
+                _totalAutoWidth += childDesiredSize.Width;
+            }
+        }
+
+        return new Size(0, _maxChildDesiredHeight * totalRowCount - Gutter);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var totalCellCount = 0;
+        var gutterHalf = Gutter / 2;
+        var itemWidth = (finalSize.Width - _totalAutoWidth + Gutter) / ColLayout.ColMaxCellCount;
+        itemWidth = Math.Max(0, itemWidth);
+
+        var childBounds = new Rect(-gutterHalf, -gutterHalf, 0, _maxChildDesiredHeight);
+        _layoutStatus = ColLayout.GetLayoutStatus(finalSize.Width);
+
+        foreach (var child in InternalChildren.OfType<Col>())
+        {
+            var cellCount = child.GetLayoutCellCount(_layoutStatus);
+            totalCellCount += cellCount;
+
+            var childWidth = cellCount > 0 ? cellCount * itemWidth : child.DesiredSize.Width;
+
+            childBounds.Width = childWidth;
+            childBounds.X += child.Offset * itemWidth;
+            if (totalCellCount > ColLayout.ColMaxCellCount)
+            {
+                childBounds.X = -gutterHalf;
+                childBounds.Y += _maxChildDesiredHeight;
+                totalCellCount = cellCount;
+            }
+
+            child.Arrange(childBounds);
+            childBounds.X += childWidth;
+        }
+
+        return finalSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
index 8f6f17ee..4a5666c2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
@@ -2,165 +2,164 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class HoneycombPanel : Panel
 {
-    public class HoneycombPanel : Panel
+    private double _unitLength;
+
+    private HoneycombStuffer _stuffer;
+
+    private static int GetXCount(int count)
     {
-        private double _unitLength;
+        if (count == 0) return 0;
 
-        private HoneycombStuffer _stuffer;
+        count -= 1;
 
-        private static int GetXCount(int count)
+        var index = (int) Math.Floor(Math.Pow((12.0 * count + 25) / 36, 0.5) - 5.0 / 6);
+        var valeIndex = 3 * index * index + 5 * index;
+        var centerValue = valeIndex + 2;
+
+        return count >= centerValue
+            ? 4 * index + 6
+            : count > valeIndex
+                ? 4 * index + 4
+                : 4 * index + 2;
+    }
+
+    private static int GetYCount(int count)
+    {
+        if (count == 0) return 0;
+
+        count -= 1;
+
+        var index = (int) Math.Floor(Math.Pow(count / 3.0 + 0.25, 0.5) - 0.5);
+        var valeIndex = 3 * index * index + 3 * index;
+
+        return count > valeIndex
+            ? 2 * index + 2
+            : 2 * index;
+    }
+
+    /*
+     *                layout order
+     *
+     *                  ●       ●
+     *                 (7)     (8)
+     *
+     *              ●       ●       ●
+     *             (6)     (1)     (9)
+     *
+     *          ●       ●       ●       ...
+     *         (5)     (0)     (2)
+     *
+     *              ●       ●       ...
+     *             (4)     (3)
+     *
+     */
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var maxSize = new Size();
+
+        foreach (UIElement child in InternalChildren)
         {
-            if (count == 0) return 0;
-
-            count -= 1;
-
-            var index = (int) Math.Floor(Math.Pow((12.0 * count + 25) / 36, 0.5) - 5.0 / 6);
-            var valeIndex = 3 * index * index + 5 * index;
-            var centerValue = valeIndex + 2;
-
-            return count >= centerValue
-                ? 4 * index + 6
-                : count > valeIndex
-                    ? 4 * index + 4
-                    : 4 * index + 2;
-        }
-
-        private static int GetYCount(int count)
-        {
-            if (count == 0) return 0;
-
-            count -= 1;
-
-            var index = (int) Math.Floor(Math.Pow(count / 3.0 + 0.25, 0.5) - 0.5);
-            var valeIndex = 3 * index * index + 3 * index;
-
-            return count > valeIndex
-                ? 2 * index + 2
-                : 2 * index;
-        }
-
-        /*
-         *                layout order
-         *
-         *                  ●       ●
-         *                 (7)     (8)
-         *
-         *              ●       ●       ●
-         *             (6)     (1)     (9)
-         *
-         *          ●       ●       ●       ...
-         *         (5)     (0)     (2)
-         *
-         *              ●       ●       ...
-         *             (4)     (3)
-         *
-         */
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            var maxSize = new Size();
-
-            foreach (UIElement child in InternalChildren)
+            if (child != null)
             {
-                if (child != null)
-                {
-                    child.Measure(availableSize);
-                    maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
-                    maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
-                }
+                child.Measure(availableSize);
+                maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
+                maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
             }
-
-            _unitLength = Math.Max(maxSize.Width, maxSize.Height) / 2;
-
-            var xCount = GetXCount(InternalChildren.Count);
-            var yCount = GetYCount(InternalChildren.Count);
-
-            var availableWidth = xCount * _unitLength;
-            var availableHeight = yCount * Math.Pow(3, 0.5) * _unitLength + _unitLength * 2;
-
-            return new Size(availableWidth, availableHeight);
         }
 
-        protected override Size ArrangeOverride(Size finalSize)
+        _unitLength = Math.Max(maxSize.Width, maxSize.Height) / 2;
+
+        var xCount = GetXCount(InternalChildren.Count);
+        var yCount = GetYCount(InternalChildren.Count);
+
+        var availableWidth = xCount * _unitLength;
+        var availableHeight = yCount * Math.Pow(3, 0.5) * _unitLength + _unitLength * 2;
+
+        return new Size(availableWidth, availableHeight);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var childLength = _unitLength * 2;
+        _stuffer = new HoneycombStuffer(new Rect(finalSize.Width / 2 - _unitLength,
+            finalSize.Height / 2 - _unitLength, childLength, childLength));
+
+        foreach (UIElement child in InternalChildren)
         {
-            var childLength = _unitLength * 2;
-            _stuffer = new HoneycombStuffer(new Rect(finalSize.Width / 2 - _unitLength,
-                finalSize.Height / 2 - _unitLength, childLength, childLength));
-
-            foreach (UIElement child in InternalChildren)
-            {
-                child.Arrange(_stuffer.Move());
-            }
-
-            return finalSize;
+            child.Arrange(_stuffer.Move());
         }
 
-        private class HoneycombStuffer
+        return finalSize;
+    }
+
+    private class HoneycombStuffer
+    {
+        private int _turns;
+
+        private int _maxIndex;
+
+        private int _currentIndex = -1;
+
+        private readonly double _offsetX;
+
+        private readonly double _offsetY;
+
+        private Rect _childBounds;
+
+        private readonly double[] _offsetXArr;
+
+        private readonly double[] _offsetYArr;
+
+        public HoneycombStuffer(Rect childBounds)
         {
-            private int _turns;
+            _childBounds = childBounds;
+            _offsetX = childBounds.Width / 2;
+            _offsetY = Math.Pow(3, 0.5) * _offsetX;
 
-            private int _maxIndex;
-
-            private int _currentIndex = -1;
-
-            private readonly double _offsetX;
-
-            private readonly double _offsetY;
-
-            private Rect _childBounds;
-
-            private readonly double[] _offsetXArr;
-
-            private readonly double[] _offsetYArr;
-
-            public HoneycombStuffer(Rect childBounds)
+            _offsetXArr = new[]
             {
-                _childBounds = childBounds;
-                _offsetX = childBounds.Width / 2;
-                _offsetY = Math.Pow(3, 0.5) * _offsetX;
+                2 * _offsetX,
+                _offsetX,
+                -_offsetX,
+                -2 * _offsetX,
+                -_offsetX,
+                _offsetX
+            };
 
-                _offsetXArr = new[]
-                {
-                    2 * _offsetX,
-                    _offsetX,
-                    -_offsetX,
-                    -2 * _offsetX,
-                    -_offsetX,
-                    _offsetX
-                };
-
-                _offsetYArr = new[]
-                {
-                    0,
-                    _offsetY,
-                    _offsetY,
-                    0,
-                    -_offsetY,
-                    -_offsetY
-                };
-            }
-
-            public Rect Move()
+            _offsetYArr = new[]
             {
-                _currentIndex++;
-                if (_currentIndex > _maxIndex)
-                {
-                    _turns++;
-                    _maxIndex = _turns * 6 - 1;
-                    _currentIndex = 0;
-                    _childBounds.Offset(_offsetX, -_offsetY);
-                    return _childBounds;
-                }
-
-                if (_turns > 0)
-                {
-                    var index = _currentIndex / _turns;
-                    _childBounds.Offset(_offsetXArr[index], _offsetYArr[index]);
-                }
+                0,
+                _offsetY,
+                _offsetY,
+                0,
+                -_offsetY,
+                -_offsetY
+            };
+        }
 
+        public Rect Move()
+        {
+            _currentIndex++;
+            if (_currentIndex > _maxIndex)
+            {
+                _turns++;
+                _maxIndex = _turns * 6 - 1;
+                _currentIndex = 0;
+                _childBounds.Offset(_offsetX, -_offsetY);
                 return _childBounds;
             }
+
+            if (_turns > 0)
+            {
+                var index = _currentIndex / _turns;
+                _childBounds.Offset(_offsetXArr[index], _offsetYArr[index]);
+            }
+
+            return _childBounds;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index 2574b1b5..d117daa9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -10,680 +10,679 @@ using System.Windows.Markup;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class RelativePanel : Panel
 {
-    public class RelativePanel : Panel
+    private readonly Graph _childGraph;
+
+    public RelativePanel() => _childGraph = new Graph();
+
+    #region Panel alignment
+
+    public static readonly DependencyProperty AlignLeftWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignLeftWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignLeftWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignLeftWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignLeftWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignLeftWithPanelProperty);
+
+    public static readonly DependencyProperty AlignTopWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignTopWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignTopWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignTopWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignTopWithPanelProperty);
+
+    public static readonly DependencyProperty AlignRightWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignRightWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignRightWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignRightWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignRightWithPanelProperty);
+
+    public static readonly DependencyProperty AlignBottomWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignBottomWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignBottomWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignBottomWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignBottomWithPanelProperty);
+
+    #endregion
+
+    #region Sibling alignment
+
+    public static readonly DependencyProperty AlignLeftWithProperty = DependencyProperty.RegisterAttached(
+        "AlignLeftWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignLeftWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignLeftWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignLeftWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignLeftWithProperty);
+
+    public static readonly DependencyProperty AlignTopWithProperty = DependencyProperty.RegisterAttached(
+        "AlignTopWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignTopWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignTopWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignTopWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignTopWithProperty);
+
+    public static readonly DependencyProperty AlignRightWithProperty = DependencyProperty.RegisterAttached(
+        "AlignRightWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignRightWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignRightWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignRightWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignRightWithProperty);
+
+    public static readonly DependencyProperty AlignBottomWithProperty = DependencyProperty.RegisterAttached(
+        "AlignBottomWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignBottomWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignBottomWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignBottomWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignBottomWithProperty);
+
+    #endregion
+
+    #region Sibling positional
+
+    public static readonly DependencyProperty LeftOfProperty = DependencyProperty.RegisterAttached(
+        "LeftOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetLeftOf(DependencyObject element, UIElement value)
+        => element.SetValue(LeftOfProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetLeftOf(DependencyObject element)
+        => (UIElement) element.GetValue(LeftOfProperty);
+
+    public static readonly DependencyProperty AboveProperty = DependencyProperty.RegisterAttached(
+        "Above", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAbove(DependencyObject element, UIElement value)
+        => element.SetValue(AboveProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAbove(DependencyObject element)
+        => (UIElement) element.GetValue(AboveProperty);
+
+    public static readonly DependencyProperty RightOfProperty = DependencyProperty.RegisterAttached(
+        "RightOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetRightOf(DependencyObject element, UIElement value)
+        => element.SetValue(RightOfProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetRightOf(DependencyObject element)
+        => (UIElement) element.GetValue(RightOfProperty);
+
+    public static readonly DependencyProperty BelowProperty = DependencyProperty.RegisterAttached(
+        "Below", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetBelow(DependencyObject element, UIElement value)
+        => element.SetValue(BelowProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetBelow(DependencyObject element)
+        => (UIElement) element.GetValue(BelowProperty);
+
+    #endregion
+
+    #region Center alignment
+
+    public static readonly DependencyProperty AlignHorizontalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignHorizontalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignHorizontalCenterWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignHorizontalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignHorizontalCenterWithPanelProperty);
+
+    public static readonly DependencyProperty AlignVerticalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
+        "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignVerticalCenterWithPanel(DependencyObject element, bool value)
+        => element.SetValue(AlignVerticalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAlignVerticalCenterWithPanel(DependencyObject element)
+        => (bool) element.GetValue(AlignVerticalCenterWithPanelProperty);
+
+    public static readonly DependencyProperty AlignHorizontalCenterWithProperty = DependencyProperty.RegisterAttached(
+        "AlignHorizontalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignHorizontalCenterWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignHorizontalCenterWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignHorizontalCenterWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignHorizontalCenterWithProperty);
+
+    public static readonly DependencyProperty AlignVerticalCenterWithProperty = DependencyProperty.RegisterAttached(
+        "AlignVerticalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
+
+    public static void SetAlignVerticalCenterWith(DependencyObject element, UIElement value)
+        => element.SetValue(AlignVerticalCenterWithProperty, value);
+
+    [TypeConverter(typeof(NameReferenceConverter))]
+    public static UIElement GetAlignVerticalCenterWith(DependencyObject element)
+        => (UIElement) element.GetValue(AlignVerticalCenterWithProperty);
+
+    #endregion
+
+    protected override Size MeasureOverride(Size availableSize)
     {
-        private readonly Graph _childGraph;
+        #region Calc DesiredSize
 
-        public RelativePanel() => _childGraph = new Graph();
-
-        #region Panel alignment
-
-        public static readonly DependencyProperty AlignLeftWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignLeftWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignLeftWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignLeftWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignLeftWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignLeftWithPanelProperty);
-
-        public static readonly DependencyProperty AlignTopWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignTopWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignTopWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignTopWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignTopWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignTopWithPanelProperty);
-
-        public static readonly DependencyProperty AlignRightWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignRightWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignRightWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignRightWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignRightWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignRightWithPanelProperty);
-
-        public static readonly DependencyProperty AlignBottomWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignBottomWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignBottomWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignBottomWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignBottomWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignBottomWithPanelProperty);
-
-        #endregion
-
-        #region Sibling alignment
-
-        public static readonly DependencyProperty AlignLeftWithProperty = DependencyProperty.RegisterAttached(
-            "AlignLeftWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignLeftWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignLeftWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignLeftWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignLeftWithProperty);
-
-        public static readonly DependencyProperty AlignTopWithProperty = DependencyProperty.RegisterAttached(
-            "AlignTopWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignTopWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignTopWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignTopWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignTopWithProperty);
-
-        public static readonly DependencyProperty AlignRightWithProperty = DependencyProperty.RegisterAttached(
-            "AlignRightWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignRightWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignRightWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignRightWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignRightWithProperty);
-
-        public static readonly DependencyProperty AlignBottomWithProperty = DependencyProperty.RegisterAttached(
-            "AlignBottomWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignBottomWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignBottomWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignBottomWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignBottomWithProperty);
-
-        #endregion
-
-        #region Sibling positional
-
-        public static readonly DependencyProperty LeftOfProperty = DependencyProperty.RegisterAttached(
-            "LeftOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetLeftOf(DependencyObject element, UIElement value)
-            => element.SetValue(LeftOfProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetLeftOf(DependencyObject element)
-            => (UIElement) element.GetValue(LeftOfProperty);
-
-        public static readonly DependencyProperty AboveProperty = DependencyProperty.RegisterAttached(
-            "Above", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAbove(DependencyObject element, UIElement value)
-            => element.SetValue(AboveProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAbove(DependencyObject element)
-            => (UIElement) element.GetValue(AboveProperty);
-
-        public static readonly DependencyProperty RightOfProperty = DependencyProperty.RegisterAttached(
-            "RightOf", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetRightOf(DependencyObject element, UIElement value)
-            => element.SetValue(RightOfProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetRightOf(DependencyObject element)
-            => (UIElement) element.GetValue(RightOfProperty);
-
-        public static readonly DependencyProperty BelowProperty = DependencyProperty.RegisterAttached(
-            "Below", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetBelow(DependencyObject element, UIElement value)
-            => element.SetValue(BelowProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetBelow(DependencyObject element)
-            => (UIElement) element.GetValue(BelowProperty);
-
-        #endregion
-
-        #region Center alignment
-
-        public static readonly DependencyProperty AlignHorizontalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignHorizontalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignHorizontalCenterWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignHorizontalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignHorizontalCenterWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignHorizontalCenterWithPanelProperty);
-
-        public static readonly DependencyProperty AlignVerticalCenterWithPanelProperty = DependencyProperty.RegisterAttached(
-            "AlignVerticalCenterWithPanel", typeof(bool), typeof(RelativePanel), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignVerticalCenterWithPanel(DependencyObject element, bool value)
-            => element.SetValue(AlignVerticalCenterWithPanelProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetAlignVerticalCenterWithPanel(DependencyObject element)
-            => (bool) element.GetValue(AlignVerticalCenterWithPanelProperty);
-
-        public static readonly DependencyProperty AlignHorizontalCenterWithProperty = DependencyProperty.RegisterAttached(
-            "AlignHorizontalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignHorizontalCenterWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignHorizontalCenterWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignHorizontalCenterWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignHorizontalCenterWithProperty);
-
-        public static readonly DependencyProperty AlignVerticalCenterWithProperty = DependencyProperty.RegisterAttached(
-            "AlignVerticalCenterWith", typeof(UIElement), typeof(RelativePanel), new FrameworkPropertyMetadata(default(UIElement), FrameworkPropertyMetadataOptions.AffectsRender));
-
-        public static void SetAlignVerticalCenterWith(DependencyObject element, UIElement value)
-            => element.SetValue(AlignVerticalCenterWithProperty, value);
-
-        [TypeConverter(typeof(NameReferenceConverter))]
-        public static UIElement GetAlignVerticalCenterWith(DependencyObject element)
-            => (UIElement) element.GetValue(AlignVerticalCenterWithProperty);
-
-        #endregion
-
-        protected override Size MeasureOverride(Size availableSize)
+        _childGraph.Clear();
+        foreach (UIElement child in InternalChildren)
         {
-            #region Calc DesiredSize
+            if (child == null) continue;
+            var node = _childGraph.AddNode(child);
 
-            _childGraph.Clear();
-            foreach (UIElement child in InternalChildren)
-            {
-                if (child == null) continue;
-                var node = _childGraph.AddNode(child);
+            node.AlignLeftWithNode = _childGraph.AddLink(node, GetAlignLeftWith(child));
+            node.AlignTopWithNode = _childGraph.AddLink(node, GetAlignTopWith(child));
+            node.AlignRightWithNode = _childGraph.AddLink(node, GetAlignRightWith(child));
+            node.AlignBottomWithNode = _childGraph.AddLink(node, GetAlignBottomWith(child));
 
-                node.AlignLeftWithNode = _childGraph.AddLink(node, GetAlignLeftWith(child));
-                node.AlignTopWithNode = _childGraph.AddLink(node, GetAlignTopWith(child));
-                node.AlignRightWithNode = _childGraph.AddLink(node, GetAlignRightWith(child));
-                node.AlignBottomWithNode = _childGraph.AddLink(node, GetAlignBottomWith(child));
+            node.LeftOfNode = _childGraph.AddLink(node, GetLeftOf(child));
+            node.AboveNode = _childGraph.AddLink(node, GetAbove(child));
+            node.RightOfNode = _childGraph.AddLink(node, GetRightOf(child));
+            node.BelowNode = _childGraph.AddLink(node, GetBelow(child));
 
-                node.LeftOfNode = _childGraph.AddLink(node, GetLeftOf(child));
-                node.AboveNode = _childGraph.AddLink(node, GetAbove(child));
-                node.RightOfNode = _childGraph.AddLink(node, GetRightOf(child));
-                node.BelowNode = _childGraph.AddLink(node, GetBelow(child));
+            node.AlignHorizontalCenterWith = _childGraph.AddLink(node, GetAlignHorizontalCenterWith(child));
+            node.AlignVerticalCenterWith = _childGraph.AddLink(node, GetAlignVerticalCenterWith(child));
+        }
+        _childGraph.Measure(availableSize);
 
-                node.AlignHorizontalCenterWith = _childGraph.AddLink(node, GetAlignHorizontalCenterWith(child));
-                node.AlignVerticalCenterWith = _childGraph.AddLink(node, GetAlignVerticalCenterWith(child));
-            }
-            _childGraph.Measure(availableSize);
+        #endregion
 
-            #endregion
+        #region Calc AvailableSize
 
-            #region Calc AvailableSize
-
-            _childGraph.Reset(false);
+        _childGraph.Reset(false);
 
 
-            var calcWidth = Width.IsNaN() && HorizontalAlignment != HorizontalAlignment.Stretch;
-            var calcHeight = Height.IsNaN() && VerticalAlignment != VerticalAlignment.Stretch;
+        var calcWidth = Width.IsNaN() && HorizontalAlignment != HorizontalAlignment.Stretch;
+        var calcHeight = Height.IsNaN() && VerticalAlignment != VerticalAlignment.Stretch;
 
-            var boundingSize = _childGraph.GetBoundingSize(calcWidth, calcHeight);
-            _childGraph.Reset();
-            _childGraph.Measure(boundingSize);
-            return boundingSize;
+        var boundingSize = _childGraph.GetBoundingSize(calcWidth, calcHeight);
+        _childGraph.Reset();
+        _childGraph.Measure(boundingSize);
+        return boundingSize;
 
-            #endregion
+        #endregion
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        _childGraph.GetNodes().Do(node => node.Arrange(arrangeSize));
+        return arrangeSize;
+    }
+
+    private class GraphNode
+    {
+        public bool Measured { get; set; }
+
+        public UIElement Element { get; }
+
+        private bool HorizontalOffsetFlag { get; set; }
+
+        private bool VerticalOffsetFlag { get; set; }
+
+        private Size BoundingSize { get; set; }
+
+        public Size OriginDesiredSize { get; set; }
+
+        public double Left { get; set; } = double.NaN;
+
+        public double Top { get; set; } = double.NaN;
+
+        public double Right { get; set; } = double.NaN;
+
+        public double Bottom { get; set; } = double.NaN;
+
+        public HashSet<GraphNode> OutgoingNodes { get; }
+
+        public GraphNode AlignLeftWithNode { get; set; }
+
+        public GraphNode AlignTopWithNode { get; set; }
+
+        public GraphNode AlignRightWithNode { get; set; }
+
+        public GraphNode AlignBottomWithNode { get; set; }
+
+        public GraphNode LeftOfNode { get; set; }
+
+        public GraphNode AboveNode { get; set; }
+
+        public GraphNode RightOfNode { get; set; }
+
+        public GraphNode BelowNode { get; set; }
+
+        public GraphNode AlignHorizontalCenterWith { get; set; }
+
+        public GraphNode AlignVerticalCenterWith { get; set; }
+
+        public GraphNode(UIElement element)
+        {
+            OutgoingNodes = new HashSet<GraphNode>();
+            Element = element;
         }
 
-        protected override Size ArrangeOverride(Size arrangeSize)
+        public void Arrange(Size arrangeSize) => Element.Arrange(new Rect(Left, Top, Math.Max(arrangeSize.Width - Left - Right, 0), Math.Max(arrangeSize.Height - Top - Bottom, 0)));
+
+        public void Reset(bool clearPos)
         {
-            _childGraph.GetNodes().Do(node => node.Arrange(arrangeSize));
-            return arrangeSize;
+            if (clearPos)
+            {
+                Left = double.NaN;
+                Top = double.NaN;
+                Right = double.NaN;
+                Bottom = double.NaN;
+            }
+            Measured = false;
         }
 
-        private class GraphNode
+        public Size GetBoundingSize()
         {
-            public bool Measured { get; set; }
+            if (Left < 0 || Top < 0) return default;
+            if (Measured) return BoundingSize;
 
-            public UIElement Element { get; }
-
-            private bool HorizontalOffsetFlag { get; set; }
-
-            private bool VerticalOffsetFlag { get; set; }
-
-            private Size BoundingSize { get; set; }
-
-            public Size OriginDesiredSize { get; set; }
-
-            public double Left { get; set; } = double.NaN;
-
-            public double Top { get; set; } = double.NaN;
-
-            public double Right { get; set; } = double.NaN;
-
-            public double Bottom { get; set; } = double.NaN;
-
-            public HashSet<GraphNode> OutgoingNodes { get; }
-
-            public GraphNode AlignLeftWithNode { get; set; }
-
-            public GraphNode AlignTopWithNode { get; set; }
-
-            public GraphNode AlignRightWithNode { get; set; }
-
-            public GraphNode AlignBottomWithNode { get; set; }
-
-            public GraphNode LeftOfNode { get; set; }
-
-            public GraphNode AboveNode { get; set; }
-
-            public GraphNode RightOfNode { get; set; }
-
-            public GraphNode BelowNode { get; set; }
-
-            public GraphNode AlignHorizontalCenterWith { get; set; }
-
-            public GraphNode AlignVerticalCenterWith { get; set; }
-
-            public GraphNode(UIElement element)
+            if (!OutgoingNodes.Any())
             {
-                OutgoingNodes = new HashSet<GraphNode>();
-                Element = element;
+                BoundingSize = Element.DesiredSize;
+                Measured = true;
+            }
+            else
+            {
+                BoundingSize = GetBoundingSize(this, Element.DesiredSize, OutgoingNodes);
+                Measured = true;
             }
 
-            public void Arrange(Size arrangeSize) => Element.Arrange(new Rect(Left, Top, Math.Max(arrangeSize.Width - Left - Right, 0), Math.Max(arrangeSize.Height - Top - Bottom, 0)));
+            return BoundingSize;
+        }
 
-            public void Reset(bool clearPos)
+        private static Size GetBoundingSize(GraphNode prevNode, Size prevSize, IEnumerable<GraphNode> nodes)
+        {
+            foreach (var node in nodes)
             {
-                if (clearPos)
+                if (node.Measured || !node.OutgoingNodes.Any())
                 {
-                    Left = double.NaN;
-                    Top = double.NaN;
-                    Right = double.NaN;
-                    Bottom = double.NaN;
-                }
-                Measured = false;
-            }
+                    if (prevNode.LeftOfNode != null && prevNode.LeftOfNode == node ||
+                        prevNode.RightOfNode != null && prevNode.RightOfNode == node)
+                    {
+                        prevSize.Width += node.BoundingSize.Width;
+                        if (GetAlignHorizontalCenterWithPanel(node.Element) || node.HorizontalOffsetFlag)
+                        {
+                            prevSize.Width += prevNode.OriginDesiredSize.Width;
+                            prevNode.HorizontalOffsetFlag = true;
+                        }
+                        if (node.VerticalOffsetFlag)
+                        {
+                            prevNode.VerticalOffsetFlag = true;
+                        }
+                    }
 
-            public Size GetBoundingSize()
-            {
-                if (Left < 0 || Top < 0) return default;
-                if (Measured) return BoundingSize;
-
-                if (!OutgoingNodes.Any())
-                {
-                    BoundingSize = Element.DesiredSize;
-                    Measured = true;
+                    if (prevNode.AboveNode != null && prevNode.AboveNode == node ||
+                        prevNode.BelowNode != null && prevNode.BelowNode == node)
+                    {
+                        prevSize.Height += node.BoundingSize.Height;
+                        if (GetAlignVerticalCenterWithPanel(node.Element) || node.VerticalOffsetFlag)
+                        {
+                            prevSize.Height += prevNode.OriginDesiredSize.Height;
+                            prevNode.VerticalOffsetFlag = true;
+                        }
+                        if (node.HorizontalOffsetFlag)
+                        {
+                            prevNode.HorizontalOffsetFlag = true;
+                        }
+                    }
                 }
                 else
                 {
-                    BoundingSize = GetBoundingSize(this, Element.DesiredSize, OutgoingNodes);
-                    Measured = true;
+                    return GetBoundingSize(node, prevSize, node.OutgoingNodes);
                 }
-
-                return BoundingSize;
             }
 
-            private static Size GetBoundingSize(GraphNode prevNode, Size prevSize, IEnumerable<GraphNode> nodes)
-            {
-                foreach (var node in nodes)
-                {
-                    if (node.Measured || !node.OutgoingNodes.Any())
-                    {
-                        if (prevNode.LeftOfNode != null && prevNode.LeftOfNode == node ||
-                            prevNode.RightOfNode != null && prevNode.RightOfNode == node)
-                        {
-                            prevSize.Width += node.BoundingSize.Width;
-                            if (GetAlignHorizontalCenterWithPanel(node.Element) || node.HorizontalOffsetFlag)
-                            {
-                                prevSize.Width += prevNode.OriginDesiredSize.Width;
-                                prevNode.HorizontalOffsetFlag = true;
-                            }
-                            if (node.VerticalOffsetFlag)
-                            {
-                                prevNode.VerticalOffsetFlag = true;
-                            }
-                        }
+            return prevSize;
+        }
+    }
 
-                        if (prevNode.AboveNode != null && prevNode.AboveNode == node ||
-                            prevNode.BelowNode != null && prevNode.BelowNode == node)
-                        {
-                            prevSize.Height += node.BoundingSize.Height;
-                            if (GetAlignVerticalCenterWithPanel(node.Element) || node.VerticalOffsetFlag)
-                            {
-                                prevSize.Height += prevNode.OriginDesiredSize.Height;
-                                prevNode.VerticalOffsetFlag = true;
-                            }
-                            if (node.HorizontalOffsetFlag)
-                            {
-                                prevNode.HorizontalOffsetFlag = true;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        return GetBoundingSize(node, prevSize, node.OutgoingNodes);
-                    }
+    private class Graph
+    {
+        private readonly Dictionary<DependencyObject, GraphNode> _nodeDic;
+
+        private Size AvailableSize { get; set; }
+
+        public Graph() => _nodeDic = new Dictionary<DependencyObject, GraphNode>();
+
+        public IEnumerable<GraphNode> GetNodes() => _nodeDic.Values;
+
+        public void Clear()
+        {
+            AvailableSize = new Size();
+            _nodeDic.Clear();
+        }
+
+        public void Reset(bool clearPos = true) => _nodeDic.Values.Do(node => node.Reset(clearPos));
+
+        public GraphNode AddLink(GraphNode from, UIElement to)
+        {
+            if (to == null) return null;
+
+            GraphNode nodeTo;
+            if (_nodeDic.ContainsKey(to))
+            {
+                nodeTo = _nodeDic[to];
+            }
+            else
+            {
+                nodeTo = new GraphNode(to);
+                _nodeDic[to] = nodeTo;
+            }
+
+            from.OutgoingNodes.Add(nodeTo);
+            return nodeTo;
+        }
+
+        public GraphNode AddNode(UIElement value)
+        {
+            if (!_nodeDic.ContainsKey(value))
+            {
+                var node = new GraphNode(value);
+                _nodeDic.Add(value, node);
+                return node;
+            }
+
+            return _nodeDic[value];
+        }
+
+        public void Measure(Size availableSize)
+        {
+            AvailableSize = availableSize;
+            Measure(_nodeDic.Values, null);
+        }
+
+        private void Measure(IEnumerable<GraphNode> nodes, HashSet<DependencyObject> set)
+        {
+            set ??= new HashSet<DependencyObject>();
+
+            foreach (var node in nodes)
+            {
+                /*
+                 * 该节点无任何依赖，所以从这里开始计算元素位置。
+                 * 因为无任何依赖，所以忽略同级元素
+                 */
+                if (!node.Measured && !node.OutgoingNodes.Any())
+                {
+                    MeasureChild(node);
+                    continue;
                 }
 
-                return prevSize;
+                //  判断依赖元素是否全部排列完毕
+                if (node.OutgoingNodes.All(item => item.Measured))
+                {
+                    MeasureChild(node);
+                    continue;
+                }
+
+                //  判断是否有循环
+                if (!set.Add(node.Element)) throw new Exception("RelativePanel error: Circular dependency detected. Layout could not complete.");
+
+                //  没有循环，且有依赖，则继续往下
+                Measure(node.OutgoingNodes, set);
+
+                if (!node.Measured)
+                {
+                    MeasureChild(node);
+                }
             }
         }
 
-        private class Graph
+        private void MeasureChild(GraphNode node)
         {
-            private readonly Dictionary<DependencyObject, GraphNode> _nodeDic;
+            var child = node.Element;
+            child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            node.OriginDesiredSize = child.DesiredSize;
 
-            private Size AvailableSize { get; set; }
+            var alignLeftWithPanel = GetAlignLeftWithPanel(child);
+            var alignTopWithPanel = GetAlignTopWithPanel(child);
+            var alignRightWithPanel = GetAlignRightWithPanel(child);
+            var alignBottomWithPanel = GetAlignBottomWithPanel(child);
 
-            public Graph() => _nodeDic = new Dictionary<DependencyObject, GraphNode>();
+            #region Panel alignment
 
-            public IEnumerable<GraphNode> GetNodes() => _nodeDic.Values;
+            if (alignLeftWithPanel) node.Left = 0;
+            if (alignTopWithPanel) node.Top = 0;
+            if (alignRightWithPanel) node.Right = 0;
+            if (alignBottomWithPanel) node.Bottom = 0;
 
-            public void Clear()
+            #endregion
+
+            #region Sibling alignment
+
+            if (node.AlignLeftWithNode != null)
             {
-                AvailableSize = new Size();
-                _nodeDic.Clear();
+                node.Left = node.Left.IsNaN() ? node.AlignLeftWithNode.Left : node.AlignLeftWithNode.Left * 0.5;
             }
 
-            public void Reset(bool clearPos = true) => _nodeDic.Values.Do(node => node.Reset(clearPos));
-
-            public GraphNode AddLink(GraphNode from, UIElement to)
+            if (node.AlignTopWithNode != null)
             {
-                if (to == null) return null;
+                node.Top = node.Top.IsNaN() ? node.AlignTopWithNode.Top : node.AlignTopWithNode.Top * 0.5;
+            }
 
-                GraphNode nodeTo;
-                if (_nodeDic.ContainsKey(to))
+            if (node.AlignRightWithNode != null)
+            {
+                node.Right = node.Right.IsNaN()
+                    ? node.AlignRightWithNode.Right
+                    : node.AlignRightWithNode.Right * 0.5;
+            }
+
+            if (node.AlignBottomWithNode != null)
+            {
+                node.Bottom = node.Bottom.IsNaN()
+                    ? node.AlignBottomWithNode.Bottom
+                    : node.AlignBottomWithNode.Bottom * 0.5;
+            }
+
+            #endregion
+
+            #region Measure
+
+            var availableHeight = AvailableSize.Height - node.Top - node.Bottom;
+            if (availableHeight.IsNaN())
+            {
+                availableHeight = AvailableSize.Height;
+
+                if (!node.Top.IsNaN() && node.Bottom.IsNaN())
                 {
-                    nodeTo = _nodeDic[to];
+                    availableHeight -= node.Top;
                 }
-                else
+                else if (node.Top.IsNaN() && !node.Bottom.IsNaN())
                 {
-                    nodeTo = new GraphNode(to);
-                    _nodeDic[to] = nodeTo;
-                }
-
-                from.OutgoingNodes.Add(nodeTo);
-                return nodeTo;
-            }
-
-            public GraphNode AddNode(UIElement value)
-            {
-                if (!_nodeDic.ContainsKey(value))
-                {
-                    var node = new GraphNode(value);
-                    _nodeDic.Add(value, node);
-                    return node;
-                }
-
-                return _nodeDic[value];
-            }
-
-            public void Measure(Size availableSize)
-            {
-                AvailableSize = availableSize;
-                Measure(_nodeDic.Values, null);
-            }
-
-            private void Measure(IEnumerable<GraphNode> nodes, HashSet<DependencyObject> set)
-            {
-                set ??= new HashSet<DependencyObject>();
-
-                foreach (var node in nodes)
-                {
-                    /*
-                     * 该节点无任何依赖，所以从这里开始计算元素位置。
-                     * 因为无任何依赖，所以忽略同级元素
-                     */
-                    if (!node.Measured && !node.OutgoingNodes.Any())
-                    {
-                        MeasureChild(node);
-                        continue;
-                    }
-
-                    //  判断依赖元素是否全部排列完毕
-                    if (node.OutgoingNodes.All(item => item.Measured))
-                    {
-                        MeasureChild(node);
-                        continue;
-                    }
-
-                    //  判断是否有循环
-                    if (!set.Add(node.Element)) throw new Exception("RelativePanel error: Circular dependency detected. Layout could not complete.");
-
-                    //  没有循环，且有依赖，则继续往下
-                    Measure(node.OutgoingNodes, set);
-
-                    if (!node.Measured)
-                    {
-                        MeasureChild(node);
-                    }
+                    availableHeight -= node.Bottom;
                 }
             }
 
-            private void MeasureChild(GraphNode node)
+            var availableWidth = AvailableSize.Width - node.Left - node.Right;
+            if (availableWidth.IsNaN())
             {
-                var child = node.Element;
-                child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                node.OriginDesiredSize = child.DesiredSize;
+                availableWidth = AvailableSize.Width;
 
-                var alignLeftWithPanel = GetAlignLeftWithPanel(child);
-                var alignTopWithPanel = GetAlignTopWithPanel(child);
-                var alignRightWithPanel = GetAlignRightWithPanel(child);
-                var alignBottomWithPanel = GetAlignBottomWithPanel(child);
-
-                #region Panel alignment
-
-                if (alignLeftWithPanel) node.Left = 0;
-                if (alignTopWithPanel) node.Top = 0;
-                if (alignRightWithPanel) node.Right = 0;
-                if (alignBottomWithPanel) node.Bottom = 0;
-
-                #endregion
-
-                #region Sibling alignment
-
-                if (node.AlignLeftWithNode != null)
+                if (!node.Left.IsNaN() && node.Right.IsNaN())
                 {
-                    node.Left = node.Left.IsNaN() ? node.AlignLeftWithNode.Left : node.AlignLeftWithNode.Left * 0.5;
+                    availableWidth -= node.Left;
                 }
-
-                if (node.AlignTopWithNode != null)
+                else if (node.Left.IsNaN() && !node.Right.IsNaN())
                 {
-                    node.Top = node.Top.IsNaN() ? node.AlignTopWithNode.Top : node.AlignTopWithNode.Top * 0.5;
+                    availableWidth -= node.Right;
                 }
+            }
 
-                if (node.AlignRightWithNode != null)
+            child.Measure(new Size(Math.Max(availableWidth, 0), Math.Max(availableHeight, 0)));
+            var childSize = child.DesiredSize;
+
+            #endregion
+
+            #region Sibling positional
+
+            if (node.LeftOfNode != null && node.Left.IsNaN())
+            {
+                node.Left = node.LeftOfNode.Left - childSize.Width;
+            }
+
+            if (node.AboveNode != null && node.Top.IsNaN())
+            {
+                node.Top = node.AboveNode.Top - childSize.Height;
+            }
+
+            if (node.RightOfNode != null)
+            {
+                if (node.Right.IsNaN())
                 {
-                    node.Right = node.Right.IsNaN()
-                        ? node.AlignRightWithNode.Right
-                        : node.AlignRightWithNode.Right * 0.5;
+                    node.Right = node.RightOfNode.Right - childSize.Width;
                 }
 
-                if (node.AlignBottomWithNode != null)
-                {
-                    node.Bottom = node.Bottom.IsNaN()
-                        ? node.AlignBottomWithNode.Bottom
-                        : node.AlignBottomWithNode.Bottom * 0.5;
-                }
-
-                #endregion
-
-                #region Measure
-
-                var availableHeight = AvailableSize.Height - node.Top - node.Bottom;
-                if (availableHeight.IsNaN())
-                {
-                    availableHeight = AvailableSize.Height;
-
-                    if (!node.Top.IsNaN() && node.Bottom.IsNaN())
-                    {
-                        availableHeight -= node.Top;
-                    }
-                    else if (node.Top.IsNaN() && !node.Bottom.IsNaN())
-                    {
-                        availableHeight -= node.Bottom;
-                    }
-                }
-
-                var availableWidth = AvailableSize.Width - node.Left - node.Right;
-                if (availableWidth.IsNaN())
-                {
-                    availableWidth = AvailableSize.Width;
-
-                    if (!node.Left.IsNaN() && node.Right.IsNaN())
-                    {
-                        availableWidth -= node.Left;
-                    }
-                    else if (node.Left.IsNaN() && !node.Right.IsNaN())
-                    {
-                        availableWidth -= node.Right;
-                    }
-                }
-
-                child.Measure(new Size(Math.Max(availableWidth, 0), Math.Max(availableHeight, 0)));
-                var childSize = child.DesiredSize;
-
-                #endregion
-
-                #region Sibling positional
-
-                if (node.LeftOfNode != null && node.Left.IsNaN())
-                {
-                    node.Left = node.LeftOfNode.Left - childSize.Width;
-                }
-
-                if (node.AboveNode != null && node.Top.IsNaN())
-                {
-                    node.Top = node.AboveNode.Top - childSize.Height;
-                }
-
-                if (node.RightOfNode != null)
-                {
-                    if (node.Right.IsNaN())
-                    {
-                        node.Right = node.RightOfNode.Right - childSize.Width;
-                    }
-
-                    if (node.Left.IsNaN())
-                    {
-                        node.Left = AvailableSize.Width - node.RightOfNode.Right;
-                    }
-                }
-
-                if (node.BelowNode != null)
-                {
-                    if (node.Bottom.IsNaN())
-                    {
-                        node.Bottom = node.BelowNode.Bottom - childSize.Height;
-                    }
-
-                    if (node.Top.IsNaN())
-                    {
-                        node.Top = AvailableSize.Height - node.BelowNode.Bottom;
-                    }
-                }
-
-                #endregion
-
-                #region Sibling-center alignment
-
-                if (node.AlignHorizontalCenterWith != null)
-                {
-                    var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
-                    var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
-
-                    if (node.Left.IsNaN()) node.Left = halfWidthLeft;
-                    else node.Left = (node.Left + halfWidthLeft) * 0.5;
-
-                    if (node.Right.IsNaN()) node.Right = halfWidthRight;
-                    else node.Right = (node.Right + halfWidthRight) * 0.5;
-                }
-
-                if (node.AlignVerticalCenterWith != null)
-                {
-                    var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
-                    var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
-
-                    if (node.Top.IsNaN()) node.Top = halfHeightTop;
-                    else node.Top = (node.Top + halfHeightTop) * 0.5;
-
-                    if (node.Bottom.IsNaN()) node.Bottom = halfHeightBottom;
-                    else node.Bottom = (node.Bottom + halfHeightBottom) * 0.5;
-                }
-
-                #endregion
-
-                #region Panel-center alignment
-
-                if (GetAlignHorizontalCenterWithPanel(child))
-                {
-                    var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5;
-
-                    if (node.Left.IsNaN()) node.Left = halfSubWidth;
-                    else node.Left = (node.Left + halfSubWidth) * 0.5;
-
-                    if (node.Right.IsNaN()) node.Right = halfSubWidth;
-                    else node.Right = (node.Right + halfSubWidth) * 0.5;
-                }
-
-                if (GetAlignVerticalCenterWithPanel(child))
-                {
-                    var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5;
-
-                    if (node.Top.IsNaN()) node.Top = halfSubHeight;
-                    else node.Top = (node.Top + halfSubHeight) * 0.5;
-
-                    if (node.Bottom.IsNaN()) node.Bottom = halfSubHeight;
-                    else node.Bottom = (node.Bottom + halfSubHeight) * 0.5;
-                }
-
-                #endregion
-
                 if (node.Left.IsNaN())
                 {
-                    if (!node.Right.IsNaN())
-                        node.Left = AvailableSize.Width - node.Right - childSize.Width;
-                    else
-                    {
-                        node.Left = 0;
-                        node.Right = AvailableSize.Width - childSize.Width;
-                    }
+                    node.Left = AvailableSize.Width - node.RightOfNode.Right;
                 }
-                else if (!node.Left.IsNaN() && node.Right.IsNaN())
+            }
+
+            if (node.BelowNode != null)
+            {
+                if (node.Bottom.IsNaN())
                 {
-                    node.Right = AvailableSize.Width - node.Left - childSize.Width;
+                    node.Bottom = node.BelowNode.Bottom - childSize.Height;
                 }
 
                 if (node.Top.IsNaN())
                 {
-                    if (!node.Bottom.IsNaN())
-                        node.Top = AvailableSize.Height - node.Bottom - childSize.Height;
-                    else
-                    {
-                        node.Top = 0;
-                        node.Bottom = AvailableSize.Height - childSize.Height;
-                    }
+                    node.Top = AvailableSize.Height - node.BelowNode.Bottom;
                 }
-                else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
-                {
-                    node.Bottom = AvailableSize.Height - node.Top - childSize.Height;
-                }
-
-                node.Measured = true;
             }
 
-            public Size GetBoundingSize(bool calcWidth, bool calcHeight)
+            #endregion
+
+            #region Sibling-center alignment
+
+            if (node.AlignHorizontalCenterWith != null)
             {
-                var boundingSize = new Size();
+                var halfWidthLeft = (AvailableSize.Width + node.AlignHorizontalCenterWith.Left - node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
+                var halfWidthRight = (AvailableSize.Width - node.AlignHorizontalCenterWith.Left + node.AlignHorizontalCenterWith.Right - childSize.Width) * 0.5;
 
-                foreach (var node in _nodeDic.Values)
-                {
-                    var size = node.GetBoundingSize();
-                    boundingSize.Width = Math.Max(boundingSize.Width, size.Width);
-                    boundingSize.Height = Math.Max(boundingSize.Height, size.Height);
-                }
+                if (node.Left.IsNaN()) node.Left = halfWidthLeft;
+                else node.Left = (node.Left + halfWidthLeft) * 0.5;
 
-                boundingSize.Width = calcWidth ? boundingSize.Width : AvailableSize.Width;
-                boundingSize.Height = calcHeight ? boundingSize.Height : AvailableSize.Height;
-                return boundingSize;
+                if (node.Right.IsNaN()) node.Right = halfWidthRight;
+                else node.Right = (node.Right + halfWidthRight) * 0.5;
             }
+
+            if (node.AlignVerticalCenterWith != null)
+            {
+                var halfHeightTop = (AvailableSize.Height + node.AlignVerticalCenterWith.Top - node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+                var halfHeightBottom = (AvailableSize.Height - node.AlignVerticalCenterWith.Top + node.AlignVerticalCenterWith.Bottom - childSize.Height) * 0.5;
+
+                if (node.Top.IsNaN()) node.Top = halfHeightTop;
+                else node.Top = (node.Top + halfHeightTop) * 0.5;
+
+                if (node.Bottom.IsNaN()) node.Bottom = halfHeightBottom;
+                else node.Bottom = (node.Bottom + halfHeightBottom) * 0.5;
+            }
+
+            #endregion
+
+            #region Panel-center alignment
+
+            if (GetAlignHorizontalCenterWithPanel(child))
+            {
+                var halfSubWidth = (AvailableSize.Width - childSize.Width) * 0.5;
+
+                if (node.Left.IsNaN()) node.Left = halfSubWidth;
+                else node.Left = (node.Left + halfSubWidth) * 0.5;
+
+                if (node.Right.IsNaN()) node.Right = halfSubWidth;
+                else node.Right = (node.Right + halfSubWidth) * 0.5;
+            }
+
+            if (GetAlignVerticalCenterWithPanel(child))
+            {
+                var halfSubHeight = (AvailableSize.Height - childSize.Height) * 0.5;
+
+                if (node.Top.IsNaN()) node.Top = halfSubHeight;
+                else node.Top = (node.Top + halfSubHeight) * 0.5;
+
+                if (node.Bottom.IsNaN()) node.Bottom = halfSubHeight;
+                else node.Bottom = (node.Bottom + halfSubHeight) * 0.5;
+            }
+
+            #endregion
+
+            if (node.Left.IsNaN())
+            {
+                if (!node.Right.IsNaN())
+                    node.Left = AvailableSize.Width - node.Right - childSize.Width;
+                else
+                {
+                    node.Left = 0;
+                    node.Right = AvailableSize.Width - childSize.Width;
+                }
+            }
+            else if (!node.Left.IsNaN() && node.Right.IsNaN())
+            {
+                node.Right = AvailableSize.Width - node.Left - childSize.Width;
+            }
+
+            if (node.Top.IsNaN())
+            {
+                if (!node.Bottom.IsNaN())
+                    node.Top = AvailableSize.Height - node.Bottom - childSize.Height;
+                else
+                {
+                    node.Top = 0;
+                    node.Bottom = AvailableSize.Height - childSize.Height;
+                }
+            }
+            else if (!node.Top.IsNaN() && node.Bottom.IsNaN())
+            {
+                node.Bottom = AvailableSize.Height - node.Top - childSize.Height;
+            }
+
+            node.Measured = true;
+        }
+
+        public Size GetBoundingSize(bool calcWidth, bool calcHeight)
+        {
+            var boundingSize = new Size();
+
+            foreach (var node in _nodeDic.Values)
+            {
+                var size = node.GetBoundingSize();
+                boundingSize.Width = Math.Max(boundingSize.Width, size.Width);
+                boundingSize.Height = Math.Max(boundingSize.Height, size.Height);
+            }
+
+            boundingSize.Width = calcWidth ? boundingSize.Width : AvailableSize.Width;
+            boundingSize.Height = calcHeight ? boundingSize.Height : AvailableSize.Height;
+            return boundingSize;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
index 7d29289e..3b58fec1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
@@ -2,41 +2,40 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     用以代替Grid
+/// </summary>
+/// <remarks>
+///     当不需要Grid的行、列分隔等功能时建议用此轻量级类代替
+/// </remarks>
+public class SimplePanel : Panel
 {
-    /// <summary>
-    ///     用以代替Grid
-    /// </summary>
-    /// <remarks>
-    ///     当不需要Grid的行、列分隔等功能时建议用此轻量级类代替
-    /// </remarks>
-    public class SimplePanel : Panel
+    protected override Size MeasureOverride(Size constraint)
     {
-        protected override Size MeasureOverride(Size constraint)
+        var maxSize = new Size();
+
+        foreach (UIElement child in InternalChildren)
         {
-            var maxSize = new Size();
-
-            foreach (UIElement child in InternalChildren)
+            if (child != null)
             {
-                if (child != null)
-                {
-                    child.Measure(constraint);
-                    maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
-                    maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
-                }
+                child.Measure(constraint);
+                maxSize.Width = Math.Max(maxSize.Width, child.DesiredSize.Width);
+                maxSize.Height = Math.Max(maxSize.Height, child.DesiredSize.Height);
             }
-
-            return maxSize;
         }
 
-        protected override Size ArrangeOverride(Size arrangeSize)
-        {
-            foreach (UIElement child in InternalChildren)
-            {
-                child?.Arrange(new Rect(arrangeSize));
-            }
-
-            return arrangeSize;
-        }
+        return maxSize;
     }
-}
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        foreach (UIElement child in InternalChildren)
+        {
+            child?.Arrange(new Rect(arrangeSize));
+        }
+
+        return arrangeSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
index 6fa5f209..bd69c73e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
@@ -2,100 +2,99 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SimpleStackPanel : Panel
 {
-    public class SimpleStackPanel : Panel
+    public static readonly DependencyProperty OrientationProperty =
+        StackPanel.OrientationProperty.AddOwner(typeof(SimpleStackPanel),
+            new FrameworkPropertyMetadata(Orientation.Vertical, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public Orientation Orientation
     {
-        public static readonly DependencyProperty OrientationProperty =
-            StackPanel.OrientationProperty.AddOwner(typeof(SimpleStackPanel),
-                new FrameworkPropertyMetadata(Orientation.Vertical, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        protected override Size MeasureOverride(Size constraint)
-        {
-            var stackDesiredSize = new Size();
-            var children = InternalChildren;
-            var layoutSlotSize = constraint;
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                layoutSlotSize.Width = double.PositiveInfinity;
-
-                for (int i = 0, count = children.Count; i < count; ++i)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    child.Measure(layoutSlotSize);
-                    var childDesiredSize = child.DesiredSize;
-
-                    stackDesiredSize.Width += childDesiredSize.Width;
-                    stackDesiredSize.Height = Math.Max(stackDesiredSize.Height, childDesiredSize.Height);
-                }
-            }
-            else
-            {
-                layoutSlotSize.Height = double.PositiveInfinity;
-
-                for (int i = 0, count = children.Count; i < count; ++i)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    child.Measure(layoutSlotSize);
-                    var childDesiredSize = child.DesiredSize;
-
-                    stackDesiredSize.Width = Math.Max(stackDesiredSize.Width, childDesiredSize.Width);
-                    stackDesiredSize.Height += childDesiredSize.Height;
-                }
-            }
-
-            return stackDesiredSize;
-        }
-
-        protected override Size ArrangeOverride(Size arrangeSize)
-        {
-            var children = InternalChildren;
-            var rcChild = new Rect(arrangeSize);
-            var previousChildSize = 0.0;
-
-            if (Orientation == Orientation.Horizontal)
-            {
-                for (int i = 0, count = children.Count; i < count; ++i)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    rcChild.X += previousChildSize;
-                    previousChildSize = child.DesiredSize.Width;
-                    rcChild.Width = previousChildSize;
-                    rcChild.Height = Math.Max(arrangeSize.Height, child.DesiredSize.Height);
-
-                    child.Arrange(rcChild);
-                }
-            }
-            else
-            {
-                for (int i = 0, count = children.Count; i < count; ++i)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    rcChild.Y += previousChildSize;
-                    previousChildSize = child.DesiredSize.Height;
-                    rcChild.Height = previousChildSize;
-                    rcChild.Width = Math.Max(arrangeSize.Width, child.DesiredSize.Width);
-
-                    child.Arrange(rcChild);
-                }
-            }
-
-            return arrangeSize;
-        }
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
     }
-}
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var stackDesiredSize = new Size();
+        var children = InternalChildren;
+        var layoutSlotSize = constraint;
+
+        if (Orientation == Orientation.Horizontal)
+        {
+            layoutSlotSize.Width = double.PositiveInfinity;
+
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                child.Measure(layoutSlotSize);
+                var childDesiredSize = child.DesiredSize;
+
+                stackDesiredSize.Width += childDesiredSize.Width;
+                stackDesiredSize.Height = Math.Max(stackDesiredSize.Height, childDesiredSize.Height);
+            }
+        }
+        else
+        {
+            layoutSlotSize.Height = double.PositiveInfinity;
+
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                child.Measure(layoutSlotSize);
+                var childDesiredSize = child.DesiredSize;
+
+                stackDesiredSize.Width = Math.Max(stackDesiredSize.Width, childDesiredSize.Width);
+                stackDesiredSize.Height += childDesiredSize.Height;
+            }
+        }
+
+        return stackDesiredSize;
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        var children = InternalChildren;
+        var rcChild = new Rect(arrangeSize);
+        var previousChildSize = 0.0;
+
+        if (Orientation == Orientation.Horizontal)
+        {
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                rcChild.X += previousChildSize;
+                previousChildSize = child.DesiredSize.Width;
+                rcChild.Width = previousChildSize;
+                rcChild.Height = Math.Max(arrangeSize.Height, child.DesiredSize.Height);
+
+                child.Arrange(rcChild);
+            }
+        }
+        else
+        {
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                rcChild.Y += previousChildSize;
+                previousChildSize = child.DesiredSize.Height;
+                rcChild.Height = previousChildSize;
+                rcChild.Width = Math.Max(arrangeSize.Width, child.DesiredSize.Width);
+
+                child.Arrange(rcChild);
+            }
+        }
+
+        return arrangeSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
index bebb72c0..c8be6cd1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
@@ -5,381 +5,380 @@ using System.Windows.Controls;
 using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class UniformSpacingPanel : Panel
 {
-    public class UniformSpacingPanel : Panel
+    private Orientation _orientation;
+
+    public UniformSpacingPanel()
     {
-        private Orientation _orientation;
+        _orientation = Orientation.Horizontal;
+    }
 
-        public UniformSpacingPanel()
+    public static readonly DependencyProperty OrientationProperty =
+        StackPanel.OrientationProperty.AddOwner(typeof(UniformSpacingPanel),
+            new FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure, OnOrientationChanged));
+
+    private static void OnOrientationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var p = (UniformSpacingPanel) d;
+        p._orientation = (Orientation) e.NewValue;
+    }
+
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public static readonly DependencyProperty ChildWrappingProperty = DependencyProperty.Register(
+        "ChildWrapping", typeof(VisualWrapping), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(default(VisualWrapping), FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public VisualWrapping ChildWrapping
+    {
+        get => (VisualWrapping) GetValue(ChildWrappingProperty);
+        set => SetValue(ChildWrappingProperty, value);
+    }
+
+    public static readonly DependencyProperty SpacingProperty = DependencyProperty.Register(
+        "Spacing", typeof(double), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
+
+    public double Spacing
+    {
+        get => (double) GetValue(SpacingProperty);
+        set => SetValue(SpacingProperty, value);
+    }
+
+    public static readonly DependencyProperty HorizontalSpacingProperty = DependencyProperty.Register(
+        "HorizontalSpacing", typeof(double), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
+
+    public double HorizontalSpacing
+    {
+        get => (double) GetValue(HorizontalSpacingProperty);
+        set => SetValue(HorizontalSpacingProperty, value);
+    }
+
+    public static readonly DependencyProperty VerticalSpacingProperty = DependencyProperty.Register(
+        "VerticalSpacing", typeof(double), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
+
+    public double VerticalSpacing
+    {
+        get => (double) GetValue(VerticalSpacingProperty);
+        set => SetValue(VerticalSpacingProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
+        "ItemWidth", typeof(double), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure),
+        IsWidthHeightValid);
+
+    [TypeConverter(typeof(LengthConverter))]
+    public double ItemWidth
+    {
+        get => (double) GetValue(ItemWidthProperty);
+        set => SetValue(ItemWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
+        "ItemHeight", typeof(double), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure),
+        IsWidthHeightValid);
+
+    [TypeConverter(typeof(LengthConverter))]
+    public double ItemHeight
+    {
+        get => (double) GetValue(ItemHeightProperty);
+        set => SetValue(ItemHeightProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemHorizontalAlignmentProperty = DependencyProperty.Register(
+        "ItemHorizontalAlignment", typeof(HorizontalAlignment?), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(HorizontalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public HorizontalAlignment? ItemHorizontalAlignment
+    {
+        get => (HorizontalAlignment?) GetValue(ItemHorizontalAlignmentProperty);
+        set => SetValue(ItemHorizontalAlignmentProperty, value);
+    }
+
+    public static readonly DependencyProperty ItemVerticalAlignmentProperty = DependencyProperty.Register(
+        "ItemVerticalAlignment", typeof(VerticalAlignment?), typeof(UniformSpacingPanel),
+        new FrameworkPropertyMetadata(VerticalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public VerticalAlignment? ItemVerticalAlignment
+    {
+        get => (VerticalAlignment?) GetValue(ItemVerticalAlignmentProperty);
+        set => SetValue(ItemVerticalAlignmentProperty, value);
+    }
+
+    private static bool IsWidthHeightValid(object value)
+    {
+        var v = (double) value;
+        return double.IsNaN(v) || v >= 0.0d && !double.IsPositiveInfinity(v);
+    }
+
+    private static bool IsSpacingValid(object value)
+    {
+        if (value is double spacing)
         {
-            _orientation = Orientation.Horizontal;
+            return double.IsNaN(spacing) || spacing > 0;
         }
 
-        public static readonly DependencyProperty OrientationProperty =
-            StackPanel.OrientationProperty.AddOwner(typeof(UniformSpacingPanel),
-                new FrameworkPropertyMetadata(Orientation.Horizontal, FrameworkPropertyMetadataOptions.AffectsMeasure, OnOrientationChanged));
+        return false;
+    }
 
-        private static void OnOrientationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private void ArrangeWrapLine(double v, double lineV, int start, int end, bool useItemU, double itemU, double spacing)
+    {
+        double u = 0;
+        var isHorizontal = _orientation == Orientation.Horizontal;
+
+        var children = InternalChildren;
+        for (var i = start; i < end; i++)
         {
-            var p = (UniformSpacingPanel) d;
-            p._orientation = (Orientation) e.NewValue;
-        }
+            var child = children[i];
+            if (child == null) continue;
 
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
+            var childSize = new PanelUvSize(_orientation, child.DesiredSize);
+            var layoutSlotU = useItemU ? itemU : childSize.U;
 
-        public static readonly DependencyProperty ChildWrappingProperty = DependencyProperty.Register(
-            "ChildWrapping", typeof(VisualWrapping), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(default(VisualWrapping), FrameworkPropertyMetadataOptions.AffectsMeasure));
+            child.Arrange(isHorizontal ? new Rect(u, v, layoutSlotU, lineV) : new Rect(v, u, lineV, layoutSlotU));
 
-        public VisualWrapping ChildWrapping
-        {
-            get => (VisualWrapping) GetValue(ChildWrappingProperty);
-            set => SetValue(ChildWrappingProperty, value);
-        }
-
-        public static readonly DependencyProperty SpacingProperty = DependencyProperty.Register(
-            "Spacing", typeof(double), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
-
-        public double Spacing
-        {
-            get => (double) GetValue(SpacingProperty);
-            set => SetValue(SpacingProperty, value);
-        }
-
-        public static readonly DependencyProperty HorizontalSpacingProperty = DependencyProperty.Register(
-            "HorizontalSpacing", typeof(double), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
-
-        public double HorizontalSpacing
-        {
-            get => (double) GetValue(HorizontalSpacingProperty);
-            set => SetValue(HorizontalSpacingProperty, value);
-        }
-
-        public static readonly DependencyProperty VerticalSpacingProperty = DependencyProperty.Register(
-            "VerticalSpacing", typeof(double), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure), IsSpacingValid);
-
-        public double VerticalSpacing
-        {
-            get => (double) GetValue(VerticalSpacingProperty);
-            set => SetValue(VerticalSpacingProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemWidthProperty = DependencyProperty.Register(
-            "ItemWidth", typeof(double), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure),
-            IsWidthHeightValid);
-
-        [TypeConverter(typeof(LengthConverter))]
-        public double ItemWidth
-        {
-            get => (double) GetValue(ItemWidthProperty);
-            set => SetValue(ItemWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemHeightProperty = DependencyProperty.Register(
-            "ItemHeight", typeof(double), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(double.NaN, FrameworkPropertyMetadataOptions.AffectsMeasure),
-            IsWidthHeightValid);
-
-        [TypeConverter(typeof(LengthConverter))]
-        public double ItemHeight
-        {
-            get => (double) GetValue(ItemHeightProperty);
-            set => SetValue(ItemHeightProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemHorizontalAlignmentProperty = DependencyProperty.Register(
-            "ItemHorizontalAlignment", typeof(HorizontalAlignment?), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(HorizontalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public HorizontalAlignment? ItemHorizontalAlignment
-        {
-            get => (HorizontalAlignment?) GetValue(ItemHorizontalAlignmentProperty);
-            set => SetValue(ItemHorizontalAlignmentProperty, value);
-        }
-
-        public static readonly DependencyProperty ItemVerticalAlignmentProperty = DependencyProperty.Register(
-            "ItemVerticalAlignment", typeof(VerticalAlignment?), typeof(UniformSpacingPanel),
-            new FrameworkPropertyMetadata(VerticalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public VerticalAlignment? ItemVerticalAlignment
-        {
-            get => (VerticalAlignment?) GetValue(ItemVerticalAlignmentProperty);
-            set => SetValue(ItemVerticalAlignmentProperty, value);
-        }
-
-        private static bool IsWidthHeightValid(object value)
-        {
-            var v = (double) value;
-            return double.IsNaN(v) || v >= 0.0d && !double.IsPositiveInfinity(v);
-        }
-
-        private static bool IsSpacingValid(object value)
-        {
-            if (value is double spacing)
+            if (layoutSlotU > 0)
             {
-                return double.IsNaN(spacing) || spacing > 0;
+                u += layoutSlotU + spacing;
             }
-
-            return false;
         }
+    }
 
-        private void ArrangeWrapLine(double v, double lineV, int start, int end, bool useItemU, double itemU, double spacing)
+    private void ArrangeLine(double lineV, bool useItemU, double itemU, double spacing)
+    {
+        double u = 0;
+        var isHorizontal = _orientation == Orientation.Horizontal;
+
+        var children = InternalChildren;
+        for (var i = 0; i < children.Count; i++)
         {
-            double u = 0;
-            var isHorizontal = _orientation == Orientation.Horizontal;
+            var child = children[i];
+            if (child == null) continue;
 
-            var children = InternalChildren;
-            for (var i = start; i < end; i++)
+            var childSize = new PanelUvSize(_orientation, child.DesiredSize);
+            var layoutSlotU = useItemU ? itemU : childSize.U;
+
+            child.Arrange(isHorizontal ? new Rect(u, 0, layoutSlotU, lineV) : new Rect(0, u, lineV, layoutSlotU));
+
+            if (layoutSlotU > 0)
+            {
+                u += layoutSlotU + spacing;
+            }
+        }
+    }
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var curLineSize = new PanelUvSize(_orientation);
+        var panelSize = new PanelUvSize(_orientation);
+        var uvConstraint = new PanelUvSize(_orientation, constraint);
+        var itemWidth = ItemWidth;
+        var itemHeight = ItemHeight;
+        var itemWidthSet = !double.IsNaN(itemWidth);
+        var itemHeightSet = !double.IsNaN(itemHeight);
+        var childWrapping = ChildWrapping;
+        var itemHorizontalAlignment = ItemHorizontalAlignment;
+        var itemVerticalAlignment = ItemVerticalAlignment;
+        var itemHorizontalAlignmentSet = itemHorizontalAlignment != null;
+        var itemVerticalAlignmentSet = ItemVerticalAlignment != null;
+        var spacingSize = GetSpacingSize();
+
+        var childConstraint = new Size(
+            itemWidthSet ? itemWidth : constraint.Width,
+            itemHeightSet ? itemHeight : constraint.Height);
+
+        var children = InternalChildren;
+        var isFirst = true;
+
+        if (childWrapping == VisualWrapping.Wrap)
+        {
+            for (int i = 0, count = children.Count; i < count; i++)
             {
                 var child = children[i];
                 if (child == null) continue;
 
-                var childSize = new PanelUvSize(_orientation, child.DesiredSize);
-                var layoutSlotU = useItemU ? itemU : childSize.U;
-
-                child.Arrange(isHorizontal ? new Rect(u, v, layoutSlotU, lineV) : new Rect(v, u, lineV, layoutSlotU));
-
-                if (layoutSlotU > 0)
+                if (itemHorizontalAlignmentSet)
                 {
-                    u += layoutSlotU + spacing;
+                    child.SetCurrentValue(HorizontalAlignmentProperty, itemHorizontalAlignment);
                 }
-            }
-        }
 
-        private void ArrangeLine(double lineV, bool useItemU, double itemU, double spacing)
-        {
-            double u = 0;
-            var isHorizontal = _orientation == Orientation.Horizontal;
-
-            var children = InternalChildren;
-            for (var i = 0; i < children.Count; i++)
-            {
-                var child = children[i];
-                if (child == null) continue;
-
-                var childSize = new PanelUvSize(_orientation, child.DesiredSize);
-                var layoutSlotU = useItemU ? itemU : childSize.U;
-
-                child.Arrange(isHorizontal ? new Rect(u, 0, layoutSlotU, lineV) : new Rect(0, u, lineV, layoutSlotU));
-
-                if (layoutSlotU > 0)
+                if (itemVerticalAlignmentSet)
                 {
-                    u += layoutSlotU + spacing;
+                    child.SetCurrentValue(VerticalAlignmentProperty, itemVerticalAlignment);
                 }
-            }
-        }
 
-        protected override Size MeasureOverride(Size constraint)
-        {
-            var curLineSize = new PanelUvSize(_orientation);
-            var panelSize = new PanelUvSize(_orientation);
-            var uvConstraint = new PanelUvSize(_orientation, constraint);
-            var itemWidth = ItemWidth;
-            var itemHeight = ItemHeight;
-            var itemWidthSet = !double.IsNaN(itemWidth);
-            var itemHeightSet = !double.IsNaN(itemHeight);
-            var childWrapping = ChildWrapping;
-            var itemHorizontalAlignment = ItemHorizontalAlignment;
-            var itemVerticalAlignment = ItemVerticalAlignment;
-            var itemHorizontalAlignmentSet = itemHorizontalAlignment != null;
-            var itemVerticalAlignmentSet = ItemVerticalAlignment != null;
-            var spacingSize = GetSpacingSize();
+                child.Measure(childConstraint);
 
-            var childConstraint = new Size(
-                itemWidthSet ? itemWidth : constraint.Width,
-                itemHeightSet ? itemHeight : constraint.Height);
+                var sz = new PanelUvSize(
+                    _orientation,
+                    itemWidthSet ? itemWidth : child.DesiredSize.Width,
+                    itemHeightSet ? itemHeight : child.DesiredSize.Height);
 
-            var children = InternalChildren;
-            var isFirst = true;
-
-            if (childWrapping == VisualWrapping.Wrap)
-            {
-                for (int i = 0, count = children.Count; i < count; i++)
+                if (MathHelper.GreaterThan(curLineSize.U + sz.U + spacingSize.U, uvConstraint.U))
                 {
-                    var child = children[i];
-                    if (child == null) continue;
+                    panelSize.U = Math.Max(curLineSize.U, panelSize.U);
+                    panelSize.V += curLineSize.V + spacingSize.V;
+                    curLineSize = sz;
 
-                    if (itemHorizontalAlignmentSet)
+                    if (MathHelper.GreaterThan(sz.U, uvConstraint.U))
                     {
-                        child.SetCurrentValue(HorizontalAlignmentProperty, itemHorizontalAlignment);
+                        panelSize.U = Math.Max(sz.U, panelSize.U);
+                        panelSize.V += sz.V + spacingSize.V;
+                        curLineSize = new PanelUvSize(_orientation);
                     }
 
-                    if (itemVerticalAlignmentSet)
-                    {
-                        child.SetCurrentValue(VerticalAlignmentProperty, itemVerticalAlignment);
-                    }
-
-                    child.Measure(childConstraint);
-
-                    var sz = new PanelUvSize(
-                        _orientation,
-                        itemWidthSet ? itemWidth : child.DesiredSize.Width,
-                        itemHeightSet ? itemHeight : child.DesiredSize.Height);
-
-                    if (MathHelper.GreaterThan(curLineSize.U + sz.U + spacingSize.U, uvConstraint.U))
-                    {
-                        panelSize.U = Math.Max(curLineSize.U, panelSize.U);
-                        panelSize.V += curLineSize.V + spacingSize.V;
-                        curLineSize = sz;
-
-                        if (MathHelper.GreaterThan(sz.U, uvConstraint.U))
-                        {
-                            panelSize.U = Math.Max(sz.U, panelSize.U);
-                            panelSize.V += sz.V + spacingSize.V;
-                            curLineSize = new PanelUvSize(_orientation);
-                        }
-
-                        isFirst = true;
-                    }
-                    else
-                    {
-                        curLineSize.U += isFirst ? sz.U : sz.U + spacingSize.U;
-                        curLineSize.V = Math.Max(sz.V, curLineSize.V);
-
-                        isFirst = false;
-                    }
-                }
-            }
-            else
-            {
-                var layoutSlotSize = constraint;
-
-                if (_orientation == Orientation.Horizontal)
-                {
-                    layoutSlotSize.Width = double.PositiveInfinity;
+                    isFirst = true;
                 }
                 else
                 {
-                    layoutSlotSize.Height = double.PositiveInfinity;
-                }
-
-                for (int i = 0, count = children.Count; i < count; ++i)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    if (itemHorizontalAlignmentSet)
-                    {
-                        child.SetCurrentValue(HorizontalAlignmentProperty, itemHorizontalAlignment);
-                    }
-
-                    if (itemVerticalAlignmentSet)
-                    {
-                        child.SetCurrentValue(VerticalAlignmentProperty, itemVerticalAlignment);
-                    }
-
-                    child.Measure(layoutSlotSize);
-
-                    var sz = new PanelUvSize(
-                        _orientation,
-                        itemWidthSet ? itemWidth : child.DesiredSize.Width,
-                        itemHeightSet ? itemHeight : child.DesiredSize.Height);
-
                     curLineSize.U += isFirst ? sz.U : sz.U + spacingSize.U;
                     curLineSize.V = Math.Max(sz.V, curLineSize.V);
 
                     isFirst = false;
                 }
             }
-
-            panelSize.U = Math.Max(curLineSize.U, panelSize.U);
-            panelSize.V += curLineSize.V;
-
-            return new Size(panelSize.Width, panelSize.Height);
         }
-
-        private PanelUvSize GetSpacingSize()
+        else
         {
-            var spacing = Spacing;
+            var layoutSlotSize = constraint;
 
-            if (!double.IsNaN(spacing))
+            if (_orientation == Orientation.Horizontal)
             {
-                return new PanelUvSize(_orientation, spacing, spacing);
-            }
-
-            var horizontalSpacing = HorizontalSpacing;
-            if (double.IsNaN(horizontalSpacing))
-            {
-                horizontalSpacing = 0;
-            }
-
-            var verticalSpacing = VerticalSpacing;
-            if (double.IsNaN(verticalSpacing))
-            {
-                verticalSpacing = 0;
-            }
-
-            return new PanelUvSize(_orientation, horizontalSpacing, verticalSpacing);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var firstInLine = 0;
-            var itemWidth = ItemWidth;
-            var itemHeight = ItemHeight;
-            double accumulatedV = 0;
-            var itemU = _orientation == Orientation.Horizontal ? itemWidth : itemHeight;
-            var curLineSize = new PanelUvSize(_orientation);
-            var uvFinalSize = new PanelUvSize(_orientation, finalSize);
-            var itemWidthSet = !double.IsNaN(itemWidth);
-            var itemHeightSet = !double.IsNaN(itemHeight);
-            var useItemU = _orientation == Orientation.Horizontal ? itemWidthSet : itemHeightSet;
-            var childWrapping = ChildWrapping;
-            var spacingSize = GetSpacingSize();
-
-            var children = InternalChildren;
-            var isFirst = true;
-
-            if (childWrapping == VisualWrapping.Wrap)
-            {
-                for (int i = 0, count = children.Count; i < count; i++)
-                {
-                    var child = children[i];
-                    if (child == null) continue;
-
-                    var sz = new PanelUvSize(
-                        _orientation,
-                        itemWidthSet ? itemWidth : child.DesiredSize.Width,
-                        itemHeightSet ? itemHeight : child.DesiredSize.Height);
-
-                    if (MathHelper.GreaterThan(curLineSize.U + (isFirst ? sz.U : sz.U + spacingSize.U), uvFinalSize.U))
-                    {
-                        ArrangeWrapLine(accumulatedV, curLineSize.V, firstInLine, i, useItemU, itemU, spacingSize.U);
-
-                        accumulatedV += curLineSize.V + spacingSize.V;
-                        curLineSize = sz;
-
-                        firstInLine = i;
-                    }
-                    else
-                    {
-                        curLineSize.U += isFirst ? sz.U : sz.U + spacingSize.U;
-                        curLineSize.V = Math.Max(sz.V, curLineSize.V);
-                    }
-
-                    isFirst = false;
-                }
-
-                if (firstInLine < children.Count)
-                {
-                    ArrangeWrapLine(accumulatedV, curLineSize.V, firstInLine, children.Count, useItemU, itemU, spacingSize.U);
-                }
+                layoutSlotSize.Width = double.PositiveInfinity;
             }
             else
             {
-                ArrangeLine(uvFinalSize.V, useItemU, itemU, spacingSize.U);
+                layoutSlotSize.Height = double.PositiveInfinity;
             }
 
-            return finalSize;
+            for (int i = 0, count = children.Count; i < count; ++i)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                if (itemHorizontalAlignmentSet)
+                {
+                    child.SetCurrentValue(HorizontalAlignmentProperty, itemHorizontalAlignment);
+                }
+
+                if (itemVerticalAlignmentSet)
+                {
+                    child.SetCurrentValue(VerticalAlignmentProperty, itemVerticalAlignment);
+                }
+
+                child.Measure(layoutSlotSize);
+
+                var sz = new PanelUvSize(
+                    _orientation,
+                    itemWidthSet ? itemWidth : child.DesiredSize.Width,
+                    itemHeightSet ? itemHeight : child.DesiredSize.Height);
+
+                curLineSize.U += isFirst ? sz.U : sz.U + spacingSize.U;
+                curLineSize.V = Math.Max(sz.V, curLineSize.V);
+
+                isFirst = false;
+            }
         }
+
+        panelSize.U = Math.Max(curLineSize.U, panelSize.U);
+        panelSize.V += curLineSize.V;
+
+        return new Size(panelSize.Width, panelSize.Height);
     }
-}
+
+    private PanelUvSize GetSpacingSize()
+    {
+        var spacing = Spacing;
+
+        if (!double.IsNaN(spacing))
+        {
+            return new PanelUvSize(_orientation, spacing, spacing);
+        }
+
+        var horizontalSpacing = HorizontalSpacing;
+        if (double.IsNaN(horizontalSpacing))
+        {
+            horizontalSpacing = 0;
+        }
+
+        var verticalSpacing = VerticalSpacing;
+        if (double.IsNaN(verticalSpacing))
+        {
+            verticalSpacing = 0;
+        }
+
+        return new PanelUvSize(_orientation, horizontalSpacing, verticalSpacing);
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var firstInLine = 0;
+        var itemWidth = ItemWidth;
+        var itemHeight = ItemHeight;
+        double accumulatedV = 0;
+        var itemU = _orientation == Orientation.Horizontal ? itemWidth : itemHeight;
+        var curLineSize = new PanelUvSize(_orientation);
+        var uvFinalSize = new PanelUvSize(_orientation, finalSize);
+        var itemWidthSet = !double.IsNaN(itemWidth);
+        var itemHeightSet = !double.IsNaN(itemHeight);
+        var useItemU = _orientation == Orientation.Horizontal ? itemWidthSet : itemHeightSet;
+        var childWrapping = ChildWrapping;
+        var spacingSize = GetSpacingSize();
+
+        var children = InternalChildren;
+        var isFirst = true;
+
+        if (childWrapping == VisualWrapping.Wrap)
+        {
+            for (int i = 0, count = children.Count; i < count; i++)
+            {
+                var child = children[i];
+                if (child == null) continue;
+
+                var sz = new PanelUvSize(
+                    _orientation,
+                    itemWidthSet ? itemWidth : child.DesiredSize.Width,
+                    itemHeightSet ? itemHeight : child.DesiredSize.Height);
+
+                if (MathHelper.GreaterThan(curLineSize.U + (isFirst ? sz.U : sz.U + spacingSize.U), uvFinalSize.U))
+                {
+                    ArrangeWrapLine(accumulatedV, curLineSize.V, firstInLine, i, useItemU, itemU, spacingSize.U);
+
+                    accumulatedV += curLineSize.V + spacingSize.V;
+                    curLineSize = sz;
+
+                    firstInLine = i;
+                }
+                else
+                {
+                    curLineSize.U += isFirst ? sz.U : sz.U + spacingSize.U;
+                    curLineSize.V = Math.Max(sz.V, curLineSize.V);
+                }
+
+                isFirst = false;
+            }
+
+            if (firstInLine < children.Count)
+            {
+                ArrangeWrapLine(accumulatedV, curLineSize.V, firstInLine, children.Count, useItemU, itemU, spacingSize.U);
+            }
+        }
+        else
+        {
+            ArrangeLine(uvFinalSize.V, useItemU, itemU, spacingSize.U);
+        }
+
+        return finalSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
index 8415ac30..854f9837 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
@@ -5,145 +5,144 @@ using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class WaterfallPanel : Panel
 {
-    public class WaterfallPanel : Panel
+    public static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
+        "Groups", typeof(int), typeof(WaterfallPanel), new FrameworkPropertyMetadata(
+            ValueBoxes.Int2Box, FrameworkPropertyMetadataOptions.AffectsMeasure), IsGroupsValid);
+
+    public int Groups
     {
-        public static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
-            "Groups", typeof(int), typeof(WaterfallPanel), new FrameworkPropertyMetadata(
-                ValueBoxes.Int2Box, FrameworkPropertyMetadataOptions.AffectsMeasure), IsGroupsValid);
+        get => (int) GetValue(GroupsProperty);
+        set => SetValue(GroupsProperty, value);
+    }
 
-        public int Groups
+    private static bool IsGroupsValid(object value) => (int) value >= 1;
+
+    public static readonly DependencyProperty AutoGroupProperty = DependencyProperty.Register(
+        "AutoGroup", typeof(bool), typeof(WaterfallPanel), new FrameworkPropertyMetadata(
+            ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public bool AutoGroup
+    {
+        get => (bool) GetValue(AutoGroupProperty);
+        set => SetValue(AutoGroupProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty DesiredLengthProperty = DependencyProperty.Register(
+        "DesiredLength", typeof(double), typeof(WaterfallPanel), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.AffectsMeasure), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double DesiredLength
+    {
+        get => (double) GetValue(DesiredLengthProperty);
+        set => SetValue(DesiredLengthProperty, value);
+    }
+
+    public static readonly DependencyProperty OrientationProperty =
+        StackPanel.OrientationProperty.AddOwner(typeof(WaterfallPanel),
+            new FrameworkPropertyMetadata(Orientation.Horizontal,
+                FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    private int CaculateGroupCount(Orientation orientation, PanelUvSize size)
+    {
+        if (!AutoGroup)
         {
-            get => (int) GetValue(GroupsProperty);
-            set => SetValue(GroupsProperty, value);
+            return Groups;
         }
 
-        private static bool IsGroupsValid(object value) => (int) value >= 1;
+        var itemLength = DesiredLength;
 
-        public static readonly DependencyProperty AutoGroupProperty = DependencyProperty.Register(
-            "AutoGroup", typeof(bool), typeof(WaterfallPanel), new FrameworkPropertyMetadata(
-                ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public bool AutoGroup
+        if (MathHelper.IsVerySmall(itemLength))
         {
-            get => (bool) GetValue(AutoGroupProperty);
-            set => SetValue(AutoGroupProperty, ValueBoxes.BooleanBox(value));
+            return Groups;
         }
 
-        public static readonly DependencyProperty DesiredLengthProperty = DependencyProperty.Register(
-            "DesiredLength", typeof(double), typeof(WaterfallPanel), new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.AffectsMeasure), ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+        return (int) (size.U / itemLength);
+    }
 
-        public double DesiredLength
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        var orientation = Orientation;
+        var uvConstraint = new PanelUvSize(orientation, finalSize);
+
+        var groups = CaculateGroupCount(orientation, uvConstraint);
+        if (groups < 1)
         {
-            get => (double) GetValue(DesiredLengthProperty);
-            set => SetValue(DesiredLengthProperty, value);
-        }
-
-        public static readonly DependencyProperty OrientationProperty =
-            StackPanel.OrientationProperty.AddOwner(typeof(WaterfallPanel),
-                new FrameworkPropertyMetadata(Orientation.Horizontal,
-                    FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        private int CaculateGroupCount(Orientation orientation, PanelUvSize size)
-        {
-            if (!AutoGroup)
-            {
-                return Groups;
-            }
-
-            var itemLength = DesiredLength;
-
-            if (MathHelper.IsVerySmall(itemLength))
-            {
-                return Groups;
-            }
-
-            return (int) (size.U / itemLength);
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var orientation = Orientation;
-            var uvConstraint = new PanelUvSize(orientation, finalSize);
-
-            var groups = CaculateGroupCount(orientation, uvConstraint);
-            if (groups < 1)
-            {
-                return finalSize;
-            }
-
-            var vArr = new double[groups].ToList();
-            var itemU = uvConstraint.U / groups;
-
-            var children = InternalChildren;
-            for (int i = 0, count = children.Count; i < count; i++)
-            {
-                var child = children[i];
-                if (child == null)
-                {
-                    continue;
-                }
-
-                var minIndex = vArr.IndexOf(vArr.Min());
-                var minV = vArr[minIndex];
-                var childUvSize = new PanelUvSize(orientation, child.DesiredSize);
-                var childSize = new PanelUvSize(orientation, itemU, childUvSize.V);
-                var childRectSize = new PanelUvSize(orientation, minIndex * itemU, minV);
-
-                child.Arrange(new Rect(new Point(childRectSize.U, childRectSize.V), childSize.ScreenSize));
-                vArr[minIndex] = minV + childUvSize.V;
-            }
-
             return finalSize;
         }
 
-        protected override Size MeasureOverride(Size constraint)
+        var vArr = new double[groups].ToList();
+        var itemU = uvConstraint.U / groups;
+
+        var children = InternalChildren;
+        for (int i = 0, count = children.Count; i < count; i++)
         {
-            var orientation = Orientation;
-            var uvConstraint = new PanelUvSize(orientation, constraint);
-
-            var groups = CaculateGroupCount(orientation, uvConstraint);
-            if (groups < 1)
+            var child = children[i];
+            if (child == null)
             {
-                return constraint;
+                continue;
             }
 
-            var vArr = new double[groups].ToList();
-            var itemU = uvConstraint.U / groups;
-            if (double.IsNaN(itemU) || double.IsInfinity(itemU))
-            {
-                return constraint;
-            }
+            var minIndex = vArr.IndexOf(vArr.Min());
+            var minV = vArr[minIndex];
+            var childUvSize = new PanelUvSize(orientation, child.DesiredSize);
+            var childSize = new PanelUvSize(orientation, itemU, childUvSize.V);
+            var childRectSize = new PanelUvSize(orientation, minIndex * itemU, minV);
 
-            var children = InternalChildren;
-            for (int i = 0, count = children.Count; i < count; i++)
-            {
-                var child = children[i];
-                if (child == null)
-                {
-                    continue;
-                }
-
-                child.Measure(constraint);
-
-                var sz = new PanelUvSize(orientation, child.DesiredSize);
-                var minIndex = vArr.IndexOf(vArr.Min());
-                var minV = vArr[minIndex];
-
-                vArr[minIndex] = minV + sz.V;
-            }
-
-            uvConstraint = new PanelUvSize(orientation, new Size(uvConstraint.ScreenSize.Width, vArr.Max()));
-
-            return uvConstraint.ScreenSize;
+            child.Arrange(new Rect(new Point(childRectSize.U, childRectSize.V), childSize.ScreenSize));
+            vArr[minIndex] = minV + childUvSize.V;
         }
+
+        return finalSize;
     }
-}
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        var orientation = Orientation;
+        var uvConstraint = new PanelUvSize(orientation, constraint);
+
+        var groups = CaculateGroupCount(orientation, uvConstraint);
+        if (groups < 1)
+        {
+            return constraint;
+        }
+
+        var vArr = new double[groups].ToList();
+        var itemU = uvConstraint.U / groups;
+        if (double.IsNaN(itemU) || double.IsInfinity(itemU))
+        {
+            return constraint;
+        }
+
+        var children = InternalChildren;
+        for (int i = 0, count = children.Count; i < count; i++)
+        {
+            var child = children[i];
+            if (child == null)
+            {
+                continue;
+            }
+
+            child.Measure(constraint);
+
+            var sz = new PanelUvSize(orientation, child.DesiredSize);
+            var minIndex = vArr.IndexOf(vArr.Min());
+            var minV = vArr[minIndex];
+
+            vArr[minIndex] = minV + sz.V;
+        }
+
+        uvConstraint = new PanelUvSize(orientation, new Size(uvConstraint.ScreenSize.Width, vArr.Max()));
+
+        return uvConstraint.ScreenSize;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
index 13cb62a7..caf19139 100644
--- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
@@ -4,99 +4,98 @@ using System.Windows.Controls.Primitives;
 using HandyControl.Data;
 using HandyControl.Expression.Shapes;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = IndicatorTemplateName, Type = typeof(Arc))]
+public class CircleProgressBar : RangeBase
 {
-    [TemplatePart(Name = IndicatorTemplateName, Type = typeof(Arc))]
-    public class CircleProgressBar : RangeBase
+    private const string IndicatorTemplateName = "PART_Indicator";
+
+    public static readonly DependencyProperty ArcThicknessProperty = DependencyProperty.Register(
+        "ArcThickness", typeof(double), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
+        "ShowText", typeof(bool), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(CircleProgressBar), new PropertyMetadata(default(string)));
+
+    public static readonly DependencyProperty IsIndeterminateProperty =
+        ProgressBar.IsIndeterminateProperty.AddOwner(typeof(CircleProgressBar),
+            new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+
+    private Arc _indicator;
+
+    static CircleProgressBar()
     {
-        private const string IndicatorTemplateName = "PART_Indicator";
-
-        public static readonly DependencyProperty ArcThicknessProperty = DependencyProperty.Register(
-            "ArcThickness", typeof(double), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
-            "ShowText", typeof(bool), typeof(CircleProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(CircleProgressBar), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty IsIndeterminateProperty =
-            ProgressBar.IsIndeterminateProperty.AddOwner(typeof(CircleProgressBar),
-                new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-
-        private Arc _indicator;
-
-        static CircleProgressBar()
-        {
-            FocusableProperty.OverrideMetadata(typeof(CircleProgressBar),
-                new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-            MaximumProperty.OverrideMetadata(typeof(CircleProgressBar),
-                new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
-        }
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public bool ShowText
-        {
-            get => (bool) GetValue(ShowTextProperty);
-            set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public double ArcThickness
-        {
-            get => (double) GetValue(ArcThicknessProperty);
-            set => SetValue(ArcThicknessProperty, value);
-        }
-
-        public bool IsIndeterminate
-        {
-            get => (bool) GetValue(IsIndeterminateProperty);
-            set => SetValue(IsIndeterminateProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private void SetProgressBarIndicatorAngle()
-        {
-            if (_indicator == null) return;
-            var minimum = Minimum;
-            var maximum = Maximum;
-            var num = Value;
-            _indicator.EndAngle = (maximum <= minimum ? 0 : (num - minimum) / (maximum - minimum)) * 360;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _indicator = GetTemplateChild(IndicatorTemplateName) as Arc;
-            if (_indicator != null)
-            {
-                _indicator.StartAngle = 0;
-                _indicator.EndAngle = 0;
-            }
-
-            SetProgressBarIndicatorAngle();
-        }
-
-        protected override void OnMinimumChanged(double oldMinimum, double newMinimum)
-        {
-            base.OnMinimumChanged(oldMinimum, newMinimum);
-            SetProgressBarIndicatorAngle();
-        }
-
-        protected override void OnMaximumChanged(double oldMaximum, double newMaximum)
-        {
-            base.OnMaximumChanged(oldMaximum, newMaximum);
-            SetProgressBarIndicatorAngle();
-        }
-
-        protected override void OnValueChanged(double oldValue, double newValue)
-        {
-            base.OnValueChanged(oldValue, newValue);
-            SetProgressBarIndicatorAngle();
-        }
+        FocusableProperty.OverrideMetadata(typeof(CircleProgressBar),
+            new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+        MaximumProperty.OverrideMetadata(typeof(CircleProgressBar),
+            new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
     }
-}
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public bool ShowText
+    {
+        get => (bool) GetValue(ShowTextProperty);
+        set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public double ArcThickness
+    {
+        get => (double) GetValue(ArcThicknessProperty);
+        set => SetValue(ArcThicknessProperty, value);
+    }
+
+    public bool IsIndeterminate
+    {
+        get => (bool) GetValue(IsIndeterminateProperty);
+        set => SetValue(IsIndeterminateProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private void SetProgressBarIndicatorAngle()
+    {
+        if (_indicator == null) return;
+        var minimum = Minimum;
+        var maximum = Maximum;
+        var num = Value;
+        _indicator.EndAngle = (maximum <= minimum ? 0 : (num - minimum) / (maximum - minimum)) * 360;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _indicator = GetTemplateChild(IndicatorTemplateName) as Arc;
+        if (_indicator != null)
+        {
+            _indicator.StartAngle = 0;
+            _indicator.EndAngle = 0;
+        }
+
+        SetProgressBarIndicatorAngle();
+    }
+
+    protected override void OnMinimumChanged(double oldMinimum, double newMinimum)
+    {
+        base.OnMinimumChanged(oldMinimum, newMinimum);
+        SetProgressBarIndicatorAngle();
+    }
+
+    protected override void OnMaximumChanged(double oldMaximum, double newMaximum)
+    {
+        base.OnMaximumChanged(oldMaximum, newMaximum);
+        SetProgressBarIndicatorAngle();
+    }
+
+    protected override void OnValueChanged(double oldValue, double newValue)
+    {
+        base.OnValueChanged(oldValue, newValue);
+        SetProgressBarIndicatorAngle();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
index ada5b18e..414c73cd 100644
--- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
@@ -4,119 +4,118 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     波浪进度条
+/// </summary>
+[TemplatePart(Name = ElementWave, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementClip, Type = typeof(FrameworkElement))]
+public class WaveProgressBar : RangeBase
 {
-    /// <summary>
-    ///     波浪进度条
-    /// </summary>
-    [TemplatePart(Name = ElementWave, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementClip, Type = typeof(FrameworkElement))]
-    public class WaveProgressBar : RangeBase
+    private const string ElementWave = "PART_Wave";
+
+    private const string ElementClip = "PART_Clip";
+
+    private FrameworkElement _waveElement;
+
+    private const double TranslateTransformMinY = -20;
+
+    private double _translateTransformYRange;
+
+    private TranslateTransform _translateTransform;
+
+    static WaveProgressBar()
     {
-        private const string ElementWave = "PART_Wave";
+        FocusableProperty.OverrideMetadata(typeof(WaveProgressBar), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+        MaximumProperty.OverrideMetadata(typeof(WaveProgressBar), new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
+    }
 
-        private const string ElementClip = "PART_Clip";
+    protected override void OnMinimumChanged(double oldMinimum, double newMinimum) => UpdateWave(Value);
 
-        private FrameworkElement _waveElement;
+    protected override void OnMaximumChanged(double oldMaximum, double newMaximum) => UpdateWave(Value);
 
-        private const double TranslateTransformMinY = -20;
+    protected override void OnValueChanged(double oldValue, double newValue)
+    {
+        base.OnValueChanged(oldValue, newValue);
+        UpdateWave(newValue);
+    }
 
-        private double _translateTransformYRange;
+    private void UpdateWave(double value)
+    {
+        if (_translateTransform == null || MathHelper.IsVerySmall(Maximum)) return;
+        var scale = 1 - value / Maximum;
+        var y = _translateTransformYRange * scale + TranslateTransformMinY;
+        _translateTransform.Y = y;
+    }
 
-        private TranslateTransform _translateTransform;
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
 
-        static WaveProgressBar()
+        _waveElement = GetTemplateChild(ElementWave) as FrameworkElement;
+        var clipElement = GetTemplateChild(ElementClip) as FrameworkElement;
+
+        if (_waveElement != null && clipElement != null)
         {
-            FocusableProperty.OverrideMetadata(typeof(WaveProgressBar), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
-            MaximumProperty.OverrideMetadata(typeof(WaveProgressBar), new FrameworkPropertyMetadata(ValueBoxes.Double100Box));
-        }
+            var clipElementHeight = clipElement.Height;
 
-        protected override void OnMinimumChanged(double oldMinimum, double newMinimum) => UpdateWave(Value);
-
-        protected override void OnMaximumChanged(double oldMaximum, double newMaximum) => UpdateWave(Value);
-
-        protected override void OnValueChanged(double oldValue, double newValue)
-        {
-            base.OnValueChanged(oldValue, newValue);
-            UpdateWave(newValue);
-        }
-
-        private void UpdateWave(double value)
-        {
-            if (_translateTransform == null || MathHelper.IsVerySmall(Maximum)) return;
-            var scale = 1 - value / Maximum;
-            var y = _translateTransformYRange * scale + TranslateTransformMinY;
-            _translateTransform.Y = y;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _waveElement = GetTemplateChild(ElementWave) as FrameworkElement;
-            var clipElement = GetTemplateChild(ElementClip) as FrameworkElement;
-
-            if (_waveElement != null && clipElement != null)
+            _translateTransform = new TranslateTransform
             {
-                var clipElementHeight = clipElement.Height;
+                Y = clipElementHeight
+            };
+            _translateTransformYRange = clipElementHeight - TranslateTransformMinY;
+            _waveElement.RenderTransform = new TransformGroup
+            {
+                Children = { _translateTransform }
+            };
 
-                _translateTransform = new TranslateTransform
-                {
-                    Y = clipElementHeight
-                };
-                _translateTransformYRange = clipElementHeight - TranslateTransformMinY;
-                _waveElement.RenderTransform = new TransformGroup
-                {
-                    Children = { _translateTransform }
-                };
-
-                UpdateWave(Value);
-            }
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(WaveProgressBar), new PropertyMetadata(default(string)));
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
-            "ShowText", typeof(bool), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ShowText
-        {
-            get => (bool) GetValue(ShowTextProperty);
-            set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty WaveFillProperty = DependencyProperty.Register(
-            "WaveFill", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush)));
-
-        public Brush WaveFill
-        {
-            get => (Brush) GetValue(WaveFillProperty);
-            set => SetValue(WaveFillProperty, value);
-        }
-
-        public static readonly DependencyProperty WaveThicknessProperty = DependencyProperty.Register(
-            "WaveThickness", typeof(double), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double WaveThickness
-        {
-            get => (double) GetValue(WaveThicknessProperty);
-            set => SetValue(WaveThicknessProperty, value);
-        }
-
-        public static readonly DependencyProperty WaveStrokeProperty = DependencyProperty.Register(
-            "WaveStroke", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush)));
-
-        public Brush WaveStroke
-        {
-            get => (Brush) GetValue(WaveStrokeProperty);
-            set => SetValue(WaveStrokeProperty, value);
+            UpdateWave(Value);
         }
     }
-}
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(WaveProgressBar), new PropertyMetadata(default(string)));
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
+        "ShowText", typeof(bool), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ShowText
+    {
+        get => (bool) GetValue(ShowTextProperty);
+        set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty WaveFillProperty = DependencyProperty.Register(
+        "WaveFill", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush)));
+
+    public Brush WaveFill
+    {
+        get => (Brush) GetValue(WaveFillProperty);
+        set => SetValue(WaveFillProperty, value);
+    }
+
+    public static readonly DependencyProperty WaveThicknessProperty = DependencyProperty.Register(
+        "WaveThickness", typeof(double), typeof(WaveProgressBar), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double WaveThickness
+    {
+        get => (double) GetValue(WaveThicknessProperty);
+        set => SetValue(WaveThicknessProperty, value);
+    }
+
+    public static readonly DependencyProperty WaveStrokeProperty = DependencyProperty.Register(
+        "WaveStroke", typeof(Brush), typeof(WaveProgressBar), new PropertyMetadata(default(Brush)));
+
+    public Brush WaveStroke
+    {
+        get => (Brush) GetValue(WaveStrokeProperty);
+        set => SetValue(WaveStrokeProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
index e7c478a0..c1bdd279 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
@@ -1,14 +1,13 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public class DatePropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
-        {
-            IsEnabled = !propertyItem.IsReadOnly
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.DatePicker.SelectedDateProperty;
-    }
-}
+public class DatePropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
+    {
+        IsEnabled = !propertyItem.IsReadOnly
+    };
+
+    public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.DatePicker.SelectedDateProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
index 6f6946db..149b5942 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
@@ -1,14 +1,13 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public class DateTimePropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
-        {
-            IsEnabled = !propertyItem.IsReadOnly
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => DateTimePicker.SelectedDateTimeProperty;
-    }
-}
+public class DateTimePropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
+    {
+        IsEnabled = !propertyItem.IsReadOnly
+    };
+
+    public override DependencyProperty GetDependencyProperty() => DateTimePicker.SelectedDateTimeProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
index 3187a0fd..a12cf7a9 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
@@ -2,16 +2,15 @@
 using System.Windows;
 using System.Windows.Controls.Primitives;
 
-namespace HandyControl.Controls
-{
-    public class EnumPropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
-        {
-            IsEnabled = !propertyItem.IsReadOnly,
-            ItemsSource = Enum.GetValues(propertyItem.PropertyType)
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
-    }
-}
+public class EnumPropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
+    {
+        IsEnabled = !propertyItem.IsReadOnly,
+        ItemsSource = Enum.GetValues(propertyItem.PropertyType)
+    };
+
+    public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
index 21adcf1a..cc81c327 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
@@ -8,64 +8,63 @@ using System.Windows.Shapes;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class HorizontalAlignmentPropertyEditor : PropertyEditorBase
 {
-    public class HorizontalAlignmentPropertyEditor : PropertyEditorBase
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
     {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
-        {
-            Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
-            ItemsSource = Enum.GetValues(propertyItem.PropertyType),
-            ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("HorizontalAlignmentPathTemplateSelector"),
-            HorizontalAlignment = HorizontalAlignment.Left
-        };
+        Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
+        ItemsSource = Enum.GetValues(propertyItem.PropertyType),
+        ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("HorizontalAlignmentPathTemplateSelector"),
+        HorizontalAlignment = HorizontalAlignment.Left
+    };
 
-        public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
-    }
+    public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+}
 
-    public class HorizontalAlignmentPathTemplateSelector : DataTemplateSelector
+public class HorizontalAlignmentPathTemplateSelector : DataTemplateSelector
+{
+    public override DataTemplate SelectTemplate(object item, DependencyObject container)
     {
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        if (item is HorizontalAlignment horizontalAlignment)
         {
-            if (item is HorizontalAlignment horizontalAlignment)
+            var dataTemplate = new DataTemplate
             {
-                var dataTemplate = new DataTemplate
-                {
-                    DataType = typeof(System.Windows.Controls.ComboBox)
-                };
+                DataType = typeof(System.Windows.Controls.ComboBox)
+            };
 
-                var factory = new FrameworkElementFactory(typeof(Path));
-                factory.SetValue(FrameworkElement.WidthProperty, 12.0);
-                factory.SetValue(FrameworkElement.HeightProperty, ValueBoxes.Double10Box);
-                factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+            var factory = new FrameworkElementFactory(typeof(Path));
+            factory.SetValue(FrameworkElement.WidthProperty, 12.0);
+            factory.SetValue(FrameworkElement.HeightProperty, ValueBoxes.Double10Box);
+            factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+            {
+                RelativeSource = new RelativeSource
                 {
-                    RelativeSource = new RelativeSource
-                    {
-                        AncestorType = typeof(ComboBoxItem)
-                    }
-                });
-
-                switch (horizontalAlignment)
-                {
-                    case HorizontalAlignment.Left:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignLeftGeometry"));
-                        break;
-                    case HorizontalAlignment.Center:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHCenterGeometry"));
-                        break;
-                    case HorizontalAlignment.Right:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignRightGeometry"));
-                        break;
-                    case HorizontalAlignment.Stretch:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHStretchGeometry"));
-                        break;
+                    AncestorType = typeof(ComboBoxItem)
                 }
+            });
 
-                dataTemplate.VisualTree = factory;
-                return dataTemplate;
+            switch (horizontalAlignment)
+            {
+                case HorizontalAlignment.Left:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignLeftGeometry"));
+                    break;
+                case HorizontalAlignment.Center:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHCenterGeometry"));
+                    break;
+                case HorizontalAlignment.Right:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignRightGeometry"));
+                    break;
+                case HorizontalAlignment.Stretch:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignHStretchGeometry"));
+                    break;
             }
 
-            return null;
+            dataTemplate.VisualTree = factory;
+            return dataTemplate;
         }
+
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
index 2b4e44e7..ca413b23 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
@@ -4,60 +4,59 @@ using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace HandyControl.Controls
-{
-    public class ImagePropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem)
-        {
-            var imageSelector = new ImageSelector
-            {
-                IsEnabled = !propertyItem.IsReadOnly,
-                Width = 50,
-                Height = 50,
-                HorizontalAlignment = HorizontalAlignment.Left
-            };
+namespace HandyControl.Controls;
 
-            BindingOperations.SetBinding(this, UriProperty, new Binding(ImageSelector.UriProperty.Name)
+public class ImagePropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem)
+    {
+        var imageSelector = new ImageSelector
+        {
+            IsEnabled = !propertyItem.IsReadOnly,
+            Width = 50,
+            Height = 50,
+            HorizontalAlignment = HorizontalAlignment.Left
+        };
+
+        BindingOperations.SetBinding(this, UriProperty, new Binding(ImageSelector.UriProperty.Name)
+        {
+            Source = imageSelector,
+            Mode = BindingMode.OneWay
+        });
+
+        return imageSelector;
+    }
+
+    internal static readonly DependencyProperty UriProperty = DependencyProperty.Register(
+        "Uri", typeof(Uri), typeof(ImagePropertyEditor), new PropertyMetadata(default(Uri), OnUriChangedCallback));
+
+    private static void OnUriChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((ImagePropertyEditor) d).Source = e.NewValue is Uri uri ? BitmapFrame.Create(uri) : null;
+
+    internal Uri Uri
+    {
+        get => (Uri) GetValue(UriProperty);
+        set => SetValue(UriProperty, value);
+    }
+
+    public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
+        "Source", typeof(ImageSource), typeof(ImagePropertyEditor), new PropertyMetadata(default(ImageSource)));
+
+    public ImageSource Source
+    {
+        get => (ImageSource) GetValue(SourceProperty);
+        set => SetValue(SourceProperty, value);
+    }
+
+    public override void CreateBinding(PropertyItem propertyItem, DependencyObject element)
+        => BindingOperations.SetBinding(this, GetDependencyProperty(),
+            new Binding($"({propertyItem.PropertyName})")
             {
-                Source = imageSelector,
-                Mode = BindingMode.OneWay
+                Source = propertyItem.Value,
+                Mode = GetBindingMode(propertyItem),
+                UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
+                Converter = GetConverter(propertyItem)
             });
 
-            return imageSelector;
-        }
-
-        internal static readonly DependencyProperty UriProperty = DependencyProperty.Register(
-            "Uri", typeof(Uri), typeof(ImagePropertyEditor), new PropertyMetadata(default(Uri), OnUriChangedCallback));
-
-        private static void OnUriChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((ImagePropertyEditor) d).Source = e.NewValue is Uri uri ? BitmapFrame.Create(uri) : null;
-
-        internal Uri Uri
-        {
-            get => (Uri) GetValue(UriProperty);
-            set => SetValue(UriProperty, value);
-        }
-
-        public static readonly DependencyProperty SourceProperty = DependencyProperty.Register(
-            "Source", typeof(ImageSource), typeof(ImagePropertyEditor), new PropertyMetadata(default(ImageSource)));
-
-        public ImageSource Source
-        {
-            get => (ImageSource) GetValue(SourceProperty);
-            set => SetValue(SourceProperty, value);
-        }
-
-        public override void CreateBinding(PropertyItem propertyItem, DependencyObject element)
-            => BindingOperations.SetBinding(this, GetDependencyProperty(),
-                new Binding($"({propertyItem.PropertyName})")
-                {
-                    Source = propertyItem.Value,
-                    Mode = GetBindingMode(propertyItem),
-                    UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
-                    Converter = GetConverter(propertyItem)
-                });
-
-        public override DependencyProperty GetDependencyProperty() => SourceProperty;
-    }
-}
+    public override DependencyProperty GetDependencyProperty() => SourceProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
index 0d84738c..78801ef1 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
@@ -1,31 +1,30 @@
 using System.Windows;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class NumberPropertyEditor : PropertyEditorBase
 {
-    public class NumberPropertyEditor : PropertyEditorBase
+    public NumberPropertyEditor()
     {
-        public NumberPropertyEditor()
-        {
 
-        }
-
-        public NumberPropertyEditor(double minimum, double maximum)
-        {
-            Minimum = minimum;
-            Maximum = maximum;
-        }
-
-        public double Minimum { get; set; }
-
-        public double Maximum { get; set; }
-
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new NumericUpDown
-        {
-            IsReadOnly = propertyItem.IsReadOnly,
-            Minimum = Minimum,
-            Maximum = Maximum
-        };
-
-        public override DependencyProperty GetDependencyProperty() => NumericUpDown.ValueProperty;
     }
-}
+
+    public NumberPropertyEditor(double minimum, double maximum)
+    {
+        Minimum = minimum;
+        Maximum = maximum;
+    }
+
+    public double Minimum { get; set; }
+
+    public double Maximum { get; set; }
+
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new NumericUpDown
+    {
+        IsReadOnly = propertyItem.IsReadOnly,
+        Minimum = Minimum,
+        Maximum = Maximum
+    };
+
+    public override DependencyProperty GetDependencyProperty() => NumericUpDown.ValueProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
index 8e31e055..69248be0 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
@@ -1,14 +1,13 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public class PlainTextPropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.TextBox
-        {
-            IsReadOnly = propertyItem.IsReadOnly
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.TextBox.TextProperty;
-    }
-}
+public class PlainTextPropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.TextBox
+    {
+        IsReadOnly = propertyItem.IsReadOnly
+    };
+
+    public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.TextBox.TextProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
index 9c2a6442..b153e281 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
@@ -1,28 +1,27 @@
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public abstract class PropertyEditorBase : DependencyObject
 {
-    public abstract class PropertyEditorBase : DependencyObject
-    {
-        public abstract FrameworkElement CreateElement(PropertyItem propertyItem);
+    public abstract FrameworkElement CreateElement(PropertyItem propertyItem);
 
-        public virtual void CreateBinding(PropertyItem propertyItem, DependencyObject element) =>
-            BindingOperations.SetBinding(element, GetDependencyProperty(),
-                new Binding($"{propertyItem.PropertyName}")
-                {
-                    Source = propertyItem.Value,
-                    Mode = GetBindingMode(propertyItem),
-                    UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
-                    Converter = GetConverter(propertyItem)
-                });
+    public virtual void CreateBinding(PropertyItem propertyItem, DependencyObject element) =>
+        BindingOperations.SetBinding(element, GetDependencyProperty(),
+            new Binding($"{propertyItem.PropertyName}")
+            {
+                Source = propertyItem.Value,
+                Mode = GetBindingMode(propertyItem),
+                UpdateSourceTrigger = GetUpdateSourceTrigger(propertyItem),
+                Converter = GetConverter(propertyItem)
+            });
 
-        public abstract DependencyProperty GetDependencyProperty();
+    public abstract DependencyProperty GetDependencyProperty();
 
-        public virtual BindingMode GetBindingMode(PropertyItem propertyItem) => propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+    public virtual BindingMode GetBindingMode(PropertyItem propertyItem) => propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
 
-        public virtual UpdateSourceTrigger GetUpdateSourceTrigger(PropertyItem propertyItem) => UpdateSourceTrigger.PropertyChanged;
+    public virtual UpdateSourceTrigger GetUpdateSourceTrigger(PropertyItem propertyItem) => UpdateSourceTrigger.PropertyChanged;
 
-        protected virtual IValueConverter GetConverter(PropertyItem propertyItem) => null;
-    }
-}
+    protected virtual IValueConverter GetConverter(PropertyItem propertyItem) => null;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
index cd70e8e3..9629832a 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
@@ -2,19 +2,18 @@
 using System.Windows.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ReadOnlyTextPropertyEditor : PropertyEditorBase
 {
-    public class ReadOnlyTextPropertyEditor : PropertyEditorBase
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.TextBox
     {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.TextBox
-        {
-            IsReadOnly = true
-        };
+        IsReadOnly = true
+    };
 
-        public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.TextBox.TextProperty;
+    public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.TextBox.TextProperty;
 
-        public override BindingMode GetBindingMode(PropertyItem propertyItem) => BindingMode.OneWay;
+    public override BindingMode GetBindingMode(PropertyItem propertyItem) => BindingMode.OneWay;
 
-        protected override IValueConverter GetConverter(PropertyItem propertyItem) => ResourceHelper.GetResourceInternal<IValueConverter>("Object2StringConverter");
-    }
-}
+    protected override IValueConverter GetConverter(PropertyItem propertyItem) => ResourceHelper.GetResourceInternal<IValueConverter>("Object2StringConverter");
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
index b6e2678c..9f5994eb 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
@@ -2,17 +2,16 @@
 using System.Windows.Controls.Primitives;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
-{
-    public class SwitchPropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new ToggleButton
-        {
-            Style = ResourceHelper.GetResourceInternal<Style>("ToggleButtonSwitch"),
-            HorizontalAlignment = HorizontalAlignment.Left,
-            IsEnabled = !propertyItem.IsReadOnly
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => ToggleButton.IsCheckedProperty;
-    }
-}
+public class SwitchPropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new ToggleButton
+    {
+        Style = ResourceHelper.GetResourceInternal<Style>("ToggleButtonSwitch"),
+        HorizontalAlignment = HorizontalAlignment.Left,
+        IsEnabled = !propertyItem.IsReadOnly
+    };
+
+    public override DependencyProperty GetDependencyProperty() => ToggleButton.IsCheckedProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
index dbddc1f9..205fc658 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
@@ -1,14 +1,13 @@
 using System.Windows;
 
-namespace HandyControl.Controls
-{
-    public class TimePropertyEditor : PropertyEditorBase
-    {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
-        {
-            IsEnabled = !propertyItem.IsReadOnly
-        };
+namespace HandyControl.Controls;
 
-        public override DependencyProperty GetDependencyProperty() => TimePicker.SelectedTimeProperty;
-    }
-}
+public class TimePropertyEditor : PropertyEditorBase
+{
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new DateTimePicker
+    {
+        IsEnabled = !propertyItem.IsReadOnly
+    };
+
+    public override DependencyProperty GetDependencyProperty() => TimePicker.SelectedTimeProperty;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
index 47941849..08fdc70a 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
@@ -8,64 +8,63 @@ using System.Windows.Shapes;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class VerticalAlignmentPropertyEditor : PropertyEditorBase
 {
-    public class VerticalAlignmentPropertyEditor : PropertyEditorBase
+    public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
     {
-        public override FrameworkElement CreateElement(PropertyItem propertyItem) => new System.Windows.Controls.ComboBox
-        {
-            Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
-            ItemsSource = Enum.GetValues(propertyItem.PropertyType),
-            ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("VerticalAlignmentPathTemplateSelector"),
-            HorizontalAlignment = HorizontalAlignment.Left
-        };
+        Style = ResourceHelper.GetResourceInternal<Style>("ComboBoxCapsule"),
+        ItemsSource = Enum.GetValues(propertyItem.PropertyType),
+        ItemTemplateSelector = ResourceHelper.GetResourceInternal<DataTemplateSelector>("VerticalAlignmentPathTemplateSelector"),
+        HorizontalAlignment = HorizontalAlignment.Left
+    };
 
-        public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
-    }
+    public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
+}
 
-    public class VerticalAlignmentPathTemplateSelector : DataTemplateSelector
+public class VerticalAlignmentPathTemplateSelector : DataTemplateSelector
+{
+    public override DataTemplate SelectTemplate(object item, DependencyObject container)
     {
-        public override DataTemplate SelectTemplate(object item, DependencyObject container)
+        if (item is VerticalAlignment verticalAlignment)
         {
-            if (item is VerticalAlignment verticalAlignment)
+            var dataTemplate = new DataTemplate
             {
-                var dataTemplate = new DataTemplate
-                {
-                    DataType = typeof(System.Windows.Controls.ComboBox)
-                };
+                DataType = typeof(System.Windows.Controls.ComboBox)
+            };
 
-                var factory = new FrameworkElementFactory(typeof(Path));
-                factory.SetValue(FrameworkElement.WidthProperty, ValueBoxes.Double10Box);
-                factory.SetValue(FrameworkElement.HeightProperty, 12.0);
-                factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+            var factory = new FrameworkElementFactory(typeof(Path));
+            factory.SetValue(FrameworkElement.WidthProperty, ValueBoxes.Double10Box);
+            factory.SetValue(FrameworkElement.HeightProperty, 12.0);
+            factory.SetBinding(Shape.FillProperty, new Binding(Control.ForegroundProperty.Name)
+            {
+                RelativeSource = new RelativeSource
                 {
-                    RelativeSource = new RelativeSource
-                    {
-                        AncestorType = typeof(ComboBoxItem)
-                    }
-                });
-
-                switch (verticalAlignment)
-                {
-                    case VerticalAlignment.Top:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignTopGeometry"));
-                        break;
-                    case VerticalAlignment.Center:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVCenterGeometry"));
-                        break;
-                    case VerticalAlignment.Bottom:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignBottomGeometry"));
-                        break;
-                    case VerticalAlignment.Stretch:
-                        factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVStretchGeometry"));
-                        break;
+                    AncestorType = typeof(ComboBoxItem)
                 }
+            });
 
-                dataTemplate.VisualTree = factory;
-                return dataTemplate;
+            switch (verticalAlignment)
+            {
+                case VerticalAlignment.Top:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignTopGeometry"));
+                    break;
+                case VerticalAlignment.Center:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVCenterGeometry"));
+                    break;
+                case VerticalAlignment.Bottom:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignBottomGeometry"));
+                    break;
+                case VerticalAlignment.Stretch:
+                    factory.SetValue(Path.DataProperty, ResourceHelper.GetResourceInternal<Geometry>("AlignVStretchGeometry"));
+                    break;
             }
 
-            return null;
+            dataTemplate.VisualTree = factory;
+            return dataTemplate;
         }
+
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
index 2d6c2e7d..6f122703 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
@@ -9,196 +9,195 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementItemsControl, Type = typeof(ItemsControl))]
+[TemplatePart(Name = ElementSearchBar, Type = typeof(SearchBar))]
+public class PropertyGrid : Control
 {
-    [TemplatePart(Name = ElementItemsControl, Type = typeof(ItemsControl))]
-    [TemplatePart(Name = ElementSearchBar, Type = typeof(SearchBar))]
-    public class PropertyGrid : Control
+    private const string ElementItemsControl = "PART_ItemsControl";
+
+    private const string ElementSearchBar = "PART_SearchBar";
+
+    private ItemsControl _itemsControl;
+
+    private ICollectionView _dataView;
+
+    private SearchBar _searchBar;
+
+    private string _searchKey;
+
+    public PropertyGrid()
     {
-        private const string ElementItemsControl = "PART_ItemsControl";
+        CommandBindings.Add(new CommandBinding(ControlCommands.SortByCategory, SortByCategory, (s, e) => e.CanExecute = ShowSortButton));
+        CommandBindings.Add(new CommandBinding(ControlCommands.SortByName, SortByName, (s, e) => e.CanExecute = ShowSortButton));
+    }
 
-        private const string ElementSearchBar = "PART_SearchBar";
+    public virtual PropertyResolver PropertyResolver { get; } = new();
 
-        private ItemsControl _itemsControl;
+    public static readonly RoutedEvent SelectedObjectChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedObjectChanged", RoutingStrategy.Bubble,
+            typeof(RoutedPropertyChangedEventHandler<object>), typeof(PropertyGrid));
 
-        private ICollectionView _dataView;
+    public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
+    {
+        add => AddHandler(SelectedObjectChangedEvent, value);
+        remove => RemoveHandler(SelectedObjectChangedEvent, value);
+    }
 
-        private SearchBar _searchBar;
+    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register(
+        "SelectedObject", typeof(object), typeof(PropertyGrid), new PropertyMetadata(default, OnSelectedObjectChanged));
 
-        private string _searchKey;
+    private static void OnSelectedObjectChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (PropertyGrid) d;
+        ctl.OnSelectedObjectChanged(e.OldValue, e.NewValue);
+    }
 
-        public PropertyGrid()
+    public object SelectedObject
+    {
+        get => GetValue(SelectedObjectProperty);
+        set => SetValue(SelectedObjectProperty, value);
+    }
+
+    protected virtual void OnSelectedObjectChanged(object oldValue, object newValue)
+    {
+        UpdateItems(newValue);
+        RaiseEvent(new RoutedPropertyChangedEventArgs<object>(oldValue, newValue, SelectedObjectChangedEvent));
+    }
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+        "Description", typeof(string), typeof(PropertyGrid), new PropertyMetadata(default(string)));
+
+    public string Description
+    {
+        get => (string) GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+
+    public static readonly DependencyProperty MaxTitleWidthProperty = DependencyProperty.Register(
+        "MaxTitleWidth", typeof(double), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double MaxTitleWidth
+    {
+        get => (double) GetValue(MaxTitleWidthProperty);
+        set => SetValue(MaxTitleWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty MinTitleWidthProperty = DependencyProperty.Register(
+        "MinTitleWidth", typeof(double), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public double MinTitleWidth
+    {
+        get => (double) GetValue(MinTitleWidthProperty);
+        set => SetValue(MinTitleWidthProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowSortButtonProperty = DependencyProperty.Register(
+        "ShowSortButton", typeof(bool), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ShowSortButton
+    {
+        get => (bool) GetValue(ShowSortButtonProperty);
+        set => SetValue(ShowSortButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_searchBar != null)
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.SortByCategory, SortByCategory, (s, e) => e.CanExecute = ShowSortButton));
-            CommandBindings.Add(new CommandBinding(ControlCommands.SortByName, SortByName, (s, e) => e.CanExecute = ShowSortButton));
+            _searchBar.SearchStarted -= SearchBar_SearchStarted;
         }
 
-        public virtual PropertyResolver PropertyResolver { get; } = new();
+        base.OnApplyTemplate();
 
-        public static readonly RoutedEvent SelectedObjectChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedObjectChanged", RoutingStrategy.Bubble,
-                typeof(RoutedPropertyChangedEventHandler<object>), typeof(PropertyGrid));
+        _itemsControl = GetTemplateChild(ElementItemsControl) as ItemsControl;
+        _searchBar = GetTemplateChild(ElementSearchBar) as SearchBar;
 
-        public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
+        if (_searchBar != null)
         {
-            add => AddHandler(SelectedObjectChangedEvent, value);
-            remove => RemoveHandler(SelectedObjectChangedEvent, value);
+            _searchBar.SearchStarted += SearchBar_SearchStarted;
         }
 
-        public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register(
-            "SelectedObject", typeof(object), typeof(PropertyGrid), new PropertyMetadata(default, OnSelectedObjectChanged));
+        UpdateItems(SelectedObject);
+    }
 
-        private static void OnSelectedObjectChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private void UpdateItems(object obj)
+    {
+        if (obj == null || _itemsControl == null) return;
+
+        _dataView = CollectionViewSource.GetDefaultView(TypeDescriptor.GetProperties(obj.GetType()).OfType<PropertyDescriptor>()
+            .Where(item => PropertyResolver.ResolveIsBrowsable(item)).Select(CreatePropertyItem)
+            .Do(item => item.InitElement()));
+
+        SortByCategory(null, null);
+        _itemsControl.ItemsSource = _dataView;
+    }
+
+    private void SortByCategory(object sender, ExecutedRoutedEventArgs e)
+    {
+        if (_dataView == null) return;
+
+        using (_dataView.DeferRefresh())
         {
-            var ctl = (PropertyGrid) d;
-            ctl.OnSelectedObjectChanged(e.OldValue, e.NewValue);
-        }
-
-        public object SelectedObject
-        {
-            get => GetValue(SelectedObjectProperty);
-            set => SetValue(SelectedObjectProperty, value);
-        }
-
-        protected virtual void OnSelectedObjectChanged(object oldValue, object newValue)
-        {
-            UpdateItems(newValue);
-            RaiseEvent(new RoutedPropertyChangedEventArgs<object>(oldValue, newValue, SelectedObjectChangedEvent));
-        }
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-            "Description", typeof(string), typeof(PropertyGrid), new PropertyMetadata(default(string)));
-
-        public string Description
-        {
-            get => (string) GetValue(DescriptionProperty);
-            set => SetValue(DescriptionProperty, value);
-        }
-
-        public static readonly DependencyProperty MaxTitleWidthProperty = DependencyProperty.Register(
-            "MaxTitleWidth", typeof(double), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double MaxTitleWidth
-        {
-            get => (double) GetValue(MaxTitleWidthProperty);
-            set => SetValue(MaxTitleWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty MinTitleWidthProperty = DependencyProperty.Register(
-            "MinTitleWidth", typeof(double), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public double MinTitleWidth
-        {
-            get => (double) GetValue(MinTitleWidthProperty);
-            set => SetValue(MinTitleWidthProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowSortButtonProperty = DependencyProperty.Register(
-            "ShowSortButton", typeof(bool), typeof(PropertyGrid), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ShowSortButton
-        {
-            get => (bool) GetValue(ShowSortButtonProperty);
-            set => SetValue(ShowSortButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public override void OnApplyTemplate()
-        {
-            if (_searchBar != null)
-            {
-                _searchBar.SearchStarted -= SearchBar_SearchStarted;
-            }
-
-            base.OnApplyTemplate();
-
-            _itemsControl = GetTemplateChild(ElementItemsControl) as ItemsControl;
-            _searchBar = GetTemplateChild(ElementSearchBar) as SearchBar;
-
-            if (_searchBar != null)
-            {
-                _searchBar.SearchStarted += SearchBar_SearchStarted;
-            }
-
-            UpdateItems(SelectedObject);
-        }
-
-        private void UpdateItems(object obj)
-        {
-            if (obj == null || _itemsControl == null) return;
-
-            _dataView = CollectionViewSource.GetDefaultView(TypeDescriptor.GetProperties(obj.GetType()).OfType<PropertyDescriptor>()
-                .Where(item => PropertyResolver.ResolveIsBrowsable(item)).Select(CreatePropertyItem)
-                .Do(item => item.InitElement()));
-
-            SortByCategory(null, null);
-            _itemsControl.ItemsSource = _dataView;
-        }
-
-        private void SortByCategory(object sender, ExecutedRoutedEventArgs e)
-        {
-            if (_dataView == null) return;
-
-            using (_dataView.DeferRefresh())
-            {
-                _dataView.GroupDescriptions.Clear();
-                _dataView.SortDescriptions.Clear();
-                _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.CategoryProperty.Name, ListSortDirection.Ascending));
-                _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.DisplayNameProperty.Name, ListSortDirection.Ascending));
-                _dataView.GroupDescriptions.Add(new PropertyGroupDescription(PropertyItem.CategoryProperty.Name));
-            }
-        }
-
-        private void SortByName(object sender, ExecutedRoutedEventArgs e)
-        {
-            if (_dataView == null) return;
-
-            using (_dataView.DeferRefresh())
-            {
-                _dataView.GroupDescriptions.Clear();
-                _dataView.SortDescriptions.Clear();
-                _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.PropertyNameProperty.Name, ListSortDirection.Ascending));
-            }
-        }
-
-        private void SearchBar_SearchStarted(object sender, FunctionEventArgs<string> e)
-        {
-            if (_dataView == null) return;
-
-            _searchKey = e.Info;
-            if (string.IsNullOrEmpty(_searchKey))
-            {
-                foreach (UIElement item in _dataView)
-                {
-                    item.Show();
-                }
-            }
-            else
-            {
-                foreach (PropertyItem item in _dataView)
-                {
-                    item.Show(item.PropertyName.ToLower().Contains(_searchKey) || item.DisplayName.ToLower().Contains(_searchKey));
-                }
-            }
-        }
-
-        protected virtual PropertyItem CreatePropertyItem(PropertyDescriptor propertyDescriptor) => new()
-        {
-            Category = PropertyResolver.ResolveCategory(propertyDescriptor),
-            DisplayName = PropertyResolver.ResolveDisplayName(propertyDescriptor),
-            Description = PropertyResolver.ResolveDescription(propertyDescriptor),
-            IsReadOnly = PropertyResolver.ResolveIsReadOnly(propertyDescriptor),
-            DefaultValue = PropertyResolver.ResolveDefaultValue(propertyDescriptor),
-            Editor = PropertyResolver.ResolveEditor(propertyDescriptor),
-            Value = SelectedObject,
-            PropertyName = propertyDescriptor.Name,
-            PropertyType = propertyDescriptor.PropertyType,
-            PropertyTypeName = $"{propertyDescriptor.PropertyType.Namespace}.{propertyDescriptor.PropertyType.Name}"
-        };
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            TitleElement.SetTitleWidth(this, new GridLength(Math.Max(MinTitleWidth, Math.Min(MaxTitleWidth, ActualWidth / 3))));
+            _dataView.GroupDescriptions.Clear();
+            _dataView.SortDescriptions.Clear();
+            _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.CategoryProperty.Name, ListSortDirection.Ascending));
+            _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.DisplayNameProperty.Name, ListSortDirection.Ascending));
+            _dataView.GroupDescriptions.Add(new PropertyGroupDescription(PropertyItem.CategoryProperty.Name));
         }
     }
-}
+
+    private void SortByName(object sender, ExecutedRoutedEventArgs e)
+    {
+        if (_dataView == null) return;
+
+        using (_dataView.DeferRefresh())
+        {
+            _dataView.GroupDescriptions.Clear();
+            _dataView.SortDescriptions.Clear();
+            _dataView.SortDescriptions.Add(new SortDescription(PropertyItem.PropertyNameProperty.Name, ListSortDirection.Ascending));
+        }
+    }
+
+    private void SearchBar_SearchStarted(object sender, FunctionEventArgs<string> e)
+    {
+        if (_dataView == null) return;
+
+        _searchKey = e.Info;
+        if (string.IsNullOrEmpty(_searchKey))
+        {
+            foreach (UIElement item in _dataView)
+            {
+                item.Show();
+            }
+        }
+        else
+        {
+            foreach (PropertyItem item in _dataView)
+            {
+                item.Show(item.PropertyName.ToLower().Contains(_searchKey) || item.DisplayName.ToLower().Contains(_searchKey));
+            }
+        }
+    }
+
+    protected virtual PropertyItem CreatePropertyItem(PropertyDescriptor propertyDescriptor) => new()
+    {
+        Category = PropertyResolver.ResolveCategory(propertyDescriptor),
+        DisplayName = PropertyResolver.ResolveDisplayName(propertyDescriptor),
+        Description = PropertyResolver.ResolveDescription(propertyDescriptor),
+        IsReadOnly = PropertyResolver.ResolveIsReadOnly(propertyDescriptor),
+        DefaultValue = PropertyResolver.ResolveDefaultValue(propertyDescriptor),
+        Editor = PropertyResolver.ResolveEditor(propertyDescriptor),
+        Value = SelectedObject,
+        PropertyName = propertyDescriptor.Name,
+        PropertyType = propertyDescriptor.PropertyType,
+        PropertyTypeName = $"{propertyDescriptor.PropertyType.Namespace}.{propertyDescriptor.PropertyType.Name}"
+    };
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        TitleElement.SetTitleWidth(this, new GridLength(Math.Max(MinTitleWidth, Math.Min(MaxTitleWidth, ActualWidth / 3))));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
index b749992c..9352e50d 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
@@ -4,125 +4,124 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class PropertyItem : ListBoxItem
 {
-    public class PropertyItem : ListBoxItem
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+        "Value", typeof(object), typeof(PropertyItem), new PropertyMetadata(default(object)));
+
+    public object Value
     {
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-            "Value", typeof(object), typeof(PropertyItem), new PropertyMetadata(default(object)));
-
-        public object Value
-        {
-            get => GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
-        }
-
-        public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register(
-            "DisplayName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
-
-        public string DisplayName
-        {
-            get => (string) GetValue(DisplayNameProperty);
-            set => SetValue(DisplayNameProperty, value);
-        }
-
-        public static readonly DependencyProperty PropertyNameProperty = DependencyProperty.Register(
-            "PropertyName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
-
-        public string PropertyName
-        {
-            get => (string) GetValue(PropertyNameProperty);
-            set => SetValue(PropertyNameProperty, value);
-        }
-
-        public static readonly DependencyProperty PropertyTypeProperty = DependencyProperty.Register(
-            "PropertyType", typeof(Type), typeof(PropertyItem), new PropertyMetadata(default(Type)));
-
-        public Type PropertyType
-        {
-            get => (Type) GetValue(PropertyTypeProperty);
-            set => SetValue(PropertyTypeProperty, value);
-        }
-
-        public static readonly DependencyProperty PropertyTypeNameProperty = DependencyProperty.Register(
-            "PropertyTypeName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
-
-        public string PropertyTypeName
-        {
-            get => (string) GetValue(PropertyTypeNameProperty);
-            set => SetValue(PropertyTypeNameProperty, value);
-        }
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
-            "Description", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
-
-        public string Description
-        {
-            get => (string) GetValue(DescriptionProperty);
-            set => SetValue(DescriptionProperty, value);
-        }
-
-        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
-            "IsReadOnly", typeof(bool), typeof(PropertyItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsReadOnly
-        {
-            get => (bool) GetValue(IsReadOnlyProperty);
-            set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
-            "DefaultValue", typeof(object), typeof(PropertyItem), new PropertyMetadata(default(object)));
-
-        public object DefaultValue
-        {
-            get => GetValue(DefaultValueProperty);
-            set => SetValue(DefaultValueProperty, value);
-        }
-
-        public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register(
-            "Category", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
-
-        public string Category
-        {
-            get => (string) GetValue(CategoryProperty);
-            set => SetValue(CategoryProperty, value);
-        }
-
-        public static readonly DependencyProperty EditorProperty = DependencyProperty.Register(
-            "Editor", typeof(PropertyEditorBase), typeof(PropertyItem), new PropertyMetadata(default(PropertyEditorBase)));
-
-        public PropertyEditorBase Editor
-        {
-            get => (PropertyEditorBase) GetValue(EditorProperty);
-            set => SetValue(EditorProperty, value);
-        }
-
-        public static readonly DependencyProperty EditorElementProperty = DependencyProperty.Register(
-            "EditorElement", typeof(FrameworkElement), typeof(PropertyItem), new PropertyMetadata(default(FrameworkElement)));
-
-        public FrameworkElement EditorElement
-        {
-            get => (FrameworkElement) GetValue(EditorElementProperty);
-            set => SetValue(EditorElementProperty, value);
-        }
-
-        public static readonly DependencyProperty IsExpandedEnabledProperty = DependencyProperty.Register(
-            "IsExpandedEnabled", typeof(bool), typeof(PropertyItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsExpandedEnabled
-        {
-            get => (bool) GetValue(IsExpandedEnabledProperty);
-            set => SetValue(IsExpandedEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public PropertyDescriptor PropertyDescriptor { get; set; }
-
-        public virtual void InitElement()
-        {
-            if (Editor == null) return;
-            EditorElement = Editor.CreateElement(this);
-            Editor.CreateBinding(this, EditorElement);
-        }
+        get => GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
     }
-}
+
+    public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register(
+        "DisplayName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
+
+    public string DisplayName
+    {
+        get => (string) GetValue(DisplayNameProperty);
+        set => SetValue(DisplayNameProperty, value);
+    }
+
+    public static readonly DependencyProperty PropertyNameProperty = DependencyProperty.Register(
+        "PropertyName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
+
+    public string PropertyName
+    {
+        get => (string) GetValue(PropertyNameProperty);
+        set => SetValue(PropertyNameProperty, value);
+    }
+
+    public static readonly DependencyProperty PropertyTypeProperty = DependencyProperty.Register(
+        "PropertyType", typeof(Type), typeof(PropertyItem), new PropertyMetadata(default(Type)));
+
+    public Type PropertyType
+    {
+        get => (Type) GetValue(PropertyTypeProperty);
+        set => SetValue(PropertyTypeProperty, value);
+    }
+
+    public static readonly DependencyProperty PropertyTypeNameProperty = DependencyProperty.Register(
+        "PropertyTypeName", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
+
+    public string PropertyTypeName
+    {
+        get => (string) GetValue(PropertyTypeNameProperty);
+        set => SetValue(PropertyTypeNameProperty, value);
+    }
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+        "Description", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
+
+    public string Description
+    {
+        get => (string) GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
+        "IsReadOnly", typeof(bool), typeof(PropertyItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsReadOnly
+    {
+        get => (bool) GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
+        "DefaultValue", typeof(object), typeof(PropertyItem), new PropertyMetadata(default(object)));
+
+    public object DefaultValue
+    {
+        get => GetValue(DefaultValueProperty);
+        set => SetValue(DefaultValueProperty, value);
+    }
+
+    public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register(
+        "Category", typeof(string), typeof(PropertyItem), new PropertyMetadata(default(string)));
+
+    public string Category
+    {
+        get => (string) GetValue(CategoryProperty);
+        set => SetValue(CategoryProperty, value);
+    }
+
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register(
+        "Editor", typeof(PropertyEditorBase), typeof(PropertyItem), new PropertyMetadata(default(PropertyEditorBase)));
+
+    public PropertyEditorBase Editor
+    {
+        get => (PropertyEditorBase) GetValue(EditorProperty);
+        set => SetValue(EditorProperty, value);
+    }
+
+    public static readonly DependencyProperty EditorElementProperty = DependencyProperty.Register(
+        "EditorElement", typeof(FrameworkElement), typeof(PropertyItem), new PropertyMetadata(default(FrameworkElement)));
+
+    public FrameworkElement EditorElement
+    {
+        get => (FrameworkElement) GetValue(EditorElementProperty);
+        set => SetValue(EditorElementProperty, value);
+    }
+
+    public static readonly DependencyProperty IsExpandedEnabledProperty = DependencyProperty.Register(
+        "IsExpandedEnabled", typeof(bool), typeof(PropertyItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsExpandedEnabled
+    {
+        get => (bool) GetValue(IsExpandedEnabledProperty);
+        set => SetValue(IsExpandedEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public PropertyDescriptor PropertyDescriptor { get; set; }
+
+    public virtual void InitElement()
+    {
+        if (Editor == null) return;
+        EditorElement = Editor.CreateElement(this);
+        Editor.CreateBinding(this, EditorElement);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
index 9016b74a..e292fbf5 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
@@ -1,17 +1,16 @@
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
-{
-    public class PropertyItemsControl : ListBox
-    {
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is PropertyItem;
+namespace HandyControl.Controls;
 
-        public PropertyItemsControl()
-        {
+public class PropertyItemsControl : ListBox
+{
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is PropertyItem;
+
+    public PropertyItemsControl()
+    {
 #if !NET40
             VirtualizingPanel.SetIsVirtualizingWhenGrouping(this, true);
             VirtualizingPanel.SetScrollUnit(this, ScrollUnit.Pixel);
 #endif
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
index 3ce20d4e..509974cb 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
@@ -6,122 +6,121 @@ using System.Windows;
 using System.Windows.Media;
 using HandyControl.Properties.Langs;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class PropertyResolver
 {
-    public class PropertyResolver
+    private static readonly Dictionary<Type, EditorTypeCode> TypeCodeDic = new()
     {
-        private static readonly Dictionary<Type, EditorTypeCode> TypeCodeDic = new()
-        {
-            [typeof(string)] = EditorTypeCode.PlainText,
-            [typeof(sbyte)] = EditorTypeCode.SByteNumber,
-            [typeof(byte)] = EditorTypeCode.ByteNumber,
-            [typeof(short)] = EditorTypeCode.Int16Number,
-            [typeof(ushort)] = EditorTypeCode.UInt16Number,
-            [typeof(int)] = EditorTypeCode.Int32Number,
-            [typeof(uint)] = EditorTypeCode.UInt32Number,
-            [typeof(long)] = EditorTypeCode.Int64Number,
-            [typeof(ulong)] = EditorTypeCode.UInt64Number,
-            [typeof(float)] = EditorTypeCode.SingleNumber,
-            [typeof(double)] = EditorTypeCode.DoubleNumber,
-            [typeof(bool)] = EditorTypeCode.Switch,
-            [typeof(DateTime)] = EditorTypeCode.DateTime,
-            [typeof(HorizontalAlignment)] = EditorTypeCode.HorizontalAlignment,
-            [typeof(VerticalAlignment)] = EditorTypeCode.VerticalAlignment,
-            [typeof(ImageSource)] = EditorTypeCode.ImageSource
-        };
+        [typeof(string)] = EditorTypeCode.PlainText,
+        [typeof(sbyte)] = EditorTypeCode.SByteNumber,
+        [typeof(byte)] = EditorTypeCode.ByteNumber,
+        [typeof(short)] = EditorTypeCode.Int16Number,
+        [typeof(ushort)] = EditorTypeCode.UInt16Number,
+        [typeof(int)] = EditorTypeCode.Int32Number,
+        [typeof(uint)] = EditorTypeCode.UInt32Number,
+        [typeof(long)] = EditorTypeCode.Int64Number,
+        [typeof(ulong)] = EditorTypeCode.UInt64Number,
+        [typeof(float)] = EditorTypeCode.SingleNumber,
+        [typeof(double)] = EditorTypeCode.DoubleNumber,
+        [typeof(bool)] = EditorTypeCode.Switch,
+        [typeof(DateTime)] = EditorTypeCode.DateTime,
+        [typeof(HorizontalAlignment)] = EditorTypeCode.HorizontalAlignment,
+        [typeof(VerticalAlignment)] = EditorTypeCode.VerticalAlignment,
+        [typeof(ImageSource)] = EditorTypeCode.ImageSource
+    };
 
-        public string ResolveCategory(PropertyDescriptor propertyDescriptor)
-        {
-            var categoryAttribute = propertyDescriptor.Attributes.OfType<CategoryAttribute>().FirstOrDefault();
+    public string ResolveCategory(PropertyDescriptor propertyDescriptor)
+    {
+        var categoryAttribute = propertyDescriptor.Attributes.OfType<CategoryAttribute>().FirstOrDefault();
 
-            return categoryAttribute == null ?
+        return categoryAttribute == null ?
+            Lang.Miscellaneous :
+            string.IsNullOrEmpty(categoryAttribute.Category) ?
                 Lang.Miscellaneous :
-                string.IsNullOrEmpty(categoryAttribute.Category) ?
-                    Lang.Miscellaneous :
-                    categoryAttribute.Category;
-        }
-
-        public string ResolveDisplayName(PropertyDescriptor propertyDescriptor)
-        {
-            var displayName = propertyDescriptor.DisplayName;
-            if (string.IsNullOrEmpty(displayName))
-            {
-                displayName = propertyDescriptor.Name;
-            }
-
-            return displayName;
-        }
-
-        public string ResolveDescription(PropertyDescriptor propertyDescriptor) => propertyDescriptor.Description;
-
-        public bool ResolveIsBrowsable(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsBrowsable;
-
-        public bool ResolveIsDisplay(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsLocalizable;
-
-        public bool ResolveIsReadOnly(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsReadOnly;
-
-        public object ResolveDefaultValue(PropertyDescriptor propertyDescriptor)
-        {
-            var defaultValueAttribute = propertyDescriptor.Attributes.OfType<DefaultValueAttribute>().FirstOrDefault();
-            return defaultValueAttribute?.Value;
-        }
-
-        public PropertyEditorBase ResolveEditor(PropertyDescriptor propertyDescriptor)
-        {
-            var editorAttribute = propertyDescriptor.Attributes.OfType<EditorAttribute>().FirstOrDefault();
-            var editor = editorAttribute == null || string.IsNullOrEmpty(editorAttribute.EditorTypeName)
-                ? CreateDefaultEditor(propertyDescriptor.PropertyType)
-                : CreateEditor(Type.GetType(editorAttribute.EditorTypeName));
-
-            return editor;
-        }
-
-        public virtual PropertyEditorBase CreateDefaultEditor(Type type) =>
-            TypeCodeDic.TryGetValue(type, out var editorType)
-                ? editorType switch
-                {
-                    EditorTypeCode.PlainText => new PlainTextPropertyEditor(),
-                    EditorTypeCode.SByteNumber => new NumberPropertyEditor(sbyte.MinValue, sbyte.MaxValue),
-                    EditorTypeCode.ByteNumber => new NumberPropertyEditor(byte.MinValue, byte.MaxValue),
-                    EditorTypeCode.Int16Number => new NumberPropertyEditor(short.MinValue, short.MaxValue),
-                    EditorTypeCode.UInt16Number => new NumberPropertyEditor(ushort.MinValue, ushort.MaxValue),
-                    EditorTypeCode.Int32Number => new NumberPropertyEditor(int.MinValue, int.MaxValue),
-                    EditorTypeCode.UInt32Number => new NumberPropertyEditor(uint.MinValue, uint.MaxValue),
-                    EditorTypeCode.Int64Number => new NumberPropertyEditor(long.MinValue, long.MaxValue),
-                    EditorTypeCode.UInt64Number => new NumberPropertyEditor(ulong.MinValue, ulong.MaxValue),
-                    EditorTypeCode.SingleNumber => new NumberPropertyEditor(float.MinValue, float.MaxValue),
-                    EditorTypeCode.DoubleNumber => new NumberPropertyEditor(double.MinValue, double.MaxValue),
-                    EditorTypeCode.Switch => new SwitchPropertyEditor(),
-                    EditorTypeCode.DateTime => new DateTimePropertyEditor(),
-                    EditorTypeCode.HorizontalAlignment => new HorizontalAlignmentPropertyEditor(),
-                    EditorTypeCode.VerticalAlignment => new VerticalAlignmentPropertyEditor(),
-                    EditorTypeCode.ImageSource => new ImagePropertyEditor(),
-                    _ => new ReadOnlyTextPropertyEditor()
-                }
-                : type.IsSubclassOf(typeof(Enum))
-                    ? new EnumPropertyEditor()
-                    : new ReadOnlyTextPropertyEditor();
-
-        public virtual PropertyEditorBase CreateEditor(Type type) => Activator.CreateInstance(type) as PropertyEditorBase ?? new ReadOnlyTextPropertyEditor();
-
-        private enum EditorTypeCode
-        {
-            PlainText,
-            SByteNumber,
-            ByteNumber,
-            Int16Number,
-            UInt16Number,
-            Int32Number,
-            UInt32Number,
-            Int64Number,
-            UInt64Number,
-            SingleNumber,
-            DoubleNumber,
-            Switch,
-            DateTime,
-            HorizontalAlignment,
-            VerticalAlignment,
-            ImageSource
-        }
+                categoryAttribute.Category;
     }
-}
+
+    public string ResolveDisplayName(PropertyDescriptor propertyDescriptor)
+    {
+        var displayName = propertyDescriptor.DisplayName;
+        if (string.IsNullOrEmpty(displayName))
+        {
+            displayName = propertyDescriptor.Name;
+        }
+
+        return displayName;
+    }
+
+    public string ResolveDescription(PropertyDescriptor propertyDescriptor) => propertyDescriptor.Description;
+
+    public bool ResolveIsBrowsable(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsBrowsable;
+
+    public bool ResolveIsDisplay(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsLocalizable;
+
+    public bool ResolveIsReadOnly(PropertyDescriptor propertyDescriptor) => propertyDescriptor.IsReadOnly;
+
+    public object ResolveDefaultValue(PropertyDescriptor propertyDescriptor)
+    {
+        var defaultValueAttribute = propertyDescriptor.Attributes.OfType<DefaultValueAttribute>().FirstOrDefault();
+        return defaultValueAttribute?.Value;
+    }
+
+    public PropertyEditorBase ResolveEditor(PropertyDescriptor propertyDescriptor)
+    {
+        var editorAttribute = propertyDescriptor.Attributes.OfType<EditorAttribute>().FirstOrDefault();
+        var editor = editorAttribute == null || string.IsNullOrEmpty(editorAttribute.EditorTypeName)
+            ? CreateDefaultEditor(propertyDescriptor.PropertyType)
+            : CreateEditor(Type.GetType(editorAttribute.EditorTypeName));
+
+        return editor;
+    }
+
+    public virtual PropertyEditorBase CreateDefaultEditor(Type type) =>
+        TypeCodeDic.TryGetValue(type, out var editorType)
+            ? editorType switch
+            {
+                EditorTypeCode.PlainText => new PlainTextPropertyEditor(),
+                EditorTypeCode.SByteNumber => new NumberPropertyEditor(sbyte.MinValue, sbyte.MaxValue),
+                EditorTypeCode.ByteNumber => new NumberPropertyEditor(byte.MinValue, byte.MaxValue),
+                EditorTypeCode.Int16Number => new NumberPropertyEditor(short.MinValue, short.MaxValue),
+                EditorTypeCode.UInt16Number => new NumberPropertyEditor(ushort.MinValue, ushort.MaxValue),
+                EditorTypeCode.Int32Number => new NumberPropertyEditor(int.MinValue, int.MaxValue),
+                EditorTypeCode.UInt32Number => new NumberPropertyEditor(uint.MinValue, uint.MaxValue),
+                EditorTypeCode.Int64Number => new NumberPropertyEditor(long.MinValue, long.MaxValue),
+                EditorTypeCode.UInt64Number => new NumberPropertyEditor(ulong.MinValue, ulong.MaxValue),
+                EditorTypeCode.SingleNumber => new NumberPropertyEditor(float.MinValue, float.MaxValue),
+                EditorTypeCode.DoubleNumber => new NumberPropertyEditor(double.MinValue, double.MaxValue),
+                EditorTypeCode.Switch => new SwitchPropertyEditor(),
+                EditorTypeCode.DateTime => new DateTimePropertyEditor(),
+                EditorTypeCode.HorizontalAlignment => new HorizontalAlignmentPropertyEditor(),
+                EditorTypeCode.VerticalAlignment => new VerticalAlignmentPropertyEditor(),
+                EditorTypeCode.ImageSource => new ImagePropertyEditor(),
+                _ => new ReadOnlyTextPropertyEditor()
+            }
+            : type.IsSubclassOf(typeof(Enum))
+                ? new EnumPropertyEditor()
+                : new ReadOnlyTextPropertyEditor();
+
+    public virtual PropertyEditorBase CreateEditor(Type type) => Activator.CreateInstance(type) as PropertyEditorBase ?? new ReadOnlyTextPropertyEditor();
+
+    private enum EditorTypeCode
+    {
+        PlainText,
+        SByteNumber,
+        ByteNumber,
+        Int16Number,
+        UInt16Number,
+        Int32Number,
+        UInt32Number,
+        Int64Number,
+        UInt64Number,
+        SingleNumber,
+        DoubleNumber,
+        Switch,
+        DateTime,
+        HorizontalAlignment,
+        VerticalAlignment,
+        ImageSource
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
index 69b01fdd..b4ee2e0b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
@@ -6,266 +6,265 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Rate : RegularItemsControl
 {
-    public class Rate : RegularItemsControl
+    static Rate()
     {
-        static Rate()
-        {
-            ItemWidthProperty.OverrideMetadata(typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
-            ItemHeightProperty.OverrideMetadata(typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
-        }
-
-        public static readonly DependencyProperty AllowHalfProperty = DependencyProperty.Register(
-            "AllowHalf", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static readonly DependencyProperty AllowClearProperty = DependencyProperty.Register(
-            "AllowClear", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(Geometry), typeof(Rate), new FrameworkPropertyMetadata(default(Geometry), FrameworkPropertyMetadataOptions.Inherits));
-
-        public static readonly DependencyProperty CountProperty = DependencyProperty.Register(
-            "Count", typeof(int), typeof(Rate), new PropertyMetadata(ValueBoxes.Int5Box));
-
-        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
-            "DefaultValue", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
-
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
-            "Value", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box, OnValueChanged));
-
-        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((Rate) d).OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, d)
-            {
-                Info = (double) e.NewValue
-            });
-
-        protected virtual void OnValueChanged(FunctionEventArgs<double> e)
-        {
-            RaiseEvent(e);
-            UpdateItems();
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(Rate), new PropertyMetadata(default(string)));
-
-        public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
-            "ShowText", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
-            "IsReadOnly", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private bool _isLoaded;
-
-        private bool _updateItems;
-
-        #region Public Events
-
-        public static readonly RoutedEvent ValueChangedEvent =
-            EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<double>>), typeof(Rate));
-
-        public event EventHandler<FunctionEventArgs<double>> ValueChanged
-        {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
-
-        #endregion Public Events
-
-        public Rate()
-        {
-            AddHandler(RateItem.SelectedChangedEvent, new RoutedEventHandler(RateItemSelectedChanged));
-            AddHandler(RateItem.ValueChangedEvent, new RoutedEventHandler(RateItemValueChanged));
-
-            Loaded += (s, e) =>
-            {
-                if (DesignerHelper.IsInDesignMode) return;
-
-                _updateItems = false;
-                OnApplyTemplateInternal();
-                _updateItems = true;
-                UpdateItems();
-
-                if (_isLoaded) return;
-                _isLoaded = true;
-
-                if (Value <= 0)
-                {
-                    if (DefaultValue > 0)
-                    {
-                        Value = DefaultValue;
-                    }
-                }
-                else
-                {
-                    UpdateItems();
-                }
-            };
-        }
-
-        public bool AllowHalf
-        {
-            get => (bool) GetValue(AllowHalfProperty);
-            set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool AllowClear
-        {
-            get => (bool) GetValue(AllowClearProperty);
-            set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry) GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        public int Count
-        {
-            get => (int) GetValue(CountProperty);
-            set => SetValue(CountProperty, value);
-        }
-
-        public double DefaultValue
-        {
-            get => (double) GetValue(DefaultValueProperty);
-            set => SetValue(DefaultValueProperty, value);
-        }
-
-        public double Value
-        {
-            get => (double) GetValue(ValueProperty);
-            set => SetValue(ValueProperty, value);
-        }
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public bool ShowText
-        {
-            get => (bool) GetValue(ShowTextProperty);
-            set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool IsReadOnly
-        {
-            get => (bool) GetValue(IsReadOnlyProperty);
-            set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private void RateItemValueChanged(object sender, RoutedEventArgs e) =>
-            Value = (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
-
-        private void RateItemSelectedChanged(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is RateItem rateItem)
-            {
-                var index = rateItem.Index;
-                for (var i = 0; i < index; i++)
-                {
-                    if (Items[i] is RateItem item)
-                    {
-                        item.IsSelected = true;
-                        item.IsHalf = false;
-                    }
-                }
-
-                for (var i = index; i < Count; i++)
-                {
-                    if (Items[i] is RateItem item)
-                    {
-                        item.IsSelected = false;
-                        item.IsHalf = false;
-                    }
-                }
-            }
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is RateItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new RateItem();
-
-        private void OnApplyTemplateInternal()
-        {
-            Items.Clear();
-
-            for (var i = 1; i <= Count; i++)
-            {
-                var item = new RateItem
-                {
-                    Index = i,
-                    Width = ItemWidth,
-                    Height = ItemHeight,
-                    Margin = ItemMargin,
-                    AllowHalf = AllowHalf,
-                    AllowClear = AllowClear,
-                    Icon = Icon,
-                    IsReadOnly = IsReadOnly,
-                    Background = Background
-                };
-
-                Items.Add(item);
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            if (!_isLoaded)
-            {
-                _updateItems = true;
-                OnApplyTemplateInternal();
-                _updateItems = false;
-            }
-
-            base.OnApplyTemplate();
-        }
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-            UpdateItems();
-        }
-
-        protected override void UpdateItems()
-        {
-            if (!_isLoaded || !_updateItems) return;
-            var count = (int) Value;
-
-            for (var i = 0; i < count; i++)
-            {
-                if (Items[i] is RateItem rateItem)
-                {
-                    rateItem.IsSelected = true;
-                    rateItem.IsHalf = false;
-                }
-            }
-
-            if (Value > count)
-            {
-                if (Items[count] is RateItem rateItem)
-                {
-                    rateItem.IsSelected = true;
-                    rateItem.IsHalf = true;
-                }
-
-                count += 1;
-            }
-
-            for (var i = count; i < Count; i++)
-            {
-                if (Items[i] is RateItem rateItem)
-                {
-                    rateItem.IsSelected = false;
-                    rateItem.IsHalf = false;
-                }
-            }
-        }
-
-        public void Reset() => Value = DefaultValue;
+        ItemWidthProperty.OverrideMetadata(typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
+        ItemHeightProperty.OverrideMetadata(typeof(Rate), new PropertyMetadata(ValueBoxes.Double20Box));
     }
-}
+
+    public static readonly DependencyProperty AllowHalfProperty = DependencyProperty.Register(
+        "AllowHalf", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static readonly DependencyProperty AllowClearProperty = DependencyProperty.Register(
+        "AllowClear", typeof(bool), typeof(Rate), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+        "Icon", typeof(Geometry), typeof(Rate), new FrameworkPropertyMetadata(default(Geometry), FrameworkPropertyMetadataOptions.Inherits));
+
+    public static readonly DependencyProperty CountProperty = DependencyProperty.Register(
+        "Count", typeof(int), typeof(Rate), new PropertyMetadata(ValueBoxes.Int5Box));
+
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register(
+        "DefaultValue", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box));
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register(
+        "Value", typeof(double), typeof(Rate), new PropertyMetadata(ValueBoxes.Double0Box, OnValueChanged));
+
+    private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((Rate) d).OnValueChanged(new FunctionEventArgs<double>(ValueChangedEvent, d)
+        {
+            Info = (double) e.NewValue
+        });
+
+    protected virtual void OnValueChanged(FunctionEventArgs<double> e)
+    {
+        RaiseEvent(e);
+        UpdateItems();
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(Rate), new PropertyMetadata(default(string)));
+
+    public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register(
+        "ShowText", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register(
+        "IsReadOnly", typeof(bool), typeof(Rate), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private bool _isLoaded;
+
+    private bool _updateItems;
+
+    #region Public Events
+
+    public static readonly RoutedEvent ValueChangedEvent =
+        EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<double>>), typeof(Rate));
+
+    public event EventHandler<FunctionEventArgs<double>> ValueChanged
+    {
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
+    }
+
+    #endregion Public Events
+
+    public Rate()
+    {
+        AddHandler(RateItem.SelectedChangedEvent, new RoutedEventHandler(RateItemSelectedChanged));
+        AddHandler(RateItem.ValueChangedEvent, new RoutedEventHandler(RateItemValueChanged));
+
+        Loaded += (s, e) =>
+        {
+            if (DesignerHelper.IsInDesignMode) return;
+
+            _updateItems = false;
+            OnApplyTemplateInternal();
+            _updateItems = true;
+            UpdateItems();
+
+            if (_isLoaded) return;
+            _isLoaded = true;
+
+            if (Value <= 0)
+            {
+                if (DefaultValue > 0)
+                {
+                    Value = DefaultValue;
+                }
+            }
+            else
+            {
+                UpdateItems();
+            }
+        };
+    }
+
+    public bool AllowHalf
+    {
+        get => (bool) GetValue(AllowHalfProperty);
+        set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool AllowClear
+    {
+        get => (bool) GetValue(AllowClearProperty);
+        set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public Geometry Icon
+    {
+        get => (Geometry) GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    public int Count
+    {
+        get => (int) GetValue(CountProperty);
+        set => SetValue(CountProperty, value);
+    }
+
+    public double DefaultValue
+    {
+        get => (double) GetValue(DefaultValueProperty);
+        set => SetValue(DefaultValueProperty, value);
+    }
+
+    public double Value
+    {
+        get => (double) GetValue(ValueProperty);
+        set => SetValue(ValueProperty, value);
+    }
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public bool ShowText
+    {
+        get => (bool) GetValue(ShowTextProperty);
+        set => SetValue(ShowTextProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool IsReadOnly
+    {
+        get => (bool) GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private void RateItemValueChanged(object sender, RoutedEventArgs e) =>
+        Value = (from RateItem item in Items where item.IsSelected select item.IsHalf ? 0.5 : 1).Sum();
+
+    private void RateItemSelectedChanged(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is RateItem rateItem)
+        {
+            var index = rateItem.Index;
+            for (var i = 0; i < index; i++)
+            {
+                if (Items[i] is RateItem item)
+                {
+                    item.IsSelected = true;
+                    item.IsHalf = false;
+                }
+            }
+
+            for (var i = index; i < Count; i++)
+            {
+                if (Items[i] is RateItem item)
+                {
+                    item.IsSelected = false;
+                    item.IsHalf = false;
+                }
+            }
+        }
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is RateItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new RateItem();
+
+    private void OnApplyTemplateInternal()
+    {
+        Items.Clear();
+
+        for (var i = 1; i <= Count; i++)
+        {
+            var item = new RateItem
+            {
+                Index = i,
+                Width = ItemWidth,
+                Height = ItemHeight,
+                Margin = ItemMargin,
+                AllowHalf = AllowHalf,
+                AllowClear = AllowClear,
+                Icon = Icon,
+                IsReadOnly = IsReadOnly,
+                Background = Background
+            };
+
+            Items.Add(item);
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (!_isLoaded)
+        {
+            _updateItems = true;
+            OnApplyTemplateInternal();
+            _updateItems = false;
+        }
+
+        base.OnApplyTemplate();
+    }
+
+    protected override void OnMouseLeave(MouseEventArgs e)
+    {
+        base.OnMouseLeave(e);
+        UpdateItems();
+    }
+
+    protected override void UpdateItems()
+    {
+        if (!_isLoaded || !_updateItems) return;
+        var count = (int) Value;
+
+        for (var i = 0; i < count; i++)
+        {
+            if (Items[i] is RateItem rateItem)
+            {
+                rateItem.IsSelected = true;
+                rateItem.IsHalf = false;
+            }
+        }
+
+        if (Value > count)
+        {
+            if (Items[count] is RateItem rateItem)
+            {
+                rateItem.IsSelected = true;
+                rateItem.IsHalf = true;
+            }
+
+            count += 1;
+        }
+
+        for (var i = count; i < Count; i++)
+        {
+            if (Items[i] is RateItem rateItem)
+            {
+                rateItem.IsSelected = false;
+                rateItem.IsHalf = false;
+            }
+        }
+    }
+
+    public void Reset() => Value = DefaultValue;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
index 17cc4051..d6779cb9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
@@ -5,217 +5,216 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementIcon, Type = typeof(FrameworkElement))]
+public class RateItem : Control
 {
-    [TemplatePart(Name = ElementIcon, Type = typeof(FrameworkElement))]
-    public class RateItem : Control
+    private const string ElementIcon = "PART_Icon";
+
+    public static readonly DependencyProperty AllowClearProperty =
+        Rate.AllowClearProperty.AddOwner(typeof(RateItem));
+
+    public static readonly DependencyProperty AllowHalfProperty =
+        Rate.AllowHalfProperty.AddOwner(typeof(RateItem), new PropertyMetadata(OnAllowHalfChanged));
+
+    public static readonly DependencyProperty IconProperty = Rate.IconProperty.AddOwner(typeof(RateItem));
+
+    public static readonly DependencyProperty IsReadOnlyProperty = Rate.IsReadOnlyProperty.AddOwner(typeof(RateItem));
+
+    internal static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
+        "IsSelected", typeof(bool), typeof(RateItem),
+        new PropertyMetadata(ValueBoxes.FalseBox, OnIsSelectedChanged));
+
+    public static readonly RoutedEvent SelectedChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedChanged", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(RateItem));
+
+    public static readonly RoutedEvent ValueChangedEvent =
+        EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(RateItem));
+
+    private FrameworkElement _icon;
+
+    private bool _isHalf;
+
+    private bool _isLoaded;
+
+    private bool _isMouseLeftButtonDown;
+
+    private bool _isSentValue;
+
+    public RateItem()
     {
-        private const string ElementIcon = "PART_Icon";
-
-        public static readonly DependencyProperty AllowClearProperty =
-            Rate.AllowClearProperty.AddOwner(typeof(RateItem));
-
-        public static readonly DependencyProperty AllowHalfProperty =
-            Rate.AllowHalfProperty.AddOwner(typeof(RateItem), new PropertyMetadata(OnAllowHalfChanged));
-
-        public static readonly DependencyProperty IconProperty = Rate.IconProperty.AddOwner(typeof(RateItem));
-
-        public static readonly DependencyProperty IsReadOnlyProperty = Rate.IsReadOnlyProperty.AddOwner(typeof(RateItem));
-
-        internal static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
-            "IsSelected", typeof(bool), typeof(RateItem),
-            new PropertyMetadata(ValueBoxes.FalseBox, OnIsSelectedChanged));
-
-        public static readonly RoutedEvent SelectedChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedChanged", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(RateItem));
-
-        public static readonly RoutedEvent ValueChangedEvent =
-            EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(RateItem));
-
-        private FrameworkElement _icon;
-
-        private bool _isHalf;
-
-        private bool _isLoaded;
-
-        private bool _isMouseLeftButtonDown;
-
-        private bool _isSentValue;
-
-        public RateItem()
+        Loaded += (s, e) =>
         {
-            Loaded += (s, e) =>
-            {
-                if (_isLoaded) return;
-                _isLoaded = true;
+            if (_isLoaded) return;
+            _isLoaded = true;
 
-                OnApplyTemplate();
-            };
-        }
+            OnApplyTemplate();
+        };
+    }
 
-        public bool AllowClear
+    public bool AllowClear
+    {
+        get => (bool) GetValue(AllowClearProperty);
+        set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool AllowHalf
+    {
+        get => (bool) GetValue(AllowHalfProperty);
+        set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public Geometry Icon
+    {
+        get => (Geometry) GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
+
+    internal bool IsSelected
+    {
+        get => (bool) GetValue(IsSelectedProperty);
+        set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool IsReadOnly
+    {
+        get => (bool) GetValue(IsReadOnlyProperty);
+        set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal bool IsHalf
+    {
+        get => _isHalf;
+        set
         {
-            get => (bool) GetValue(AllowClearProperty);
-            set => SetValue(AllowClearProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool AllowHalf
-        {
-            get => (bool) GetValue(AllowHalfProperty);
-            set => SetValue(AllowHalfProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public Geometry Icon
-        {
-            get => (Geometry) GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
-
-        internal bool IsSelected
-        {
-            get => (bool) GetValue(IsSelectedProperty);
-            set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool IsReadOnly
-        {
-            get => (bool) GetValue(IsReadOnlyProperty);
-            set => SetValue(IsReadOnlyProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal bool IsHalf
-        {
-            get => _isHalf;
-            set
-            {
-                if (_isHalf == value) return;
-                _isHalf = value;
-                if (_icon == null) return;
-                _icon.Width = value ? Width / 2 : Width;
-            }
-        }
-
-        internal int Index { get; set; }
-
-        private static void OnAllowHalfChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (RateItem) d;
-            ctl.HandleMouseMoveEvent((bool) e.NewValue);
-        }
-
-        private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (RateItem) d;
-            ctl._icon?.Show((bool) e.NewValue);
-        }
-
-        public event RoutedEventHandler SelectedChanged
-        {
-            add => AddHandler(SelectedChangedEvent, value);
-            remove => RemoveHandler(SelectedChangedEvent, value);
-        }
-
-        public event RoutedEventHandler ValueChanged
-        {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
-
-        private void HandleMouseMoveEvent(bool handle)
-        {
-            if (handle)
-            {
-                MouseMove += RateItem_MouseMove;
-            }
-            else
-            {
-                MouseMove -= RateItem_MouseMove;
-            }
-        }
-
-        private void RateItem_MouseMove(object sender, MouseEventArgs e)
-        {
-            if (IsReadOnly) return;
-            if (!AllowHalf) return;
-            var p = e.GetPosition(this);
-            IsHalf = p.X < Width / 2;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _icon = GetTemplateChild(ElementIcon) as FrameworkElement;
-
-            if (_isLoaded)
-            {
-                if (_icon == null) return;
-                _icon.Show(IsSelected);
-                _icon.Width = IsHalf ? Width / 2 : Width;
-            }
-        }
-
-        protected override void OnMouseEnter(MouseEventArgs e)
-        {
-            base.OnMouseEnter(e);
-            if (IsReadOnly) return;
-            _isSentValue = false;
-            IsSelected = true;
-            RaiseEvent(new RoutedEventArgs(SelectedChangedEvent) { Source = this });
-        }
-
-        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
-            if (IsReadOnly) return;
-            _isMouseLeftButtonDown = true;
-        }
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-            if (IsReadOnly) return;
-            _isMouseLeftButtonDown = false;
-        }
-
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonUp(e);
-            if (IsReadOnly) return;
-            if (_isMouseLeftButtonDown)
-            {
-                if (Index == 1 && AllowClear)
-                {
-                    if (IsSelected)
-                    {
-                        if (!_isSentValue)
-                        {
-                            RaiseEvent(new RoutedEventArgs(ValueChangedEvent) { Source = this });
-                            _isMouseLeftButtonDown = false;
-                            _isSentValue = true;
-                            return;
-                        }
-
-                        _isSentValue = false;
-                        IsSelected = false;
-                        IsHalf = false;
-                    }
-                    else
-                    {
-                        IsSelected = true;
-                        if (AllowHalf)
-                        {
-                            var p = e.GetPosition(this);
-                            IsHalf = p.X < Width / 2;
-                        }
-                    }
-                }
-
-                RaiseEvent(new RoutedEventArgs(ValueChangedEvent) { Source = this });
-                _isMouseLeftButtonDown = false;
-            }
+            if (_isHalf == value) return;
+            _isHalf = value;
+            if (_icon == null) return;
+            _icon.Width = value ? Width / 2 : Width;
         }
     }
-}
+
+    internal int Index { get; set; }
+
+    private static void OnAllowHalfChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (RateItem) d;
+        ctl.HandleMouseMoveEvent((bool) e.NewValue);
+    }
+
+    private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (RateItem) d;
+        ctl._icon?.Show((bool) e.NewValue);
+    }
+
+    public event RoutedEventHandler SelectedChanged
+    {
+        add => AddHandler(SelectedChangedEvent, value);
+        remove => RemoveHandler(SelectedChangedEvent, value);
+    }
+
+    public event RoutedEventHandler ValueChanged
+    {
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
+    }
+
+    private void HandleMouseMoveEvent(bool handle)
+    {
+        if (handle)
+        {
+            MouseMove += RateItem_MouseMove;
+        }
+        else
+        {
+            MouseMove -= RateItem_MouseMove;
+        }
+    }
+
+    private void RateItem_MouseMove(object sender, MouseEventArgs e)
+    {
+        if (IsReadOnly) return;
+        if (!AllowHalf) return;
+        var p = e.GetPosition(this);
+        IsHalf = p.X < Width / 2;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _icon = GetTemplateChild(ElementIcon) as FrameworkElement;
+
+        if (_isLoaded)
+        {
+            if (_icon == null) return;
+            _icon.Show(IsSelected);
+            _icon.Width = IsHalf ? Width / 2 : Width;
+        }
+    }
+
+    protected override void OnMouseEnter(MouseEventArgs e)
+    {
+        base.OnMouseEnter(e);
+        if (IsReadOnly) return;
+        _isSentValue = false;
+        IsSelected = true;
+        RaiseEvent(new RoutedEventArgs(SelectedChangedEvent) { Source = this });
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+        if (IsReadOnly) return;
+        _isMouseLeftButtonDown = true;
+    }
+
+    protected override void OnMouseLeave(MouseEventArgs e)
+    {
+        base.OnMouseLeave(e);
+        if (IsReadOnly) return;
+        _isMouseLeftButtonDown = false;
+    }
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+        if (IsReadOnly) return;
+        if (_isMouseLeftButtonDown)
+        {
+            if (Index == 1 && AllowClear)
+            {
+                if (IsSelected)
+                {
+                    if (!_isSentValue)
+                    {
+                        RaiseEvent(new RoutedEventArgs(ValueChangedEvent) { Source = this });
+                        _isMouseLeftButtonDown = false;
+                        _isSentValue = true;
+                        return;
+                    }
+
+                    _isSentValue = false;
+                    IsSelected = false;
+                    IsHalf = false;
+                }
+                else
+                {
+                    IsSelected = true;
+                    if (AllowHalf)
+                    {
+                        var p = e.GetPosition(this);
+                        IsHalf = p.X < Width / 2;
+                    }
+                }
+            }
+
+            RaiseEvent(new RoutedEventArgs(ValueChangedEvent) { Source = this });
+            _isMouseLeftButtonDown = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
index 887db21f..8945b908 100644
--- a/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
@@ -2,14 +2,13 @@
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Screenshot
 {
-    public class Screenshot
-    {
-        public static event EventHandler<FunctionEventArgs<ImageSource>> Snapped;
+    public static event EventHandler<FunctionEventArgs<ImageSource>> Snapped;
 
-        public void Start() => new ScreenshotWindow(this).Show();
+    public void Start() => new ScreenshotWindow(this).Show();
 
-        internal void OnSnapped(ImageSource source) => Snapped?.Invoke(this, new FunctionEventArgs<ImageSource>(source));
-    }
-}
+    internal void OnSnapped(ImageSource source) => Snapped?.Invoke(this, new FunctionEventArgs<ImageSource>(source));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
index d4d49101..ab3752e0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
@@ -12,712 +12,711 @@ using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementCanvas, Type = typeof(InkCanvas))]
+[TemplatePart(Name = ElementMaskAreaLeft, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementMaskAreaTop, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementMaskAreaRight, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementMaskAreaBottom, Type = typeof(FrameworkElement))]
+[TemplatePart(Name = ElementTargetArea, Type = typeof(InkCanvas))]
+[TemplatePart(Name = ElementMagnifier, Type = typeof(FrameworkElement))]
+public class ScreenshotWindow : System.Windows.Window
 {
-    [TemplatePart(Name = ElementCanvas, Type = typeof(InkCanvas))]
-    [TemplatePart(Name = ElementMaskAreaLeft, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementMaskAreaTop, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementMaskAreaRight, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementMaskAreaBottom, Type = typeof(FrameworkElement))]
-    [TemplatePart(Name = ElementTargetArea, Type = typeof(InkCanvas))]
-    [TemplatePart(Name = ElementMagnifier, Type = typeof(FrameworkElement))]
-    public class ScreenshotWindow : System.Windows.Window
+    #region fields
+
+    private readonly Screenshot _screenshot;
+
+    private VisualBrush _visualPreview;
+
+    private Size _viewboxSize;
+
+    private BitmapSource _imageSource;
+
+    private static readonly Guid BmpGuid = new("{b96b3cab-0728-11d3-9d7b-0000f81ef32e}");
+
+    #region const
+
+    private const int IntervalLength = 1;
+
+    private const int IntervalBigLength = 10;
+
+    private const int SnapLength = 4;
+
+    #endregion
+
+    #region IntPtr
+
+    private IntPtr _desktopWindowHandle;
+
+    private IntPtr _mouseOverWindowHandle;
+
+    private readonly IntPtr _screenshotWindowHandle;
+
+    #endregion
+
+    #region status
+
+    private InteropValues.RECT _desktopWindowRect;
+
+    private InteropValues.RECT _targetWindowRect;
+
+    private readonly int[] _flagArr = new int[4];
+
+    private bool _isOut;
+
+    private bool _canDrag;
+
+    private bool _receiveMoveMsg = true;
+
+    private Point _mousePointOld;
+
+    private Point _pointFixed;
+
+    private InteropValues.POINT _pointFloating;
+
+    private bool _saveScreenshot;
+
+    #endregion
+
+    #endregion
+
+    #region Elements
+
+    internal InkCanvas Canvas { get; set; }
+
+    internal FrameworkElement MaskAreaLeft { get; set; }
+
+    internal FrameworkElement MaskAreaTop { get; set; }
+
+    internal FrameworkElement MaskAreaRight { get; set; }
+
+    internal FrameworkElement MaskAreaBottom { get; set; }
+
+    internal FrameworkElement TargetArea { get; set; }
+
+    private FrameworkElement _magnifier;
+
+    #endregion
+
+    #region const
+
+    private const string ElementCanvas = "PART_Canvas";
+
+    private const string ElementMaskAreaLeft = "PART_MaskAreaLeft";
+
+    private const string ElementMaskAreaTop = "PART_MaskAreaTop";
+
+    private const string ElementMaskAreaRight = "PART_MaskAreaRight";
+
+    private const string ElementMaskAreaBottom = "PART_MaskAreaBottom";
+
+    private const string ElementTargetArea = "PART_TargetArea";
+
+    private const string ElementMagnifier = "PART_Magnifier";
+
+    #endregion
+
+    #region prop
+
+    public static readonly DependencyProperty IsDrawingProperty = DependencyProperty.Register(
+        "IsDrawing", typeof(bool), typeof(ScreenshotWindow), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsDrawing
     {
-        #region fields
+        get => (bool) GetValue(IsDrawingProperty);
+        internal set => SetValue(IsDrawingProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private readonly Screenshot _screenshot;
+    public static readonly DependencyProperty IsSelectingProperty = DependencyProperty.Register(
+        "IsSelecting", typeof(bool), typeof(ScreenshotWindow), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        private VisualBrush _visualPreview;
+    public bool IsSelecting
+    {
+        get => (bool) GetValue(IsSelectingProperty);
+        internal set => SetValue(IsSelectingProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private Size _viewboxSize;
+    public static readonly DependencyProperty SizeProperty = DependencyProperty.Register(
+        "Size", typeof(Size), typeof(ScreenshotWindow), new PropertyMetadata(default(Size)));
 
-        private BitmapSource _imageSource;
+    public Size Size
+    {
+        get => (Size) GetValue(SizeProperty);
+        internal set => SetValue(SizeProperty, value);
+    }
 
-        private static readonly Guid BmpGuid = new("{b96b3cab-0728-11d3-9d7b-0000f81ef32e}");
+    public static readonly DependencyProperty SizeStrProperty = DependencyProperty.Register(
+        "SizeStr", typeof(string), typeof(ScreenshotWindow), new PropertyMetadata(default(string)));
 
-        #region const
+    public string SizeStr
+    {
+        get => (string) GetValue(SizeStrProperty);
+        internal set => SetValue(SizeStrProperty, value);
+    }
 
-        private const int IntervalLength = 1;
+    public static readonly DependencyProperty PixelColorProperty = DependencyProperty.Register(
+        "PixelColor", typeof(Color), typeof(ScreenshotWindow), new PropertyMetadata(default(Color)));
 
-        private const int IntervalBigLength = 10;
+    public Color PixelColor
+    {
+        get => (Color) GetValue(PixelColorProperty);
+        internal set => SetValue(PixelColorProperty, value);
+    }
 
-        private const int SnapLength = 4;
+    public static readonly DependencyProperty PixelColorStrProperty = DependencyProperty.Register(
+        "PixelColorStr", typeof(string), typeof(ScreenshotWindow), new PropertyMetadata(default(string)));
 
-        #endregion
+    public string PixelColorStr
+    {
+        get => (string) GetValue(PixelColorStrProperty);
+        internal set => SetValue(PixelColorStrProperty, value);
+    }
 
-        #region IntPtr
+    public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
+        "PreviewBrush", typeof(Brush), typeof(ScreenshotWindow), new PropertyMetadata(default(Brush)));
 
-        private IntPtr _desktopWindowHandle;
+    public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
 
-        private IntPtr _mouseOverWindowHandle;
+    public Brush PreviewBrush
+    {
+        get => (Brush) GetValue(PreviewBrushProperty);
+        set => SetValue(PreviewBrushProperty, value);
+    }
 
-        private readonly IntPtr _screenshotWindowHandle;
+    #endregion
 
-        #endregion
+    public ScreenshotWindow(Screenshot screenshot)
+    {
+        Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.Window4ScreenshotStyle);
+        _screenshot = screenshot;
+        DataContext = this;
 
-        #region status
+        _screenshotWindowHandle = this.GetHandle();
+        InteropMethods.EnableWindow(_screenshotWindowHandle, false);
 
-        private InteropValues.RECT _desktopWindowRect;
+        Loaded += ScreenshotWindow_Loaded;
+        Closed += ScreenshotWindow_Closed;
+    }
 
-        private InteropValues.RECT _targetWindowRect;
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
 
-        private readonly int[] _flagArr = new int[4];
+        Canvas = GetTemplateChild(ElementCanvas) as InkCanvas;
+        MaskAreaLeft = GetTemplateChild(ElementMaskAreaLeft) as FrameworkElement;
+        MaskAreaTop = GetTemplateChild(ElementMaskAreaTop) as FrameworkElement;
+        MaskAreaRight = GetTemplateChild(ElementMaskAreaRight) as FrameworkElement;
+        MaskAreaBottom = GetTemplateChild(ElementMaskAreaBottom) as FrameworkElement;
+        TargetArea = GetTemplateChild(ElementTargetArea) as FrameworkElement;
+        _magnifier = GetTemplateChild(ElementMagnifier) as FrameworkElement;
 
-        private bool _isOut;
-
-        private bool _canDrag;
-
-        private bool _receiveMoveMsg = true;
-
-        private Point _mousePointOld;
-
-        private Point _pointFixed;
-
-        private InteropValues.POINT _pointFloating;
-
-        private bool _saveScreenshot;
-
-        #endregion
-
-        #endregion
-
-        #region Elements
-
-        internal InkCanvas Canvas { get; set; }
-
-        internal FrameworkElement MaskAreaLeft { get; set; }
-
-        internal FrameworkElement MaskAreaTop { get; set; }
-
-        internal FrameworkElement MaskAreaRight { get; set; }
-
-        internal FrameworkElement MaskAreaBottom { get; set; }
-
-        internal FrameworkElement TargetArea { get; set; }
-
-        private FrameworkElement _magnifier;
-
-        #endregion
-
-        #region const
-
-        private const string ElementCanvas = "PART_Canvas";
-
-        private const string ElementMaskAreaLeft = "PART_MaskAreaLeft";
-
-        private const string ElementMaskAreaTop = "PART_MaskAreaTop";
-
-        private const string ElementMaskAreaRight = "PART_MaskAreaRight";
-
-        private const string ElementMaskAreaBottom = "PART_MaskAreaBottom";
-
-        private const string ElementTargetArea = "PART_TargetArea";
-
-        private const string ElementMagnifier = "PART_Magnifier";
-
-        #endregion
-
-        #region prop
-
-        public static readonly DependencyProperty IsDrawingProperty = DependencyProperty.Register(
-            "IsDrawing", typeof(bool), typeof(ScreenshotWindow), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsDrawing
+        if (_magnifier != null)
         {
-            get => (bool) GetValue(IsDrawingProperty);
-            internal set => SetValue(IsDrawingProperty, ValueBoxes.BooleanBox(value));
+            _viewboxSize = new Size(29, 21);
         }
 
-        public static readonly DependencyProperty IsSelectingProperty = DependencyProperty.Register(
-            "IsSelecting", typeof(bool), typeof(ScreenshotWindow), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsSelecting
+        _visualPreview = new VisualBrush(Canvas)
         {
-            get => (bool) GetValue(IsSelectingProperty);
-            internal set => SetValue(IsSelectingProperty, ValueBoxes.BooleanBox(value));
-        }
+            ViewboxUnits = BrushMappingMode.Absolute
+        };
+        SetValue(PreviewBrushPropertyKey, _visualPreview);
+        _magnifier.Show();
+    }
 
-        public static readonly DependencyProperty SizeProperty = DependencyProperty.Register(
-            "Size", typeof(Size), typeof(ScreenshotWindow), new PropertyMetadata(default(Size)));
+    protected override void OnPreviewKeyDown(KeyEventArgs e)
+    {
+        if (e.Key == Key.Escape) Close();
 
-        public Size Size
+        if (IsDrawing)
         {
-            get => (Size) GetValue(SizeProperty);
-            internal set => SetValue(SizeProperty, value);
-        }
-
-        public static readonly DependencyProperty SizeStrProperty = DependencyProperty.Register(
-            "SizeStr", typeof(string), typeof(ScreenshotWindow), new PropertyMetadata(default(string)));
-
-        public string SizeStr
-        {
-            get => (string) GetValue(SizeStrProperty);
-            internal set => SetValue(SizeStrProperty, value);
-        }
-
-        public static readonly DependencyProperty PixelColorProperty = DependencyProperty.Register(
-            "PixelColor", typeof(Color), typeof(ScreenshotWindow), new PropertyMetadata(default(Color)));
-
-        public Color PixelColor
-        {
-            get => (Color) GetValue(PixelColorProperty);
-            internal set => SetValue(PixelColorProperty, value);
-        }
-
-        public static readonly DependencyProperty PixelColorStrProperty = DependencyProperty.Register(
-            "PixelColorStr", typeof(string), typeof(ScreenshotWindow), new PropertyMetadata(default(string)));
-
-        public string PixelColorStr
-        {
-            get => (string) GetValue(PixelColorStrProperty);
-            internal set => SetValue(PixelColorStrProperty, value);
-        }
-
-        public static readonly DependencyPropertyKey PreviewBrushPropertyKey = DependencyProperty.RegisterReadOnly(
-            "PreviewBrush", typeof(Brush), typeof(ScreenshotWindow), new PropertyMetadata(default(Brush)));
-
-        public static readonly DependencyProperty PreviewBrushProperty = PreviewBrushPropertyKey.DependencyProperty;
-
-        public Brush PreviewBrush
-        {
-            get => (Brush) GetValue(PreviewBrushProperty);
-            set => SetValue(PreviewBrushProperty, value);
-        }
-
-        #endregion
-
-        public ScreenshotWindow(Screenshot screenshot)
-        {
-            Style = ResourceHelper.GetResourceInternal<Style>(ResourceToken.Window4ScreenshotStyle);
-            _screenshot = screenshot;
-            DataContext = this;
-
-            _screenshotWindowHandle = this.GetHandle();
-            InteropMethods.EnableWindow(_screenshotWindowHandle, false);
-
-            Loaded += ScreenshotWindow_Loaded;
-            Closed += ScreenshotWindow_Closed;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            Canvas = GetTemplateChild(ElementCanvas) as InkCanvas;
-            MaskAreaLeft = GetTemplateChild(ElementMaskAreaLeft) as FrameworkElement;
-            MaskAreaTop = GetTemplateChild(ElementMaskAreaTop) as FrameworkElement;
-            MaskAreaRight = GetTemplateChild(ElementMaskAreaRight) as FrameworkElement;
-            MaskAreaBottom = GetTemplateChild(ElementMaskAreaBottom) as FrameworkElement;
-            TargetArea = GetTemplateChild(ElementTargetArea) as FrameworkElement;
-            _magnifier = GetTemplateChild(ElementMagnifier) as FrameworkElement;
-
-            if (_magnifier != null)
+            switch (e.Key)
             {
-                _viewboxSize = new Size(29, 21);
-            }
-
-            _visualPreview = new VisualBrush(Canvas)
-            {
-                ViewboxUnits = BrushMappingMode.Absolute
-            };
-            SetValue(PreviewBrushPropertyKey, _visualPreview);
-            _magnifier.Show();
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            if (e.Key == Key.Escape) Close();
-
-            if (IsDrawing)
-            {
-                switch (e.Key)
+                case Key.Left:
                 {
-                    case Key.Left:
-                        {
-                            MoveTargetArea(MoveRect(_targetWindowRect, -1, rightFlag: -1));
-                        }
-                        break;
-                    case Key.Up:
-                        {
-                            MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: -1, topFlag: -1));
-                        }
-                        break;
-                    case Key.Right:
-                        {
-                            MoveTargetArea(MoveRect(_targetWindowRect, 1, rightFlag: 1));
-                        }
-                        break;
-                    case Key.Down:
-                        {
-                            MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: 1, topFlag: 1));
-                        }
-                        break;
-                    case Key.Enter:
-                        _saveScreenshot = true;
-                        Close();
-                        break;
+                    MoveTargetArea(MoveRect(_targetWindowRect, -1, rightFlag: -1));
                 }
-            }
-        }
-
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e) => _mousePointOld = e.GetPosition(this);
-
-        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e) => _magnifier.Collapse();
-
-        protected override void OnPreviewMouseDoubleClick(MouseButtonEventArgs e)
-        {
-            _saveScreenshot = true;
-            Close();
-        }
-
-        protected override void OnPreviewMouseMove(MouseEventArgs e)
-        {
-            if (e.LeftButton != MouseButtonState.Pressed)
-            {
-                UpdateStatus(e.GetPosition(TargetArea));
-                return;
-            }
-
-            var newPoint = Mouse.GetPosition(this);
-            var offsetX = (int) (newPoint.X - _mousePointOld.X);
-            var offsetY = (int) (newPoint.Y - _mousePointOld.Y);
-
-            if (IsDrawing)
-            {
-                if (_isOut) return;
-                var rect = _targetWindowRect;
-
-                if (_canDrag)
+                    break;
+                case Key.Up:
                 {
-                    rect.Left += offsetX;
-                    rect.Top += offsetY;
-                    rect.Right += offsetX;
-                    rect.Bottom += offsetY;
+                    MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: -1, topFlag: -1));
                 }
-                else
+                    break;
+                case Key.Right:
                 {
-                    var magnifierPos = new InteropValues.POINT((int) newPoint.X, (int) newPoint.Y);
+                    MoveTargetArea(MoveRect(_targetWindowRect, 1, rightFlag: 1));
+                }
+                    break;
+                case Key.Down:
+                {
+                    MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: 1, topFlag: 1));
+                }
+                    break;
+                case Key.Enter:
+                    _saveScreenshot = true;
+                    Close();
+                    break;
+            }
+        }
+    }
 
-                    if (_flagArr[0] > 0)
-                    {
-                        _pointFloating.X += offsetX * _flagArr[0];
-                        magnifierPos.X = _pointFloating.X;
-                    }
-                    else if (_flagArr[2] > 0)
-                    {
-                        _pointFloating.X += offsetX * _flagArr[2];
-                        magnifierPos.X = _pointFloating.X - 1;
-                    }
+    protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e) => _mousePointOld = e.GetPosition(this);
 
-                    if (_flagArr[1] > 0)
-                    {
-                        _pointFloating.Y += offsetY * _flagArr[1];
-                        magnifierPos.Y = _pointFloating.Y;
-                    }
-                    else if (_flagArr[3] > 0)
-                    {
-                        _pointFloating.Y += offsetY * _flagArr[3];
-                        magnifierPos.Y = _pointFloating.Y - 1;
-                    }
+    protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e) => _magnifier.Collapse();
 
-                    rect.Left = (int) Math.Min(_pointFixed.X, _pointFloating.X);
-                    rect.Top = (int) Math.Min(_pointFixed.Y, _pointFloating.Y);
-                    rect.Right = (int) Math.Max(_pointFixed.X, _pointFloating.X);
-                    rect.Bottom = (int) Math.Max(_pointFixed.Y, _pointFloating.Y);
+    protected override void OnPreviewMouseDoubleClick(MouseButtonEventArgs e)
+    {
+        _saveScreenshot = true;
+        Close();
+    }
 
-                    _magnifier.Show();
-                    MoveMagnifier(magnifierPos);
+    protected override void OnPreviewMouseMove(MouseEventArgs e)
+    {
+        if (e.LeftButton != MouseButtonState.Pressed)
+        {
+            UpdateStatus(e.GetPosition(TargetArea));
+            return;
+        }
+
+        var newPoint = Mouse.GetPosition(this);
+        var offsetX = (int) (newPoint.X - _mousePointOld.X);
+        var offsetY = (int) (newPoint.Y - _mousePointOld.Y);
+
+        if (IsDrawing)
+        {
+            if (_isOut) return;
+            var rect = _targetWindowRect;
+
+            if (_canDrag)
+            {
+                rect.Left += offsetX;
+                rect.Top += offsetY;
+                rect.Right += offsetX;
+                rect.Bottom += offsetY;
+            }
+            else
+            {
+                var magnifierPos = new InteropValues.POINT((int) newPoint.X, (int) newPoint.Y);
+
+                if (_flagArr[0] > 0)
+                {
+                    _pointFloating.X += offsetX * _flagArr[0];
+                    magnifierPos.X = _pointFloating.X;
+                }
+                else if (_flagArr[2] > 0)
+                {
+                    _pointFloating.X += offsetX * _flagArr[2];
+                    magnifierPos.X = _pointFloating.X - 1;
                 }
 
-                MoveTargetArea(rect);
-                _mousePointOld = newPoint;
-            }
-            else if (IsSelecting)
-            {
-                var minX = (int) Math.Min(_mousePointOld.X, newPoint.X);
-                var maxX = (int) Math.Max(_mousePointOld.X, newPoint.X);
-                var minY = (int) Math.Min(_mousePointOld.Y, newPoint.Y);
-                var maxY = (int) Math.Max(_mousePointOld.Y, newPoint.Y);
-
-                MoveTargetArea(new InteropValues.RECT(minX, minY, maxX, maxY));
-            }
-            else if (!IsSelecting && offsetX > 0 && offsetY > 0)
-            {
-                IsSelecting = true;
-            }
-        }
-
-        private void ScreenshotWindow_Closed(object sender, EventArgs e)
-        {
-            if (_saveScreenshot)
-            {
-                SaveScreenshot();
-            }
-
-            StopHooks();
-            IsDrawing = false;
-
-            Loaded -= ScreenshotWindow_Loaded;
-            Closed -= ScreenshotWindow_Closed;
-        }
-
-        private void ScreenshotWindow_Loaded(object sender, RoutedEventArgs e)
-        {
-            _imageSource = GetDesktopSnapshot();
-            var image = new Image
-            {
-                Source = _imageSource
-            };
-            RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.NearestNeighbor);
-            Canvas.Children.Add(image);
-            StartHooks();
-            InteropMethods.GetCursorPos(out var point);
-            MoveElement(point);
-            MoveMagnifier(point);
-        }
-
-        private void UpdateStatus(Point point)
-        {
-            Cursor cursor;
-
-            var leftAbs = Math.Abs(point.X);
-            var topAbs = Math.Abs(point.Y);
-            var rightAbs = Math.Abs(point.X - _targetWindowRect.Width);
-            var downAbs = Math.Abs(point.Y - _targetWindowRect.Height);
-
-            _canDrag = false;
-            _isOut = false;
-            _flagArr[0] = 0;
-            _flagArr[1] = 0;
-            _flagArr[2] = 0;
-            _flagArr[3] = 0;
-
-            if (leftAbs <= SnapLength)
-            {
-                if (topAbs > SnapLength)
+                if (_flagArr[1] > 0)
                 {
-                    if (downAbs > SnapLength)
-                    {
-                        // left
-                        cursor = Cursors.SizeWE;
-                        _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Top);
-                        _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Bottom);
-                        _flagArr[0] = 1;
-                    }
-                    else
-                    {
-                        //left bottom
-                        cursor = Cursors.SizeNESW;
-                        _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Top);
-                        _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Bottom);
-                        _flagArr[0] = 1;
-                        _flagArr[3] = 1;
-                    }
+                    _pointFloating.Y += offsetY * _flagArr[1];
+                    magnifierPos.Y = _pointFloating.Y;
                 }
-                else
+                else if (_flagArr[3] > 0)
                 {
-                    // left top
-                    cursor = Cursors.SizeNWSE;
-                    _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Bottom);
-                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Top);
+                    _pointFloating.Y += offsetY * _flagArr[3];
+                    magnifierPos.Y = _pointFloating.Y - 1;
+                }
+
+                rect.Left = (int) Math.Min(_pointFixed.X, _pointFloating.X);
+                rect.Top = (int) Math.Min(_pointFixed.Y, _pointFloating.Y);
+                rect.Right = (int) Math.Max(_pointFixed.X, _pointFloating.X);
+                rect.Bottom = (int) Math.Max(_pointFixed.Y, _pointFloating.Y);
+
+                _magnifier.Show();
+                MoveMagnifier(magnifierPos);
+            }
+
+            MoveTargetArea(rect);
+            _mousePointOld = newPoint;
+        }
+        else if (IsSelecting)
+        {
+            var minX = (int) Math.Min(_mousePointOld.X, newPoint.X);
+            var maxX = (int) Math.Max(_mousePointOld.X, newPoint.X);
+            var minY = (int) Math.Min(_mousePointOld.Y, newPoint.Y);
+            var maxY = (int) Math.Max(_mousePointOld.Y, newPoint.Y);
+
+            MoveTargetArea(new InteropValues.RECT(minX, minY, maxX, maxY));
+        }
+        else if (!IsSelecting && offsetX > 0 && offsetY > 0)
+        {
+            IsSelecting = true;
+        }
+    }
+
+    private void ScreenshotWindow_Closed(object sender, EventArgs e)
+    {
+        if (_saveScreenshot)
+        {
+            SaveScreenshot();
+        }
+
+        StopHooks();
+        IsDrawing = false;
+
+        Loaded -= ScreenshotWindow_Loaded;
+        Closed -= ScreenshotWindow_Closed;
+    }
+
+    private void ScreenshotWindow_Loaded(object sender, RoutedEventArgs e)
+    {
+        _imageSource = GetDesktopSnapshot();
+        var image = new Image
+        {
+            Source = _imageSource
+        };
+        RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.NearestNeighbor);
+        Canvas.Children.Add(image);
+        StartHooks();
+        InteropMethods.GetCursorPos(out var point);
+        MoveElement(point);
+        MoveMagnifier(point);
+    }
+
+    private void UpdateStatus(Point point)
+    {
+        Cursor cursor;
+
+        var leftAbs = Math.Abs(point.X);
+        var topAbs = Math.Abs(point.Y);
+        var rightAbs = Math.Abs(point.X - _targetWindowRect.Width);
+        var downAbs = Math.Abs(point.Y - _targetWindowRect.Height);
+
+        _canDrag = false;
+        _isOut = false;
+        _flagArr[0] = 0;
+        _flagArr[1] = 0;
+        _flagArr[2] = 0;
+        _flagArr[3] = 0;
+
+        if (leftAbs <= SnapLength)
+        {
+            if (topAbs > SnapLength)
+            {
+                if (downAbs > SnapLength)
+                {
+                    // left
+                    cursor = Cursors.SizeWE;
+                    _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Top);
+                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Bottom);
                     _flagArr[0] = 1;
-                    _flagArr[1] = 1;
-                }
-            }
-            else if (rightAbs > SnapLength)
-            {
-                if (topAbs > SnapLength)
-                {
-                    if (downAbs > SnapLength)
-                    {
-                        if (TargetArea.IsMouseOver)
-                        {
-                            //drag
-                            cursor = Cursors.SizeAll;
-                            _canDrag = true;
-                        }
-                        else
-                        {
-                            //out
-                            cursor = Cursors.Arrow;
-                            _isOut = true;
-                        }
-                    }
-                    else
-                    {
-                        //bottom
-                        cursor = Cursors.SizeNS;
-                        _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Top);
-                        _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Bottom);
-                        _flagArr[3] = 1;
-                    }
                 }
                 else
                 {
-                    //top
-                    cursor = Cursors.SizeNS;
-                    _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Bottom);
-                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Top);
-                    _flagArr[1] = 1;
-                }
-            }
-            else if (rightAbs <= SnapLength)
-            {
-                if (topAbs > SnapLength)
-                {
-                    if (downAbs > SnapLength)
-                    {
-                        //right
-                        cursor = Cursors.SizeWE;
-                        _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Bottom);
-                        _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Top);
-                        _flagArr[2] = 1;
-                    }
-                    else
-                    {
-                        //right bottom
-                        cursor = Cursors.SizeNWSE;
-                        _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Top);
-                        _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Bottom);
-                        _flagArr[2] = 1;
-                        _flagArr[3] = 1;
-                    }
-                }
-                else
-                {
-                    // right top
+                    //left bottom
                     cursor = Cursors.SizeNESW;
-                    _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Bottom);
-                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Top);
-                    _flagArr[1] = 1;
-                    _flagArr[2] = 1;
+                    _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Top);
+                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Bottom);
+                    _flagArr[0] = 1;
+                    _flagArr[3] = 1;
                 }
             }
             else
             {
-                //out
-                cursor = Cursors.Arrow;
-                _isOut = true;
-            }
-
-            TargetArea.Cursor = cursor;
-        }
-
-        private void StopHooks()
-        {
-            MouseHook.Stop();
-            MouseHook.StatusChanged -= MouseHook_StatusChanged;
-        }
-
-        private void StartHooks()
-        {
-            MouseHook.Start();
-            MouseHook.StatusChanged += MouseHook_StatusChanged;
-        }
-
-        private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
-        {
-            switch (e.MessageType)
-            {
-                case MouseHookMessageType.MouseMove:
-                    MoveElement(e.Point);
-                    MoveMagnifier(e.Point);
-                    break;
-                case MouseHookMessageType.LeftButtonDown:
-                    _receiveMoveMsg = false;
-                    _mousePointOld = new Point(e.Point.X, e.Point.Y);
-                    InteropMethods.EnableWindow(_screenshotWindowHandle, true);
-                    break;
-                case MouseHookMessageType.RightButtonDown:
-                    if (!IsDrawing) Close();
-                    break;
-                case MouseHookMessageType.LeftButtonUp:
-                    StopHooks();
-                    IsSelecting = false;
-                    IsDrawing = true;
-                    _magnifier.Collapse();
-                    break;
+                // left top
+                cursor = Cursors.SizeNWSE;
+                _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Bottom);
+                _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Top);
+                _flagArr[0] = 1;
+                _flagArr[1] = 1;
             }
         }
-
-        private void SaveScreenshot()
+        else if (rightAbs > SnapLength)
         {
-            var cb = new CroppedBitmap(_imageSource, new Int32Rect(_targetWindowRect.Left, _targetWindowRect.Top, _targetWindowRect.Width, _targetWindowRect.Height));
-            _screenshot.OnSnapped(cb);
-
-            Close();
-        }
-
-        private BitmapSource GetDesktopSnapshot()
-        {
-            _desktopWindowHandle = InteropMethods.GetDesktopWindow();
-            var hdcSrc = InteropMethods.GetWindowDC(_desktopWindowHandle);
-            var hdcDest = InteropMethods.CreateCompatibleDC(hdcSrc);
-
-            InteropMethods.GetWindowRect(_desktopWindowHandle, out _desktopWindowRect);
-            var desktopWindowWidth = _desktopWindowRect.Right - _desktopWindowRect.Left;
-            var desktopWindowHeight = _desktopWindowRect.Bottom - _desktopWindowRect.Top;
-
-            var hbitmap = InteropMethods.CreateCompatibleBitmap(hdcSrc, desktopWindowWidth, desktopWindowHeight);
-            var hOld = InteropMethods.SelectObject(hdcDest, hbitmap);
-            InteropMethods.BitBlt(hdcDest, 0, 0, desktopWindowWidth, desktopWindowHeight, hdcSrc, 0, 0, InteropValues.SRCCOPY);
-            InteropMethods.SelectObject(hdcDest, hOld);
-            InteropMethods.DeleteDC(hdcDest);
-            InteropMethods.ReleaseDC(_desktopWindowHandle, hdcSrc);
-
-            var status = InteropMethods.Gdip.GdipCreateBitmapFromHBITMAP(new HandleRef(null, hbitmap), new HandleRef(null, IntPtr.Zero), out var bitmap);
-            if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
-
-            using var ms = new MemoryStream();
-            status = InteropMethods.Gdip.GdipGetImageEncodersSize(out var numEncoders, out var size);
-            if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
-
-            var memory = Marshal.AllocHGlobal(size);
-            try
+            if (topAbs > SnapLength)
             {
-                status = InteropMethods.Gdip.GdipGetImageEncoders(numEncoders, size, memory);
-                if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
-
-                var codecInfo = ImageCodecInfo.ConvertFromMemory(memory, numEncoders).FirstOrDefault(item => item.FormatID.Equals(BmpGuid));
-                if (codecInfo == null) throw new Exception("ImageCodecInfo is null");
-
-                var encoderParamsMemory = IntPtr.Zero;
-
-                try
+                if (downAbs > SnapLength)
                 {
-                    var g = codecInfo.Clsid;
-                    status = InteropMethods.Gdip.GdipSaveImageToStream(new HandleRef(this, bitmap),
-                        new InteropValues.ComStreamFromDataStream(ms), ref g,
-                        new HandleRef(null, encoderParamsMemory));
-                }
-                finally
-                {
-                    if (encoderParamsMemory != IntPtr.Zero)
+                    if (TargetArea.IsMouseOver)
                     {
-                        Marshal.FreeHGlobal(encoderParamsMemory);
+                        //drag
+                        cursor = Cursors.SizeAll;
+                        _canDrag = true;
+                    }
+                    else
+                    {
+                        //out
+                        cursor = Cursors.Arrow;
+                        _isOut = true;
                     }
                 }
-
-                if (status != InteropMethods.Gdip.Ok)
+                else
                 {
-                    throw InteropMethods.Gdip.StatusException(status);
+                    //bottom
+                    cursor = Cursors.SizeNS;
+                    _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Top);
+                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Bottom);
+                    _flagArr[3] = 1;
                 }
             }
+            else
+            {
+                //top
+                cursor = Cursors.SizeNS;
+                _pointFixed = new Point(_targetWindowRect.Right, _targetWindowRect.Bottom);
+                _pointFloating = new InteropValues.POINT(_targetWindowRect.Left, _targetWindowRect.Top);
+                _flagArr[1] = 1;
+            }
+        }
+        else if (rightAbs <= SnapLength)
+        {
+            if (topAbs > SnapLength)
+            {
+                if (downAbs > SnapLength)
+                {
+                    //right
+                    cursor = Cursors.SizeWE;
+                    _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Bottom);
+                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Top);
+                    _flagArr[2] = 1;
+                }
+                else
+                {
+                    //right bottom
+                    cursor = Cursors.SizeNWSE;
+                    _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Top);
+                    _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Bottom);
+                    _flagArr[2] = 1;
+                    _flagArr[3] = 1;
+                }
+            }
+            else
+            {
+                // right top
+                cursor = Cursors.SizeNESW;
+                _pointFixed = new Point(_targetWindowRect.Left, _targetWindowRect.Bottom);
+                _pointFloating = new InteropValues.POINT(_targetWindowRect.Right, _targetWindowRect.Top);
+                _flagArr[1] = 1;
+                _flagArr[2] = 1;
+            }
+        }
+        else
+        {
+            //out
+            cursor = Cursors.Arrow;
+            _isOut = true;
+        }
+
+        TargetArea.Cursor = cursor;
+    }
+
+    private void StopHooks()
+    {
+        MouseHook.Stop();
+        MouseHook.StatusChanged -= MouseHook_StatusChanged;
+    }
+
+    private void StartHooks()
+    {
+        MouseHook.Start();
+        MouseHook.StatusChanged += MouseHook_StatusChanged;
+    }
+
+    private void MouseHook_StatusChanged(object sender, MouseHookEventArgs e)
+    {
+        switch (e.MessageType)
+        {
+            case MouseHookMessageType.MouseMove:
+                MoveElement(e.Point);
+                MoveMagnifier(e.Point);
+                break;
+            case MouseHookMessageType.LeftButtonDown:
+                _receiveMoveMsg = false;
+                _mousePointOld = new Point(e.Point.X, e.Point.Y);
+                InteropMethods.EnableWindow(_screenshotWindowHandle, true);
+                break;
+            case MouseHookMessageType.RightButtonDown:
+                if (!IsDrawing) Close();
+                break;
+            case MouseHookMessageType.LeftButtonUp:
+                StopHooks();
+                IsSelecting = false;
+                IsDrawing = true;
+                _magnifier.Collapse();
+                break;
+        }
+    }
+
+    private void SaveScreenshot()
+    {
+        var cb = new CroppedBitmap(_imageSource, new Int32Rect(_targetWindowRect.Left, _targetWindowRect.Top, _targetWindowRect.Width, _targetWindowRect.Height));
+        _screenshot.OnSnapped(cb);
+
+        Close();
+    }
+
+    private BitmapSource GetDesktopSnapshot()
+    {
+        _desktopWindowHandle = InteropMethods.GetDesktopWindow();
+        var hdcSrc = InteropMethods.GetWindowDC(_desktopWindowHandle);
+        var hdcDest = InteropMethods.CreateCompatibleDC(hdcSrc);
+
+        InteropMethods.GetWindowRect(_desktopWindowHandle, out _desktopWindowRect);
+        var desktopWindowWidth = _desktopWindowRect.Right - _desktopWindowRect.Left;
+        var desktopWindowHeight = _desktopWindowRect.Bottom - _desktopWindowRect.Top;
+
+        var hbitmap = InteropMethods.CreateCompatibleBitmap(hdcSrc, desktopWindowWidth, desktopWindowHeight);
+        var hOld = InteropMethods.SelectObject(hdcDest, hbitmap);
+        InteropMethods.BitBlt(hdcDest, 0, 0, desktopWindowWidth, desktopWindowHeight, hdcSrc, 0, 0, InteropValues.SRCCOPY);
+        InteropMethods.SelectObject(hdcDest, hOld);
+        InteropMethods.DeleteDC(hdcDest);
+        InteropMethods.ReleaseDC(_desktopWindowHandle, hdcSrc);
+
+        var status = InteropMethods.Gdip.GdipCreateBitmapFromHBITMAP(new HandleRef(null, hbitmap), new HandleRef(null, IntPtr.Zero), out var bitmap);
+        if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
+
+        using var ms = new MemoryStream();
+        status = InteropMethods.Gdip.GdipGetImageEncodersSize(out var numEncoders, out var size);
+        if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
+
+        var memory = Marshal.AllocHGlobal(size);
+        try
+        {
+            status = InteropMethods.Gdip.GdipGetImageEncoders(numEncoders, size, memory);
+            if (status != InteropMethods.Gdip.Ok) throw InteropMethods.Gdip.StatusException(status);
+
+            var codecInfo = ImageCodecInfo.ConvertFromMemory(memory, numEncoders).FirstOrDefault(item => item.FormatID.Equals(BmpGuid));
+            if (codecInfo == null) throw new Exception("ImageCodecInfo is null");
+
+            var encoderParamsMemory = IntPtr.Zero;
+
+            try
+            {
+                var g = codecInfo.Clsid;
+                status = InteropMethods.Gdip.GdipSaveImageToStream(new HandleRef(this, bitmap),
+                    new InteropValues.ComStreamFromDataStream(ms), ref g,
+                    new HandleRef(null, encoderParamsMemory));
+            }
             finally
             {
-                Marshal.FreeHGlobal(memory);
-            }
-
-            var bitmapImage = new BitmapImage();
-            bitmapImage.BeginInit();
-            bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-            bitmapImage.StreamSource = ms;
-            bitmapImage.EndInit();
-            bitmapImage.Freeze();
-            return bitmapImage;
-        }
-
-        private void MoveElement(InteropValues.POINT point)
-        {
-            if (!_receiveMoveMsg) return;
-
-            var mouseOverWindowHandle = InteropMethods.ChildWindowFromPointEx(_desktopWindowHandle,
-                new InteropValues.POINT
+                if (encoderParamsMemory != IntPtr.Zero)
                 {
-                    X = point.X,
-                    Y = point.Y
-                }, 1 | 2);
+                    Marshal.FreeHGlobal(encoderParamsMemory);
+                }
+            }
 
-            if (mouseOverWindowHandle != _mouseOverWindowHandle && mouseOverWindowHandle != IntPtr.Zero)
+            if (status != InteropMethods.Gdip.Ok)
             {
-                _mouseOverWindowHandle = mouseOverWindowHandle;
-
-                InteropMethods.GetWindowRect(_mouseOverWindowHandle, out var windowRect);
-                MoveTargetArea(windowRect);
+                throw InteropMethods.Gdip.StatusException(status);
             }
         }
-
-        private static InteropValues.RECT MoveRect(InteropValues.RECT rect, int leftFlag = 0, int topFlag = 0, int rightFlag = 0, int bottomFlag = 0)
+        finally
         {
-            var moveLength = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)
-                ? IntervalBigLength
-                : IntervalLength;
-
-            rect.Left += leftFlag * moveLength;
-            rect.Top += topFlag * moveLength;
-            rect.Right += rightFlag * moveLength;
-            rect.Bottom += bottomFlag * moveLength;
-
-            return rect;
+            Marshal.FreeHGlobal(memory);
         }
 
-        private void MoveTargetArea(InteropValues.RECT rect)
+        var bitmapImage = new BitmapImage();
+        bitmapImage.BeginInit();
+        bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
+        bitmapImage.StreamSource = ms;
+        bitmapImage.EndInit();
+        bitmapImage.Freeze();
+        return bitmapImage;
+    }
+
+    private void MoveElement(InteropValues.POINT point)
+    {
+        if (!_receiveMoveMsg) return;
+
+        var mouseOverWindowHandle = InteropMethods.ChildWindowFromPointEx(_desktopWindowHandle,
+            new InteropValues.POINT
+            {
+                X = point.X,
+                Y = point.Y
+            }, 1 | 2);
+
+        if (mouseOverWindowHandle != _mouseOverWindowHandle && mouseOverWindowHandle != IntPtr.Zero)
         {
-            if (rect.Left < 0)
-            {
-                rect.Right -= rect.Left;
-                rect.Left = 0;
-            }
+            _mouseOverWindowHandle = mouseOverWindowHandle;
 
-            if (rect.Top < 0)
-            {
-                rect.Bottom -= rect.Top;
-                rect.Top = 0;
-            }
-
-            if (rect.Right > _desktopWindowRect.Width)
-            {
-                rect.Left -= rect.Right - _desktopWindowRect.Width;
-                rect.Right = _desktopWindowRect.Width;
-            }
-
-            if (rect.Bottom > _desktopWindowRect.Height)
-            {
-                rect.Top -= rect.Bottom - _desktopWindowRect.Height;
-                rect.Bottom = _desktopWindowRect.Height;
-            }
-
-            rect.Left = Math.Max(0, rect.Left);
-            rect.Top = Math.Max(0, rect.Top);
-
-            var width = rect.Width;
-            var height = rect.Height;
-            var left = rect.Left;
-            var top = rect.Top;
-
-            TargetArea.Width = width;
-            TargetArea.Height = height;
-            TargetArea.Margin = new Thickness(left, top, 0, 0);
-
-            _targetWindowRect = new InteropValues.RECT(left, top, left + width, top + height);
-            Size = _targetWindowRect.Size;
-            SizeStr = $"{_targetWindowRect.Width} x {_targetWindowRect.Height}";
-
-            MoveMaskArea();
-        }
-
-        private void MoveMaskArea()
-        {
-            MaskAreaLeft.Width = TargetArea.Margin.Left;
-            MaskAreaLeft.Height = _desktopWindowRect.Height;
-
-            MaskAreaTop.Margin = new Thickness(TargetArea.Margin.Left, 0, 0, 0);
-            MaskAreaTop.Width = TargetArea.Width;
-            MaskAreaTop.Height = TargetArea.Margin.Top;
-
-            MaskAreaRight.Margin = new Thickness(TargetArea.Width + TargetArea.Margin.Left, 0, 0, 0);
-            MaskAreaRight.Width = _desktopWindowRect.Width - TargetArea.Margin.Left - TargetArea.Width;
-            MaskAreaRight.Height = _desktopWindowRect.Height;
-
-            MaskAreaBottom.Margin = new Thickness(TargetArea.Margin.Left, TargetArea.Height + TargetArea.Margin.Top, 0, 0);
-            MaskAreaBottom.Width = TargetArea.Width;
-            MaskAreaBottom.Height = _desktopWindowRect.Height - TargetArea.Height - TargetArea.Margin.Top;
-        }
-
-        private void MoveMagnifier(InteropValues.POINT point)
-        {
-            _magnifier.Margin = new Thickness(point.X + 4, point.Y + 26, 0, 0);
-            _visualPreview.Viewbox = new Rect(new Point(point.X - _viewboxSize.Width / 2 + 0.5, point.Y - _viewboxSize.Height / 2 + 0.5), _viewboxSize);
+            InteropMethods.GetWindowRect(_mouseOverWindowHandle, out var windowRect);
+            MoveTargetArea(windowRect);
         }
     }
-}
+
+    private static InteropValues.RECT MoveRect(InteropValues.RECT rect, int leftFlag = 0, int topFlag = 0, int rightFlag = 0, int bottomFlag = 0)
+    {
+        var moveLength = Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl)
+            ? IntervalBigLength
+            : IntervalLength;
+
+        rect.Left += leftFlag * moveLength;
+        rect.Top += topFlag * moveLength;
+        rect.Right += rightFlag * moveLength;
+        rect.Bottom += bottomFlag * moveLength;
+
+        return rect;
+    }
+
+    private void MoveTargetArea(InteropValues.RECT rect)
+    {
+        if (rect.Left < 0)
+        {
+            rect.Right -= rect.Left;
+            rect.Left = 0;
+        }
+
+        if (rect.Top < 0)
+        {
+            rect.Bottom -= rect.Top;
+            rect.Top = 0;
+        }
+
+        if (rect.Right > _desktopWindowRect.Width)
+        {
+            rect.Left -= rect.Right - _desktopWindowRect.Width;
+            rect.Right = _desktopWindowRect.Width;
+        }
+
+        if (rect.Bottom > _desktopWindowRect.Height)
+        {
+            rect.Top -= rect.Bottom - _desktopWindowRect.Height;
+            rect.Bottom = _desktopWindowRect.Height;
+        }
+
+        rect.Left = Math.Max(0, rect.Left);
+        rect.Top = Math.Max(0, rect.Top);
+
+        var width = rect.Width;
+        var height = rect.Height;
+        var left = rect.Left;
+        var top = rect.Top;
+
+        TargetArea.Width = width;
+        TargetArea.Height = height;
+        TargetArea.Margin = new Thickness(left, top, 0, 0);
+
+        _targetWindowRect = new InteropValues.RECT(left, top, left + width, top + height);
+        Size = _targetWindowRect.Size;
+        SizeStr = $"{_targetWindowRect.Width} x {_targetWindowRect.Height}";
+
+        MoveMaskArea();
+    }
+
+    private void MoveMaskArea()
+    {
+        MaskAreaLeft.Width = TargetArea.Margin.Left;
+        MaskAreaLeft.Height = _desktopWindowRect.Height;
+
+        MaskAreaTop.Margin = new Thickness(TargetArea.Margin.Left, 0, 0, 0);
+        MaskAreaTop.Width = TargetArea.Width;
+        MaskAreaTop.Height = TargetArea.Margin.Top;
+
+        MaskAreaRight.Margin = new Thickness(TargetArea.Width + TargetArea.Margin.Left, 0, 0, 0);
+        MaskAreaRight.Width = _desktopWindowRect.Width - TargetArea.Margin.Left - TargetArea.Width;
+        MaskAreaRight.Height = _desktopWindowRect.Height;
+
+        MaskAreaBottom.Margin = new Thickness(TargetArea.Margin.Left, TargetArea.Height + TargetArea.Margin.Top, 0, 0);
+        MaskAreaBottom.Width = TargetArea.Width;
+        MaskAreaBottom.Height = _desktopWindowRect.Height - TargetArea.Height - TargetArea.Margin.Top;
+    }
+
+    private void MoveMagnifier(InteropValues.POINT point)
+    {
+        _magnifier.Margin = new Thickness(point.X + 4, point.Y + 26, 0, 0);
+        _visualPreview.Viewbox = new Rect(new Point(point.X - _viewboxSize.Width / 2 + 0.5, point.Y - _viewboxSize.Height / 2 + 0.5), _viewboxSize);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
index 264e57f2..c302451a 100644
--- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
@@ -3,257 +3,256 @@ using System.Linq;
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SideMenu : HeaderedSimpleItemsControl
 {
-    public class SideMenu : HeaderedSimpleItemsControl
+    private SideMenuItem _selectedItem;
+
+    private SideMenuItem _selectedHeader;
+
+    private bool _isItemSelected;
+
+    public SideMenu()
     {
-        private SideMenuItem _selectedItem;
+        AddHandler(SideMenuItem.SelectedEvent, new RoutedEventHandler(SideMenuItemSelected));
 
-        private SideMenuItem _selectedHeader;
+        Loaded += (s, e) => Init();
+    }
 
-        private bool _isItemSelected;
+    protected override void Refresh()
+    {
+        base.Refresh();
 
-        public SideMenu()
+        Init();
+    }
+
+    private void Init()
+    {
+        if (ItemsHost == null) return;
+
+        OnExpandModeChanged(ExpandMode);
+    }
+
+    private void SideMenuItemSelected(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is SideMenuItem item)
         {
-            AddHandler(SideMenuItem.SelectedEvent, new RoutedEventHandler(SideMenuItemSelected));
-
-            Loaded += (s, e) => Init();
-        }
-
-        protected override void Refresh()
-        {
-            base.Refresh();
-
-            Init();
-        }
-
-        private void Init()
-        {
-            if (ItemsHost == null) return;
-
-            OnExpandModeChanged(ExpandMode);
-        }
-
-        private void SideMenuItemSelected(object sender, RoutedEventArgs e)
-        {
-            if (e.OriginalSource is SideMenuItem item)
+            if (item.Role == SideMenuItemRole.Item)
             {
-                if (item.Role == SideMenuItemRole.Item)
+                _isItemSelected = true;
+
+                if (Equals(item, _selectedItem)) return;
+
+                if (_selectedItem != null)
                 {
-                    _isItemSelected = true;
+                    _selectedItem.IsSelected = false;
+                }
 
-                    if (Equals(item, _selectedItem)) return;
-
-                    if (_selectedItem != null)
+                _selectedItem = item;
+                _selectedItem.IsSelected = true;
+                RaiseEvent(new FunctionEventArgs<object>(SelectionChangedEvent, this)
+                {
+                    Info = e.OriginalSource
+                });
+            }
+            else
+            {
+                if (!Equals(item, _selectedHeader))
+                {
+                    if (_selectedHeader != null)
                     {
-                        _selectedItem.IsSelected = false;
+                        if (ExpandMode == ExpandMode.Freedom && item.ItemsHost.IsVisible && !_isItemSelected)
+                        {
+                            item.IsSelected = false;
+                            SwitchPanelArea(item);
+                            return;
+                        }
+
+                        _selectedHeader.IsSelected = false;
+                        if (ExpandMode != ExpandMode.Freedom)
+                        {
+                            SwitchPanelArea(_selectedHeader);
+                        }
                     }
 
-                    _selectedItem = item;
-                    _selectedItem.IsSelected = true;
+                    _selectedHeader = item;
+                    _selectedHeader.IsSelected = true;
+                    SwitchPanelArea(_selectedHeader);
+                }
+                else if (ExpandMode == ExpandMode.Freedom && !_isItemSelected)
+                {
+                    _selectedHeader.IsSelected = false;
+                    SwitchPanelArea(_selectedHeader);
+                    _selectedHeader = null;
+                }
+
+                if (_isItemSelected)
+                {
+                    _isItemSelected = false;
+                }
+                else if (_selectedHeader != null)
+                {
+                    if (AutoSelect)
+                    {
+                        if (_selectedItem != null)
+                        {
+                            _selectedItem.IsSelected = false;
+                            _selectedItem = null;
+                        }
+
+                        _selectedHeader.SelectDefaultItem();
+                    }
+                    _isItemSelected = false;
+                }
+
+                if (!item.HasItems)
+                {
                     RaiseEvent(new FunctionEventArgs<object>(SelectionChangedEvent, this)
                     {
                         Info = e.OriginalSource
                     });
                 }
-                else
+            }
+        }
+    }
+
+    private void SwitchPanelArea(SideMenuItem oldItem)
+    {
+        switch (ExpandMode)
+        {
+            case ExpandMode.ShowAll:
+                return;
+            case ExpandMode.ShowOne:
+            case ExpandMode.Freedom:
+            case ExpandMode.Accordion:
+                oldItem.SwitchPanelArea(oldItem.IsSelected);
+                break;
+        }
+    }
+
+    protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
+
+    public static readonly DependencyProperty AutoSelectProperty = DependencyProperty.Register(
+        "AutoSelect", typeof(bool), typeof(SideMenu), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool AutoSelect
+    {
+        get => (bool) GetValue(AutoSelectProperty);
+        set => SetValue(AutoSelectProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register(
+        "ExpandMode", typeof(ExpandMode), typeof(SideMenu), new PropertyMetadata(default(ExpandMode), OnExpandModeChanged));
+
+    private static void OnExpandModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (SideMenu) d;
+        var v = (ExpandMode) e.NewValue;
+
+        if (ctl.ItemsHost == null)
+        {
+            return;
+        }
+
+        ctl.OnExpandModeChanged(v);
+    }
+
+    private void OnExpandModeChanged(ExpandMode mode)
+    {
+        if (mode == ExpandMode.ShowAll)
+        {
+            ShowAll();
+        }
+        else if (mode == ExpandMode.ShowOne)
+        {
+            SideMenuItem sideMenuItemSelected = null;
+            foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
+            {
+                if (sideMenuItemSelected != null)
                 {
-                    if (!Equals(item, _selectedHeader))
+                    sideMenuItem.IsSelected = false;
+                    if (sideMenuItem.ItemsHost != null)
                     {
-                        if (_selectedHeader != null)
+                        foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
                         {
-                            if (ExpandMode == ExpandMode.Freedom && item.ItemsHost.IsVisible && !_isItemSelected)
-                            {
-                                item.IsSelected = false;
-                                SwitchPanelArea(item);
-                                return;
-                            }
-
-                            _selectedHeader.IsSelected = false;
-                            if (ExpandMode != ExpandMode.Freedom)
-                            {
-                                SwitchPanelArea(_selectedHeader);
-                            }
+                            sideMenuSubItem.IsSelected = false;
                         }
-
-                        _selectedHeader = item;
-                        _selectedHeader.IsSelected = true;
-                        SwitchPanelArea(_selectedHeader);
                     }
-                    else if (ExpandMode == ExpandMode.Freedom && !_isItemSelected)
+                }
+                else if (sideMenuItem.IsSelected)
+                {
+                    switch (sideMenuItem.Role)
                     {
-                        _selectedHeader.IsSelected = false;
-                        SwitchPanelArea(_selectedHeader);
-                        _selectedHeader = null;
+                        case SideMenuItemRole.Header:
+                            _selectedHeader = sideMenuItem;
+                            break;
+                        case SideMenuItemRole.Item:
+                            _selectedItem = sideMenuItem;
+                            break;
                     }
 
-                    if (_isItemSelected)
+                    ShowSelectedOne(sideMenuItem);
+                    sideMenuItemSelected = sideMenuItem;
+
+                    if (sideMenuItem.ItemsHost != null)
                     {
-                        _isItemSelected = false;
-                    }
-                    else if (_selectedHeader != null)
-                    {
-                        if (AutoSelect)
+                        foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
                         {
                             if (_selectedItem != null)
-                            {
-                                _selectedItem.IsSelected = false;
-                                _selectedItem = null;
-                            }
-
-                            _selectedHeader.SelectDefaultItem();
-                        }
-                        _isItemSelected = false;
-                    }
-
-                    if (!item.HasItems)
-                    {
-                        RaiseEvent(new FunctionEventArgs<object>(SelectionChangedEvent, this)
-                        {
-                            Info = e.OriginalSource
-                        });
-                    }
-                }
-            }
-        }
-
-        private void SwitchPanelArea(SideMenuItem oldItem)
-        {
-            switch (ExpandMode)
-            {
-                case ExpandMode.ShowAll:
-                    return;
-                case ExpandMode.ShowOne:
-                case ExpandMode.Freedom:
-                case ExpandMode.Accordion:
-                    oldItem.SwitchPanelArea(oldItem.IsSelected);
-                    break;
-            }
-        }
-
-        protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
-
-        public static readonly DependencyProperty AutoSelectProperty = DependencyProperty.Register(
-            "AutoSelect", typeof(bool), typeof(SideMenu), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool AutoSelect
-        {
-            get => (bool) GetValue(AutoSelectProperty);
-            set => SetValue(AutoSelectProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ExpandModeProperty = DependencyProperty.Register(
-            "ExpandMode", typeof(ExpandMode), typeof(SideMenu), new PropertyMetadata(default(ExpandMode), OnExpandModeChanged));
-
-        private static void OnExpandModeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (SideMenu) d;
-            var v = (ExpandMode) e.NewValue;
-
-            if (ctl.ItemsHost == null)
-            {
-                return;
-            }
-
-            ctl.OnExpandModeChanged(v);
-        }
-
-        private void OnExpandModeChanged(ExpandMode mode)
-        {
-            if (mode == ExpandMode.ShowAll)
-            {
-                ShowAll();
-            }
-            else if (mode == ExpandMode.ShowOne)
-            {
-                SideMenuItem sideMenuItemSelected = null;
-                foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
-                {
-                    if (sideMenuItemSelected != null)
-                    {
-                        sideMenuItem.IsSelected = false;
-                        if (sideMenuItem.ItemsHost != null)
-                        {
-                            foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
                             {
                                 sideMenuSubItem.IsSelected = false;
                             }
-                        }
-                    }
-                    else if (sideMenuItem.IsSelected)
-                    {
-                        switch (sideMenuItem.Role)
-                        {
-                            case SideMenuItemRole.Header:
-                                _selectedHeader = sideMenuItem;
-                                break;
-                            case SideMenuItemRole.Item:
-                                _selectedItem = sideMenuItem;
-                                break;
-                        }
-
-                        ShowSelectedOne(sideMenuItem);
-                        sideMenuItemSelected = sideMenuItem;
-
-                        if (sideMenuItem.ItemsHost != null)
-                        {
-                            foreach (var sideMenuSubItem in sideMenuItem.ItemsHost.Children.OfType<SideMenuItem>())
+                            else if (sideMenuSubItem.IsSelected)
                             {
-                                if (_selectedItem != null)
-                                {
-                                    sideMenuSubItem.IsSelected = false;
-                                }
-                                else if (sideMenuSubItem.IsSelected)
-                                {
-                                    _selectedItem = sideMenuSubItem;
-                                }
+                                _selectedItem = sideMenuSubItem;
                             }
                         }
                     }
                 }
             }
         }
+    }
 
-        public ExpandMode ExpandMode
+    public ExpandMode ExpandMode
+    {
+        get => (ExpandMode) GetValue(ExpandModeProperty);
+        set => SetValue(ExpandModeProperty, value);
+    }
+
+    public static readonly DependencyProperty PanelAreaLengthProperty = DependencyProperty.Register(
+        "PanelAreaLength", typeof(double), typeof(SideMenu), new PropertyMetadata(double.NaN));
+
+    public double PanelAreaLength
+    {
+        get => (double) GetValue(PanelAreaLengthProperty);
+        set => SetValue(PanelAreaLengthProperty, value);
+    }
+
+    private void ShowAll()
+    {
+        foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
         {
-            get => (ExpandMode) GetValue(ExpandModeProperty);
-            set => SetValue(ExpandModeProperty, value);
-        }
-
-        public static readonly DependencyProperty PanelAreaLengthProperty = DependencyProperty.Register(
-            "PanelAreaLength", typeof(double), typeof(SideMenu), new PropertyMetadata(double.NaN));
-
-        public double PanelAreaLength
-        {
-            get => (double) GetValue(PanelAreaLengthProperty);
-            set => SetValue(PanelAreaLengthProperty, value);
-        }
-
-        private void ShowAll()
-        {
-            foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
-            {
-                sideMenuItem.SwitchPanelArea(true);
-            }
-        }
-
-        private void ShowSelectedOne(SideMenuItem item)
-        {
-            foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
-            {
-                sideMenuItem.SwitchPanelArea(Equals(sideMenuItem, item));
-            }
-        }
-
-        public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(
-            "SelectionChanged", RoutingStrategy.Bubble, typeof(EventHandler<FunctionEventArgs<object>>), typeof(SideMenu));
-
-        public event EventHandler<FunctionEventArgs<object>> SelectionChanged
-        {
-            add => AddHandler(SelectionChangedEvent, value);
-            remove => RemoveHandler(SelectionChangedEvent, value);
+            sideMenuItem.SwitchPanelArea(true);
         }
     }
-}
+
+    private void ShowSelectedOne(SideMenuItem item)
+    {
+        foreach (var sideMenuItem in ItemsHost.Children.OfType<SideMenuItem>())
+        {
+            sideMenuItem.SwitchPanelArea(Equals(sideMenuItem, item));
+        }
+    }
+
+    public static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(
+        "SelectionChanged", RoutingStrategy.Bubble, typeof(EventHandler<FunctionEventArgs<object>>), typeof(SideMenu));
+
+    public event EventHandler<FunctionEventArgs<object>> SelectionChanged
+    {
+        add => AddHandler(SelectionChangedEvent, value);
+        remove => RemoveHandler(SelectionChangedEvent, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
index 242d4b09..3cfb955a 100644
--- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
@@ -6,212 +6,211 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SideMenuItem : HeaderedSimpleItemsControl, ISelectable, ICommandSource
 {
-    public class SideMenuItem : HeaderedSimpleItemsControl, ISelectable, ICommandSource
+    private bool _isMouseLeftButtonDown;
+
+    public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+        "Icon", typeof(object), typeof(SideMenuItem), new PropertyMetadata(default(object)));
+
+    public object Icon
     {
-        private bool _isMouseLeftButtonDown;
+        get => GetValue(IconProperty);
+        set => SetValue(IconProperty, value);
+    }
 
-        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
-            "Icon", typeof(object), typeof(SideMenuItem), new PropertyMetadata(default(object)));
-
-        public object Icon
+    public SideMenuItem()
+    {
+        SetBinding(ExpandModeProperty, new Binding(SideMenu.ExpandModeProperty.Name)
         {
-            get => GetValue(IconProperty);
-            set => SetValue(IconProperty, value);
-        }
+            RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(SideMenu), 1)
+        });
+    }
 
-        public SideMenuItem()
+    internal static readonly DependencyProperty ExpandModeProperty =
+        SideMenu.ExpandModeProperty.AddOwner(typeof(SideMenuItem), new PropertyMetadata(default(ExpandMode)));
+
+    internal ExpandMode ExpandMode
+    {
+        get => (ExpandMode) GetValue(ExpandModeProperty);
+        set => SetValue(ExpandModeProperty, value);
+    }
+
+    protected override void Refresh()
+    {
+        if (ItemsHost == null) return;
+
+        ItemsHost.Children.Clear();
+        foreach (var item in Items)
         {
-            SetBinding(ExpandModeProperty, new Binding(SideMenu.ExpandModeProperty.Name)
+            DependencyObject container;
+            if (IsItemItsOwnContainerOverride(item))
             {
-                RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(SideMenu), 1)
-            });
-        }
-
-        internal static readonly DependencyProperty ExpandModeProperty =
-            SideMenu.ExpandModeProperty.AddOwner(typeof(SideMenuItem), new PropertyMetadata(default(ExpandMode)));
-
-        internal ExpandMode ExpandMode
-        {
-            get => (ExpandMode) GetValue(ExpandModeProperty);
-            set => SetValue(ExpandModeProperty, value);
-        }
-
-        protected override void Refresh()
-        {
-            if (ItemsHost == null) return;
-
-            ItemsHost.Children.Clear();
-            foreach (var item in Items)
+                container = item as DependencyObject;
+            }
+            else
             {
-                DependencyObject container;
-                if (IsItemItsOwnContainerOverride(item))
-                {
-                    container = item as DependencyObject;
-                }
-                else
-                {
-                    container = GetContainerForItemOverride();
-                    PrepareContainerForItemOverride(container, item);
-                }
-
-                if (container is FrameworkElement element)
-                {
-                    element.Style = ItemContainerStyle;
-                    ItemsHost.Children.Add(element);
-                }
+                container = GetContainerForItemOverride();
+                PrepareContainerForItemOverride(container, item);
             }
 
-            if (IsLoaded)
+            if (container is FrameworkElement element)
             {
-                SwitchPanelArea(ExpandMode == ExpandMode.ShowAll || IsSelected);
+                element.Style = ItemContainerStyle;
+                ItemsHost.Children.Add(element);
             }
         }
 
-        protected virtual void OnSelected(RoutedEventArgs e)
+        if (IsLoaded)
         {
-            RaiseEvent(e);
-
-            switch (Command)
-            {
-                case null:
-                    return;
-                case RoutedCommand command:
-                    command.Execute(CommandParameter, CommandTarget);
-                    break;
-                default:
-                    Command.Execute(CommandParameter);
-                    break;
-            }
-        }
-
-        public static readonly RoutedEvent SelectedEvent =
-            EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
-                typeof(RoutedEventHandler), typeof(SideMenuItem));
-
-        public event RoutedEventHandler Selected
-        {
-            add => AddHandler(SelectedEvent, value);
-            remove => RemoveHandler(SelectedEvent, value);
-        }
-
-        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
-            "IsSelected", typeof(bool), typeof(SideMenuItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsSelected
-        {
-            get => (bool) GetValue(IsSelectedProperty);
-            set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
-            "Role", typeof(SideMenuItemRole), typeof(SideMenuItem), new PropertyMetadata(default(SideMenuItemRole)));
-
-        public SideMenuItemRole Role
-        {
-            get => (SideMenuItemRole) GetValue(RoleProperty);
-            internal set => SetValue(RoleProperty, value);
-        }
-
-        protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
-
-        protected override void OnMouseLeave(MouseEventArgs e)
-        {
-            base.OnMouseLeave(e);
-
-            _isMouseLeftButtonDown = false;
-        }
-
-        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
-
-            _isMouseLeftButtonDown = true;
-        }
-
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonUp(e);
-
-            if (_isMouseLeftButtonDown)
-            {
-                IsSelected = true;
-                OnSelected(new RoutedEventArgs(SelectedEvent, this));
-                _isMouseLeftButtonDown = false;
-            }
-        }
-
-        internal void SelectDefaultItem()
-        {
-            if (Role == SideMenuItemRole.Header && ItemsHost.Children.Count > 0)
-            {
-                var item = ItemsHost.Children.OfType<SideMenuItem>().FirstOrDefault();
-                if (item is { IsSelected: false })
-                {
-                    item.OnSelected(new RoutedEventArgs(SelectedEvent, item));
-                }
-            }
-        }
-
-        internal void SwitchPanelArea(bool isShow)
-        {
-            if (ItemsHost == null) return;
-            if (Role == SideMenuItemRole.Header)
-            {
-                ItemsHost.Show(isShow);
-            }
-        }
-
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
-            "Command", typeof(ICommand), typeof(SideMenuItem), new PropertyMetadata(default(ICommand), OnCommandChanged));
-
-        private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (SideMenuItem) d;
-            if (e.OldValue is ICommand oldCommand)
-            {
-                oldCommand.CanExecuteChanged -= ctl.CanExecuteChanged;
-            }
-            if (e.NewValue is ICommand newCommand)
-            {
-                newCommand.CanExecuteChanged += ctl.CanExecuteChanged;
-            }
-        }
-
-        public ICommand Command
-        {
-            get => (ICommand) GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
-            "CommandParameter", typeof(object), typeof(SideMenuItem), new PropertyMetadata(default(object)));
-
-        public object CommandParameter
-        {
-            get => GetValue(CommandParameterProperty);
-            set => SetValue(CommandParameterProperty, value);
-        }
-
-        public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register(
-            "CommandTarget", typeof(IInputElement), typeof(SideMenuItem), new PropertyMetadata(default(IInputElement)));
-
-        public IInputElement CommandTarget
-        {
-            get => (IInputElement) GetValue(CommandTargetProperty);
-            set => SetValue(CommandTargetProperty, value);
-        }
-
-        private void CanExecuteChanged(object sender, EventArgs e)
-        {
-            if (Command == null) return;
-
-            IsEnabled = Command is RoutedCommand command
-                ? command.CanExecute(CommandParameter, CommandTarget)
-                : Command.CanExecute(CommandParameter);
+            SwitchPanelArea(ExpandMode == ExpandMode.ShowAll || IsSelected);
         }
     }
-}
+
+    protected virtual void OnSelected(RoutedEventArgs e)
+    {
+        RaiseEvent(e);
+
+        switch (Command)
+        {
+            case null:
+                return;
+            case RoutedCommand command:
+                command.Execute(CommandParameter, CommandTarget);
+                break;
+            default:
+                Command.Execute(CommandParameter);
+                break;
+        }
+    }
+
+    public static readonly RoutedEvent SelectedEvent =
+        EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble,
+            typeof(RoutedEventHandler), typeof(SideMenuItem));
+
+    public event RoutedEventHandler Selected
+    {
+        add => AddHandler(SelectedEvent, value);
+        remove => RemoveHandler(SelectedEvent, value);
+    }
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
+        "IsSelected", typeof(bool), typeof(SideMenuItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsSelected
+    {
+        get => (bool) GetValue(IsSelectedProperty);
+        set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty RoleProperty = DependencyProperty.Register(
+        "Role", typeof(SideMenuItemRole), typeof(SideMenuItem), new PropertyMetadata(default(SideMenuItemRole)));
+
+    public SideMenuItemRole Role
+    {
+        get => (SideMenuItemRole) GetValue(RoleProperty);
+        internal set => SetValue(RoleProperty, value);
+    }
+
+    protected override DependencyObject GetContainerForItemOverride() => new SideMenuItem();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is SideMenuItem;
+
+    protected override void OnMouseLeave(MouseEventArgs e)
+    {
+        base.OnMouseLeave(e);
+
+        _isMouseLeftButtonDown = false;
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+
+        _isMouseLeftButtonDown = true;
+    }
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+
+        if (_isMouseLeftButtonDown)
+        {
+            IsSelected = true;
+            OnSelected(new RoutedEventArgs(SelectedEvent, this));
+            _isMouseLeftButtonDown = false;
+        }
+    }
+
+    internal void SelectDefaultItem()
+    {
+        if (Role == SideMenuItemRole.Header && ItemsHost.Children.Count > 0)
+        {
+            var item = ItemsHost.Children.OfType<SideMenuItem>().FirstOrDefault();
+            if (item is { IsSelected: false })
+            {
+                item.OnSelected(new RoutedEventArgs(SelectedEvent, item));
+            }
+        }
+    }
+
+    internal void SwitchPanelArea(bool isShow)
+    {
+        if (ItemsHost == null) return;
+        if (Role == SideMenuItemRole.Header)
+        {
+            ItemsHost.Show(isShow);
+        }
+    }
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register(
+        "Command", typeof(ICommand), typeof(SideMenuItem), new PropertyMetadata(default(ICommand), OnCommandChanged));
+
+    private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (SideMenuItem) d;
+        if (e.OldValue is ICommand oldCommand)
+        {
+            oldCommand.CanExecuteChanged -= ctl.CanExecuteChanged;
+        }
+        if (e.NewValue is ICommand newCommand)
+        {
+            newCommand.CanExecuteChanged += ctl.CanExecuteChanged;
+        }
+    }
+
+    public ICommand Command
+    {
+        get => (ICommand) GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
+        "CommandParameter", typeof(object), typeof(SideMenuItem), new PropertyMetadata(default(object)));
+
+    public object CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register(
+        "CommandTarget", typeof(IInputElement), typeof(SideMenuItem), new PropertyMetadata(default(IInputElement)));
+
+    public IInputElement CommandTarget
+    {
+        get => (IInputElement) GetValue(CommandTargetProperty);
+        set => SetValue(CommandTargetProperty, value);
+    }
+
+    private void CanExecuteChanged(object sender, EventArgs e)
+    {
+        if (Command == null) return;
+
+        IsEnabled = Command is RoutedCommand command
+            ? command.CanExecute(CommandParameter, CommandTarget)
+            : Command.CanExecute(CommandParameter);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
index cb900692..cf716c55 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
@@ -1,26 +1,25 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CompareSlider : Slider
 {
-    public class CompareSlider : Slider
+    public static readonly DependencyProperty TargetContentProperty = DependencyProperty.Register(
+        "TargetContent", typeof(object), typeof(CompareSlider), new PropertyMetadata(default(object)));
+
+    public static readonly DependencyProperty SourceContentProperty = DependencyProperty.Register(
+        "SourceContent", typeof(object), typeof(CompareSlider), new PropertyMetadata(default(object)));
+
+    public object TargetContent
     {
-        public static readonly DependencyProperty TargetContentProperty = DependencyProperty.Register(
-            "TargetContent", typeof(object), typeof(CompareSlider), new PropertyMetadata(default(object)));
-
-        public static readonly DependencyProperty SourceContentProperty = DependencyProperty.Register(
-            "SourceContent", typeof(object), typeof(CompareSlider), new PropertyMetadata(default(object)));
-
-        public object TargetContent
-        {
-            get => GetValue(TargetContentProperty);
-            set => SetValue(TargetContentProperty, value);
-        }
-
-        public object SourceContent
-        {
-            get => GetValue(SourceContentProperty);
-            set => SetValue(SourceContentProperty, value);
-        }
+        get => GetValue(TargetContentProperty);
+        set => SetValue(TargetContentProperty, value);
     }
-}
+
+    public object SourceContent
+    {
+        get => GetValue(SourceContentProperty);
+        set => SetValue(SourceContentProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
index af178977..59d61e33 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
@@ -3,115 +3,114 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class CompareTrack : Track
 {
-    public class CompareTrack : Track
+    protected override Size ArrangeOverride(Size arrangeSize)
     {
-        protected override Size ArrangeOverride(Size arrangeSize)
+        base.ArrangeOverride(arrangeSize);
+
+        var isVertical = Orientation == Orientation.Vertical;
+        ComputeSliderLengths(arrangeSize, isVertical, out var decreaseButtonLength, out var thumbLength,
+            out var increaseButtonLength);
+
+        var offset = new Point();
+        var pieceSize = arrangeSize;
+        var isDirectionReversed = IsDirectionReversed;
+
+        if (isVertical)
         {
-            base.ArrangeOverride(arrangeSize);
+            CoerceLength(ref decreaseButtonLength, arrangeSize.Height);
+            CoerceLength(ref increaseButtonLength, arrangeSize.Height);
+            CoerceLength(ref thumbLength, arrangeSize.Height);
 
-            var isVertical = Orientation == Orientation.Vertical;
-            ComputeSliderLengths(arrangeSize, isVertical, out var decreaseButtonLength, out var thumbLength,
-                out var increaseButtonLength);
+            offset.Y = isDirectionReversed ? decreaseButtonLength + thumbLength : 0.0;
+            pieceSize.Height = increaseButtonLength;
 
-            var offset = new Point();
-            var pieceSize = arrangeSize;
-            var isDirectionReversed = IsDirectionReversed;
+            IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
 
-            if (isVertical)
+            offset.Y = isDirectionReversed ? 0.0 : increaseButtonLength + thumbLength;
+            pieceSize.Height = decreaseButtonLength;
+
+            if (DecreaseRepeatButton != null)
             {
-                CoerceLength(ref decreaseButtonLength, arrangeSize.Height);
-                CoerceLength(ref increaseButtonLength, arrangeSize.Height);
-                CoerceLength(ref thumbLength, arrangeSize.Height);
-
-                offset.Y = isDirectionReversed ? decreaseButtonLength + thumbLength : 0.0;
-                pieceSize.Height = increaseButtonLength;
-
-                IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.Y = isDirectionReversed ? 0.0 : increaseButtonLength + thumbLength;
-                pieceSize.Height = decreaseButtonLength;
-
-                if (DecreaseRepeatButton != null)
-                {
-                    DecreaseRepeatButton.Arrange(new Rect(offset, pieceSize));
-                    DecreaseRepeatButton.Height = pieceSize.Height;
-                }
-
-                offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
-                pieceSize.Height = thumbLength;
-
-                Thumb?.Arrange(new Rect(offset, pieceSize));
-            }
-            else
-            {
-                CoerceLength(ref decreaseButtonLength, arrangeSize.Width);
-                CoerceLength(ref increaseButtonLength, arrangeSize.Width);
-                CoerceLength(ref thumbLength, arrangeSize.Width);
-
-                offset.X = isDirectionReversed ? increaseButtonLength + thumbLength : 0.0;
-                pieceSize.Width = decreaseButtonLength;
-
-                DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-
-                offset.X = isDirectionReversed ? 0.0 : decreaseButtonLength + thumbLength;
-                pieceSize.Width = increaseButtonLength;
-
-                if (IncreaseRepeatButton != null)
-                {
-                    IncreaseRepeatButton.Arrange(new Rect(offset, pieceSize));
-                    IncreaseRepeatButton.Width = pieceSize.Width;
-                }
-
-                offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
-                pieceSize.Width = thumbLength;
-
-                Thumb?.Arrange(new Rect(offset, pieceSize));
+                DecreaseRepeatButton.Arrange(new Rect(offset, pieceSize));
+                DecreaseRepeatButton.Height = pieceSize.Height;
             }
 
-            return arrangeSize;
+            offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
+            pieceSize.Height = thumbLength;
+
+            Thumb?.Arrange(new Rect(offset, pieceSize));
+        }
+        else
+        {
+            CoerceLength(ref decreaseButtonLength, arrangeSize.Width);
+            CoerceLength(ref increaseButtonLength, arrangeSize.Width);
+            CoerceLength(ref thumbLength, arrangeSize.Width);
+
+            offset.X = isDirectionReversed ? increaseButtonLength + thumbLength : 0.0;
+            pieceSize.Width = decreaseButtonLength;
+
+            DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+
+            offset.X = isDirectionReversed ? 0.0 : decreaseButtonLength + thumbLength;
+            pieceSize.Width = increaseButtonLength;
+
+            if (IncreaseRepeatButton != null)
+            {
+                IncreaseRepeatButton.Arrange(new Rect(offset, pieceSize));
+                IncreaseRepeatButton.Width = pieceSize.Width;
+            }
+
+            offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
+            pieceSize.Width = thumbLength;
+
+            Thumb?.Arrange(new Rect(offset, pieceSize));
         }
 
-        private void ComputeSliderLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
-            out double thumbLength, out double increaseButtonLength)
-        {
-            var min = Minimum;
-            var range = Math.Max(0.0, Maximum - min);
-            var offset = Math.Min(range, Value - min);
-
-            double trackLength;
-
-            // Compute thumb size
-            if (isVertical)
-            {
-                trackLength = arrangeSize.Height;
-                thumbLength = Thumb?.DesiredSize.Height ?? 0;
-            }
-            else
-            {
-                trackLength = arrangeSize.Width;
-                thumbLength = Thumb?.DesiredSize.Width ?? 0;
-            }
-
-            CoerceLength(ref thumbLength, trackLength);
-
-            var remainingTrackLength = trackLength - thumbLength;
-
-            decreaseButtonLength = remainingTrackLength * offset / range;
-            CoerceLength(ref decreaseButtonLength, remainingTrackLength);
-
-            increaseButtonLength = remainingTrackLength - decreaseButtonLength;
-            CoerceLength(ref increaseButtonLength, remainingTrackLength);
-        }
-
-        private static void CoerceLength(ref double componentLength, double trackLength)
-        {
-            if (componentLength < 0)
-                componentLength = 0.0;
-            else if (componentLength > trackLength || double.IsNaN(componentLength))
-                componentLength = trackLength;
-        }
+        return arrangeSize;
     }
-}
+
+    private void ComputeSliderLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
+        out double thumbLength, out double increaseButtonLength)
+    {
+        var min = Minimum;
+        var range = Math.Max(0.0, Maximum - min);
+        var offset = Math.Min(range, Value - min);
+
+        double trackLength;
+
+        // Compute thumb size
+        if (isVertical)
+        {
+            trackLength = arrangeSize.Height;
+            thumbLength = Thumb?.DesiredSize.Height ?? 0;
+        }
+        else
+        {
+            trackLength = arrangeSize.Width;
+            thumbLength = Thumb?.DesiredSize.Width ?? 0;
+        }
+
+        CoerceLength(ref thumbLength, trackLength);
+
+        var remainingTrackLength = trackLength - thumbLength;
+
+        decreaseButtonLength = remainingTrackLength * offset / range;
+        CoerceLength(ref decreaseButtonLength, remainingTrackLength);
+
+        increaseButtonLength = remainingTrackLength - decreaseButtonLength;
+        CoerceLength(ref increaseButtonLength, remainingTrackLength);
+    }
+
+    private static void CoerceLength(ref double componentLength, double trackLength)
+    {
+        if (componentLength < 0)
+            componentLength = 0.0;
+        else if (componentLength > trackLength || double.IsNaN(componentLength))
+            componentLength = trackLength;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
index 4577008c..fbbd0526 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
@@ -9,196 +9,195 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = TrackKey, Type = typeof(Track))]
+[TemplatePart(Name = ThumbKey, Type = typeof(FrameworkElement))]
+public class PreviewSlider : Slider
 {
-    [TemplatePart(Name = TrackKey, Type = typeof(Track))]
-    [TemplatePart(Name = ThumbKey, Type = typeof(FrameworkElement))]
-    public class PreviewSlider : Slider
+    private AdornerContainer _adorner;
+
+    private const string TrackKey = "PART_Track";
+
+    private const string ThumbKey = "PART_Thumb";
+
+    private FrameworkElement _previewContent;
+
+    private FrameworkElement _thumb;
+
+    private TranslateTransform _transform;
+
+    private Track _track;
+
+    /// <summary>
+    ///     预览内容
+    /// </summary>
+    public static readonly DependencyProperty PreviewContentProperty = DependencyProperty.Register(
+        "PreviewContent", typeof(object), typeof(PreviewSlider), new PropertyMetadata(default(object)));
+
+    /// <summary>
+    ///     预览内容
+    /// </summary>
+    public object PreviewContent
     {
-        private AdornerContainer _adorner;
+        get => GetValue(PreviewContentProperty);
+        set => SetValue(PreviewContentProperty, value);
+    }
 
-        private const string TrackKey = "PART_Track";
+    public static readonly DependencyProperty PreviewContentOffsetProperty = DependencyProperty.Register(
+        "PreviewContentOffset", typeof(double), typeof(PreviewSlider), new PropertyMetadata(9.0));
 
-        private const string ThumbKey = "PART_Thumb";
+    public double PreviewContentOffset
+    {
+        get => (double) GetValue(PreviewContentOffsetProperty);
+        set => SetValue(PreviewContentOffsetProperty, value);
+    }
 
-        private FrameworkElement _previewContent;
+    public static readonly DependencyProperty PreviewPositionProperty = DependencyProperty.RegisterAttached(
+        "PreviewPosition", typeof(double), typeof(PreviewSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.Inherits));
 
-        private FrameworkElement _thumb;
+    public static void SetPreviewPosition(DependencyObject element, double value)
+        => element.SetValue(PreviewPositionProperty, value);
 
-        private TranslateTransform _transform;
+    public static double GetPreviewPosition(DependencyObject element)
+        => (double) element.GetValue(PreviewPositionProperty);
 
-        private Track _track;
+    public double PreviewPosition
+    {
+        get => GetPreviewPosition(_previewContent);
+        set => SetPreviewPosition(_previewContent, value);
+    }
 
-        /// <summary>
-        ///     预览内容
-        /// </summary>
-        public static readonly DependencyProperty PreviewContentProperty = DependencyProperty.Register(
-            "PreviewContent", typeof(object), typeof(PreviewSlider), new PropertyMetadata(default(object)));
+    /// <summary>
+    ///     值改变事件
+    /// </summary>
+    public static readonly RoutedEvent PreviewPositionChangedEvent =
+        EventManager.RegisterRoutedEvent("PreviewPositionChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<double>>), typeof(PreviewSlider));
 
-        /// <summary>
-        ///     预览内容
-        /// </summary>
-        public object PreviewContent
+    /// <summary>
+    ///     值改变事件
+    /// </summary>
+    public event EventHandler<FunctionEventArgs<double>> PreviewPositionChanged
+    {
+        add => AddHandler(PreviewPositionChangedEvent, value);
+        remove => RemoveHandler(PreviewPositionChangedEvent, value);
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+        base.OnMouseMove(e);
+
+        if (_previewContent == null) return;
+
+        var p = e.GetPosition(_adorner);
+        var maximum = Maximum;
+        var minimum = Minimum;
+
+        if (Orientation == Orientation.Horizontal)
         {
-            get => GetValue(PreviewContentProperty);
-            set => SetValue(PreviewContentProperty, value);
-        }
 
-        public static readonly DependencyProperty PreviewContentOffsetProperty = DependencyProperty.Register(
-            "PreviewContentOffset", typeof(double), typeof(PreviewSlider), new PropertyMetadata(9.0));
-
-        public double PreviewContentOffset
-        {
-            get => (double) GetValue(PreviewContentOffsetProperty);
-            set => SetValue(PreviewContentOffsetProperty, value);
-        }
-
-        public static readonly DependencyProperty PreviewPositionProperty = DependencyProperty.RegisterAttached(
-            "PreviewPosition", typeof(double), typeof(PreviewSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetPreviewPosition(DependencyObject element, double value)
-            => element.SetValue(PreviewPositionProperty, value);
-
-        public static double GetPreviewPosition(DependencyObject element)
-            => (double) element.GetValue(PreviewPositionProperty);
-
-        public double PreviewPosition
-        {
-            get => GetPreviewPosition(_previewContent);
-            set => SetPreviewPosition(_previewContent, value);
-        }
-
-        /// <summary>
-        ///     值改变事件
-        /// </summary>
-        public static readonly RoutedEvent PreviewPositionChangedEvent =
-            EventManager.RegisterRoutedEvent("PreviewPositionChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<double>>), typeof(PreviewSlider));
-
-        /// <summary>
-        ///     值改变事件
-        /// </summary>
-        public event EventHandler<FunctionEventArgs<double>> PreviewPositionChanged
-        {
-            add => AddHandler(PreviewPositionChangedEvent, value);
-            remove => RemoveHandler(PreviewPositionChangedEvent, value);
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            if (_previewContent == null) return;
-
-            var p = e.GetPosition(_adorner);
-            var maximum = Maximum;
-            var minimum = Minimum;
-
-            if (Orientation == Orientation.Horizontal)
+            var pos = !IsDirectionReversed
+                ? (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth * (maximum - minimum) + minimum
+                : (1 - (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth) * (maximum - minimum) + minimum;
+            if (pos > maximum || pos < 0)
             {
-
-                var pos = !IsDirectionReversed
-                    ? (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth * (maximum - minimum) + minimum
-                    : (1 - (e.GetPosition(this).X - _thumb.ActualWidth * 0.5) / _track.ActualWidth) * (maximum - minimum) + minimum;
-                if (pos > maximum || pos < 0)
+                if (_thumb.IsMouseCaptureWithin)
                 {
-                    if (_thumb.IsMouseCaptureWithin)
-                    {
-                        PreviewPosition = Value;
-                    }
-                    return;
+                    PreviewPosition = Value;
                 }
-
-                _transform.X = p.X - _previewContent.ActualWidth * 0.5;
-                _transform.Y = _thumb.TranslatePoint(new Point(), _adorner).Y - _previewContent.ActualHeight - PreviewContentOffset;
-
-                PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
+                return;
             }
-            else
+
+            _transform.X = p.X - _previewContent.ActualWidth * 0.5;
+            _transform.Y = _thumb.TranslatePoint(new Point(), _adorner).Y - _previewContent.ActualHeight - PreviewContentOffset;
+
+            PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
+        }
+        else
+        {
+            var pos = !IsDirectionReversed
+                ? (1 - (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight) * (maximum - minimum) + minimum
+                : (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight * (maximum - minimum) + minimum;
+            if (pos > maximum || pos < 0)
             {
-                var pos = !IsDirectionReversed
-                    ? (1 - (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight) * (maximum - minimum) + minimum
-                    : (e.GetPosition(this).Y - _thumb.ActualHeight * 0.5) / _track.ActualHeight * (maximum - minimum) + minimum;
-                if (pos > maximum || pos < 0)
+                if (_thumb.IsMouseCaptureWithin)
                 {
-                    if (_thumb.IsMouseCaptureWithin)
-                    {
-                        PreviewPosition = Value;
-                    }
-                    return;
+                    PreviewPosition = Value;
                 }
-
-                _transform.X = _thumb.TranslatePoint(new Point(), _adorner).X - _previewContent.ActualWidth - PreviewContentOffset;
-                _transform.Y = p.Y - _previewContent.ActualHeight * 0.5;
-
-                PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
+                return;
             }
 
-            RaiseEvent(new FunctionEventArgs<double>(PreviewPositionChangedEvent, this)
-            {
-                Info = PreviewPosition
-            });
+            _transform.X = _thumb.TranslatePoint(new Point(), _adorner).X - _previewContent.ActualWidth - PreviewContentOffset;
+            _transform.Y = p.Y - _previewContent.ActualHeight * 0.5;
+
+            PreviewPosition = _thumb.IsMouseCaptureWithin ? Value : pos;
         }
 
-        protected override void OnMouseEnter(MouseEventArgs e)
+        RaiseEvent(new FunctionEventArgs<double>(PreviewPositionChangedEvent, this)
         {
-            base.OnMouseEnter(e);
+            Info = PreviewPosition
+        });
+    }
 
-            if (_adorner == null)
-            {
-                var layer = AdornerLayer.GetAdornerLayer(this);
-                if (layer == null) return;
-                _adorner = new AdornerContainer(layer)
-                {
-                    Child = _previewContent
-                };
-                layer.Add(_adorner);
-            }
-        }
+    protected override void OnMouseEnter(MouseEventArgs e)
+    {
+        base.OnMouseEnter(e);
 
-        protected override void OnMouseLeave(MouseEventArgs e)
+        if (_adorner == null)
         {
-            base.OnMouseLeave(e);
-
             var layer = AdornerLayer.GetAdornerLayer(this);
-            if (layer != null)
+            if (layer == null) return;
+            _adorner = new AdornerContainer(layer)
             {
-                layer.Remove(_adorner);
-            }
-            else if (_adorner is { Parent: AdornerLayer parent })
-            {
-                parent.Remove(_adorner);
-            }
-
-            if (_adorner != null)
-            {
-                _adorner.Child = null;
-                _adorner = null;
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            var contentControl = new ContentControl
-            {
-                DataContext = this
+                Child = _previewContent
             };
-            contentControl.SetBinding(ContentControl.ContentProperty, new Binding(PreviewContentProperty.Name) { Source = this });
-            _previewContent = contentControl;
-
-            _track = Template.FindName(TrackKey, this) as Track;
-            _thumb = Template.FindName(ThumbKey, this) as FrameworkElement;
-
-            if (_previewContent != null)
-            {
-                _transform = new TranslateTransform();
-
-                _previewContent.HorizontalAlignment = HorizontalAlignment.Left;
-                _previewContent.VerticalAlignment = VerticalAlignment.Top;
-                _previewContent.RenderTransform = _transform;
-            }
+            layer.Add(_adorner);
         }
     }
-}
+
+    protected override void OnMouseLeave(MouseEventArgs e)
+    {
+        base.OnMouseLeave(e);
+
+        var layer = AdornerLayer.GetAdornerLayer(this);
+        if (layer != null)
+        {
+            layer.Remove(_adorner);
+        }
+        else if (_adorner is { Parent: AdornerLayer parent })
+        {
+            parent.Remove(_adorner);
+        }
+
+        if (_adorner != null)
+        {
+            _adorner.Child = null;
+            _adorner = null;
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        var contentControl = new ContentControl
+        {
+            DataContext = this
+        };
+        contentControl.SetBinding(ContentControl.ContentProperty, new Binding(PreviewContentProperty.Name) { Source = this });
+        _previewContent = contentControl;
+
+        _track = Template.FindName(TrackKey, this) as Track;
+        _thumb = Template.FindName(ThumbKey, this) as FrameworkElement;
+
+        if (_previewContent != null)
+        {
+            _transform = new TranslateTransform();
+
+            _previewContent.HorizontalAlignment = HorizontalAlignment.Left;
+            _previewContent.VerticalAlignment = VerticalAlignment.Top;
+            _previewContent.RenderTransform = _transform;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
index aa8a94a5..75dc825d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
@@ -12,344 +12,297 @@ using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[DefaultEvent("ValueChanged"), DefaultProperty("Value")]
+[TemplatePart(Name = ElementTrack, Type = typeof(Track))]
+public class RangeSlider : TwoWayRangeBase
 {
-    [DefaultEvent("ValueChanged"), DefaultProperty("Value")]
-    [TemplatePart(Name = ElementTrack, Type = typeof(Track))]
-    public class RangeSlider : TwoWayRangeBase
+    private const string ElementTrack = "PART_Track";
+
+    private RangeTrack _track;
+
+    private readonly ToolTip _autoToolTipStart = null;
+
+    private readonly ToolTip _autoToolTipEnd = null;
+
+    private RangeThumb _thumbCurrent;
+
+    private object _thumbOriginalToolTip;
+
+    private Point _originThumbPoint;
+
+    private Point _previousScreenCoordPosition;
+
+    static RangeSlider()
     {
-        private const string ElementTrack = "PART_Track";
+        InitializeCommands();
 
-        private RangeTrack _track;
+        MinimumProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
+        MaximumProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double10Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
+        ValueStartProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
+        ValueEndProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
 
-        private readonly ToolTip _autoToolTipStart = null;
+        // Register Event Handler for the Thumb
+        EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragStartedEvent, new DragStartedEventHandler(OnThumbDragStarted));
+        EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragDeltaEvent, new DragDeltaEventHandler(OnThumbDragDelta));
+        EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragCompletedEvent, new DragCompletedEventHandler(OnThumbDragCompleted));
 
-        private readonly ToolTip _autoToolTipEnd = null;
+        // Listen to MouseLeftButtonDown event to determine if slide should move focus to itself
+        EventManager.RegisterClassHandler(typeof(RangeSlider), Mouse.MouseDownEvent, new MouseButtonEventHandler(OnMouseLeftButtonDown), true);
+    }
 
-        private RangeThumb _thumbCurrent;
+    public RangeSlider()
+    {
+        CommandBindings.Add(new CommandBinding(IncreaseLarge, OnIncreaseLarge));
+        CommandBindings.Add(new CommandBinding(IncreaseSmall, OnIncreaseSmall));
 
-        private object _thumbOriginalToolTip;
+        CommandBindings.Add(new CommandBinding(DecreaseLarge, OnDecreaseLarge));
+        CommandBindings.Add(new CommandBinding(DecreaseSmall, OnDecreaseSmall));
 
-        private Point _originThumbPoint;
+        CommandBindings.Add(new CommandBinding(CenterLarge, OnCenterLarge));
+        CommandBindings.Add(new CommandBinding(CenterSmall, OnCenterSmall));
+    }
 
-        private Point _previousScreenCoordPosition;
+    private void OnIncreaseLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnIncreaseLarge();
 
-        static RangeSlider()
+    private void OnIncreaseSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnIncreaseSmall();
+
+    private void OnDecreaseLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnDecreaseLarge();
+
+    private void OnDecreaseSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnDecreaseSmall();
+
+    private void OnCenterLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnCenterLarge(e.Parameter);
+
+    private void OnCenterSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnCenterSmall(e.Parameter);
+
+    protected virtual void OnIncreaseLarge() => MoveToNextTick(LargeChange, false);
+
+    protected virtual void OnIncreaseSmall() => MoveToNextTick(SmallChange, false);
+
+    protected virtual void OnDecreaseLarge() => MoveToNextTick(-LargeChange, true);
+
+    protected virtual void OnDecreaseSmall() => MoveToNextTick(-SmallChange, true);
+
+    protected virtual void OnCenterLarge(object parameter) => MoveToNextTick(LargeChange, false, true);
+
+    protected virtual void OnCenterSmall(object parameter) => MoveToNextTick(SmallChange, false, true);
+
+    public static RoutedCommand IncreaseLarge { get; private set; }
+
+    public static RoutedCommand IncreaseSmall { get; private set; }
+
+    public static RoutedCommand DecreaseLarge { get; private set; }
+
+    public static RoutedCommand DecreaseSmall { get; private set; }
+
+    public static RoutedCommand CenterLarge { get; private set; }
+
+    public static RoutedCommand CenterSmall { get; private set; }
+
+    private static void InitializeCommands()
+    {
+        IncreaseLarge = new RoutedCommand(nameof(IncreaseLarge), typeof(RangeSlider));
+        IncreaseSmall = new RoutedCommand(nameof(IncreaseSmall), typeof(RangeSlider));
+
+        DecreaseLarge = new RoutedCommand(nameof(DecreaseLarge), typeof(RangeSlider));
+        DecreaseSmall = new RoutedCommand(nameof(DecreaseSmall), typeof(RangeSlider));
+
+        CenterLarge = new RoutedCommand(nameof(CenterLarge), typeof(RangeSlider));
+        CenterSmall = new RoutedCommand(nameof(CenterSmall), typeof(RangeSlider));
+    }
+
+    public override void OnApplyTemplate()
+    {
+        _thumbCurrent = null;
+
+        base.OnApplyTemplate();
+
+        _track = GetTemplateChild(ElementTrack) as RangeTrack;
+
+        if (_autoToolTipStart != null)
         {
-            InitializeCommands();
-
-            MinimumProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
-            MaximumProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double10Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
-            ValueStartProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
-            ValueEndProperty.OverrideMetadata(typeof(RangeSlider), new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-            // Register Event Handler for the Thumb
-            EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragStartedEvent, new DragStartedEventHandler(OnThumbDragStarted));
-            EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragDeltaEvent, new DragDeltaEventHandler(OnThumbDragDelta));
-            EventManager.RegisterClassHandler(typeof(RangeSlider), Thumb.DragCompletedEvent, new DragCompletedEventHandler(OnThumbDragCompleted));
-
-            // Listen to MouseLeftButtonDown event to determine if slide should move focus to itself
-            EventManager.RegisterClassHandler(typeof(RangeSlider), Mouse.MouseDownEvent, new MouseButtonEventHandler(OnMouseLeftButtonDown), true);
+            _autoToolTipStart.PlacementTarget = _track?.ThumbStart;
         }
 
-        public RangeSlider()
+        if (_autoToolTipEnd != null)
         {
-            CommandBindings.Add(new CommandBinding(IncreaseLarge, OnIncreaseLarge));
-            CommandBindings.Add(new CommandBinding(IncreaseSmall, OnIncreaseSmall));
+            _autoToolTipEnd.PlacementTarget = _track?.ThumbEnd;
+        }
+    }
 
-            CommandBindings.Add(new CommandBinding(DecreaseLarge, OnDecreaseLarge));
-            CommandBindings.Add(new CommandBinding(DecreaseSmall, OnDecreaseSmall));
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(RangeSlider), new PropertyMetadata(default(Orientation)));
 
-            CommandBindings.Add(new CommandBinding(CenterLarge, OnCenterLarge));
-            CommandBindings.Add(new CommandBinding(CenterSmall, OnCenterSmall));
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public static readonly DependencyProperty IsDirectionReversedProperty = DependencyProperty.Register(
+        "IsDirectionReversed", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsDirectionReversed
+    {
+        get => (bool) GetValue(IsDirectionReversedProperty);
+        set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty DelayProperty = RepeatButton.DelayProperty.AddOwner(typeof(RangeSlider), new FrameworkPropertyMetadata(GetKeyboardDelay()));
+
+    public int Delay
+    {
+        get => (int) GetValue(DelayProperty);
+        set => SetValue(DelayProperty, value);
+    }
+
+    internal static int GetKeyboardDelay()
+    {
+        var delay = SystemParameters.KeyboardDelay;
+        if (delay < 0 || delay > 3)
+            delay = 0;
+        return (delay + 1) * 250;
+    }
+
+    public static readonly DependencyProperty IntervalProperty = RepeatButton.IntervalProperty.AddOwner(typeof(RangeSlider), new FrameworkPropertyMetadata(GetKeyboardSpeed()));
+
+    public int Interval
+    {
+        get => (int) GetValue(IntervalProperty);
+        set => SetValue(IntervalProperty, value);
+    }
+
+    internal static int GetKeyboardSpeed()
+    {
+        var speed = SystemParameters.KeyboardSpeed;
+        if (speed < 0 || speed > 31)
+            speed = 31;
+        return (31 - speed) * (400 - 1000 / 30) / 31 + 1000 / 30;
+    }
+
+    public static readonly DependencyProperty AutoToolTipPlacementProperty = DependencyProperty.Register(
+        "AutoToolTipPlacement", typeof(AutoToolTipPlacement), typeof(RangeSlider), new PropertyMetadata(default(AutoToolTipPlacement)));
+
+    public AutoToolTipPlacement AutoToolTipPlacement
+    {
+        get => (AutoToolTipPlacement) GetValue(AutoToolTipPlacementProperty);
+        set => SetValue(AutoToolTipPlacementProperty, value);
+    }
+
+    public static readonly DependencyProperty AutoToolTipPrecisionProperty = DependencyProperty.Register(
+        "AutoToolTipPrecision", typeof(int), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.Int0Box),
+        ValidateHelper.IsInRangeOfPosIntIncludeZero);
+
+    public int AutoToolTipPrecision
+    {
+        get => (int) GetValue(AutoToolTipPrecisionProperty);
+        set => SetValue(AutoToolTipPrecisionProperty, value);
+    }
+
+    public static readonly DependencyProperty IsSnapToTickEnabledProperty = DependencyProperty.Register(
+        "IsSnapToTickEnabled", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsSnapToTickEnabled
+    {
+        get => (bool) GetValue(IsSnapToTickEnabledProperty);
+        set => SetValue(IsSnapToTickEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty TickPlacementProperty = DependencyProperty.Register(
+        "TickPlacement", typeof(TickPlacement), typeof(RangeSlider), new PropertyMetadata(default(TickPlacement)));
+
+    public TickPlacement TickPlacement
+    {
+        get => (TickPlacement) GetValue(TickPlacementProperty);
+        set => SetValue(TickPlacementProperty, value);
+    }
+
+    public static readonly DependencyProperty TickFrequencyProperty = DependencyProperty.Register(
+        "TickFrequency", typeof(double), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.Double1Box),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double TickFrequency
+    {
+        get => (double) GetValue(TickFrequencyProperty);
+        set => SetValue(TickFrequencyProperty, value);
+    }
+
+    public static readonly DependencyProperty TicksProperty = DependencyProperty.Register(
+        "Ticks", typeof(DoubleCollection), typeof(RangeSlider), new PropertyMetadata(new DoubleCollection()));
+
+    public DoubleCollection Ticks
+    {
+        get => (DoubleCollection) GetValue(TicksProperty);
+        set => SetValue(TicksProperty, value);
+    }
+
+    public static readonly DependencyProperty IsMoveToPointEnabledProperty = DependencyProperty.Register(
+        "IsMoveToPointEnabled", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsMoveToPointEnabled
+    {
+        get => (bool) GetValue(IsMoveToPointEnabledProperty);
+        set => SetValue(IsMoveToPointEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        if (IsMoveToPointEnabled && _track.ThumbStart is { IsMouseOver: false } && _track.ThumbEnd is { IsMouseOver: false })
+        {
+            // Here we need to determine whether it's closer to the starting point or the end point. 
+            var pt = e.MouseDevice.GetPosition(_track);
+            UpdateValue(pt);
+            e.Handled = true;
         }
 
-        private void OnIncreaseLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnIncreaseLarge();
+        base.OnPreviewMouseLeftButtonDown(e);
+    }
 
-        private void OnIncreaseSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnIncreaseSmall();
+    private void MoveToNextTick(double direction, bool isStart, bool isCenter = false, object parameter = null)
+    {
+        if (MathHelper.AreClose(direction, 0)) return;
 
-        private void OnDecreaseLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnDecreaseLarge();
-
-        private void OnDecreaseSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnDecreaseSmall();
-
-        private void OnCenterLarge(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnCenterLarge(e.Parameter);
-
-        private void OnCenterSmall(object sender, ExecutedRoutedEventArgs e) => (sender as RangeSlider)?.OnCenterSmall(e.Parameter);
-
-        protected virtual void OnIncreaseLarge() => MoveToNextTick(LargeChange, false);
-
-        protected virtual void OnIncreaseSmall() => MoveToNextTick(SmallChange, false);
-
-        protected virtual void OnDecreaseLarge() => MoveToNextTick(-LargeChange, true);
-
-        protected virtual void OnDecreaseSmall() => MoveToNextTick(-SmallChange, true);
-
-        protected virtual void OnCenterLarge(object parameter) => MoveToNextTick(LargeChange, false, true);
-
-        protected virtual void OnCenterSmall(object parameter) => MoveToNextTick(SmallChange, false, true);
-
-        public static RoutedCommand IncreaseLarge { get; private set; }
-
-        public static RoutedCommand IncreaseSmall { get; private set; }
-
-        public static RoutedCommand DecreaseLarge { get; private set; }
-
-        public static RoutedCommand DecreaseSmall { get; private set; }
-
-        public static RoutedCommand CenterLarge { get; private set; }
-
-        public static RoutedCommand CenterSmall { get; private set; }
-
-        private static void InitializeCommands()
+        if (isCenter)
         {
-            IncreaseLarge = new RoutedCommand(nameof(IncreaseLarge), typeof(RangeSlider));
-            IncreaseSmall = new RoutedCommand(nameof(IncreaseSmall), typeof(RangeSlider));
-
-            DecreaseLarge = new RoutedCommand(nameof(DecreaseLarge), typeof(RangeSlider));
-            DecreaseSmall = new RoutedCommand(nameof(DecreaseSmall), typeof(RangeSlider));
-
-            CenterLarge = new RoutedCommand(nameof(CenterLarge), typeof(RangeSlider));
-            CenterSmall = new RoutedCommand(nameof(CenterSmall), typeof(RangeSlider));
-        }
-
-        public override void OnApplyTemplate()
-        {
-            _thumbCurrent = null;
-
-            base.OnApplyTemplate();
-
-            _track = GetTemplateChild(ElementTrack) as RangeTrack;
-
-            if (_autoToolTipStart != null)
+            if (parameter == null)
             {
-                _autoToolTipStart.PlacementTarget = _track?.ThumbStart;
-            }
-
-            if (_autoToolTipEnd != null)
-            {
-                _autoToolTipEnd.PlacementTarget = _track?.ThumbEnd;
-            }
-        }
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(RangeSlider), new PropertyMetadata(default(Orientation)));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        public static readonly DependencyProperty IsDirectionReversedProperty = DependencyProperty.Register(
-            "IsDirectionReversed", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsDirectionReversed
-        {
-            get => (bool) GetValue(IsDirectionReversedProperty);
-            set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty DelayProperty = RepeatButton.DelayProperty.AddOwner(typeof(RangeSlider), new FrameworkPropertyMetadata(GetKeyboardDelay()));
-
-        public int Delay
-        {
-            get => (int) GetValue(DelayProperty);
-            set => SetValue(DelayProperty, value);
-        }
-
-        internal static int GetKeyboardDelay()
-        {
-            var delay = SystemParameters.KeyboardDelay;
-            if (delay < 0 || delay > 3)
-                delay = 0;
-            return (delay + 1) * 250;
-        }
-
-        public static readonly DependencyProperty IntervalProperty = RepeatButton.IntervalProperty.AddOwner(typeof(RangeSlider), new FrameworkPropertyMetadata(GetKeyboardSpeed()));
-
-        public int Interval
-        {
-            get => (int) GetValue(IntervalProperty);
-            set => SetValue(IntervalProperty, value);
-        }
-
-        internal static int GetKeyboardSpeed()
-        {
-            var speed = SystemParameters.KeyboardSpeed;
-            if (speed < 0 || speed > 31)
-                speed = 31;
-            return (31 - speed) * (400 - 1000 / 30) / 31 + 1000 / 30;
-        }
-
-        public static readonly DependencyProperty AutoToolTipPlacementProperty = DependencyProperty.Register(
-            "AutoToolTipPlacement", typeof(AutoToolTipPlacement), typeof(RangeSlider), new PropertyMetadata(default(AutoToolTipPlacement)));
-
-        public AutoToolTipPlacement AutoToolTipPlacement
-        {
-            get => (AutoToolTipPlacement) GetValue(AutoToolTipPlacementProperty);
-            set => SetValue(AutoToolTipPlacementProperty, value);
-        }
-
-        public static readonly DependencyProperty AutoToolTipPrecisionProperty = DependencyProperty.Register(
-            "AutoToolTipPrecision", typeof(int), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.Int0Box),
-            ValidateHelper.IsInRangeOfPosIntIncludeZero);
-
-        public int AutoToolTipPrecision
-        {
-            get => (int) GetValue(AutoToolTipPrecisionProperty);
-            set => SetValue(AutoToolTipPrecisionProperty, value);
-        }
-
-        public static readonly DependencyProperty IsSnapToTickEnabledProperty = DependencyProperty.Register(
-            "IsSnapToTickEnabled", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsSnapToTickEnabled
-        {
-            get => (bool) GetValue(IsSnapToTickEnabledProperty);
-            set => SetValue(IsSnapToTickEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty TickPlacementProperty = DependencyProperty.Register(
-            "TickPlacement", typeof(TickPlacement), typeof(RangeSlider), new PropertyMetadata(default(TickPlacement)));
-
-        public TickPlacement TickPlacement
-        {
-            get => (TickPlacement) GetValue(TickPlacementProperty);
-            set => SetValue(TickPlacementProperty, value);
-        }
-
-        public static readonly DependencyProperty TickFrequencyProperty = DependencyProperty.Register(
-            "TickFrequency", typeof(double), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.Double1Box),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public double TickFrequency
-        {
-            get => (double) GetValue(TickFrequencyProperty);
-            set => SetValue(TickFrequencyProperty, value);
-        }
-
-        public static readonly DependencyProperty TicksProperty = DependencyProperty.Register(
-            "Ticks", typeof(DoubleCollection), typeof(RangeSlider), new PropertyMetadata(new DoubleCollection()));
-
-        public DoubleCollection Ticks
-        {
-            get => (DoubleCollection) GetValue(TicksProperty);
-            set => SetValue(TicksProperty, value);
-        }
-
-        public static readonly DependencyProperty IsMoveToPointEnabledProperty = DependencyProperty.Register(
-            "IsMoveToPointEnabled", typeof(bool), typeof(RangeSlider), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsMoveToPointEnabled
-        {
-            get => (bool) GetValue(IsMoveToPointEnabledProperty);
-            set => SetValue(IsMoveToPointEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            if (IsMoveToPointEnabled && _track.ThumbStart is { IsMouseOver: false } && _track.ThumbEnd is { IsMouseOver: false })
-            {
-                // Here we need to determine whether it's closer to the starting point or the end point. 
-                var pt = e.MouseDevice.GetPosition(_track);
-                UpdateValue(pt);
-                e.Handled = true;
-            }
-
-            base.OnPreviewMouseLeftButtonDown(e);
-        }
-
-        private void MoveToNextTick(double direction, bool isStart, bool isCenter = false, object parameter = null)
-        {
-            if (MathHelper.AreClose(direction, 0)) return;
-
-            if (isCenter)
-            {
-                if (parameter == null)
+                var pt = Mouse.GetPosition(_track);
+                var newValue = _track.ValueFromPoint(pt);
+                if (ValidateHelper.IsInRangeOfDouble(newValue))
                 {
-                    var pt = Mouse.GetPosition(_track);
-                    var newValue = _track.ValueFromPoint(pt);
-                    if (ValidateHelper.IsInRangeOfDouble(newValue))
+                    isStart = (ValueStart + ValueEnd) / 2 > newValue;
+                    if (!isStart)
                     {
-                        isStart = (ValueStart + ValueEnd) / 2 > newValue;
-                        if (!isStart)
-                        {
-                            direction = -Math.Abs(direction);
-                        }
+                        direction = -Math.Abs(direction);
                     }
                 }
-
-                if (parameter is bool parameterValue)
-                {
-                    isStart = parameterValue;
-                }
             }
 
-            var value = isStart ? ValueStart : ValueEnd;
-            var next = SnapToTick(Math.Max(Minimum, Math.Min(Maximum, value + direction)));
-            var greaterThan = direction > 0;
-
-            // If the snapping brought us back to value, find the next tick point
-            if (MathHelper.AreClose(next, value) &&
-                !(greaterThan && MathHelper.AreClose(value, Maximum)) &&
-                !(!greaterThan && MathHelper.AreClose(value, Minimum)))
+            if (parameter is bool parameterValue)
             {
-                // If ticks collection is available, use it.
-                // Note that ticks may be unsorted.
-                if (Ticks is { Count: > 0 })
-                {
-                    foreach (var tick in Ticks)
-                    {
-                        // Find the smallest tick greater than value or the largest tick less than value
-                        if (greaterThan && MathHelper.GreaterThan(tick, value) && (MathHelper.LessThan(tick, next) || MathHelper.AreClose(next, value))
-                            || !greaterThan && MathHelper.LessThan(tick, value) && (MathHelper.GreaterThan(tick, next) || MathHelper.AreClose(next, value)))
-                        {
-                            next = tick;
-                        }
-                    }
-                }
-                else if (MathHelper.GreaterThan(TickFrequency, 0.0))
-                {
-                    // Find the current tick we are at
-                    var tickNumber = Math.Round((value - Minimum) / TickFrequency);
-
-                    if (greaterThan)
-                        tickNumber += 1.0;
-                    else
-                        tickNumber -= 1.0;
-
-                    next = Minimum + tickNumber * TickFrequency;
-                }
-            }
-
-            // Update if we've found a better value
-            if (!MathHelper.AreClose(next, value))
-            {
-                SetCurrentValue(isStart ? ValueStartProperty : ValueEndProperty, next);
+                isStart = parameterValue;
             }
         }
 
-        private double SnapToTick(double value)
+        var value = isStart ? ValueStart : ValueEnd;
+        var next = SnapToTick(Math.Max(Minimum, Math.Min(Maximum, value + direction)));
+        var greaterThan = direction > 0;
+
+        // If the snapping brought us back to value, find the next tick point
+        if (MathHelper.AreClose(next, value) &&
+            !(greaterThan && MathHelper.AreClose(value, Maximum)) &&
+            !(!greaterThan && MathHelper.AreClose(value, Minimum)))
         {
-            if (!IsSnapToTickEnabled) return value;
-
-            var previous = Minimum;
-            var next = Maximum;
-
+            // If ticks collection is available, use it.
+            // Note that ticks may be unsorted.
             if (Ticks is { Count: > 0 })
             {
                 foreach (var tick in Ticks)
                 {
-                    if (MathHelper.AreClose(tick, value))
-                    {
-                        return value;
-                    }
-
-                    if (MathHelper.LessThan(tick, value) && MathHelper.GreaterThan(tick, previous))
-                    {
-                        previous = tick;
-                    }
-                    else if (MathHelper.GreaterThan(tick, value) && MathHelper.LessThan(tick, next))
+                    // Find the smallest tick greater than value or the largest tick less than value
+                    if (greaterThan && MathHelper.GreaterThan(tick, value) && (MathHelper.LessThan(tick, next) || MathHelper.AreClose(next, value))
+                        || !greaterThan && MathHelper.LessThan(tick, value) && (MathHelper.GreaterThan(tick, next) || MathHelper.AreClose(next, value)))
                     {
                         next = tick;
                     }
@@ -357,290 +310,336 @@ namespace HandyControl.Controls
             }
             else if (MathHelper.GreaterThan(TickFrequency, 0.0))
             {
-                previous = Minimum + Math.Round((value - Minimum) / TickFrequency) * TickFrequency;
-                next = Math.Min(Maximum, previous + TickFrequency);
-            }
+                // Find the current tick we are at
+                var tickNumber = Math.Round((value - Minimum) / TickFrequency);
 
-            return MathHelper.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous;
-        }
+                if (greaterThan)
+                    tickNumber += 1.0;
+                else
+                    tickNumber -= 1.0;
 
-        private void UpdateValue(Point point)
-        {
-            var newValue = _track.ValueFromPoint(point);
-            if (ValidateHelper.IsInRangeOfDouble(newValue))
-            {
-                var isStart = (ValueStart + ValueEnd) / 2 > newValue;
-                UpdateValue(newValue, isStart);
+                next = Minimum + tickNumber * TickFrequency;
             }
         }
 
-        private void UpdateValue(double value, bool isStart)
+        // Update if we've found a better value
+        if (!MathHelper.AreClose(next, value))
         {
-            var snappedValue = SnapToTick(value);
-
-            if (isStart)
-            {
-                if (!MathHelper.AreClose(snappedValue, ValueStart))
-                {
-                    var start = Math.Max(Minimum, Math.Min(Maximum, snappedValue));
-                    if (start > ValueEnd)
-                    {
-                        SetCurrentValue(ValueStartProperty, ValueEnd);
-                        SetCurrentValue(ValueEndProperty, start);
-                        _track.ThumbStart.CancelDrag();
-                        _track.ThumbEnd.StartDrag();
-                        _thumbCurrent = _track.ThumbEnd;
-                    }
-                    else
-                    {
-                        SetCurrentValue(ValueStartProperty, start);
-                    }
-                }
-            }
-            else
-            {
-                if (!MathHelper.AreClose(snappedValue, ValueEnd))
-                {
-                    var end = Math.Max(Minimum, Math.Min(Maximum, snappedValue));
-                    if (end < ValueStart)
-                    {
-                        SetCurrentValue(ValueEndProperty, ValueStart);
-                        SetCurrentValue(ValueStartProperty, end);
-                        _track.ThumbEnd.CancelDrag();
-                        _track.ThumbStart.StartDrag();
-                        _thumbCurrent = _track.ThumbStart;
-                    }
-                    else
-                    {
-                        SetCurrentValue(ValueEndProperty, end);
-                    }
-                }
-            }
-        }
-
-        private static void OnThumbDragStarted(object sender, DragStartedEventArgs e) => (sender as RangeSlider)?.OnThumbDragStarted(e);
-
-        protected virtual void OnThumbDragStarted(DragStartedEventArgs e)
-        {
-            // Show AutoToolTip if needed.
-
-            if (e.OriginalSource is not RangeThumb thumb) return;
-            _thumbCurrent = thumb;
-            _originThumbPoint = Mouse.GetPosition(_thumbCurrent);
-            _thumbCurrent.StartDrag();
-
-            if (AutoToolTipPlacement == AutoToolTipPlacement.None)
-            {
-                return;
-            }
-
-            var isStart = thumb.Equals(_track.ThumbStart);
-            if (!isStart)
-            {
-                if (!thumb.Equals(_track.ThumbEnd)) return;
-            }
-
-            // Save original tooltip
-            _thumbOriginalToolTip = thumb.ToolTip;
-            OnThumbDragStarted(isStart ? _autoToolTipStart : _autoToolTipEnd, isStart);
-        }
-
-        private void OnThumbDragStarted(ToolTip toolTip, bool isStart)
-        {
-            toolTip ??= new ToolTip
-            {
-                Placement = PlacementMode.Custom,
-                PlacementTarget = isStart ? _track.ThumbStart : _track.ThumbEnd,
-                CustomPopupPlacementCallback = AutoToolTipCustomPlacementCallback
-            };
-
-            if (isStart)
-            {
-                _track.ThumbStart.ToolTip = toolTip;
-            }
-            else
-            {
-                _track.ThumbEnd.ToolTip = toolTip;
-            }
-            toolTip.Content = GetAutoToolTipNumber(isStart);
-            toolTip.IsOpen = true;
-        }
-
-        private CustomPopupPlacement[] AutoToolTipCustomPlacementCallback(Size popupSize, Size targetSize, Point offset)
-        {
-            switch (AutoToolTipPlacement)
-            {
-                case AutoToolTipPlacement.TopLeft:
-                    if (Orientation == Orientation.Horizontal)
-                    {
-                        // Place popup at top of thumb
-                        return new[]{new CustomPopupPlacement(
-                            new Point((targetSize.Width - popupSize.Width) * 0.5, -popupSize.Height),
-                            PopupPrimaryAxis.Horizontal)
-                        };
-                    }
-                    else
-                    {
-                        // Place popup at left of thumb
-                        return new[] {
-                            new CustomPopupPlacement(
-                            new Point(-popupSize.Width, (targetSize.Height - popupSize.Height) * 0.5),
-                            PopupPrimaryAxis.Vertical)
-                        };
-                    }
-
-                case AutoToolTipPlacement.BottomRight:
-                    if (Orientation == Orientation.Horizontal)
-                    {
-                        // Place popup at bottom of thumb
-                        return new[] {
-                            new CustomPopupPlacement(
-                            new Point((targetSize.Width - popupSize.Width) * 0.5, targetSize.Height) ,
-                            PopupPrimaryAxis.Horizontal)
-                        };
-
-                    }
-                    else
-                    {
-                        // Place popup at right of thumb
-                        return new[] {
-                            new CustomPopupPlacement(
-                            new Point(targetSize.Width, (targetSize.Height - popupSize.Height) * 0.5),
-                            PopupPrimaryAxis.Vertical)
-                        };
-                    }
-
-                default:
-                    return new CustomPopupPlacement[] { };
-            }
-        }
-
-        private string GetAutoToolTipNumber(bool isStart)
-        {
-            var format = (NumberFormatInfo) NumberFormatInfo.CurrentInfo.Clone();
-            format.NumberDecimalDigits = AutoToolTipPrecision;
-            return isStart ? ValueStart.ToString("N", format) : ValueEnd.ToString("N", format);
-        }
-
-        private static void OnThumbDragDelta(object sender, DragDeltaEventArgs e) => (sender as RangeSlider)?.OnThumbDragDelta(e);
-
-        protected virtual void OnThumbDragDelta(DragDeltaEventArgs e)
-        {
-            if (e.OriginalSource is not Thumb thumb) return;
-            var isStart = thumb.Equals(_track.ThumbStart);
-            if (!isStart)
-            {
-                if (!thumb.Equals(_track.ThumbEnd)) return;
-            }
-
-            // Convert to Track's co-ordinate
-            OnThumbDragDelta(_track, isStart, e);
-        }
-
-        private void OnThumbDragDelta(RangeTrack track, bool isStart, DragDeltaEventArgs e)
-        {
-            if (track == null || track.ThumbStart == null | _track.ThumbEnd == null) return;
-
-            var newValue = (isStart ? ValueStart : ValueEnd) + track.ValueFromDistance(e.HorizontalChange, e.VerticalChange);
-            if (ValidateHelper.IsInRangeOfDouble(newValue))
-            {
-                UpdateValue(newValue, isStart);
-            }
-
-            // Show AutoToolTip if needed
-            if (AutoToolTipPlacement != AutoToolTipPlacement.None)
-            {
-                var toolTip = (isStart ? _autoToolTipStart : _autoToolTipEnd) ?? new ToolTip();
-
-                toolTip.Content = GetAutoToolTipNumber(isStart);
-
-                var thumb = isStart ? _track.ThumbStart : _track.ThumbEnd;
-
-                if (!Equals(thumb.ToolTip, toolTip))
-                {
-                    thumb.ToolTip = toolTip;
-                }
-
-                if (!toolTip.IsOpen)
-                {
-                    toolTip.IsOpen = true;
-                }
-            }
-        }
-
-        private static void OnThumbDragCompleted(object sender, DragCompletedEventArgs e) => (sender as RangeSlider)?.OnThumbDragCompleted(e);
-
-        protected virtual void OnThumbDragCompleted(DragCompletedEventArgs e)
-        {
-            // Show AutoToolTip if needed.
-
-            if (e.OriginalSource is not Thumb thumb || AutoToolTipPlacement == AutoToolTipPlacement.None)
-            {
-                return;
-            }
-
-            var isStart = thumb.Equals(_track.ThumbStart);
-            if (!isStart)
-            {
-                if (!thumb.Equals(_track.ThumbEnd)) return;
-            }
-
-            var toolTip = isStart ? _autoToolTipStart : _autoToolTipEnd;
-            if (toolTip != null)
-            {
-                toolTip.IsOpen = false;
-            }
-
-            thumb.ToolTip = _thumbOriginalToolTip;
-        }
-
-        private static void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton != MouseButton.Left) return;
-
-            var slider = (RangeSlider) sender;
-
-            // When someone click on the Slider's part, and it's not focusable
-            // Slider need to take the focus in order to process keyboard correctly
-            if (!slider.IsKeyboardFocusWithin)
-            {
-                e.Handled = slider.Focus() || e.Handled;
-            }
-
-            if (slider._track.ThumbStart.IsMouseOver)
-            {
-                slider._track.ThumbStart.StartDrag();
-                slider._thumbCurrent = slider._track.ThumbStart;
-            }
-
-            if (slider._track.ThumbEnd.IsMouseOver)
-            {
-                slider._track.ThumbEnd.StartDrag();
-                slider._thumbCurrent = slider._track.ThumbEnd;
-            }
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            if (_thumbCurrent == null) return;
-            if (e.MouseDevice.LeftButton != MouseButtonState.Pressed) return;
-            if (!_thumbCurrent.IsDragging) return;
-
-            var thumbCoordPosition = e.GetPosition(_thumbCurrent);
-            var screenCoordPosition = PointFromScreen(thumbCoordPosition);
-            if (screenCoordPosition != _previousScreenCoordPosition)
-            {
-                _previousScreenCoordPosition = screenCoordPosition;
-                _thumbCurrent.RaiseEvent(new DragDeltaEventArgs(thumbCoordPosition.X - _originThumbPoint.X,
-                    thumbCoordPosition.Y - _originThumbPoint.Y));
-            }
-        }
-
-        protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnPreviewMouseLeftButtonUp(e);
-
-            _thumbCurrent = null;
+            SetCurrentValue(isStart ? ValueStartProperty : ValueEndProperty, next);
         }
     }
-}
+
+    private double SnapToTick(double value)
+    {
+        if (!IsSnapToTickEnabled) return value;
+
+        var previous = Minimum;
+        var next = Maximum;
+
+        if (Ticks is { Count: > 0 })
+        {
+            foreach (var tick in Ticks)
+            {
+                if (MathHelper.AreClose(tick, value))
+                {
+                    return value;
+                }
+
+                if (MathHelper.LessThan(tick, value) && MathHelper.GreaterThan(tick, previous))
+                {
+                    previous = tick;
+                }
+                else if (MathHelper.GreaterThan(tick, value) && MathHelper.LessThan(tick, next))
+                {
+                    next = tick;
+                }
+            }
+        }
+        else if (MathHelper.GreaterThan(TickFrequency, 0.0))
+        {
+            previous = Minimum + Math.Round((value - Minimum) / TickFrequency) * TickFrequency;
+            next = Math.Min(Maximum, previous + TickFrequency);
+        }
+
+        return MathHelper.GreaterThanOrClose(value, (previous + next) * 0.5) ? next : previous;
+    }
+
+    private void UpdateValue(Point point)
+    {
+        var newValue = _track.ValueFromPoint(point);
+        if (ValidateHelper.IsInRangeOfDouble(newValue))
+        {
+            var isStart = (ValueStart + ValueEnd) / 2 > newValue;
+            UpdateValue(newValue, isStart);
+        }
+    }
+
+    private void UpdateValue(double value, bool isStart)
+    {
+        var snappedValue = SnapToTick(value);
+
+        if (isStart)
+        {
+            if (!MathHelper.AreClose(snappedValue, ValueStart))
+            {
+                var start = Math.Max(Minimum, Math.Min(Maximum, snappedValue));
+                if (start > ValueEnd)
+                {
+                    SetCurrentValue(ValueStartProperty, ValueEnd);
+                    SetCurrentValue(ValueEndProperty, start);
+                    _track.ThumbStart.CancelDrag();
+                    _track.ThumbEnd.StartDrag();
+                    _thumbCurrent = _track.ThumbEnd;
+                }
+                else
+                {
+                    SetCurrentValue(ValueStartProperty, start);
+                }
+            }
+        }
+        else
+        {
+            if (!MathHelper.AreClose(snappedValue, ValueEnd))
+            {
+                var end = Math.Max(Minimum, Math.Min(Maximum, snappedValue));
+                if (end < ValueStart)
+                {
+                    SetCurrentValue(ValueEndProperty, ValueStart);
+                    SetCurrentValue(ValueStartProperty, end);
+                    _track.ThumbEnd.CancelDrag();
+                    _track.ThumbStart.StartDrag();
+                    _thumbCurrent = _track.ThumbStart;
+                }
+                else
+                {
+                    SetCurrentValue(ValueEndProperty, end);
+                }
+            }
+        }
+    }
+
+    private static void OnThumbDragStarted(object sender, DragStartedEventArgs e) => (sender as RangeSlider)?.OnThumbDragStarted(e);
+
+    protected virtual void OnThumbDragStarted(DragStartedEventArgs e)
+    {
+        // Show AutoToolTip if needed.
+
+        if (e.OriginalSource is not RangeThumb thumb) return;
+        _thumbCurrent = thumb;
+        _originThumbPoint = Mouse.GetPosition(_thumbCurrent);
+        _thumbCurrent.StartDrag();
+
+        if (AutoToolTipPlacement == AutoToolTipPlacement.None)
+        {
+            return;
+        }
+
+        var isStart = thumb.Equals(_track.ThumbStart);
+        if (!isStart)
+        {
+            if (!thumb.Equals(_track.ThumbEnd)) return;
+        }
+
+        // Save original tooltip
+        _thumbOriginalToolTip = thumb.ToolTip;
+        OnThumbDragStarted(isStart ? _autoToolTipStart : _autoToolTipEnd, isStart);
+    }
+
+    private void OnThumbDragStarted(ToolTip toolTip, bool isStart)
+    {
+        toolTip ??= new ToolTip
+        {
+            Placement = PlacementMode.Custom,
+            PlacementTarget = isStart ? _track.ThumbStart : _track.ThumbEnd,
+            CustomPopupPlacementCallback = AutoToolTipCustomPlacementCallback
+        };
+
+        if (isStart)
+        {
+            _track.ThumbStart.ToolTip = toolTip;
+        }
+        else
+        {
+            _track.ThumbEnd.ToolTip = toolTip;
+        }
+        toolTip.Content = GetAutoToolTipNumber(isStart);
+        toolTip.IsOpen = true;
+    }
+
+    private CustomPopupPlacement[] AutoToolTipCustomPlacementCallback(Size popupSize, Size targetSize, Point offset)
+    {
+        switch (AutoToolTipPlacement)
+        {
+            case AutoToolTipPlacement.TopLeft:
+                if (Orientation == Orientation.Horizontal)
+                {
+                    // Place popup at top of thumb
+                    return new[]{new CustomPopupPlacement(
+                        new Point((targetSize.Width - popupSize.Width) * 0.5, -popupSize.Height),
+                        PopupPrimaryAxis.Horizontal)
+                    };
+                }
+                else
+                {
+                    // Place popup at left of thumb
+                    return new[] {
+                        new CustomPopupPlacement(
+                            new Point(-popupSize.Width, (targetSize.Height - popupSize.Height) * 0.5),
+                            PopupPrimaryAxis.Vertical)
+                    };
+                }
+
+            case AutoToolTipPlacement.BottomRight:
+                if (Orientation == Orientation.Horizontal)
+                {
+                    // Place popup at bottom of thumb
+                    return new[] {
+                        new CustomPopupPlacement(
+                            new Point((targetSize.Width - popupSize.Width) * 0.5, targetSize.Height) ,
+                            PopupPrimaryAxis.Horizontal)
+                    };
+
+                }
+                else
+                {
+                    // Place popup at right of thumb
+                    return new[] {
+                        new CustomPopupPlacement(
+                            new Point(targetSize.Width, (targetSize.Height - popupSize.Height) * 0.5),
+                            PopupPrimaryAxis.Vertical)
+                    };
+                }
+
+            default:
+                return new CustomPopupPlacement[] { };
+        }
+    }
+
+    private string GetAutoToolTipNumber(bool isStart)
+    {
+        var format = (NumberFormatInfo) NumberFormatInfo.CurrentInfo.Clone();
+        format.NumberDecimalDigits = AutoToolTipPrecision;
+        return isStart ? ValueStart.ToString("N", format) : ValueEnd.ToString("N", format);
+    }
+
+    private static void OnThumbDragDelta(object sender, DragDeltaEventArgs e) => (sender as RangeSlider)?.OnThumbDragDelta(e);
+
+    protected virtual void OnThumbDragDelta(DragDeltaEventArgs e)
+    {
+        if (e.OriginalSource is not Thumb thumb) return;
+        var isStart = thumb.Equals(_track.ThumbStart);
+        if (!isStart)
+        {
+            if (!thumb.Equals(_track.ThumbEnd)) return;
+        }
+
+        // Convert to Track's co-ordinate
+        OnThumbDragDelta(_track, isStart, e);
+    }
+
+    private void OnThumbDragDelta(RangeTrack track, bool isStart, DragDeltaEventArgs e)
+    {
+        if (track == null || track.ThumbStart == null | _track.ThumbEnd == null) return;
+
+        var newValue = (isStart ? ValueStart : ValueEnd) + track.ValueFromDistance(e.HorizontalChange, e.VerticalChange);
+        if (ValidateHelper.IsInRangeOfDouble(newValue))
+        {
+            UpdateValue(newValue, isStart);
+        }
+
+        // Show AutoToolTip if needed
+        if (AutoToolTipPlacement != AutoToolTipPlacement.None)
+        {
+            var toolTip = (isStart ? _autoToolTipStart : _autoToolTipEnd) ?? new ToolTip();
+
+            toolTip.Content = GetAutoToolTipNumber(isStart);
+
+            var thumb = isStart ? _track.ThumbStart : _track.ThumbEnd;
+
+            if (!Equals(thumb.ToolTip, toolTip))
+            {
+                thumb.ToolTip = toolTip;
+            }
+
+            if (!toolTip.IsOpen)
+            {
+                toolTip.IsOpen = true;
+            }
+        }
+    }
+
+    private static void OnThumbDragCompleted(object sender, DragCompletedEventArgs e) => (sender as RangeSlider)?.OnThumbDragCompleted(e);
+
+    protected virtual void OnThumbDragCompleted(DragCompletedEventArgs e)
+    {
+        // Show AutoToolTip if needed.
+
+        if (e.OriginalSource is not Thumb thumb || AutoToolTipPlacement == AutoToolTipPlacement.None)
+        {
+            return;
+        }
+
+        var isStart = thumb.Equals(_track.ThumbStart);
+        if (!isStart)
+        {
+            if (!thumb.Equals(_track.ThumbEnd)) return;
+        }
+
+        var toolTip = isStart ? _autoToolTipStart : _autoToolTipEnd;
+        if (toolTip != null)
+        {
+            toolTip.IsOpen = false;
+        }
+
+        thumb.ToolTip = _thumbOriginalToolTip;
+    }
+
+    private static void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton != MouseButton.Left) return;
+
+        var slider = (RangeSlider) sender;
+
+        // When someone click on the Slider's part, and it's not focusable
+        // Slider need to take the focus in order to process keyboard correctly
+        if (!slider.IsKeyboardFocusWithin)
+        {
+            e.Handled = slider.Focus() || e.Handled;
+        }
+
+        if (slider._track.ThumbStart.IsMouseOver)
+        {
+            slider._track.ThumbStart.StartDrag();
+            slider._thumbCurrent = slider._track.ThumbStart;
+        }
+
+        if (slider._track.ThumbEnd.IsMouseOver)
+        {
+            slider._track.ThumbEnd.StartDrag();
+            slider._thumbCurrent = slider._track.ThumbEnd;
+        }
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+        if (_thumbCurrent == null) return;
+        if (e.MouseDevice.LeftButton != MouseButtonState.Pressed) return;
+        if (!_thumbCurrent.IsDragging) return;
+
+        var thumbCoordPosition = e.GetPosition(_thumbCurrent);
+        var screenCoordPosition = PointFromScreen(thumbCoordPosition);
+        if (screenCoordPosition != _previousScreenCoordPosition)
+        {
+            _previousScreenCoordPosition = screenCoordPosition;
+            _thumbCurrent.RaiseEvent(new DragDeltaEventArgs(thumbCoordPosition.X - _originThumbPoint.X,
+                thumbCoordPosition.Y - _originThumbPoint.Y));
+        }
+    }
+
+    protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnPreviewMouseLeftButtonUp(e);
+
+        _thumbCurrent = null;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
index f0c60ec2..8da6ee39 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
@@ -3,44 +3,43 @@ using System.Windows;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class RangeThumb : Thumb
 {
-    public class RangeThumb : Thumb
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
+        "Content", typeof(object), typeof(RangeThumb), new PropertyMetadata(default(object)));
+
+    public object Content
     {
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(
-            "Content", typeof(object), typeof(RangeThumb), new PropertyMetadata(default(object)));
-
-        public object Content
-        {
-            get => GetValue(ContentProperty);
-            set => SetValue(ContentProperty, value);
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-
-        }
-
-        public void StartDrag()
-        {
-            IsDragging = true;
-            Focus();
-            CaptureMouse();
-            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, MouseButton.Left)
-            {
-                RoutedEvent = PreviewMouseLeftButtonDownEvent,
-                Source = this
-            });
-        }
-
-        public new void CancelDrag()
-        {
-            base.CancelDrag();
-
-            RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, MouseButton.Left)
-            {
-                RoutedEvent = PreviewMouseLeftButtonUpEvent
-            });
-        }
+        get => GetValue(ContentProperty);
+        set => SetValue(ContentProperty, value);
     }
-}
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+
+    }
+
+    public void StartDrag()
+    {
+        IsDragging = true;
+        Focus();
+        CaptureMouse();
+        RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, MouseButton.Left)
+        {
+            RoutedEvent = PreviewMouseLeftButtonDownEvent,
+            Source = this
+        });
+    }
+
+    public new void CancelDrag()
+    {
+        base.CancelDrag();
+
+        RaiseEvent(new MouseButtonEventArgs(Mouse.PrimaryDevice, Environment.TickCount, MouseButton.Left)
+        {
+            RoutedEvent = PreviewMouseLeftButtonUpEvent
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
index 443fc6b9..bda84b87 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
@@ -8,452 +8,451 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class RangeTrack : FrameworkElement
 {
-    public class RangeTrack : FrameworkElement
+    private RepeatButton _increaseButton;
+
+    private RepeatButton _centerButton;
+
+    private RepeatButton _decreaseButton;
+
+    private RangeThumb _thumbStart;
+
+    private RangeThumb _thumbEnd;
+
+    private Visual[] _visualChildren;
+
+    private double Density { get; set; } = double.NaN;
+
+    public RepeatButton DecreaseRepeatButton
     {
-        private RepeatButton _increaseButton;
-
-        private RepeatButton _centerButton;
-
-        private RepeatButton _decreaseButton;
-
-        private RangeThumb _thumbStart;
-
-        private RangeThumb _thumbEnd;
-
-        private Visual[] _visualChildren;
-
-        private double Density { get; set; } = double.NaN;
-
-        public RepeatButton DecreaseRepeatButton
+        get => _decreaseButton;
+        set
         {
-            get => _decreaseButton;
-            set
+            if (Equals(_increaseButton, value) || Equals(_centerButton, value))
             {
-                if (Equals(_increaseButton, value) || Equals(_centerButton, value))
-                {
-                    throw new NotSupportedException("SameButtons");
-                }
-                UpdateComponent(_decreaseButton, value);
-                _decreaseButton = value;
-
-                if (_decreaseButton != null)
-                {
-                    CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
-                }
+                throw new NotSupportedException("SameButtons");
             }
-        }
+            UpdateComponent(_decreaseButton, value);
+            _decreaseButton = value;
 
-        public RepeatButton CenterRepeatButton
-        {
-            get => _centerButton;
-            set
+            if (_decreaseButton != null)
             {
-                if (Equals(_increaseButton, value) || Equals(_decreaseButton, value))
-                {
-                    throw new NotSupportedException("SameButtons");
-                }
-                UpdateComponent(_centerButton, value);
-                _centerButton = value;
-
-                if (_centerButton != null)
-                {
-                    CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
-                }
-            }
-        }
-
-        public RepeatButton IncreaseRepeatButton
-        {
-            get => _increaseButton;
-            set
-            {
-                if (Equals(_decreaseButton, value) || Equals(_centerButton, value))
-                {
-                    throw new NotSupportedException("SameButtons");
-                }
-                UpdateComponent(_increaseButton, value);
-                _increaseButton = value;
-
-                if (_increaseButton != null)
-                {
-                    CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
-                }
-            }
-        }
-
-        public RangeThumb ThumbStart
-        {
-            get => _thumbStart;
-            set
-            {
-                UpdateComponent(_thumbStart, value);
-                _thumbStart = value;
-            }
-        }
-
-        public RangeThumb ThumbEnd
-        {
-            get => _thumbEnd;
-            set
-            {
-                UpdateComponent(_thumbEnd, value);
-                _thumbEnd = value;
-            }
-        }
-
-        static RangeTrack()
-        {
-            IsEnabledProperty.OverrideMetadata(typeof(RangeTrack), new UIPropertyMetadata(OnIsEnabledChanged));
-        }
-
-        public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
-            "Orientation", typeof(Orientation), typeof(RangeTrack),
-            new FrameworkPropertyMetadata(default(Orientation), FrameworkPropertyMetadataOptions.AffectsMeasure));
-
-        public Orientation Orientation
-        {
-            get => (Orientation) GetValue(OrientationProperty);
-            set => SetValue(OrientationProperty, value);
-        }
-
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
-            "Minimum", typeof(double), typeof(RangeTrack),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsArrange));
-
-        public double Minimum
-        {
-            get => (double) GetValue(MinimumProperty);
-            set => SetValue(MinimumProperty, value);
-        }
-
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
-            "Maximum", typeof(double), typeof(RangeTrack),
-            new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsArrange));
-
-        public double Maximum
-        {
-            get => (double) GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueStartProperty = DependencyProperty.Register(
-            "ValueStart", typeof(double), typeof(RangeTrack),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault |
-                FrameworkPropertyMetadataOptions.AffectsArrange));
-
-        public double ValueStart
-        {
-            get => (double) GetValue(ValueStartProperty);
-            set => SetValue(ValueStartProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueEndProperty = DependencyProperty.Register(
-            "ValueEnd", typeof(double), typeof(RangeTrack),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault |
-                FrameworkPropertyMetadataOptions.AffectsArrange));
-
-        public double ValueEnd
-        {
-            get => (double) GetValue(ValueEndProperty);
-            set => SetValue(ValueEndProperty, value);
-        }
-
-        public static readonly DependencyProperty IsDirectionReversedProperty = DependencyProperty.Register(
-            "IsDirectionReversed", typeof(bool), typeof(RangeTrack), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsDirectionReversed
-        {
-            get => (bool) GetValue(IsDirectionReversedProperty);
-            set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override Visual GetVisualChild(int index)
-        {
-            if (_visualChildren?[index] == null)
-            {
-                // ReSharper disable once UseNameofExpression
-                // ReSharper disable once LocalizableElement
-                throw new ArgumentOutOfRangeException("index", index, "ArgumentOutOfRange");
-            }
-            return _visualChildren[index];
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            var desiredSize = new Size();
-
-            // Only measure thumb
-            // Repeat buttons will be sized based on thumb
-            if (_thumbStart != null)
-            {
-                _thumbStart.Measure(availableSize);
-                desiredSize = _thumbStart.DesiredSize;
-            }
-
-            if (_thumbEnd != null)
-            {
-                _thumbEnd.Measure(availableSize);
-                desiredSize = new Size(Math.Max(_thumbEnd.DesiredSize.Width, desiredSize.Width),
-                    Math.Max(_thumbEnd.DesiredSize.Height, desiredSize.Height));
-            }
-
-            return desiredSize;
-        }
-
-        private static void CoerceLength(ref double componentLength, double trackLength)
-        {
-            if (componentLength < 0)
-            {
-                componentLength = 0;
-            }
-            else if (componentLength > trackLength || double.IsNaN(componentLength))
-            {
-                componentLength = trackLength;
-            }
-        }
-
-        protected override Size ArrangeOverride(Size arrangeSize)
-        {
-            var isVertical = Orientation == Orientation.Vertical;
-
-            ComputeLengths(arrangeSize, isVertical, out var decreaseButtonLength, out var centerButtonLength,
-                out var increaseButtonLength, out var thumbStartLength, out var thumbEndLength);
-
-            var offset = new Point();
-            var pieceSize = arrangeSize;
-            var isDirectionReversed = IsDirectionReversed;
-
-            if (isVertical)
-            {
-                CoerceLength(ref decreaseButtonLength, arrangeSize.Height);
-                CoerceLength(ref centerButtonLength, arrangeSize.Height);
-                CoerceLength(ref increaseButtonLength, arrangeSize.Height);
-                CoerceLength(ref thumbStartLength, arrangeSize.Height);
-                CoerceLength(ref thumbEndLength, arrangeSize.Height);
-
-                offset.Y = isDirectionReversed ? decreaseButtonLength + thumbEndLength + centerButtonLength + thumbStartLength : 0;
-                pieceSize.Height = increaseButtonLength;
-
-                IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.Y = isDirectionReversed ? decreaseButtonLength + thumbEndLength : increaseButtonLength + thumbStartLength;
-                pieceSize.Height = centerButtonLength;
-
-                CenterRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.Y = isDirectionReversed ? 0 : increaseButtonLength + thumbStartLength + centerButtonLength + thumbEndLength;
-                pieceSize.Height = decreaseButtonLength;
-
-                DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.Y = isDirectionReversed
-                    ? decreaseButtonLength + thumbEndLength + centerButtonLength
-                    : increaseButtonLength + thumbStartLength + centerButtonLength;
-                pieceSize.Height = thumbStartLength;
-
-                ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
-
-                offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
-                pieceSize.Height = thumbEndLength;
-
-                ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
-            }
-            else
-            {
-                CoerceLength(ref decreaseButtonLength, arrangeSize.Width);
-                CoerceLength(ref centerButtonLength, arrangeSize.Width);
-                CoerceLength(ref increaseButtonLength, arrangeSize.Width);
-                CoerceLength(ref thumbStartLength, arrangeSize.Width);
-                CoerceLength(ref thumbEndLength, arrangeSize.Width);
-
-                offset.X = isDirectionReversed ? 0 : decreaseButtonLength + thumbEndLength + centerButtonLength + thumbStartLength;
-                pieceSize.Width = increaseButtonLength;
-
-                IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.X = isDirectionReversed ? increaseButtonLength + thumbStartLength : decreaseButtonLength + thumbEndLength;
-                pieceSize.Width = centerButtonLength;
-
-                CenterRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.X = isDirectionReversed ? increaseButtonLength + thumbStartLength + centerButtonLength + thumbEndLength : 0;
-                pieceSize.Width = decreaseButtonLength;
-
-                DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
-
-                offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
-                pieceSize.Width = thumbStartLength;
-
-                ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
-
-                offset.X = isDirectionReversed
-                    ? increaseButtonLength + thumbStartLength + centerButtonLength
-                    : decreaseButtonLength + thumbEndLength + centerButtonLength;
-                pieceSize.Width = thumbEndLength;
-
-                ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
-            }
-
-            return arrangeSize;
-        }
-
-        private void ArrangeThumb(bool isDirectionReversed, bool isStart, Point offset, Size pieceSize)
-        {
-            if (isStart)
-            {
-                if (isDirectionReversed)
-                {
-                    ThumbStart?.Arrange(new Rect(offset, pieceSize));
-                }
-                else
-                {
-                    ThumbEnd?.Arrange(new Rect(offset, pieceSize));
-                }
-            }
-            else
-            {
-                if (isDirectionReversed)
-                {
-                    ThumbEnd?.Arrange(new Rect(offset, pieceSize));
-                }
-                else
-                {
-                    ThumbStart?.Arrange(new Rect(offset, pieceSize));
-                }
-            }
-        }
-
-        private void ComputeLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
-            out double centerButtonLength, out double increaseButtonLength, out double thumbStartLength,
-            out double thumbEndLength)
-        {
-            var min = Minimum;
-            var range = Math.Max(0.0, Maximum - min);
-            var offsetStart = Math.Min(range, ValueStart - min);
-            var offsetEnd = Math.Min(range, ValueEnd - min);
-
-            double trackLength;
-
-            // Compute thumb size
-            if (isVertical)
-            {
-                trackLength = arrangeSize.Height;
-                thumbStartLength = _thumbStart?.DesiredSize.Height ?? 0;
-                thumbEndLength = _thumbEnd?.DesiredSize.Height ?? 0;
-            }
-            else
-            {
-                trackLength = arrangeSize.Width;
-                thumbStartLength = _thumbStart?.DesiredSize.Width ?? 0;
-                thumbEndLength = _thumbEnd?.DesiredSize.Width ?? 0;
-            }
-
-            CoerceLength(ref thumbStartLength, trackLength);
-            CoerceLength(ref thumbEndLength, trackLength);
-
-            var remainingTrackLength = trackLength - thumbStartLength - thumbEndLength;
-
-            decreaseButtonLength = remainingTrackLength * offsetStart / range;
-            CoerceLength(ref decreaseButtonLength, remainingTrackLength);
-
-            centerButtonLength = remainingTrackLength * offsetEnd / range - decreaseButtonLength;
-            CoerceLength(ref centerButtonLength, remainingTrackLength);
-
-            increaseButtonLength = remainingTrackLength - decreaseButtonLength - centerButtonLength;
-            CoerceLength(ref increaseButtonLength, remainingTrackLength);
-
-            Density = range / remainingTrackLength;
-        }
-
-        protected override int VisualChildrenCount
-        {
-            get
-            {
-                if (_visualChildren == null) return 0;
-
-                for (var i = 0; i < _visualChildren.Length; i++)
-                {
-                    if (_visualChildren[i] == null) return i;
-                }
-
-                return _visualChildren.Length;
-            }
-        }
-
-        private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if ((bool) e.NewValue)
-            {
-                Mouse.Synchronize();
-            }
-        }
-
-        public virtual double ValueFromPoint(Point pt)
-        {
-            return Orientation == Orientation.Horizontal
-                ? !IsDirectionReversed
-                    ? pt.X / RenderSize.Width * Maximum
-                    : (1 - pt.X / RenderSize.Width) * Maximum
-                : !IsDirectionReversed
-                    ? pt.Y / RenderSize.Height * Maximum
-                    : (1 - pt.X / RenderSize.Height) * Maximum;
-        }
-
-        public virtual double ValueFromDistance(double horizontal, double vertical)
-        {
-            double scale = IsDirectionReversed ? -1 : 1;
-            return Orientation == Orientation.Horizontal
-                ? scale * horizontal * Density
-                : -1 * scale * vertical * Density;
-        }
-
-        private void UpdateComponent(Control oldValue, Control newValue)
-        {
-            if (oldValue != newValue)
-            {
-                _visualChildren ??= new Visual[5];
-
-                if (oldValue != null)
-                {
-                    // notify the visual layer that the old component has been removed.
-                    RemoveVisualChild(oldValue);
-                }
-
-                // Remove the old value from our z index list and add new value to end
-                int i = 0;
-                while (i < 5)
-                {
-                    // Array isn't full, break
-                    if (_visualChildren[i] == null)
-                        break;
-
-                    // found the old value
-                    if (_visualChildren[i] == oldValue)
-                    {
-                        // Move values down until end of array or a null element
-                        while (i < 4 && _visualChildren[i + 1] != null)
-                        {
-                            _visualChildren[i] = _visualChildren[i + 1];
-                            i++;
-                        }
-                    }
-                    else
-                    {
-                        i++;
-                    }
-                }
-                // Add newValue at end of z-order
-                _visualChildren[i] = newValue;
-
-                AddVisualChild(newValue);
-
-                InvalidateMeasure();
-                InvalidateArrange();
+                CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
             }
         }
     }
-}
+
+    public RepeatButton CenterRepeatButton
+    {
+        get => _centerButton;
+        set
+        {
+            if (Equals(_increaseButton, value) || Equals(_decreaseButton, value))
+            {
+                throw new NotSupportedException("SameButtons");
+            }
+            UpdateComponent(_centerButton, value);
+            _centerButton = value;
+
+            if (_centerButton != null)
+            {
+                CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
+            }
+        }
+    }
+
+    public RepeatButton IncreaseRepeatButton
+    {
+        get => _increaseButton;
+        set
+        {
+            if (Equals(_decreaseButton, value) || Equals(_centerButton, value))
+            {
+                throw new NotSupportedException("SameButtons");
+            }
+            UpdateComponent(_increaseButton, value);
+            _increaseButton = value;
+
+            if (_increaseButton != null)
+            {
+                CommandManager.InvalidateRequerySuggested(); // Should post an idle queue item to update IsEnabled on button
+            }
+        }
+    }
+
+    public RangeThumb ThumbStart
+    {
+        get => _thumbStart;
+        set
+        {
+            UpdateComponent(_thumbStart, value);
+            _thumbStart = value;
+        }
+    }
+
+    public RangeThumb ThumbEnd
+    {
+        get => _thumbEnd;
+        set
+        {
+            UpdateComponent(_thumbEnd, value);
+            _thumbEnd = value;
+        }
+    }
+
+    static RangeTrack()
+    {
+        IsEnabledProperty.OverrideMetadata(typeof(RangeTrack), new UIPropertyMetadata(OnIsEnabledChanged));
+    }
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.Register(
+        "Orientation", typeof(Orientation), typeof(RangeTrack),
+        new FrameworkPropertyMetadata(default(Orientation), FrameworkPropertyMetadataOptions.AffectsMeasure));
+
+    public Orientation Orientation
+    {
+        get => (Orientation) GetValue(OrientationProperty);
+        set => SetValue(OrientationProperty, value);
+    }
+
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+        "Minimum", typeof(double), typeof(RangeTrack),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box, FrameworkPropertyMetadataOptions.AffectsArrange));
+
+    public double Minimum
+    {
+        get => (double) GetValue(MinimumProperty);
+        set => SetValue(MinimumProperty, value);
+    }
+
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+        "Maximum", typeof(double), typeof(RangeTrack),
+        new FrameworkPropertyMetadata(ValueBoxes.Double1Box, FrameworkPropertyMetadataOptions.AffectsArrange));
+
+    public double Maximum
+    {
+        get => (double) GetValue(MaximumProperty);
+        set => SetValue(MaximumProperty, value);
+    }
+
+    public static readonly DependencyProperty ValueStartProperty = DependencyProperty.Register(
+        "ValueStart", typeof(double), typeof(RangeTrack),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault |
+            FrameworkPropertyMetadataOptions.AffectsArrange));
+
+    public double ValueStart
+    {
+        get => (double) GetValue(ValueStartProperty);
+        set => SetValue(ValueStartProperty, value);
+    }
+
+    public static readonly DependencyProperty ValueEndProperty = DependencyProperty.Register(
+        "ValueEnd", typeof(double), typeof(RangeTrack),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault |
+            FrameworkPropertyMetadataOptions.AffectsArrange));
+
+    public double ValueEnd
+    {
+        get => (double) GetValue(ValueEndProperty);
+        set => SetValue(ValueEndProperty, value);
+    }
+
+    public static readonly DependencyProperty IsDirectionReversedProperty = DependencyProperty.Register(
+        "IsDirectionReversed", typeof(bool), typeof(RangeTrack), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsDirectionReversed
+    {
+        get => (bool) GetValue(IsDirectionReversedProperty);
+        set => SetValue(IsDirectionReversedProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override Visual GetVisualChild(int index)
+    {
+        if (_visualChildren?[index] == null)
+        {
+            // ReSharper disable once UseNameofExpression
+            // ReSharper disable once LocalizableElement
+            throw new ArgumentOutOfRangeException("index", index, "ArgumentOutOfRange");
+        }
+        return _visualChildren[index];
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        var desiredSize = new Size();
+
+        // Only measure thumb
+        // Repeat buttons will be sized based on thumb
+        if (_thumbStart != null)
+        {
+            _thumbStart.Measure(availableSize);
+            desiredSize = _thumbStart.DesiredSize;
+        }
+
+        if (_thumbEnd != null)
+        {
+            _thumbEnd.Measure(availableSize);
+            desiredSize = new Size(Math.Max(_thumbEnd.DesiredSize.Width, desiredSize.Width),
+                Math.Max(_thumbEnd.DesiredSize.Height, desiredSize.Height));
+        }
+
+        return desiredSize;
+    }
+
+    private static void CoerceLength(ref double componentLength, double trackLength)
+    {
+        if (componentLength < 0)
+        {
+            componentLength = 0;
+        }
+        else if (componentLength > trackLength || double.IsNaN(componentLength))
+        {
+            componentLength = trackLength;
+        }
+    }
+
+    protected override Size ArrangeOverride(Size arrangeSize)
+    {
+        var isVertical = Orientation == Orientation.Vertical;
+
+        ComputeLengths(arrangeSize, isVertical, out var decreaseButtonLength, out var centerButtonLength,
+            out var increaseButtonLength, out var thumbStartLength, out var thumbEndLength);
+
+        var offset = new Point();
+        var pieceSize = arrangeSize;
+        var isDirectionReversed = IsDirectionReversed;
+
+        if (isVertical)
+        {
+            CoerceLength(ref decreaseButtonLength, arrangeSize.Height);
+            CoerceLength(ref centerButtonLength, arrangeSize.Height);
+            CoerceLength(ref increaseButtonLength, arrangeSize.Height);
+            CoerceLength(ref thumbStartLength, arrangeSize.Height);
+            CoerceLength(ref thumbEndLength, arrangeSize.Height);
+
+            offset.Y = isDirectionReversed ? decreaseButtonLength + thumbEndLength + centerButtonLength + thumbStartLength : 0;
+            pieceSize.Height = increaseButtonLength;
+
+            IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.Y = isDirectionReversed ? decreaseButtonLength + thumbEndLength : increaseButtonLength + thumbStartLength;
+            pieceSize.Height = centerButtonLength;
+
+            CenterRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.Y = isDirectionReversed ? 0 : increaseButtonLength + thumbStartLength + centerButtonLength + thumbEndLength;
+            pieceSize.Height = decreaseButtonLength;
+
+            DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.Y = isDirectionReversed
+                ? decreaseButtonLength + thumbEndLength + centerButtonLength
+                : increaseButtonLength + thumbStartLength + centerButtonLength;
+            pieceSize.Height = thumbStartLength;
+
+            ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
+
+            offset.Y = isDirectionReversed ? decreaseButtonLength : increaseButtonLength;
+            pieceSize.Height = thumbEndLength;
+
+            ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
+        }
+        else
+        {
+            CoerceLength(ref decreaseButtonLength, arrangeSize.Width);
+            CoerceLength(ref centerButtonLength, arrangeSize.Width);
+            CoerceLength(ref increaseButtonLength, arrangeSize.Width);
+            CoerceLength(ref thumbStartLength, arrangeSize.Width);
+            CoerceLength(ref thumbEndLength, arrangeSize.Width);
+
+            offset.X = isDirectionReversed ? 0 : decreaseButtonLength + thumbEndLength + centerButtonLength + thumbStartLength;
+            pieceSize.Width = increaseButtonLength;
+
+            IncreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.X = isDirectionReversed ? increaseButtonLength + thumbStartLength : decreaseButtonLength + thumbEndLength;
+            pieceSize.Width = centerButtonLength;
+
+            CenterRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.X = isDirectionReversed ? increaseButtonLength + thumbStartLength + centerButtonLength + thumbEndLength : 0;
+            pieceSize.Width = decreaseButtonLength;
+
+            DecreaseRepeatButton?.Arrange(new Rect(offset, pieceSize));
+
+            offset.X = isDirectionReversed ? increaseButtonLength : decreaseButtonLength;
+            pieceSize.Width = thumbStartLength;
+
+            ArrangeThumb(isDirectionReversed, false, offset, pieceSize);
+
+            offset.X = isDirectionReversed
+                ? increaseButtonLength + thumbStartLength + centerButtonLength
+                : decreaseButtonLength + thumbEndLength + centerButtonLength;
+            pieceSize.Width = thumbEndLength;
+
+            ArrangeThumb(isDirectionReversed, true, offset, pieceSize);
+        }
+
+        return arrangeSize;
+    }
+
+    private void ArrangeThumb(bool isDirectionReversed, bool isStart, Point offset, Size pieceSize)
+    {
+        if (isStart)
+        {
+            if (isDirectionReversed)
+            {
+                ThumbStart?.Arrange(new Rect(offset, pieceSize));
+            }
+            else
+            {
+                ThumbEnd?.Arrange(new Rect(offset, pieceSize));
+            }
+        }
+        else
+        {
+            if (isDirectionReversed)
+            {
+                ThumbEnd?.Arrange(new Rect(offset, pieceSize));
+            }
+            else
+            {
+                ThumbStart?.Arrange(new Rect(offset, pieceSize));
+            }
+        }
+    }
+
+    private void ComputeLengths(Size arrangeSize, bool isVertical, out double decreaseButtonLength,
+        out double centerButtonLength, out double increaseButtonLength, out double thumbStartLength,
+        out double thumbEndLength)
+    {
+        var min = Minimum;
+        var range = Math.Max(0.0, Maximum - min);
+        var offsetStart = Math.Min(range, ValueStart - min);
+        var offsetEnd = Math.Min(range, ValueEnd - min);
+
+        double trackLength;
+
+        // Compute thumb size
+        if (isVertical)
+        {
+            trackLength = arrangeSize.Height;
+            thumbStartLength = _thumbStart?.DesiredSize.Height ?? 0;
+            thumbEndLength = _thumbEnd?.DesiredSize.Height ?? 0;
+        }
+        else
+        {
+            trackLength = arrangeSize.Width;
+            thumbStartLength = _thumbStart?.DesiredSize.Width ?? 0;
+            thumbEndLength = _thumbEnd?.DesiredSize.Width ?? 0;
+        }
+
+        CoerceLength(ref thumbStartLength, trackLength);
+        CoerceLength(ref thumbEndLength, trackLength);
+
+        var remainingTrackLength = trackLength - thumbStartLength - thumbEndLength;
+
+        decreaseButtonLength = remainingTrackLength * offsetStart / range;
+        CoerceLength(ref decreaseButtonLength, remainingTrackLength);
+
+        centerButtonLength = remainingTrackLength * offsetEnd / range - decreaseButtonLength;
+        CoerceLength(ref centerButtonLength, remainingTrackLength);
+
+        increaseButtonLength = remainingTrackLength - decreaseButtonLength - centerButtonLength;
+        CoerceLength(ref increaseButtonLength, remainingTrackLength);
+
+        Density = range / remainingTrackLength;
+    }
+
+    protected override int VisualChildrenCount
+    {
+        get
+        {
+            if (_visualChildren == null) return 0;
+
+            for (var i = 0; i < _visualChildren.Length; i++)
+            {
+                if (_visualChildren[i] == null) return i;
+            }
+
+            return _visualChildren.Length;
+        }
+    }
+
+    private static void OnIsEnabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if ((bool) e.NewValue)
+        {
+            Mouse.Synchronize();
+        }
+    }
+
+    public virtual double ValueFromPoint(Point pt)
+    {
+        return Orientation == Orientation.Horizontal
+            ? !IsDirectionReversed
+                ? pt.X / RenderSize.Width * Maximum
+                : (1 - pt.X / RenderSize.Width) * Maximum
+            : !IsDirectionReversed
+                ? pt.Y / RenderSize.Height * Maximum
+                : (1 - pt.X / RenderSize.Height) * Maximum;
+    }
+
+    public virtual double ValueFromDistance(double horizontal, double vertical)
+    {
+        double scale = IsDirectionReversed ? -1 : 1;
+        return Orientation == Orientation.Horizontal
+            ? scale * horizontal * Density
+            : -1 * scale * vertical * Density;
+    }
+
+    private void UpdateComponent(Control oldValue, Control newValue)
+    {
+        if (oldValue != newValue)
+        {
+            _visualChildren ??= new Visual[5];
+
+            if (oldValue != null)
+            {
+                // notify the visual layer that the old component has been removed.
+                RemoveVisualChild(oldValue);
+            }
+
+            // Remove the old value from our z index list and add new value to end
+            int i = 0;
+            while (i < 5)
+            {
+                // Array isn't full, break
+                if (_visualChildren[i] == null)
+                    break;
+
+                // found the old value
+                if (_visualChildren[i] == oldValue)
+                {
+                    // Move values down until end of array or a null element
+                    while (i < 4 && _visualChildren[i + 1] != null)
+                    {
+                        _visualChildren[i] = _visualChildren[i + 1];
+                        i++;
+                    }
+                }
+                else
+                {
+                    i++;
+                }
+            }
+            // Add newValue at end of z-order
+            _visualChildren[i] = newValue;
+
+            AddVisualChild(newValue);
+
+            InvalidateMeasure();
+            InvalidateArrange();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
index 03ce0fed..95fcb9f6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
@@ -5,170 +5,169 @@ using System.Windows.Controls;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TwoWayRangeBase : Control
 {
-    public class TwoWayRangeBase : Control
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
+        "Minimum", typeof(double), typeof(TwoWayRangeBase),
+        new PropertyMetadata(ValueBoxes.Double0Box, OnMinimumChanged), ValidateHelper.IsInRangeOfDouble);
+
+    private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
-            "Minimum", typeof(double), typeof(TwoWayRangeBase),
-            new PropertyMetadata(ValueBoxes.Double0Box, OnMinimumChanged), ValidateHelper.IsInRangeOfDouble);
+        var ctrl = (TwoWayRangeBase) d;
 
-        private static void OnMinimumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-
-            ctrl.CoerceValue(MaximumProperty);
-            ctrl.CoerceValue(ValueStartProperty);
-            ctrl.CoerceValue(ValueEndProperty);
-            ctrl.OnMinimumChanged((double) e.OldValue, (double) e.NewValue);
-        }
-
-        protected virtual void OnMinimumChanged(double oldMinimum, double newMinimum)
-        {
-        }
-
-        public double Minimum
-        {
-            get => (double) GetValue(MinimumProperty);
-            set => SetValue(MinimumProperty, value);
-        }
-
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
-            "Maximum", typeof(double), typeof(TwoWayRangeBase),
-            new PropertyMetadata(ValueBoxes.Double10Box, OnMaximumChanged, CoerceMaximum),
-            ValidateHelper.IsInRangeOfDouble);
-
-        private static object CoerceMaximum(DependencyObject d, object basevalue)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-            var min = ctrl.Minimum;
-            if ((double) basevalue < min)
-            {
-                return min;
-            }
-            return basevalue;
-        }
-
-        private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-
-            ctrl.CoerceValue(ValueStartProperty);
-            ctrl.CoerceValue(ValueEndProperty);
-            ctrl.OnMaximumChanged((double) e.OldValue, (double) e.NewValue);
-        }
-
-        protected virtual void OnMaximumChanged(double oldMaximum, double newMaximum)
-        {
-        }
-
-        public double Maximum
-        {
-            get => (double) GetValue(MaximumProperty);
-            set => SetValue(MaximumProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueStartProperty = DependencyProperty.Register(
-            "ValueStart", typeof(double), typeof(TwoWayRangeBase),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-                OnValueStartChanged, ConstrainToRange), ValidateHelper.IsInRangeOfDouble);
-
-        private static void OnValueStartChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-            ctrl.OnValueChanged(new DoubleRange
-            {
-                Start = (double) e.OldValue,
-                End = ctrl.ValueEnd
-            }, new DoubleRange
-            {
-                Start = (double) e.NewValue,
-                End = ctrl.ValueEnd
-            });
-        }
-
-        protected virtual void OnValueChanged(DoubleRange oldValue, DoubleRange newValue) => RaiseEvent(
-            new RoutedPropertyChangedEventArgs<DoubleRange>(oldValue, newValue) { RoutedEvent = ValueChangedEvent });
-
-        public double ValueStart
-        {
-            get => (double) GetValue(ValueStartProperty);
-            set => SetValue(ValueStartProperty, value);
-        }
-
-        public static readonly DependencyProperty ValueEndProperty = DependencyProperty.Register(
-            "ValueEnd", typeof(double), typeof(TwoWayRangeBase),
-            new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
-                OnValueEndChanged, ConstrainToRange), ValidateHelper.IsInRangeOfDouble);
-
-        private static void OnValueEndChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-            ctrl.OnValueChanged(new DoubleRange
-            {
-                Start = ctrl.ValueStart,
-                End = (double) e.OldValue
-            }, new DoubleRange
-            {
-                Start = ctrl.ValueStart,
-                End = (double) e.NewValue
-            });
-        }
-
-        public double ValueEnd
-        {
-            get => (double) GetValue(ValueEndProperty);
-            set => SetValue(ValueEndProperty, value);
-        }
-
-        internal static object ConstrainToRange(DependencyObject d, object value)
-        {
-            var ctrl = (TwoWayRangeBase) d;
-            var min = ctrl.Minimum;
-            var v = (double) value;
-            if (v < min)
-            {
-                return min;
-            }
-
-            var max = ctrl.Maximum;
-            if (v > max)
-            {
-                return max;
-            }
-
-            return value;
-        }
-
-        public static readonly DependencyProperty LargeChangeProperty = DependencyProperty.Register(
-            "LargeChange", typeof(double), typeof(TwoWayRangeBase), new PropertyMetadata(ValueBoxes.Double1Box),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public double LargeChange
-        {
-            get => (double) GetValue(LargeChangeProperty);
-            set => SetValue(LargeChangeProperty, value);
-        }
-
-        public static readonly DependencyProperty SmallChangeProperty = DependencyProperty.Register(
-            "SmallChange", typeof(double), typeof(TwoWayRangeBase), new PropertyMetadata(ValueBoxes.Double01Box),
-            ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
-
-        public double SmallChange
-        {
-            get => (double) GetValue(SmallChangeProperty);
-            set => SetValue(SmallChangeProperty, value);
-        }
-
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged",
-            RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<DoubleRange>), typeof(TwoWayRangeBase));
-
-        public event RoutedPropertyChangedEventHandler<DoubleRange> ValueChanged
-        {
-            add => AddHandler(ValueChangedEvent, value);
-            remove => RemoveHandler(ValueChangedEvent, value);
-        }
+        ctrl.CoerceValue(MaximumProperty);
+        ctrl.CoerceValue(ValueStartProperty);
+        ctrl.CoerceValue(ValueEndProperty);
+        ctrl.OnMinimumChanged((double) e.OldValue, (double) e.NewValue);
     }
-}
+
+    protected virtual void OnMinimumChanged(double oldMinimum, double newMinimum)
+    {
+    }
+
+    public double Minimum
+    {
+        get => (double) GetValue(MinimumProperty);
+        set => SetValue(MinimumProperty, value);
+    }
+
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
+        "Maximum", typeof(double), typeof(TwoWayRangeBase),
+        new PropertyMetadata(ValueBoxes.Double10Box, OnMaximumChanged, CoerceMaximum),
+        ValidateHelper.IsInRangeOfDouble);
+
+    private static object CoerceMaximum(DependencyObject d, object basevalue)
+    {
+        var ctrl = (TwoWayRangeBase) d;
+        var min = ctrl.Minimum;
+        if ((double) basevalue < min)
+        {
+            return min;
+        }
+        return basevalue;
+    }
+
+    private static void OnMaximumChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctrl = (TwoWayRangeBase) d;
+
+        ctrl.CoerceValue(ValueStartProperty);
+        ctrl.CoerceValue(ValueEndProperty);
+        ctrl.OnMaximumChanged((double) e.OldValue, (double) e.NewValue);
+    }
+
+    protected virtual void OnMaximumChanged(double oldMaximum, double newMaximum)
+    {
+    }
+
+    public double Maximum
+    {
+        get => (double) GetValue(MaximumProperty);
+        set => SetValue(MaximumProperty, value);
+    }
+
+    public static readonly DependencyProperty ValueStartProperty = DependencyProperty.Register(
+        "ValueStart", typeof(double), typeof(TwoWayRangeBase),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+            OnValueStartChanged, ConstrainToRange), ValidateHelper.IsInRangeOfDouble);
+
+    private static void OnValueStartChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctrl = (TwoWayRangeBase) d;
+        ctrl.OnValueChanged(new DoubleRange
+        {
+            Start = (double) e.OldValue,
+            End = ctrl.ValueEnd
+        }, new DoubleRange
+        {
+            Start = (double) e.NewValue,
+            End = ctrl.ValueEnd
+        });
+    }
+
+    protected virtual void OnValueChanged(DoubleRange oldValue, DoubleRange newValue) => RaiseEvent(
+        new RoutedPropertyChangedEventArgs<DoubleRange>(oldValue, newValue) { RoutedEvent = ValueChangedEvent });
+
+    public double ValueStart
+    {
+        get => (double) GetValue(ValueStartProperty);
+        set => SetValue(ValueStartProperty, value);
+    }
+
+    public static readonly DependencyProperty ValueEndProperty = DependencyProperty.Register(
+        "ValueEnd", typeof(double), typeof(TwoWayRangeBase),
+        new FrameworkPropertyMetadata(ValueBoxes.Double0Box,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+            OnValueEndChanged, ConstrainToRange), ValidateHelper.IsInRangeOfDouble);
+
+    private static void OnValueEndChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctrl = (TwoWayRangeBase) d;
+        ctrl.OnValueChanged(new DoubleRange
+        {
+            Start = ctrl.ValueStart,
+            End = (double) e.OldValue
+        }, new DoubleRange
+        {
+            Start = ctrl.ValueStart,
+            End = (double) e.NewValue
+        });
+    }
+
+    public double ValueEnd
+    {
+        get => (double) GetValue(ValueEndProperty);
+        set => SetValue(ValueEndProperty, value);
+    }
+
+    internal static object ConstrainToRange(DependencyObject d, object value)
+    {
+        var ctrl = (TwoWayRangeBase) d;
+        var min = ctrl.Minimum;
+        var v = (double) value;
+        if (v < min)
+        {
+            return min;
+        }
+
+        var max = ctrl.Maximum;
+        if (v > max)
+        {
+            return max;
+        }
+
+        return value;
+    }
+
+    public static readonly DependencyProperty LargeChangeProperty = DependencyProperty.Register(
+        "LargeChange", typeof(double), typeof(TwoWayRangeBase), new PropertyMetadata(ValueBoxes.Double1Box),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double LargeChange
+    {
+        get => (double) GetValue(LargeChangeProperty);
+        set => SetValue(LargeChangeProperty, value);
+    }
+
+    public static readonly DependencyProperty SmallChangeProperty = DependencyProperty.Register(
+        "SmallChange", typeof(double), typeof(TwoWayRangeBase), new PropertyMetadata(ValueBoxes.Double01Box),
+        ValidateHelper.IsInRangeOfPosDoubleIncludeZero);
+
+    public double SmallChange
+    {
+        get => (double) GetValue(SmallChangeProperty);
+        set => SetValue(SmallChangeProperty, value);
+    }
+
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged",
+        RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<DoubleRange>), typeof(TwoWayRangeBase));
+
+    public event RoutedPropertyChangedEventHandler<DoubleRange> ValueChanged
+    {
+        add => AddHandler(ValueChangedEvent, value);
+        remove => RemoveHandler(ValueChangedEvent, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
index 9d4acf2f..520d91dd 100644
--- a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
@@ -9,176 +9,175 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(StepBarItem))]
+[DefaultEvent("StepChanged")]
+[TemplatePart(Name = ElementProgressBarBack, Type = typeof(ProgressBar))]
+public class StepBar : ItemsControl
 {
-    [StyleTypedProperty(Property = "ItemContainerStyle", StyleTargetType = typeof(StepBarItem))]
-    [DefaultEvent("StepChanged")]
-    [TemplatePart(Name = ElementProgressBarBack, Type = typeof(ProgressBar))]
-    public class StepBar : ItemsControl
+    private ProgressBar _progressBarBack;
+
+    private int _oriStepIndex = -1;
+
+    #region Constants
+
+    private const string ElementProgressBarBack = "PART_ProgressBarBack";
+
+    #endregion Constants
+
+    public StepBar()
     {
-        private ProgressBar _progressBarBack;
+        CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) => Next()));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) => Prev()));
+        ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
+    }
 
-        private int _oriStepIndex = -1;
-
-        #region Constants
-
-        private const string ElementProgressBarBack = "PART_ProgressBarBack";
-
-        #endregion Constants
-
-        public StepBar()
+    private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
+    {
+        if (ItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated)
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Next, (s, e) => Next()));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Prev, (s, e) => Prev()));
-            ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
-        }
+            var count = Items.Count;
+            if (count <= 0) return;
 
-        private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
-        {
-            if (ItemContainerGenerator.Status == GeneratorStatus.ContainersGenerated)
+            for (var i = 0; i < count; i++)
             {
-                var count = Items.Count;
-                if (count <= 0) return;
-
-                for (var i = 0; i < count; i++)
+                if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepBarItem)
                 {
-                    if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepBarItem)
-                    {
-                        stepBarItem.Index = i + 1;
-                    }
-                }
-
-                if (_oriStepIndex > 0)
-                {
-                    StepIndex = _oriStepIndex;
-                    _oriStepIndex = -1;
-                }
-                else
-                {
-                    OnStepIndexChanged(StepIndex);
-                }
-            }
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is StepBarItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new StepBarItem();
-
-        /// <summary>
-        ///     步骤改变事件
-        /// </summary>
-        public static readonly RoutedEvent StepChangedEvent =
-            EventManager.RegisterRoutedEvent("StepChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<int>>), typeof(StepBar));
-
-        /// <summary>
-        ///     步骤改变事件
-        /// </summary>
-        [Category("Behavior")]
-        public event EventHandler<FunctionEventArgs<int>> StepChanged
-        {
-            add => AddHandler(StepChangedEvent, value);
-            remove => RemoveHandler(StepChangedEvent, value);
-        }
-
-        public static readonly DependencyProperty StepIndexProperty = DependencyProperty.Register(
-            "StepIndex", typeof(int), typeof(StepBar), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
-                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnStepIndexChanged, CoerceStepIndex));
-
-        private static object CoerceStepIndex(DependencyObject d, object basevalue)
-        {
-            var ctl = (StepBar) d;
-            var stepIndex = (int) basevalue;
-            if (ctl.Items.Count == 0 && stepIndex > 0)
-            {
-                ctl._oriStepIndex = stepIndex;
-                return ValueBoxes.Int0Box;
-            }
-
-            return stepIndex < 0
-                ? ValueBoxes.Int0Box
-                : stepIndex >= ctl.Items.Count
-                    ? ctl.Items.Count == 0 ? 0 : ctl.Items.Count - 1
-                    : basevalue;
-        }
-
-        private static void OnStepIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (StepBar) d;
-            ctl.OnStepIndexChanged((int) e.NewValue);
-        }
-
-        private void OnStepIndexChanged(int stepIndex)
-        {
-            for (var i = 0; i < stepIndex; i++)
-            {
-                if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepItemFinished)
-                {
-                    stepItemFinished.Status = StepStatus.Complete;
+                    stepBarItem.Index = i + 1;
                 }
             }
 
-            for (var i = stepIndex + 1; i < Items.Count; i++)
+            if (_oriStepIndex > 0)
             {
-                if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepItemFinished)
-                {
-                    stepItemFinished.Status = StepStatus.Waiting;
-                }
-            }
-
-            if (ItemContainerGenerator.ContainerFromIndex(stepIndex) is StepBarItem stepItemSelected)
-                stepItemSelected.Status = StepStatus.UnderWay;
-            _progressBarBack?.BeginAnimation(RangeBase.ValueProperty, AnimationHelper.CreateAnimation(stepIndex));
-
-            RaiseEvent(new FunctionEventArgs<int>(StepChangedEvent, this)
-            {
-                Info = stepIndex
-            });
-        }
-
-        public int StepIndex
-        {
-            get => (int) GetValue(StepIndexProperty);
-            set => SetValue(StepIndexProperty, value);
-        }
-
-        public static readonly DependencyProperty DockProperty = DependencyProperty.Register(
-            "Dock", typeof(Dock), typeof(StepBar), new PropertyMetadata(Dock.Top));
-
-        public Dock Dock
-        {
-            get => (Dock) GetValue(DockProperty);
-            set => SetValue(DockProperty, value);
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _progressBarBack = GetTemplateChild(ElementProgressBarBack) as ProgressBar;
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-
-            var colCount = Items.Count;
-            if (_progressBarBack == null || colCount <= 0) return;
-            _progressBarBack.Maximum = colCount - 1;
-            _progressBarBack.Value = StepIndex;
-
-            if (Dock == Dock.Top || Dock == Dock.Bottom)
-            {
-                _progressBarBack.Width = (colCount - 1) * (ActualWidth / colCount);
+                StepIndex = _oriStepIndex;
+                _oriStepIndex = -1;
             }
             else
             {
-                _progressBarBack.Height = (colCount - 1) * (ActualHeight / colCount);
+                OnStepIndexChanged(StepIndex);
+            }
+        }
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is StepBarItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new StepBarItem();
+
+    /// <summary>
+    ///     步骤改变事件
+    /// </summary>
+    public static readonly RoutedEvent StepChangedEvent =
+        EventManager.RegisterRoutedEvent("StepChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<int>>), typeof(StepBar));
+
+    /// <summary>
+    ///     步骤改变事件
+    /// </summary>
+    [Category("Behavior")]
+    public event EventHandler<FunctionEventArgs<int>> StepChanged
+    {
+        add => AddHandler(StepChangedEvent, value);
+        remove => RemoveHandler(StepChangedEvent, value);
+    }
+
+    public static readonly DependencyProperty StepIndexProperty = DependencyProperty.Register(
+        "StepIndex", typeof(int), typeof(StepBar), new FrameworkPropertyMetadata(ValueBoxes.Int0Box,
+            FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnStepIndexChanged, CoerceStepIndex));
+
+    private static object CoerceStepIndex(DependencyObject d, object basevalue)
+    {
+        var ctl = (StepBar) d;
+        var stepIndex = (int) basevalue;
+        if (ctl.Items.Count == 0 && stepIndex > 0)
+        {
+            ctl._oriStepIndex = stepIndex;
+            return ValueBoxes.Int0Box;
+        }
+
+        return stepIndex < 0
+            ? ValueBoxes.Int0Box
+            : stepIndex >= ctl.Items.Count
+                ? ctl.Items.Count == 0 ? 0 : ctl.Items.Count - 1
+                : basevalue;
+    }
+
+    private static void OnStepIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (StepBar) d;
+        ctl.OnStepIndexChanged((int) e.NewValue);
+    }
+
+    private void OnStepIndexChanged(int stepIndex)
+    {
+        for (var i = 0; i < stepIndex; i++)
+        {
+            if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepItemFinished)
+            {
+                stepItemFinished.Status = StepStatus.Complete;
             }
         }
 
-        public void Next() => StepIndex++;
+        for (var i = stepIndex + 1; i < Items.Count; i++)
+        {
+            if (ItemContainerGenerator.ContainerFromIndex(i) is StepBarItem stepItemFinished)
+            {
+                stepItemFinished.Status = StepStatus.Waiting;
+            }
+        }
 
-        public void Prev() => StepIndex--;
+        if (ItemContainerGenerator.ContainerFromIndex(stepIndex) is StepBarItem stepItemSelected)
+            stepItemSelected.Status = StepStatus.UnderWay;
+        _progressBarBack?.BeginAnimation(RangeBase.ValueProperty, AnimationHelper.CreateAnimation(stepIndex));
+
+        RaiseEvent(new FunctionEventArgs<int>(StepChangedEvent, this)
+        {
+            Info = stepIndex
+        });
     }
-}
+
+    public int StepIndex
+    {
+        get => (int) GetValue(StepIndexProperty);
+        set => SetValue(StepIndexProperty, value);
+    }
+
+    public static readonly DependencyProperty DockProperty = DependencyProperty.Register(
+        "Dock", typeof(Dock), typeof(StepBar), new PropertyMetadata(Dock.Top));
+
+    public Dock Dock
+    {
+        get => (Dock) GetValue(DockProperty);
+        set => SetValue(DockProperty, value);
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _progressBarBack = GetTemplateChild(ElementProgressBarBack) as ProgressBar;
+    }
+
+    protected override void OnRender(DrawingContext drawingContext)
+    {
+        base.OnRender(drawingContext);
+
+        var colCount = Items.Count;
+        if (_progressBarBack == null || colCount <= 0) return;
+        _progressBarBack.Maximum = colCount - 1;
+        _progressBarBack.Value = StepIndex;
+
+        if (Dock == Dock.Top || Dock == Dock.Bottom)
+        {
+            _progressBarBack.Width = (colCount - 1) * (ActualWidth / colCount);
+        }
+        else
+        {
+            _progressBarBack.Height = (colCount - 1) * (ActualHeight / colCount);
+        }
+    }
+
+    public void Next() => StepIndex++;
+
+    public void Prev() => StepIndex--;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
index 14d6e147..740dcddb 100644
--- a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
@@ -2,41 +2,40 @@
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     步骤条单元项
+/// </summary>
+public class StepBarItem : ContentControl
 {
     /// <summary>
-    ///     步骤条单元项
+    ///     步骤编号
     /// </summary>
-    public class StepBarItem : ContentControl
+    public static readonly DependencyProperty IndexProperty = DependencyProperty.Register(
+        "Index", typeof(int), typeof(StepBarItem), new PropertyMetadata(-1));
+
+    /// <summary>
+    ///     步骤编号
+    /// </summary>
+    public int Index
     {
-        /// <summary>
-        ///     步骤编号
-        /// </summary>
-        public static readonly DependencyProperty IndexProperty = DependencyProperty.Register(
-            "Index", typeof(int), typeof(StepBarItem), new PropertyMetadata(-1));
-
-        /// <summary>
-        ///     步骤编号
-        /// </summary>
-        public int Index
-        {
-            get => (int) GetValue(IndexProperty);
-            internal set => SetValue(IndexProperty, value);
-        }
-
-        /// <summary>
-        ///     步骤状态
-        /// </summary>
-        public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
-            "Status", typeof(StepStatus), typeof(StepBarItem), new PropertyMetadata(StepStatus.Waiting));
-
-        /// <summary>
-        ///     步骤状态
-        /// </summary>
-        public StepStatus Status
-        {
-            get => (StepStatus) GetValue(StatusProperty);
-            internal set => SetValue(StatusProperty, value);
-        }
+        get => (int) GetValue(IndexProperty);
+        internal set => SetValue(IndexProperty, value);
     }
-}
+
+    /// <summary>
+    ///     步骤状态
+    /// </summary>
+    public static readonly DependencyProperty StatusProperty = DependencyProperty.Register(
+        "Status", typeof(StepStatus), typeof(StepBarItem), new PropertyMetadata(StepStatus.Waiting));
+
+    /// <summary>
+    ///     步骤状态
+    /// </summary>
+    public StepStatus Status
+    {
+        get => (StepStatus) GetValue(StatusProperty);
+        internal set => SetValue(StatusProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
index 113ed356..0d7b2031 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -8,422 +8,421 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = OverflowButtonKey, Type = typeof(ContextMenuToggleButton))]
+[TemplatePart(Name = HeaderPanelKey, Type = typeof(TabPanel))]
+[TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
+[TemplatePart(Name = ScrollButtonLeft, Type = typeof(ButtonBase))]
+[TemplatePart(Name = ScrollButtonRight, Type = typeof(ButtonBase))]
+[TemplatePart(Name = HeaderBorder, Type = typeof(Border))]
+public class TabControl : System.Windows.Controls.TabControl
 {
-    [TemplatePart(Name = OverflowButtonKey, Type = typeof(ContextMenuToggleButton))]
-    [TemplatePart(Name = HeaderPanelKey, Type = typeof(TabPanel))]
-    [TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
-    [TemplatePart(Name = ScrollButtonLeft, Type = typeof(ButtonBase))]
-    [TemplatePart(Name = ScrollButtonRight, Type = typeof(ButtonBase))]
-    [TemplatePart(Name = HeaderBorder, Type = typeof(Border))]
-    public class TabControl : System.Windows.Controls.TabControl
+    private const string OverflowButtonKey = "PART_OverflowButton";
+
+    private const string HeaderPanelKey = "PART_HeaderPanel";
+
+    private const string OverflowScrollviewer = "PART_OverflowScrollviewer";
+
+    private const string ScrollButtonLeft = "PART_ScrollButtonLeft";
+
+    private const string ScrollButtonRight = "PART_ScrollButtonRight";
+
+    private const string HeaderBorder = "PART_HeaderBorder";
+
+    private ContextMenuToggleButton _buttonOverflow;
+
+    internal TabPanel HeaderPanel { get; private set; }
+
+    private ScrollViewer _scrollViewerOverflow;
+
+    private ButtonBase _buttonScrollLeft;
+
+    private ButtonBase _buttonScrollRight;
+
+    private Border _headerBorder;
+
+    /// <summary>
+    ///     是否为内部操作
+    /// </summary>
+    internal bool IsInternalAction;
+
+    /// <summary>
+    ///     是否启用动画
+    /// </summary>
+    public static readonly DependencyProperty IsAnimationEnabledProperty = DependencyProperty.Register(
+        "IsAnimationEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否启用动画
+    /// </summary>
+    public bool IsAnimationEnabled
     {
-        private const string OverflowButtonKey = "PART_OverflowButton";
+        get => (bool) GetValue(IsAnimationEnabledProperty);
+        set => SetValue(IsAnimationEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private const string HeaderPanelKey = "PART_HeaderPanel";
+    /// <summary>
+    ///     是否可以拖动
+    /// </summary>
+    public static readonly DependencyProperty IsDraggableProperty = DependencyProperty.Register(
+        "IsDraggable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        private const string OverflowScrollviewer = "PART_OverflowScrollviewer";
+    /// <summary>
+    ///     是否可以拖动
+    /// </summary>
+    public bool IsDraggable
+    {
+        get => (bool) GetValue(IsDraggableProperty);
+        set => SetValue(IsDraggableProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private const string ScrollButtonLeft = "PART_ScrollButtonLeft";
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.RegisterAttached(
+        "ShowCloseButton", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
 
-        private const string ScrollButtonRight = "PART_ScrollButtonRight";
+    public static void SetShowCloseButton(DependencyObject element, bool value)
+        => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
 
-        private const string HeaderBorder = "PART_HeaderBorder";
+    public static bool GetShowCloseButton(DependencyObject element)
+        => (bool) element.GetValue(ShowCloseButtonProperty);
 
-        private ContextMenuToggleButton _buttonOverflow;
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        internal TabPanel HeaderPanel { get; private set; }
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public static readonly DependencyProperty ShowContextMenuProperty = DependencyProperty.RegisterAttached(
+        "ShowContextMenu", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
 
-        private ScrollViewer _scrollViewerOverflow;
+    public static void SetShowContextMenu(DependencyObject element, bool value)
+        => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
 
-        private ButtonBase _buttonScrollLeft;
+    public static bool GetShowContextMenu(DependencyObject element)
+        => (bool) element.GetValue(ShowContextMenuProperty);
 
-        private ButtonBase _buttonScrollRight;
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public bool ShowContextMenu
+    {
+        get => (bool) GetValue(ShowContextMenuProperty);
+        set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private Border _headerBorder;
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+        "IsTabFillEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        /// <summary>
-        ///     是否为内部操作
-        /// </summary>
-        internal bool IsInternalAction;
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public bool IsTabFillEnabled
+    {
+        get => (bool) GetValue(IsTabFillEnabledProperty);
+        set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        /// <summary>
-        ///     是否启用动画
-        /// </summary>
-        public static readonly DependencyProperty IsAnimationEnabledProperty = DependencyProperty.Register(
-            "IsAnimationEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
+        "TabItemWidth", typeof(double), typeof(TabControl), new PropertyMetadata(200.0));
 
-        /// <summary>
-        ///     是否启用动画
-        /// </summary>
-        public bool IsAnimationEnabled
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public double TabItemWidth
+    {
+        get => (double) GetValue(TabItemWidthProperty);
+        set => SetValue(TabItemWidthProperty, value);
+    }
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
+        "TabItemHeight", typeof(double), typeof(TabControl), new PropertyMetadata(30.0));
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public double TabItemHeight
+    {
+        get => (double) GetValue(TabItemHeightProperty);
+        set => SetValue(TabItemHeightProperty, value);
+    }
+
+    /// <summary>
+    ///     是否可以滚动
+    /// </summary>
+    public static readonly DependencyProperty IsScrollableProperty = DependencyProperty.Register(
+        "IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否可以滚动
+    /// </summary>
+    public bool IsScrollable
+    {
+        get => (bool) GetValue(IsScrollableProperty);
+        set => SetValue(IsScrollableProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示溢出按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowOverflowButtonProperty = DependencyProperty.Register(
+        "ShowOverflowButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    /// <summary>
+    ///     是否显示溢出按钮
+    /// </summary>
+    public bool ShowOverflowButton
+    {
+        get => (bool) GetValue(ShowOverflowButtonProperty);
+        set => SetValue(ShowOverflowButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示滚动按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowScrollButtonProperty = DependencyProperty.Register(
+        "ShowScrollButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否显示滚动按钮
+    /// </summary>
+    public bool ShowScrollButton
+    {
+        get => (bool) GetValue(ShowScrollButtonProperty);
+        set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     可见的标签数量
+    /// </summary>
+    private int _itemShowCount;
+
+    protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+    {
+        base.OnItemsChanged(e);
+
+        if (HeaderPanel == null)
         {
-            get => (bool) GetValue(IsAnimationEnabledProperty);
-            set => SetValue(IsAnimationEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否可以拖动
-        /// </summary>
-        public static readonly DependencyProperty IsDraggableProperty = DependencyProperty.Register(
-            "IsDraggable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否可以拖动
-        /// </summary>
-        public bool IsDraggable
-        {
-            get => (bool) GetValue(IsDraggableProperty);
-            set => SetValue(IsDraggableProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否显示关闭按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.RegisterAttached(
-            "ShowCloseButton", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetShowCloseButton(DependencyObject element, bool value)
-            => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowCloseButton(DependencyObject element)
-            => (bool) element.GetValue(ShowCloseButtonProperty);
-
-        /// <summary>
-        ///     是否显示关闭按钮
-        /// </summary>
-        public bool ShowCloseButton
-        {
-            get => (bool) GetValue(ShowCloseButtonProperty);
-            set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否显示上下文菜单
-        /// </summary>
-        public static readonly DependencyProperty ShowContextMenuProperty = DependencyProperty.RegisterAttached(
-            "ShowContextMenu", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static void SetShowContextMenu(DependencyObject element, bool value)
-            => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowContextMenu(DependencyObject element)
-            => (bool) element.GetValue(ShowContextMenuProperty);
-
-        /// <summary>
-        ///     是否显示上下文菜单
-        /// </summary>
-        public bool ShowContextMenu
-        {
-            get => (bool) GetValue(ShowContextMenuProperty);
-            set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否将标签填充
-        /// </summary>
-        public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
-            "IsTabFillEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否将标签填充
-        /// </summary>
-        public bool IsTabFillEnabled
-        {
-            get => (bool) GetValue(IsTabFillEnabledProperty);
-            set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     标签宽度
-        /// </summary>
-        public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
-            "TabItemWidth", typeof(double), typeof(TabControl), new PropertyMetadata(200.0));
-
-        /// <summary>
-        ///     标签宽度
-        /// </summary>
-        public double TabItemWidth
-        {
-            get => (double) GetValue(TabItemWidthProperty);
-            set => SetValue(TabItemWidthProperty, value);
-        }
-
-        /// <summary>
-        ///     标签高度
-        /// </summary>
-        public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
-            "TabItemHeight", typeof(double), typeof(TabControl), new PropertyMetadata(30.0));
-
-        /// <summary>
-        ///     标签高度
-        /// </summary>
-        public double TabItemHeight
-        {
-            get => (double) GetValue(TabItemHeightProperty);
-            set => SetValue(TabItemHeightProperty, value);
-        }
-
-        /// <summary>
-        ///     是否可以滚动
-        /// </summary>
-        public static readonly DependencyProperty IsScrollableProperty = DependencyProperty.Register(
-            "IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否可以滚动
-        /// </summary>
-        public bool IsScrollable
-        {
-            get => (bool) GetValue(IsScrollableProperty);
-            set => SetValue(IsScrollableProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否显示溢出按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowOverflowButtonProperty = DependencyProperty.Register(
-            "ShowOverflowButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        /// <summary>
-        ///     是否显示溢出按钮
-        /// </summary>
-        public bool ShowOverflowButton
-        {
-            get => (bool) GetValue(ShowOverflowButtonProperty);
-            set => SetValue(ShowOverflowButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     是否显示滚动按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowScrollButtonProperty = DependencyProperty.Register(
-            "ShowScrollButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否显示滚动按钮
-        /// </summary>
-        public bool ShowScrollButton
-        {
-            get => (bool) GetValue(ShowScrollButtonProperty);
-            set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     可见的标签数量
-        /// </summary>
-        private int _itemShowCount;
-
-        protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
-        {
-            base.OnItemsChanged(e);
-
-            if (HeaderPanel == null)
-            {
-                IsInternalAction = false;
-                return;
-            }
-
-            UpdateOverflowButton();
-
-            if (IsInternalAction)
-            {
-                IsInternalAction = false;
-                return;
-            }
-
-            if (e.Action == NotifyCollectionChangedAction.Add)
-            {
-                for (var i = 0; i < Items.Count; i++)
-                {
-                    if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) return;
-                    item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
-                    item.TabPanel = HeaderPanel;
-                }
-            }
-
-            _headerBorder?.InvalidateMeasure();
             IsInternalAction = false;
+            return;
         }
 
-        public override void OnApplyTemplate()
+        UpdateOverflowButton();
+
+        if (IsInternalAction)
         {
-            if (_buttonOverflow != null)
-            {
-                if (_buttonOverflow.Menu != null)
-                {
-                    _buttonOverflow.Menu.Closed -= Menu_Closed;
-                    _buttonOverflow.Menu = null;
-                }
-
-                _buttonOverflow.Click -= ButtonOverflow_Click;
-            }
-
-            if (_buttonScrollLeft != null) _buttonScrollLeft.Click -= ButtonScrollLeft_Click;
-            if (_buttonScrollRight != null) _buttonScrollRight.Click -= ButtonScrollRight_Click;
-
-            base.OnApplyTemplate();
-            HeaderPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
-
-            if (IsTabFillEnabled) return;
-
-            _buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
-            _scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
-            _buttonScrollLeft = GetTemplateChild(ScrollButtonLeft) as ButtonBase;
-            _buttonScrollRight = GetTemplateChild(ScrollButtonRight) as ButtonBase;
-            _headerBorder = GetTemplateChild(HeaderBorder) as Border;
-
-            if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
-            if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;
-
-            if (_buttonOverflow != null)
-            {
-                var menu = new ContextMenu
-                {
-                    Placement = PlacementMode.Bottom,
-                    PlacementTarget = _buttonOverflow
-                };
-                menu.Closed += Menu_Closed;
-                _buttonOverflow.Menu = menu;
-                _buttonOverflow.Click += ButtonOverflow_Click;
-            }
+            IsInternalAction = false;
+            return;
         }
 
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        if (e.Action == NotifyCollectionChangedAction.Add)
         {
-            base.OnRenderSizeChanged(sizeInfo);
-            UpdateOverflowButton();
-        }
-
-        private void UpdateOverflowButton()
-        {
-            if (!IsTabFillEnabled)
-            {
-                _itemShowCount = (int) (ActualWidth / TabItemWidth);
-                _buttonOverflow?.Show(ShowOverflowButton && Items.Count > 0 && Items.Count >= _itemShowCount);
-            }
-        }
-
-        private void Menu_Closed(object sender, RoutedEventArgs e) => _buttonOverflow.IsChecked = false;
-
-        private void ButtonScrollRight_Click(object sender, RoutedEventArgs e) =>
-            _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Min(
-                _scrollViewerOverflow.CurrentHorizontalOffset + TabItemWidth, _scrollViewerOverflow.ScrollableWidth));
-
-        private void ButtonScrollLeft_Click(object sender, RoutedEventArgs e) =>
-            _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Max(
-                _scrollViewerOverflow.CurrentHorizontalOffset - TabItemWidth, 0));
-
-        private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
-        {
-            if (_buttonOverflow.IsChecked == true)
-            {
-                _buttonOverflow.Menu.Items.Clear();
-                for (var i = 0; i < Items.Count; i++)
-                {
-                    if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) continue;
-
-                    var menuItem = new MenuItem
-                    {
-                        HeaderStringFormat = ItemStringFormat,
-                        HeaderTemplate = ItemTemplate,
-                        HeaderTemplateSelector = ItemTemplateSelector,
-                        Header = item.Header,
-                        Width = TabItemWidth,
-                        IsChecked = item.IsSelected,
-                        IsCheckable = true,
-                        IsEnabled = item.IsEnabled
-                    };
-
-                    menuItem.Click += delegate
-                    {
-                        _buttonOverflow.IsChecked = false;
-
-                        var list = GetActualList();
-                        if (list == null) return;
-
-                        var actualItem = ItemContainerGenerator.ItemFromContainer(item);
-                        if (actualItem == null) return;
-
-                        var index = list.IndexOf(actualItem);
-                        if (index >= _itemShowCount)
-                        {
-                            list.Remove(actualItem);
-                            list.Insert(0, actualItem);
-                            HeaderPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey,
-                                IsAnimationEnabled
-                                    ? new Duration(TimeSpan.FromMilliseconds(200))
-                                    : new Duration(TimeSpan.FromMilliseconds(0)));
-                            HeaderPanel.ForceUpdate = true;
-                            HeaderPanel.Measure(new Size(HeaderPanel.DesiredSize.Width, ActualHeight));
-                            HeaderPanel.ForceUpdate = false;
-                            SetCurrentValue(SelectedIndexProperty, ValueBoxes.Int0Box);
-                        }
-
-                        item.IsSelected = true;
-                    };
-                    _buttonOverflow.Menu.Items.Add(menuItem);
-                }
-            }
-        }
-
-        internal double GetHorizontalOffset() => _scrollViewerOverflow?.CurrentHorizontalOffset ?? 0;
-
-        internal void UpdateScroll() => _scrollViewerOverflow?.RaiseEvent(new MouseWheelEventArgs(Mouse.PrimaryDevice, Environment.TickCount, 0)
-        {
-            RoutedEvent = MouseWheelEvent
-        });
-
-        internal void CloseAllItems() => CloseOtherItems(null);
-
-        internal void CloseOtherItems(TabItem currentItem)
-        {
-            var actualItem = currentItem != null ? ItemContainerGenerator.ItemFromContainer(currentItem) : null;
-
-            var list = GetActualList();
-            if (list == null) return;
-
-            IsInternalAction = true;
-
             for (var i = 0; i < Items.Count; i++)
             {
-                var item = list[i];
-                if (!Equals(item, actualItem) && item != null)
-                {
-                    var argsClosing = new CancelRoutedEventArgs(TabItem.ClosingEvent, item);
-
-                    if (ItemContainerGenerator.ContainerFromItem(item) is not TabItem tabItem) continue;
-
-                    tabItem.RaiseEvent(argsClosing);
-                    if (argsClosing.Cancel) return;
-
-                    tabItem.RaiseEvent(new RoutedEventArgs(TabItem.ClosedEvent, item));
-                    list.Remove(item);
-
-                    i--;
-                }
+                if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) return;
+                item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                item.TabPanel = HeaderPanel;
             }
-
-            SetCurrentValue(SelectedIndexProperty, Items.Count == 0 ? -1 : 0);
         }
 
-        internal IList GetActualList()
-        {
-            IList list;
-            if (ItemsSource != null)
-            {
-                list = ItemsSource as IList;
-            }
-            else
-            {
-                list = Items;
-            }
-
-            return list;
-        }
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is TabItem;
-
-        protected override DependencyObject GetContainerForItemOverride() => new TabItem();
+        _headerBorder?.InvalidateMeasure();
+        IsInternalAction = false;
     }
-}
+
+    public override void OnApplyTemplate()
+    {
+        if (_buttonOverflow != null)
+        {
+            if (_buttonOverflow.Menu != null)
+            {
+                _buttonOverflow.Menu.Closed -= Menu_Closed;
+                _buttonOverflow.Menu = null;
+            }
+
+            _buttonOverflow.Click -= ButtonOverflow_Click;
+        }
+
+        if (_buttonScrollLeft != null) _buttonScrollLeft.Click -= ButtonScrollLeft_Click;
+        if (_buttonScrollRight != null) _buttonScrollRight.Click -= ButtonScrollRight_Click;
+
+        base.OnApplyTemplate();
+        HeaderPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
+
+        if (IsTabFillEnabled) return;
+
+        _buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
+        _scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
+        _buttonScrollLeft = GetTemplateChild(ScrollButtonLeft) as ButtonBase;
+        _buttonScrollRight = GetTemplateChild(ScrollButtonRight) as ButtonBase;
+        _headerBorder = GetTemplateChild(HeaderBorder) as Border;
+
+        if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
+        if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;
+
+        if (_buttonOverflow != null)
+        {
+            var menu = new ContextMenu
+            {
+                Placement = PlacementMode.Bottom,
+                PlacementTarget = _buttonOverflow
+            };
+            menu.Closed += Menu_Closed;
+            _buttonOverflow.Menu = menu;
+            _buttonOverflow.Click += ButtonOverflow_Click;
+        }
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        UpdateOverflowButton();
+    }
+
+    private void UpdateOverflowButton()
+    {
+        if (!IsTabFillEnabled)
+        {
+            _itemShowCount = (int) (ActualWidth / TabItemWidth);
+            _buttonOverflow?.Show(ShowOverflowButton && Items.Count > 0 && Items.Count >= _itemShowCount);
+        }
+    }
+
+    private void Menu_Closed(object sender, RoutedEventArgs e) => _buttonOverflow.IsChecked = false;
+
+    private void ButtonScrollRight_Click(object sender, RoutedEventArgs e) =>
+        _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Min(
+            _scrollViewerOverflow.CurrentHorizontalOffset + TabItemWidth, _scrollViewerOverflow.ScrollableWidth));
+
+    private void ButtonScrollLeft_Click(object sender, RoutedEventArgs e) =>
+        _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Max(
+            _scrollViewerOverflow.CurrentHorizontalOffset - TabItemWidth, 0));
+
+    private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
+    {
+        if (_buttonOverflow.IsChecked == true)
+        {
+            _buttonOverflow.Menu.Items.Clear();
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) continue;
+
+                var menuItem = new MenuItem
+                {
+                    HeaderStringFormat = ItemStringFormat,
+                    HeaderTemplate = ItemTemplate,
+                    HeaderTemplateSelector = ItemTemplateSelector,
+                    Header = item.Header,
+                    Width = TabItemWidth,
+                    IsChecked = item.IsSelected,
+                    IsCheckable = true,
+                    IsEnabled = item.IsEnabled
+                };
+
+                menuItem.Click += delegate
+                {
+                    _buttonOverflow.IsChecked = false;
+
+                    var list = GetActualList();
+                    if (list == null) return;
+
+                    var actualItem = ItemContainerGenerator.ItemFromContainer(item);
+                    if (actualItem == null) return;
+
+                    var index = list.IndexOf(actualItem);
+                    if (index >= _itemShowCount)
+                    {
+                        list.Remove(actualItem);
+                        list.Insert(0, actualItem);
+                        HeaderPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey,
+                            IsAnimationEnabled
+                                ? new Duration(TimeSpan.FromMilliseconds(200))
+                                : new Duration(TimeSpan.FromMilliseconds(0)));
+                        HeaderPanel.ForceUpdate = true;
+                        HeaderPanel.Measure(new Size(HeaderPanel.DesiredSize.Width, ActualHeight));
+                        HeaderPanel.ForceUpdate = false;
+                        SetCurrentValue(SelectedIndexProperty, ValueBoxes.Int0Box);
+                    }
+
+                    item.IsSelected = true;
+                };
+                _buttonOverflow.Menu.Items.Add(menuItem);
+            }
+        }
+    }
+
+    internal double GetHorizontalOffset() => _scrollViewerOverflow?.CurrentHorizontalOffset ?? 0;
+
+    internal void UpdateScroll() => _scrollViewerOverflow?.RaiseEvent(new MouseWheelEventArgs(Mouse.PrimaryDevice, Environment.TickCount, 0)
+    {
+        RoutedEvent = MouseWheelEvent
+    });
+
+    internal void CloseAllItems() => CloseOtherItems(null);
+
+    internal void CloseOtherItems(TabItem currentItem)
+    {
+        var actualItem = currentItem != null ? ItemContainerGenerator.ItemFromContainer(currentItem) : null;
+
+        var list = GetActualList();
+        if (list == null) return;
+
+        IsInternalAction = true;
+
+        for (var i = 0; i < Items.Count; i++)
+        {
+            var item = list[i];
+            if (!Equals(item, actualItem) && item != null)
+            {
+                var argsClosing = new CancelRoutedEventArgs(TabItem.ClosingEvent, item);
+
+                if (ItemContainerGenerator.ContainerFromItem(item) is not TabItem tabItem) continue;
+
+                tabItem.RaiseEvent(argsClosing);
+                if (argsClosing.Cancel) return;
+
+                tabItem.RaiseEvent(new RoutedEventArgs(TabItem.ClosedEvent, item));
+                list.Remove(item);
+
+                i--;
+            }
+        }
+
+        SetCurrentValue(SelectedIndexProperty, Items.Count == 0 ? -1 : 0);
+    }
+
+    internal IList GetActualList()
+    {
+        IList list;
+        if (ItemsSource != null)
+        {
+            list = ItemsSource as IList;
+        }
+        else
+        {
+            list = Items;
+        }
+
+        return list;
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is TabItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new TabItem();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
index 5d62f0d5..c336417e 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
@@ -11,481 +11,480 @@ using HandyControl.Interactivity;
 using HandyControl.Tools;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TabItem : System.Windows.Controls.TabItem
 {
-    public class TabItem : System.Windows.Controls.TabItem
+    /// <summary>
+    ///     动画速度
+    /// </summary>
+    private const int AnimationSpeed = 150;
+
+    /// <summary>
+    ///     选项卡是否处于拖动状态
+    /// </summary>
+    private static bool ItemIsDragging;
+
+    /// <summary>
+    ///     选项卡是否等待被拖动
+    /// </summary>
+    private bool _isWaiting;
+
+    /// <summary>
+    ///     拖动中的选项卡坐标
+    /// </summary>
+    private Point _dragPoint;
+
+    /// <summary>
+    ///     鼠标按下时选项卡位置
+    /// </summary>
+    private int _mouseDownIndex;
+
+    /// <summary>
+    ///     鼠标按下时选项卡横向偏移
+    /// </summary>
+    private double _mouseDownOffsetX;
+
+    /// <summary>
+    ///     鼠标按下时的坐标
+    /// </summary>
+    private Point _mouseDownPoint;
+
+    /// <summary>
+    ///     右侧可移动的最大值
+    /// </summary>
+    private double _maxMoveRight;
+
+    /// <summary>
+    ///     左侧可移动的最大值
+    /// </summary>
+    private double _maxMoveLeft;
+
+    /// <summary>
+    ///     选项卡宽度
+    /// </summary>
+    public double ItemWidth { get; internal set; }
+
+    /// <summary>
+    ///     选项卡拖动等待距离（在鼠标移动了超过20个像素无关单位后，选项卡才开始被拖动）
+    /// </summary>
+    private const double WaitLength = 20;
+
+    /// <summary>
+    ///     选项卡是否处于拖动状态
+    /// </summary>
+    private bool _isDragging;
+
+    /// <summary>
+    ///     选项卡是否已经被拖动
+    /// </summary>
+    private bool _isDragged;
+
+    /// <summary>
+    ///     目标横向位移
+    /// </summary>
+    internal double TargetOffsetX { get; set; }
+
+    /// <summary>
+    ///     当前编号
+    /// </summary>
+    private int _currentIndex;
+
+    /// <summary>
+    ///     标签容器横向滚动距离
+    /// </summary>
+    private double _scrollHorizontalOffset;
+
+    private TabPanel _tabPanel;
+
+    /// <summary>
+    ///     标签容器
+    /// </summary>
+    internal TabPanel TabPanel
     {
-        /// <summary>
-        ///     动画速度
-        /// </summary>
-        private const int AnimationSpeed = 150;
-
-        /// <summary>
-        ///     选项卡是否处于拖动状态
-        /// </summary>
-        private static bool ItemIsDragging;
-
-        /// <summary>
-        ///     选项卡是否等待被拖动
-        /// </summary>
-        private bool _isWaiting;
-
-        /// <summary>
-        ///     拖动中的选项卡坐标
-        /// </summary>
-        private Point _dragPoint;
-
-        /// <summary>
-        ///     鼠标按下时选项卡位置
-        /// </summary>
-        private int _mouseDownIndex;
-
-        /// <summary>
-        ///     鼠标按下时选项卡横向偏移
-        /// </summary>
-        private double _mouseDownOffsetX;
-
-        /// <summary>
-        ///     鼠标按下时的坐标
-        /// </summary>
-        private Point _mouseDownPoint;
-
-        /// <summary>
-        ///     右侧可移动的最大值
-        /// </summary>
-        private double _maxMoveRight;
-
-        /// <summary>
-        ///     左侧可移动的最大值
-        /// </summary>
-        private double _maxMoveLeft;
-
-        /// <summary>
-        ///     选项卡宽度
-        /// </summary>
-        public double ItemWidth { get; internal set; }
-
-        /// <summary>
-        ///     选项卡拖动等待距离（在鼠标移动了超过20个像素无关单位后，选项卡才开始被拖动）
-        /// </summary>
-        private const double WaitLength = 20;
-
-        /// <summary>
-        ///     选项卡是否处于拖动状态
-        /// </summary>
-        private bool _isDragging;
-
-        /// <summary>
-        ///     选项卡是否已经被拖动
-        /// </summary>
-        private bool _isDragged;
-
-        /// <summary>
-        ///     目标横向位移
-        /// </summary>
-        internal double TargetOffsetX { get; set; }
-
-        /// <summary>
-        ///     当前编号
-        /// </summary>
-        private int _currentIndex;
-
-        /// <summary>
-        ///     标签容器横向滚动距离
-        /// </summary>
-        private double _scrollHorizontalOffset;
-
-        private TabPanel _tabPanel;
-
-        /// <summary>
-        ///     标签容器
-        /// </summary>
-        internal TabPanel TabPanel
+        get
         {
-            get
+            if (_tabPanel == null && TabControlParent != null)
             {
-                if (_tabPanel == null && TabControlParent != null)
-                {
-                    _tabPanel = TabControlParent.HeaderPanel;
-                }
-
-                return _tabPanel;
-            }
-            set => _tabPanel = value;
-        }
-
-        /// <summary>
-        ///     当前编号
-        /// </summary>
-        internal int CurrentIndex
-        {
-            get => _currentIndex;
-            set
-            {
-                if (_currentIndex == value || value < 0) return;
-                var oldIndex = _currentIndex;
-                _currentIndex = value;
-                UpdateItemOffsetX(oldIndex);
-            }
-        }
-
-        /// <summary>
-        ///     是否显示关闭按钮
-        /// </summary>
-        public static readonly DependencyProperty ShowCloseButtonProperty =
-            TabControl.ShowCloseButtonProperty.AddOwner(typeof(TabItem));
-
-        /// <summary>
-        ///     是否显示关闭按钮
-        /// </summary>
-        public bool ShowCloseButton
-        {
-            get => (bool) GetValue(ShowCloseButtonProperty);
-            set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static void SetShowCloseButton(DependencyObject element, bool value)
-            => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowCloseButton(DependencyObject element)
-            => (bool) element.GetValue(ShowCloseButtonProperty);
-
-        /// <summary>
-        ///     是否显示上下文菜单
-        /// </summary>
-        public static readonly DependencyProperty ShowContextMenuProperty =
-            TabControl.ShowContextMenuProperty.AddOwner(typeof(TabItem), new FrameworkPropertyMetadata(OnShowContextMenuChanged));
-
-        private static void OnShowContextMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (TabItem) d;
-            if (ctl.Menu != null)
-            {
-                var show = (bool) e.NewValue;
-                ctl.Menu.IsEnabled = show;
-                ctl.Menu.Show(show);
-            }
-        }
-
-        /// <summary>
-        ///     是否显示上下文菜单
-        /// </summary>
-        public bool ShowContextMenu
-        {
-            get => (bool) GetValue(ShowContextMenuProperty);
-            set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static void SetShowContextMenu(DependencyObject element, bool value)
-            => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetShowContextMenu(DependencyObject element)
-            => (bool) element.GetValue(ShowContextMenuProperty);
-
-        public static readonly DependencyProperty MenuProperty = DependencyProperty.Register(
-            "Menu", typeof(ContextMenu), typeof(TabItem), new PropertyMetadata(default(ContextMenu), OnMenuChanged));
-
-        private static void OnMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (TabItem) d;
-            ctl.OnMenuChanged(e.NewValue as ContextMenu);
-        }
-
-        private void OnMenuChanged(ContextMenu menu)
-        {
-            if (IsLoaded && menu != null)
-            {
-                var parent = TabControlParent;
-                if (parent == null) return;
-
-                var item = parent.ItemContainerGenerator.ItemFromContainer(this);
-
-                menu.DataContext = item;
-                menu.SetBinding(IsEnabledProperty, new Binding(ShowContextMenuProperty.Name)
-                {
-                    Source = this
-                });
-                menu.SetBinding(VisibilityProperty, new Binding(ShowContextMenuProperty.Name)
-                {
-                    Source = this,
-                    Converter = ResourceHelper.GetResourceInternal<IValueConverter>(ResourceToken.Boolean2VisibilityConverter)
-                });
-            }
-        }
-
-        public ContextMenu Menu
-        {
-            get => (ContextMenu) GetValue(MenuProperty);
-            set => SetValue(MenuProperty, value);
-        }
-
-        /// <summary>
-        ///     更新选项卡横向偏移
-        /// </summary>
-        /// <param name="oldIndex"></param>
-        private void UpdateItemOffsetX(int oldIndex)
-        {
-            if (!_isDragging || CurrentIndex >= TabPanel.ItemDic.Count)
-            {
-                return;
+                _tabPanel = TabControlParent.HeaderPanel;
             }
 
-            var moveItem = TabPanel.ItemDic[CurrentIndex];
-            moveItem.CurrentIndex -= CurrentIndex - oldIndex;
-            var offsetX = moveItem.TargetOffsetX;
-            var resultX = offsetX + (oldIndex - CurrentIndex) * ItemWidth;
-            TabPanel.ItemDic[CurrentIndex] = this;
-            TabPanel.ItemDic[moveItem.CurrentIndex] = moveItem;
-            moveItem.CreateAnimation(offsetX, resultX);
+            return _tabPanel;
         }
+        set => _tabPanel = value;
+    }
 
-        public TabItem()
+    /// <summary>
+    ///     当前编号
+    /// </summary>
+    internal int CurrentIndex
+    {
+        get => _currentIndex;
+        set
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
-            CommandBindings.Add(new CommandBinding(ControlCommands.CloseAll,
-                (s, e) => { TabControlParent.CloseAllItems(); }));
-            CommandBindings.Add(new CommandBinding(ControlCommands.CloseOther,
-                (s, e) => { TabControlParent.CloseOtherItems(this); }));
-
-            Loaded += (s, e) => OnMenuChanged(Menu);
+            if (_currentIndex == value || value < 0) return;
+            var oldIndex = _currentIndex;
+            _currentIndex = value;
+            UpdateItemOffsetX(oldIndex);
         }
+    }
 
-        private TabControl TabControlParent => ItemsControl.ItemsControlFromItemContainer(this) as TabControl;
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowCloseButtonProperty =
+        TabControl.ShowCloseButtonProperty.AddOwner(typeof(TabItem));
 
-        protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static void SetShowCloseButton(DependencyObject element, bool value)
+        => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowCloseButton(DependencyObject element)
+        => (bool) element.GetValue(ShowCloseButtonProperty);
+
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public static readonly DependencyProperty ShowContextMenuProperty =
+        TabControl.ShowContextMenuProperty.AddOwner(typeof(TabItem), new FrameworkPropertyMetadata(OnShowContextMenuChanged));
+
+    private static void OnShowContextMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TabItem) d;
+        if (ctl.Menu != null)
         {
-            base.OnMouseRightButtonDown(e);
-
-            if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
-            IsSelected = true;
-            Focus();
+            var show = (bool) e.NewValue;
+            ctl.Menu.IsEnabled = show;
+            ctl.Menu.Show(show);
         }
+    }
 
-        protected override void OnHeaderChanged(object oldHeader, object newHeader)
-        {
-            base.OnHeaderChanged(oldHeader, newHeader);
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public bool ShowContextMenu
+    {
+        get => (bool) GetValue(ShowContextMenuProperty);
+        set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+    }
 
-            if (TabPanel != null)
-            {
-                TabPanel.ForceUpdate = true;
-                InvalidateMeasure();
-                TabPanel.ForceUpdate = true;
-            }
-        }
+    public static void SetShowContextMenu(DependencyObject element, bool value)
+        => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
 
-        internal void Close()
+    public static bool GetShowContextMenu(DependencyObject element)
+        => (bool) element.GetValue(ShowContextMenuProperty);
+
+    public static readonly DependencyProperty MenuProperty = DependencyProperty.Register(
+        "Menu", typeof(ContextMenu), typeof(TabItem), new PropertyMetadata(default(ContextMenu), OnMenuChanged));
+
+    private static void OnMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TabItem) d;
+        ctl.OnMenuChanged(e.NewValue as ContextMenu);
+    }
+
+    private void OnMenuChanged(ContextMenu menu)
+    {
+        if (IsLoaded && menu != null)
         {
             var parent = TabControlParent;
             if (parent == null) return;
 
             var item = parent.ItemContainerGenerator.ItemFromContainer(this);
 
-            var argsClosing = new CancelRoutedEventArgs(ClosingEvent, item);
-            RaiseEvent(argsClosing);
-            if (argsClosing.Cancel) return;
+            menu.DataContext = item;
+            menu.SetBinding(IsEnabledProperty, new Binding(ShowContextMenuProperty.Name)
+            {
+                Source = this
+            });
+            menu.SetBinding(VisibilityProperty, new Binding(ShowContextMenuProperty.Name)
+            {
+                Source = this,
+                Converter = ResourceHelper.GetResourceInternal<IValueConverter>(ResourceToken.Boolean2VisibilityConverter)
+            });
+        }
+    }
 
-            TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, parent.IsAnimationEnabled
-                    ? new Duration(TimeSpan.FromMilliseconds(200))
-                    : new Duration(TimeSpan.FromMilliseconds(1)));
+    public ContextMenu Menu
+    {
+        get => (ContextMenu) GetValue(MenuProperty);
+        set => SetValue(MenuProperty, value);
+    }
 
-            parent.IsInternalAction = true;
-            RaiseEvent(new RoutedEventArgs(ClosedEvent, item));
-
-            var list = parent.GetActualList();
-            list?.Remove(item);
+    /// <summary>
+    ///     更新选项卡横向偏移
+    /// </summary>
+    /// <param name="oldIndex"></param>
+    private void UpdateItemOffsetX(int oldIndex)
+    {
+        if (!_isDragging || CurrentIndex >= TabPanel.ItemDic.Count)
+        {
+            return;
         }
 
-        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
+        var moveItem = TabPanel.ItemDic[CurrentIndex];
+        moveItem.CurrentIndex -= CurrentIndex - oldIndex;
+        var offsetX = moveItem.TargetOffsetX;
+        var resultX = offsetX + (oldIndex - CurrentIndex) * ItemWidth;
+        TabPanel.ItemDic[CurrentIndex] = this;
+        TabPanel.ItemDic[moveItem.CurrentIndex] = moveItem;
+        moveItem.CreateAnimation(offsetX, resultX);
+    }
 
-            if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
+    public TabItem()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
+        CommandBindings.Add(new CommandBinding(ControlCommands.CloseAll,
+            (s, e) => { TabControlParent.CloseAllItems(); }));
+        CommandBindings.Add(new CommandBinding(ControlCommands.CloseOther,
+            (s, e) => { TabControlParent.CloseOtherItems(this); }));
+
+        Loaded += (s, e) => OnMenuChanged(Menu);
+    }
+
+    private TabControl TabControlParent => ItemsControl.ItemsControlFromItemContainer(this) as TabControl;
+
+    protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseRightButtonDown(e);
+
+        if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
+        IsSelected = true;
+        Focus();
+    }
+
+    protected override void OnHeaderChanged(object oldHeader, object newHeader)
+    {
+        base.OnHeaderChanged(oldHeader, newHeader);
+
+        if (TabPanel != null)
+        {
+            TabPanel.ForceUpdate = true;
+            InvalidateMeasure();
+            TabPanel.ForceUpdate = true;
+        }
+    }
+
+    internal void Close()
+    {
+        var parent = TabControlParent;
+        if (parent == null) return;
+
+        var item = parent.ItemContainerGenerator.ItemFromContainer(this);
+
+        var argsClosing = new CancelRoutedEventArgs(ClosingEvent, item);
+        RaiseEvent(argsClosing);
+        if (argsClosing.Cancel) return;
+
+        TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, parent.IsAnimationEnabled
+            ? new Duration(TimeSpan.FromMilliseconds(200))
+            : new Duration(TimeSpan.FromMilliseconds(1)));
+
+        parent.IsInternalAction = true;
+        RaiseEvent(new RoutedEventArgs(ClosedEvent, item));
+
+        var list = parent.GetActualList();
+        list?.Remove(item);
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+
+        if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
+        var parent = TabControlParent;
+        if (parent == null) return;
+
+        if (parent.IsDraggable && !ItemIsDragging && !_isDragging)
+        {
+            parent.UpdateScroll();
+            TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromSeconds(0)));
+            _mouseDownOffsetX = RenderTransform.Value.OffsetX;
+            _scrollHorizontalOffset = parent.GetHorizontalOffset();
+            var mx = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            _mouseDownIndex = CalLocationIndex(mx);
+            var subIndex = _mouseDownIndex - CalLocationIndex(_scrollHorizontalOffset);
+            _maxMoveLeft = -subIndex * ItemWidth;
+            _maxMoveRight = parent.ActualWidth - ActualWidth + _maxMoveLeft;
+
+            _isDragging = true;
+            ItemIsDragging = true;
+            _isWaiting = true;
+            _dragPoint = e.GetPosition(parent);
+            _dragPoint = new Point(_dragPoint.X + _scrollHorizontalOffset, _dragPoint.Y);
+            _mouseDownPoint = _dragPoint;
+            CaptureMouse();
+        }
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+        base.OnMouseMove(e);
+
+        if (ItemIsDragging && _isDragging)
+        {
             var parent = TabControlParent;
             if (parent == null) return;
 
-            if (parent.IsDraggable && !ItemIsDragging && !_isDragging)
-            {
-                parent.UpdateScroll();
-                TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromSeconds(0)));
-                _mouseDownOffsetX = RenderTransform.Value.OffsetX;
-                _scrollHorizontalOffset = parent.GetHorizontalOffset();
-                var mx = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
-                _mouseDownIndex = CalLocationIndex(mx);
-                var subIndex = _mouseDownIndex - CalLocationIndex(_scrollHorizontalOffset);
-                _maxMoveLeft = -subIndex * ItemWidth;
-                _maxMoveRight = parent.ActualWidth - ActualWidth + _maxMoveLeft;
+            var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            CurrentIndex = CalLocationIndex(subX);
 
-                _isDragging = true;
-                ItemIsDragging = true;
-                _isWaiting = true;
-                _dragPoint = e.GetPosition(parent);
-                _dragPoint = new Point(_dragPoint.X + _scrollHorizontalOffset, _dragPoint.Y);
-                _mouseDownPoint = _dragPoint;
-                CaptureMouse();
+            var p = e.GetPosition(parent);
+            p = new Point(p.X + _scrollHorizontalOffset, p.Y);
+
+            var subLeft = p.X - _dragPoint.X;
+            var totalLeft = p.X - _mouseDownPoint.X;
+
+            if (Math.Abs(subLeft) <= WaitLength && _isWaiting) return;
+
+            _isWaiting = false;
+            _isDragged = true;
+
+            var left = subLeft + RenderTransform.Value.OffsetX;
+            if (totalLeft < _maxMoveLeft)
+            {
+                left = _maxMoveLeft + _mouseDownOffsetX;
             }
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-
-            if (ItemIsDragging && _isDragging)
+            else if (totalLeft > _maxMoveRight)
             {
-                var parent = TabControlParent;
-                if (parent == null) return;
-
-                var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
-                CurrentIndex = CalLocationIndex(subX);
-
-                var p = e.GetPosition(parent);
-                p = new Point(p.X + _scrollHorizontalOffset, p.Y);
-
-                var subLeft = p.X - _dragPoint.X;
-                var totalLeft = p.X - _mouseDownPoint.X;
-
-                if (Math.Abs(subLeft) <= WaitLength && _isWaiting) return;
-
-                _isWaiting = false;
-                _isDragged = true;
-
-                var left = subLeft + RenderTransform.Value.OffsetX;
-                if (totalLeft < _maxMoveLeft)
-                {
-                    left = _maxMoveLeft + _mouseDownOffsetX;
-                }
-                else if (totalLeft > _maxMoveRight)
-                {
-                    left = _maxMoveRight + _mouseDownOffsetX;
-                }
-
-                var t = new TranslateTransform(left, 0);
-                RenderTransform = t;
-                _dragPoint = p;
-            }
-        }
-
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonUp(e);
-
-            ReleaseMouseCapture();
-
-            if (_isDragged)
-            {
-                var parent = TabControlParent;
-                if (parent == null) return;
-
-                var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
-                var index = CalLocationIndex(subX);
-                var left = index * ItemWidth;
-                var offsetX = RenderTransform.Value.OffsetX;
-                CreateAnimation(offsetX, offsetX - subX + left, index);
+                left = _maxMoveRight + _mouseDownOffsetX;
             }
 
-            _isDragging = false;
-            ItemIsDragging = false;
-            _isDragged = false;
-        }
-
-        protected override void OnMouseDown(MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Pressed)
-            {
-                if (ShowCloseButton || ShowContextMenu)
-                {
-                    Close();
-                }
-            }
-        }
-
-        /// <summary>
-        ///     创建动画
-        /// </summary>
-        internal void CreateAnimation(double offsetX, double resultX, int index = -1)
-        {
-            var parent = TabControlParent;
-
-            void AnimationCompleted()
-            {
-                RenderTransform = new TranslateTransform(resultX, 0);
-                if (index == -1) return;
-
-                var list = parent.GetActualList();
-                if (list == null) return;
-
-                var item = parent.ItemContainerGenerator.ItemFromContainer(this);
-                if (item == null) return;
-
-                TabPanel.CanUpdate = false;
-                parent.IsInternalAction = true;
-
-                list.Remove(item);
-                parent.IsInternalAction = true;
-                list.Insert(index, item);
-                _tabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromMilliseconds(0)));
-                TabPanel.CanUpdate = true;
-                TabPanel.ForceUpdate = true;
-                TabPanel.Measure(new Size(TabPanel.DesiredSize.Width, ActualHeight));
-                TabPanel.ForceUpdate = false;
-
-                Focus();
-                IsSelected = true;
-
-                if (!IsMouseCaptured)
-                {
-                    parent.SetCurrentValue(Selector.SelectedIndexProperty, _currentIndex);
-                }
-            }
-
-            TargetOffsetX = resultX;
-            if (!parent.IsAnimationEnabled)
-            {
-                AnimationCompleted();
-                return;
-            }
-
-            var animation = AnimationHelper.CreateAnimation(resultX, AnimationSpeed);
-            animation.FillBehavior = FillBehavior.Stop;
-            animation.Completed += (s1, e1) => AnimationCompleted();
-            var f = new TranslateTransform(offsetX, 0);
-            RenderTransform = f;
-            f.BeginAnimation(TranslateTransform.XProperty, animation, HandoffBehavior.Compose);
-        }
-
-        /// <summary>
-        ///     计算选项卡当前合适的位置编号
-        /// </summary>
-        /// <param name="left"></param>
-        /// <returns></returns>
-        private int CalLocationIndex(double left)
-        {
-            if (_isWaiting)
-            {
-                return CurrentIndex;
-            }
-
-            var maxIndex = TabControlParent.Items.Count - 1;
-            var div = (int) (left / ItemWidth);
-            var rest = left % ItemWidth;
-            var result = rest / ItemWidth > .5 ? div + 1 : div;
-
-            return result > maxIndex ? maxIndex : result;
-        }
-
-        public static readonly RoutedEvent ClosingEvent = EventManager.RegisterRoutedEvent("Closing", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
-
-        public event EventHandler Closing
-        {
-            add => AddHandler(ClosingEvent, value);
-            remove => RemoveHandler(ClosingEvent, value);
-        }
-
-        public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
-
-        public event EventHandler Closed
-        {
-            add => AddHandler(ClosedEvent, value);
-            remove => RemoveHandler(ClosedEvent, value);
+            var t = new TranslateTransform(left, 0);
+            RenderTransform = t;
+            _dragPoint = p;
         }
     }
-}
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+
+        ReleaseMouseCapture();
+
+        if (_isDragged)
+        {
+            var parent = TabControlParent;
+            if (parent == null) return;
+
+            var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            var index = CalLocationIndex(subX);
+            var left = index * ItemWidth;
+            var offsetX = RenderTransform.Value.OffsetX;
+            CreateAnimation(offsetX, offsetX - subX + left, index);
+        }
+
+        _isDragging = false;
+        ItemIsDragging = false;
+        _isDragged = false;
+    }
+
+    protected override void OnMouseDown(MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Pressed)
+        {
+            if (ShowCloseButton || ShowContextMenu)
+            {
+                Close();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     创建动画
+    /// </summary>
+    internal void CreateAnimation(double offsetX, double resultX, int index = -1)
+    {
+        var parent = TabControlParent;
+
+        void AnimationCompleted()
+        {
+            RenderTransform = new TranslateTransform(resultX, 0);
+            if (index == -1) return;
+
+            var list = parent.GetActualList();
+            if (list == null) return;
+
+            var item = parent.ItemContainerGenerator.ItemFromContainer(this);
+            if (item == null) return;
+
+            TabPanel.CanUpdate = false;
+            parent.IsInternalAction = true;
+
+            list.Remove(item);
+            parent.IsInternalAction = true;
+            list.Insert(index, item);
+            _tabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromMilliseconds(0)));
+            TabPanel.CanUpdate = true;
+            TabPanel.ForceUpdate = true;
+            TabPanel.Measure(new Size(TabPanel.DesiredSize.Width, ActualHeight));
+            TabPanel.ForceUpdate = false;
+
+            Focus();
+            IsSelected = true;
+
+            if (!IsMouseCaptured)
+            {
+                parent.SetCurrentValue(Selector.SelectedIndexProperty, _currentIndex);
+            }
+        }
+
+        TargetOffsetX = resultX;
+        if (!parent.IsAnimationEnabled)
+        {
+            AnimationCompleted();
+            return;
+        }
+
+        var animation = AnimationHelper.CreateAnimation(resultX, AnimationSpeed);
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s1, e1) => AnimationCompleted();
+        var f = new TranslateTransform(offsetX, 0);
+        RenderTransform = f;
+        f.BeginAnimation(TranslateTransform.XProperty, animation, HandoffBehavior.Compose);
+    }
+
+    /// <summary>
+    ///     计算选项卡当前合适的位置编号
+    /// </summary>
+    /// <param name="left"></param>
+    /// <returns></returns>
+    private int CalLocationIndex(double left)
+    {
+        if (_isWaiting)
+        {
+            return CurrentIndex;
+        }
+
+        var maxIndex = TabControlParent.Items.Count - 1;
+        var div = (int) (left / ItemWidth);
+        var rest = left % ItemWidth;
+        var result = rest / ItemWidth > .5 ? div + 1 : div;
+
+        return result > maxIndex ? maxIndex : result;
+    }
+
+    public static readonly RoutedEvent ClosingEvent = EventManager.RegisterRoutedEvent("Closing", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
+
+    public event EventHandler Closing
+    {
+        add => AddHandler(ClosingEvent, value);
+        remove => RemoveHandler(ClosingEvent, value);
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
+
+    public event EventHandler Closed
+    {
+        add => AddHandler(ClosedEvent, value);
+        remove => RemoveHandler(ClosedEvent, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
index 8ee9391d..86dab975 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
@@ -6,174 +6,173 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TabPanel : Panel
 {
-    public class TabPanel : Panel
+    private int _itemCount;
+
+    /// <summary>
+    ///     是否可以更新
+    /// </summary>
+    internal bool CanUpdate = true;
+
+    /// <summary>
+    ///     选项卡字典
+    /// </summary>
+    internal Dictionary<int, TabItem> ItemDic = new();
+
+    public static readonly DependencyPropertyKey FluidMoveDurationPropertyKey =
+        DependencyProperty.RegisterReadOnly("FluidMoveDuration", typeof(Duration), typeof(TabPanel),
+            new PropertyMetadata(new Duration(TimeSpan.FromMilliseconds(0))));
+
+    /// <summary>
+    ///     流式行为持续时间
+    /// </summary>
+    public static readonly DependencyProperty FluidMoveDurationProperty =
+        FluidMoveDurationPropertyKey.DependencyProperty;
+
+    /// <summary>
+    ///     流式行为持续时间
+    /// </summary>
+    public Duration FluidMoveDuration
     {
-        private int _itemCount;
+        get => (Duration) GetValue(FluidMoveDurationProperty);
+        set => SetValue(FluidMoveDurationProperty, value);
+    }
 
-        /// <summary>
-        ///     是否可以更新
-        /// </summary>
-        internal bool CanUpdate = true;
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+        "IsTabFillEnabled", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        /// <summary>
-        ///     选项卡字典
-        /// </summary>
-        internal Dictionary<int, TabItem> ItemDic = new();
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public bool IsTabFillEnabled
+    {
+        get => (bool) GetValue(IsTabFillEnabledProperty);
+        set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyPropertyKey FluidMoveDurationPropertyKey =
-            DependencyProperty.RegisterReadOnly("FluidMoveDuration", typeof(Duration), typeof(TabPanel),
-                new PropertyMetadata(new Duration(TimeSpan.FromMilliseconds(0))));
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
+        "TabItemWidth", typeof(double), typeof(TabPanel), new PropertyMetadata(200.0));
 
-        /// <summary>
-        ///     流式行为持续时间
-        /// </summary>
-        public static readonly DependencyProperty FluidMoveDurationProperty =
-            FluidMoveDurationPropertyKey.DependencyProperty;
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public double TabItemWidth
+    {
+        get => (double) GetValue(TabItemWidthProperty);
+        set => SetValue(TabItemWidthProperty, value);
+    }
 
-        /// <summary>
-        ///     流式行为持续时间
-        /// </summary>
-        public Duration FluidMoveDuration
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
+        "TabItemHeight", typeof(double), typeof(TabPanel), new PropertyMetadata(30.0));
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public double TabItemHeight
+    {
+        get => (double) GetValue(TabItemHeightProperty);
+        set => SetValue(TabItemHeightProperty, value);
+    }
+
+    /// <summary>
+    ///     是否可以强制更新
+    /// </summary>
+    internal bool ForceUpdate;
+
+    private Size _oldSize;
+
+    /// <summary>
+    ///     是否已经加载
+    /// </summary>
+    private bool _isLoaded;
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        if ((_itemCount == InternalChildren.Count || !CanUpdate) && !ForceUpdate && !IsTabFillEnabled) return _oldSize;
+        constraint.Height = TabItemHeight;
+        _itemCount = InternalChildren.Count;
+
+        var size = new Size();
+
+        ItemDic.Clear();
+
+        var count = InternalChildren.Count;
+        if (count == 0)
         {
-            get => (Duration) GetValue(FluidMoveDurationProperty);
-            set => SetValue(FluidMoveDurationProperty, value);
-        }
-
-        /// <summary>
-        ///     是否将标签填充
-        /// </summary>
-        public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
-            "IsTabFillEnabled", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        /// <summary>
-        ///     是否将标签填充
-        /// </summary>
-        public bool IsTabFillEnabled
-        {
-            get => (bool) GetValue(IsTabFillEnabledProperty);
-            set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        /// <summary>
-        ///     标签宽度
-        /// </summary>
-        public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
-            "TabItemWidth", typeof(double), typeof(TabPanel), new PropertyMetadata(200.0));
-
-        /// <summary>
-        ///     标签宽度
-        /// </summary>
-        public double TabItemWidth
-        {
-            get => (double) GetValue(TabItemWidthProperty);
-            set => SetValue(TabItemWidthProperty, value);
-        }
-
-        /// <summary>
-        ///     标签高度
-        /// </summary>
-        public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
-            "TabItemHeight", typeof(double), typeof(TabPanel), new PropertyMetadata(30.0));
-
-        /// <summary>
-        ///     标签高度
-        /// </summary>
-        public double TabItemHeight
-        {
-            get => (double) GetValue(TabItemHeightProperty);
-            set => SetValue(TabItemHeightProperty, value);
-        }
-
-        /// <summary>
-        ///     是否可以强制更新
-        /// </summary>
-        internal bool ForceUpdate;
-
-        private Size _oldSize;
-
-        /// <summary>
-        ///     是否已经加载
-        /// </summary>
-        private bool _isLoaded;
-
-        protected override Size MeasureOverride(Size constraint)
-        {
-            if ((_itemCount == InternalChildren.Count || !CanUpdate) && !ForceUpdate && !IsTabFillEnabled) return _oldSize;
-            constraint.Height = TabItemHeight;
-            _itemCount = InternalChildren.Count;
-
-            var size = new Size();
-
-            ItemDic.Clear();
-
-            var count = InternalChildren.Count;
-            if (count == 0)
-            {
-                _oldSize = new Size();
-                return _oldSize;
-            }
-            constraint.Width += InternalChildren.Count;
-
-            var itemWidth = .0;
-            var arr = new int[count];
-
-            if (!IsTabFillEnabled)
-            {
-                itemWidth = TabItemWidth;
-            }
-            else
-            {
-                if (TemplatedParent is TabControl tabControl)
-                {
-                    arr = ArithmeticHelper.DivideInt2Arr((int) tabControl.ActualWidth + InternalChildren.Count, count);
-                }
-            }
-
-            for (var index = 0; index < count; index++)
-            {
-                if (IsTabFillEnabled)
-                {
-                    itemWidth = arr[index];
-                }
-                if (InternalChildren[index] is TabItem tabItem)
-                {
-                    tabItem.RenderTransform = new TranslateTransform();
-                    tabItem.MaxWidth = itemWidth;
-                    var rect = new Rect
-                    {
-                        X = size.Width - tabItem.BorderThickness.Left,
-                        Width = itemWidth,
-                        Height = TabItemHeight
-                    };
-                    tabItem.Arrange(rect);
-                    tabItem.ItemWidth = itemWidth - tabItem.BorderThickness.Left;
-                    tabItem.CurrentIndex = index;
-                    tabItem.TargetOffsetX = 0;
-                    ItemDic[index] = tabItem;
-                    size.Width += tabItem.ItemWidth;
-                }
-            }
-            size.Height = constraint.Height;
-            _oldSize = size;
+            _oldSize = new Size();
             return _oldSize;
         }
+        constraint.Width += InternalChildren.Count;
 
-        public TabPanel()
+        var itemWidth = .0;
+        var arr = new int[count];
+
+        if (!IsTabFillEnabled)
         {
-            Loaded += (s, e) =>
-            {
-                if (_isLoaded) return;
-                ForceUpdate = true;
-                Measure(new Size(DesiredSize.Width, ActualHeight));
-                ForceUpdate = false;
-                foreach (var item in ItemDic.Values)
-                {
-                    item.TabPanel = this;
-                }
-                _isLoaded = true;
-            };
+            itemWidth = TabItemWidth;
         }
+        else
+        {
+            if (TemplatedParent is TabControl tabControl)
+            {
+                arr = ArithmeticHelper.DivideInt2Arr((int) tabControl.ActualWidth + InternalChildren.Count, count);
+            }
+        }
+
+        for (var index = 0; index < count; index++)
+        {
+            if (IsTabFillEnabled)
+            {
+                itemWidth = arr[index];
+            }
+            if (InternalChildren[index] is TabItem tabItem)
+            {
+                tabItem.RenderTransform = new TranslateTransform();
+                tabItem.MaxWidth = itemWidth;
+                var rect = new Rect
+                {
+                    X = size.Width - tabItem.BorderThickness.Left,
+                    Width = itemWidth,
+                    Height = TabItemHeight
+                };
+                tabItem.Arrange(rect);
+                tabItem.ItemWidth = itemWidth - tabItem.BorderThickness.Left;
+                tabItem.CurrentIndex = index;
+                tabItem.TargetOffsetX = 0;
+                ItemDic[index] = tabItem;
+                size.Width += tabItem.ItemWidth;
+            }
+        }
+        size.Height = constraint.Height;
+        _oldSize = size;
+        return _oldSize;
     }
-}
+
+    public TabPanel()
+    {
+        Loaded += (s, e) =>
+        {
+            if (_isLoaded) return;
+            ForceUpdate = true;
+            Measure(new Size(DesiredSize.Width, ActualHeight));
+            ForceUpdate = false;
+            foreach (var item in ItemDic.Values)
+            {
+                item.TabPanel = this;
+            }
+            _isLoaded = true;
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
index 441ee698..e8e328c9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
@@ -6,143 +6,142 @@ using System.Windows.Input;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class Tag : ContentControl
 {
-    public class Tag : ContentControl
+    public Tag()
     {
-        public Tag()
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) =>
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) =>
-            {
-                var argsClosing = new CancelRoutedEventArgs(ClosingEvent, this);
-                RaiseEvent(argsClosing);
-                if (argsClosing.Cancel) return;
+            var argsClosing = new CancelRoutedEventArgs(ClosingEvent, this);
+            RaiseEvent(argsClosing);
+            if (argsClosing.Cancel) return;
 
-                RaiseEvent(new RoutedEventArgs(ClosedEvent, this));
-            }));
-        }
+            RaiseEvent(new RoutedEventArgs(ClosedEvent, this));
+        }));
+    }
 
-        public static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.Register(
-            "ShowCloseButton", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.TrueBox));
+    public static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.Register(
+        "ShowCloseButton", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.TrueBox));
 
-        public bool ShowCloseButton
+    public bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty SelectableProperty = DependencyProperty.Register(
+        "Selectable", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool Selectable
+    {
+        get => (bool) GetValue(SelectableProperty);
+        set => SetValue(SelectableProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
+        "IsSelected", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
         {
-            get => (bool) GetValue(ShowCloseButtonProperty);
-            set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
-        }
+            var ctl = (Tag) o;
+            ctl.RaiseEvent(new RoutedEventArgs(SelectedEvent, ctl));
+        }));
 
-        public static readonly DependencyProperty SelectableProperty = DependencyProperty.Register(
-            "Selectable", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox));
+    public bool IsSelected
+    {
+        get => (bool) GetValue(IsSelectedProperty);
+        set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public bool Selectable
+    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+        "Header", typeof(object), typeof(Tag), new PropertyMetadata(default, OnHeaderChanged));
+
+    private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctrl = (Tag) d;
+
+        ctrl.SetValue(HasHeaderPropertyKey, e.NewValue != null ? ValueBoxes.TrueBox : ValueBoxes.FalseBox);
+        ctrl.OnHeaderChanged(e.OldValue, e.NewValue);
+    }
+
+    protected virtual void OnHeaderChanged(object oldHeader, object newHeader)
+    {
+        RemoveLogicalChild(oldHeader);
+        AddLogicalChild(newHeader);
+    }
+
+    public object Header
+    {
+        get => GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
+    }
+
+    internal static readonly DependencyPropertyKey HasHeaderPropertyKey = DependencyProperty.RegisterReadOnly(
+        "HasHeader", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static readonly DependencyProperty HasHeaderProperty = HasHeaderPropertyKey.DependencyProperty;
+
+    [Bindable(false), Browsable(false)]
+    public bool HasHeader => (bool) GetValue(HasHeaderProperty);
+
+    public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
+        "HeaderStringFormat", typeof(string), typeof(Tag), new PropertyMetadata(default(string)));
+
+    public string HeaderStringFormat
+    {
+        get => (string) GetValue(HeaderStringFormatProperty);
+        set => SetValue(HeaderStringFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
+        "HeaderTemplateSelector", typeof(DataTemplateSelector), typeof(Tag), new PropertyMetadata(default(DataTemplateSelector)));
+
+    public DataTemplateSelector HeaderTemplateSelector
+    {
+        get => (DataTemplateSelector) GetValue(HeaderTemplateSelectorProperty);
+        set => SetValue(HeaderTemplateSelectorProperty, value);
+    }
+
+    public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
+        "HeaderTemplate", typeof(DataTemplate), typeof(Tag), new PropertyMetadata(default(DataTemplate)));
+
+    public DataTemplate HeaderTemplate
+    {
+        get => (DataTemplate) GetValue(HeaderTemplateProperty);
+        set => SetValue(HeaderTemplateProperty, value);
+    }
+
+    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
+
+    public event EventHandler Selected
+    {
+        add => AddHandler(SelectedEvent, value);
+        remove => RemoveHandler(SelectedEvent, value);
+    }
+
+    public static readonly RoutedEvent ClosingEvent = EventManager.RegisterRoutedEvent("Closing", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
+
+    public event EventHandler Closing
+    {
+        add => AddHandler(ClosingEvent, value);
+        remove => RemoveHandler(ClosingEvent, value);
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
+
+    public event EventHandler Closed
+    {
+        add => AddHandler(ClosedEvent, value);
+        remove => RemoveHandler(ClosedEvent, value);
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+
+        if (Selectable)
         {
-            get => (bool) GetValue(SelectableProperty);
-            set => SetValue(SelectableProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register(
-            "IsSelected", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox, (o, args) =>
-            {
-                var ctl = (Tag) o;
-                ctl.RaiseEvent(new RoutedEventArgs(SelectedEvent, ctl));
-            }));
-
-        public bool IsSelected
-        {
-            get => (bool) GetValue(IsSelectedProperty);
-            set => SetValue(IsSelectedProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
-            "Header", typeof(object), typeof(Tag), new PropertyMetadata(default, OnHeaderChanged));
-
-        private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = (Tag) d;
-
-            ctrl.SetValue(HasHeaderPropertyKey, e.NewValue != null ? ValueBoxes.TrueBox : ValueBoxes.FalseBox);
-            ctrl.OnHeaderChanged(e.OldValue, e.NewValue);
-        }
-
-        protected virtual void OnHeaderChanged(object oldHeader, object newHeader)
-        {
-            RemoveLogicalChild(oldHeader);
-            AddLogicalChild(newHeader);
-        }
-
-        public object Header
-        {
-            get => GetValue(HeaderProperty);
-            set => SetValue(HeaderProperty, value);
-        }
-
-        internal static readonly DependencyPropertyKey HasHeaderPropertyKey = DependencyProperty.RegisterReadOnly(
-            "HasHeader", typeof(bool), typeof(Tag), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public static readonly DependencyProperty HasHeaderProperty = HasHeaderPropertyKey.DependencyProperty;
-
-        [Bindable(false), Browsable(false)]
-        public bool HasHeader => (bool) GetValue(HasHeaderProperty);
-
-        public static readonly DependencyProperty HeaderStringFormatProperty = DependencyProperty.Register(
-            "HeaderStringFormat", typeof(string), typeof(Tag), new PropertyMetadata(default(string)));
-
-        public string HeaderStringFormat
-        {
-            get => (string) GetValue(HeaderStringFormatProperty);
-            set => SetValue(HeaderStringFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderTemplateSelectorProperty = DependencyProperty.Register(
-            "HeaderTemplateSelector", typeof(DataTemplateSelector), typeof(Tag), new PropertyMetadata(default(DataTemplateSelector)));
-
-        public DataTemplateSelector HeaderTemplateSelector
-        {
-            get => (DataTemplateSelector) GetValue(HeaderTemplateSelectorProperty);
-            set => SetValue(HeaderTemplateSelectorProperty, value);
-        }
-
-        public static readonly DependencyProperty HeaderTemplateProperty = DependencyProperty.Register(
-            "HeaderTemplate", typeof(DataTemplate), typeof(Tag), new PropertyMetadata(default(DataTemplate)));
-
-        public DataTemplate HeaderTemplate
-        {
-            get => (DataTemplate) GetValue(HeaderTemplateProperty);
-            set => SetValue(HeaderTemplateProperty, value);
-        }
-
-        public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent("Selected", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
-
-        public event EventHandler Selected
-        {
-            add => AddHandler(SelectedEvent, value);
-            remove => RemoveHandler(SelectedEvent, value);
-        }
-
-        public static readonly RoutedEvent ClosingEvent = EventManager.RegisterRoutedEvent("Closing", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
-
-        public event EventHandler Closing
-        {
-            add => AddHandler(ClosingEvent, value);
-            remove => RemoveHandler(ClosingEvent, value);
-        }
-
-        public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Tag));
-
-        public event EventHandler Closed
-        {
-            add => AddHandler(ClosedEvent, value);
-            remove => RemoveHandler(ClosedEvent, value);
-        }
-
-        protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            base.OnMouseLeftButtonDown(e);
-
-            if (Selectable)
-            {
-                IsSelected = true;
-            }
+            IsSelected = true;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs b/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
index 13aaef92..29e52e1d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
@@ -3,51 +3,50 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TagContainer : ItemsControl
 {
-    public class TagContainer : ItemsControl
+    public TagContainer()
     {
-        public TagContainer()
-        {
-            AddHandler(Controls.Tag.ClosedEvent, new RoutedEventHandler(Tag_OnClosed));
-        }
+        AddHandler(Controls.Tag.ClosedEvent, new RoutedEventHandler(Tag_OnClosed));
+    }
 
-        private void Tag_OnClosed(object sender, RoutedEventArgs e)
+    private void Tag_OnClosed(object sender, RoutedEventArgs e)
+    {
+        if (e.OriginalSource is Tag tag)
         {
-            if (e.OriginalSource is Tag tag)
+            tag.Hide();
+
+            if (ItemsSource == null)
             {
-                tag.Hide();
-
-                if (ItemsSource == null)
-                {
-                    Items.Remove(tag);
-                }
-                else
-                {
-                    var item = ItemContainerGenerator.ItemFromContainer(tag);
-                    GetActualList()?.Remove(item);
-                    Items.Refresh();
-                }
-            }
-        }
-
-        internal IList GetActualList()
-        {
-            IList list;
-            if (ItemsSource != null)
-            {
-                list = ItemsSource as IList;
+                Items.Remove(tag);
             }
             else
             {
-                list = Items;
+                var item = ItemContainerGenerator.ItemFromContainer(tag);
+                GetActualList()?.Remove(item);
+                Items.Refresh();
             }
+        }
+    }
 
-            return list;
+    internal IList GetActualList()
+    {
+        IList list;
+        if (ItemsSource != null)
+        {
+            list = ItemsSource as IList;
+        }
+        else
+        {
+            list = Items;
         }
 
-        protected override DependencyObject GetContainerForItemOverride() => new Tag();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is Tag;
+        return list;
     }
-}
+
+    protected override DependencyObject GetContainerForItemOverride() => new Tag();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is Tag;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
index a85b4862..fa85bd10 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
@@ -8,203 +8,202 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class HighlightTextBlock : TextBlock
 {
-    public class HighlightTextBlock : TextBlock
+    public static readonly DependencyProperty SourceTextProperty =
+        DependencyProperty.Register("SourceText", typeof(string), typeof(HighlightTextBlock),
+            new PropertyMetadata(null, OnSourceTextChanged));
+
+    public static readonly DependencyProperty QueriesTextProperty =
+        DependencyProperty.Register("QueriesText", typeof(string), typeof(HighlightTextBlock),
+            new PropertyMetadata(null, OnQueriesTextChanged));
+
+    public static readonly DependencyProperty HighlightBrushProperty =
+        DependencyProperty.Register("HighlightBrush", typeof(Brush), typeof(HighlightTextBlock));
+
+    public static readonly DependencyProperty HighlightTextBrushProperty =
+        DependencyProperty.Register("HighlightTextBrush", typeof(Brush), typeof(HighlightTextBlock));
+
+    private static void OnSourceTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((HighlightTextBlock) d).RefreshInlines();
+
+    private static void OnQueriesTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
+        ((HighlightTextBlock) d).RefreshInlines();
+
+    /// <summary>
+    /// Replace the original property Text for binding text.
+    /// </summary>
+    /// <remarks>
+    /// Don't use the <see cref="TextBlock.Text"/> property!
+    /// Because the <see cref="TextBlock.Text"/> has some unique behaviors
+    /// that is not needed at <see cref="HighlightTextBlock"/> at <see cref="TextBlock"/>,
+    /// which will cause some unexpected issue. 
+    /// </remarks>
+    public string SourceText
     {
-        public static readonly DependencyProperty SourceTextProperty =
-            DependencyProperty.Register("SourceText", typeof(string), typeof(HighlightTextBlock),
-                new PropertyMetadata(null, OnSourceTextChanged));
+        get => (string) GetValue(SourceTextProperty);
+        set => SetValue(SourceTextProperty, value);
+    }
 
-        public static readonly DependencyProperty QueriesTextProperty =
-            DependencyProperty.Register("QueriesText", typeof(string), typeof(HighlightTextBlock),
-                new PropertyMetadata(null, OnQueriesTextChanged));
+    /// <summary>
+    /// Gets or sets the text that need to be highlighted.
+    /// It can be an array of text separated by spaces.
+    /// </summary>
+    public string QueriesText
+    {
+        get => (string) GetValue(QueriesTextProperty);
+        set => SetValue(QueriesTextProperty, value);
+    }
 
-        public static readonly DependencyProperty HighlightBrushProperty =
-            DependencyProperty.Register("HighlightBrush", typeof(Brush), typeof(HighlightTextBlock));
+    /// <summary>
+    /// Gets or sets the <see cref="Brush"/> of the background of the highlight text.
+    /// </summary>
+    public Brush HighlightBrush
+    {
+        get => (Brush) GetValue(HighlightBrushProperty);
+        set => SetValue(HighlightBrushProperty, value);
+    }
 
-        public static readonly DependencyProperty HighlightTextBrushProperty =
-            DependencyProperty.Register("HighlightTextBrush", typeof(Brush), typeof(HighlightTextBlock));
+    public Brush HighlightTextBrush
+    {
+        get => (Brush) GetValue(HighlightTextBrushProperty);
+        set => SetValue(HighlightTextBrushProperty, value);
+    }
 
-        private static void OnSourceTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((HighlightTextBlock) d).RefreshInlines();
+    private void RefreshInlines()
+    {
+        Inlines.Clear();
 
-        private static void OnQueriesTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
-            ((HighlightTextBlock) d).RefreshInlines();
-
-        /// <summary>
-        /// Replace the original property Text for binding text.
-        /// </summary>
-        /// <remarks>
-        /// Don't use the <see cref="TextBlock.Text"/> property!
-        /// Because the <see cref="TextBlock.Text"/> has some unique behaviors
-        /// that is not needed at <see cref="HighlightTextBlock"/> at <see cref="TextBlock"/>,
-        /// which will cause some unexpected issue. 
-        /// </remarks>
-        public string SourceText
+        if (string.IsNullOrEmpty(SourceText)) return;
+        if (string.IsNullOrEmpty(QueriesText))
         {
-            get => (string) GetValue(SourceTextProperty);
-            set => SetValue(SourceTextProperty, value);
+            Inlines.Add(SourceText);
+            return;
         }
 
-        /// <summary>
-        /// Gets or sets the text that need to be highlighted.
-        /// It can be an array of text separated by spaces.
-        /// </summary>
-        public string QueriesText
+        var sourceText = SourceText;
+        var queries = QueriesText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+        var intervals = from query in queries.Distinct()
+            from interval in GetQueryIntervals(sourceText, query)
+            select interval;
+        var mergedIntervals = MergeIntervals(intervals.ToList());
+        var fragments = SplitTextByOrderedDisjointIntervals(sourceText, mergedIntervals);
+
+        Inlines.AddRange(GenerateRunElement(fragments));
+    }
+
+    private IEnumerable GenerateRunElement(IEnumerable<Fragment> fragments)
+    {
+        return from item in fragments
+            select item.IsQuery
+                ? GetHighlightRun(item.Text)
+                : new Run(item.Text);
+    }
+
+    private Run GetHighlightRun(string highlightText)
+    {
+        var run = new Run(highlightText);
+
+        run.SetBinding(TextElement.BackgroundProperty, new Binding(nameof(HighlightBrush)) { Source = this });
+        run.SetBinding(TextElement.ForegroundProperty, new Binding(nameof(HighlightTextBrush)) { Source = this });
+
+        return run;
+    }
+
+    private static IEnumerable<Fragment> SplitTextByOrderedDisjointIntervals(string sourceText, List<Range> mergedIntervals)
+    {
+        if (string.IsNullOrEmpty(sourceText)) yield break;
+
+        if (!mergedIntervals?.Any() ?? true)
         {
-            get => (string) GetValue(QueriesTextProperty);
-            set => SetValue(QueriesTextProperty, value);
+            yield return new Fragment { Text = sourceText, IsQuery = false };
+            yield break;
         }
 
-        /// <summary>
-        /// Gets or sets the <see cref="Brush"/> of the background of the highlight text.
-        /// </summary>
-        public Brush HighlightBrush
+        var range0 = mergedIntervals.First();
+        int start0 = range0.Start;
+        int end0 = range0.End;
+
+        if (start0 > 0) yield return new Fragment { Text = sourceText.Substring(0, start0), IsQuery = false };
+        yield return new Fragment { Text = sourceText.Substring(start0, end0 - start0), IsQuery = true };
+
+        int previousEnd = end0;
+        foreach (var range in mergedIntervals.Skip(1))
         {
-            get => (Brush) GetValue(HighlightBrushProperty);
-            set => SetValue(HighlightBrushProperty, value);
+            int start = range.Start;
+            int end = range.End;
+            yield return new Fragment { Text = sourceText.Substring(previousEnd, start - previousEnd), IsQuery = false };
+            yield return new Fragment { Text = sourceText.Substring(start, end - start), IsQuery = true };
+            previousEnd = end;
         }
 
-        public Brush HighlightTextBrush
-        {
-            get => (Brush) GetValue(HighlightTextBrushProperty);
-            set => SetValue(HighlightTextBrushProperty, value);
-        }
+        if (previousEnd < sourceText.Length)
+            yield return new Fragment { Text = sourceText.Substring(previousEnd), IsQuery = false };
+    }
 
-        private void RefreshInlines()
-        {
-            Inlines.Clear();
+    private static List<Range> MergeIntervals(List<Range> intervals)
+    {
+        if (!intervals?.Any() ?? true) return new List<Range>();
 
-            if (string.IsNullOrEmpty(SourceText)) return;
-            if (string.IsNullOrEmpty(QueriesText))
+        intervals.Sort((x, y) => x.Start != y.Start ? x.Start - y.Start : x.End - y.End);
+
+        var pointer = intervals[0];
+        int startPointer = pointer.Start;
+        int endPointer = pointer.End;
+
+        var result = new List<Range>();
+        foreach (var range in intervals.Skip(1))
+        {
+            int start = range.Start;
+            int end = range.End;
+
+            if (start <= endPointer)
             {
-                Inlines.Add(SourceText);
-                return;
-            }
-
-            var sourceText = SourceText;
-            var queries = QueriesText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-            var intervals = from query in queries.Distinct()
-                            from interval in GetQueryIntervals(sourceText, query)
-                            select interval;
-            var mergedIntervals = MergeIntervals(intervals.ToList());
-            var fragments = SplitTextByOrderedDisjointIntervals(sourceText, mergedIntervals);
-
-            Inlines.AddRange(GenerateRunElement(fragments));
-        }
-
-        private IEnumerable GenerateRunElement(IEnumerable<Fragment> fragments)
-        {
-            return from item in fragments
-                   select item.IsQuery
-                   ? GetHighlightRun(item.Text)
-                   : new Run(item.Text);
-        }
-
-        private Run GetHighlightRun(string highlightText)
-        {
-            var run = new Run(highlightText);
-
-            run.SetBinding(TextElement.BackgroundProperty, new Binding(nameof(HighlightBrush)) { Source = this });
-            run.SetBinding(TextElement.ForegroundProperty, new Binding(nameof(HighlightTextBrush)) { Source = this });
-
-            return run;
-        }
-
-        private static IEnumerable<Fragment> SplitTextByOrderedDisjointIntervals(string sourceText, List<Range> mergedIntervals)
-        {
-            if (string.IsNullOrEmpty(sourceText)) yield break;
-
-            if (!mergedIntervals?.Any() ?? true)
-            {
-                yield return new Fragment { Text = sourceText, IsQuery = false };
-                yield break;
-            }
-
-            var range0 = mergedIntervals.First();
-            int start0 = range0.Start;
-            int end0 = range0.End;
-
-            if (start0 > 0) yield return new Fragment { Text = sourceText.Substring(0, start0), IsQuery = false };
-            yield return new Fragment { Text = sourceText.Substring(start0, end0 - start0), IsQuery = true };
-
-            int previousEnd = end0;
-            foreach (var range in mergedIntervals.Skip(1))
-            {
-                int start = range.Start;
-                int end = range.End;
-                yield return new Fragment { Text = sourceText.Substring(previousEnd, start - previousEnd), IsQuery = false };
-                yield return new Fragment { Text = sourceText.Substring(start, end - start), IsQuery = true };
-                previousEnd = end;
-            }
-
-            if (previousEnd < sourceText.Length)
-                yield return new Fragment { Text = sourceText.Substring(previousEnd), IsQuery = false };
-        }
-
-        private static List<Range> MergeIntervals(List<Range> intervals)
-        {
-            if (!intervals?.Any() ?? true) return new List<Range>();
-
-            intervals.Sort((x, y) => x.Start != y.Start ? x.Start - y.Start : x.End - y.End);
-
-            var pointer = intervals[0];
-            int startPointer = pointer.Start;
-            int endPointer = pointer.End;
-
-            var result = new List<Range>();
-            foreach (var range in intervals.Skip(1))
-            {
-                int start = range.Start;
-                int end = range.End;
-
-                if (start <= endPointer)
+                if (endPointer < end)
                 {
-                    if (endPointer < end)
-                    {
-                        endPointer = end;
-                    }
-                }
-                else
-                {
-                    result.Add(new Range { Start = startPointer, End = endPointer });
-                    startPointer = start;
                     endPointer = end;
                 }
             }
-            result.Add(new Range { Start = startPointer, End = endPointer });
-            return result;
-        }
-
-        private static IEnumerable<Range> GetQueryIntervals(string sourceText, string query)
-        {
-            if (string.IsNullOrEmpty(sourceText) || string.IsNullOrEmpty(query)) yield break;
-
-            int nextStartIndex = 0;
-            while (nextStartIndex < sourceText.Length)
+            else
             {
-                int index = sourceText.IndexOf(query, nextStartIndex, StringComparison.CurrentCultureIgnoreCase);
-
-                if (index == -1) yield break;
-
-                nextStartIndex = index + query.Length;
-                yield return new Range { Start = index, End = nextStartIndex };
+                result.Add(new Range { Start = startPointer, End = endPointer });
+                startPointer = start;
+                endPointer = end;
             }
         }
+        result.Add(new Range { Start = startPointer, End = endPointer });
+        return result;
+    }
 
-        private struct Fragment
+    private static IEnumerable<Range> GetQueryIntervals(string sourceText, string query)
+    {
+        if (string.IsNullOrEmpty(sourceText) || string.IsNullOrEmpty(query)) yield break;
+
+        int nextStartIndex = 0;
+        while (nextStartIndex < sourceText.Length)
         {
-            public string Text { get; set; }
+            int index = sourceText.IndexOf(query, nextStartIndex, StringComparison.CurrentCultureIgnoreCase);
 
-            public bool IsQuery { get; set; }
-        }
+            if (index == -1) yield break;
 
-        private struct Range
-        {
-            public int Start { get; set; }
-
-            public int End { get; set; }
+            nextStartIndex = index + query.Length;
+            yield return new Range { Start = index, End = nextStartIndex };
         }
     }
-}
+
+    private struct Fragment
+    {
+        public string Text { get; set; }
+
+        public bool IsQuery { get; set; }
+    }
+
+    private struct Range
+    {
+        public int Start { get; set; }
+
+        public int End { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
index 5c5746bc..43818a45 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
@@ -6,277 +6,276 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools.Helper;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class OutlineText : FrameworkElement
 {
-    public class OutlineText : FrameworkElement
+    private Pen _pen;
+
+    private FormattedText _formattedText;
+
+    private Geometry _textGeometry;
+
+    private PathGeometry _clipGeometry;
+
+    static OutlineText()
     {
-        private Pen _pen;
+        SnapsToDevicePixelsProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
+        UseLayoutRoundingProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
+    }
 
-        private FormattedText _formattedText;
+    public static readonly DependencyProperty StrokePositionProperty = DependencyProperty.Register(
+        "StrokePosition", typeof(StrokePosition), typeof(OutlineText), new PropertyMetadata(default(StrokePosition)));
 
-        private Geometry _textGeometry;
+    public StrokePosition StrokePosition
+    {
+        get => (StrokePosition) GetValue(StrokePositionProperty);
+        set => SetValue(StrokePositionProperty, value);
+    }
 
-        private PathGeometry _clipGeometry;
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(OutlineText), new FrameworkPropertyMetadata(
+            string.Empty,
+            FrameworkPropertyMetadataOptions.AffectsMeasure |
+            FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
 
-        static OutlineText()
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register(
+        "TextAlignment", typeof(TextAlignment), typeof(OutlineText),
+        new PropertyMetadata(default(TextAlignment), OnFormattedTextUpdated));
+
+    public TextAlignment TextAlignment
+    {
+        get => (TextAlignment) GetValue(TextAlignmentProperty);
+        set => SetValue(TextAlignmentProperty, value);
+    }
+
+    public static readonly DependencyProperty TextTrimmingProperty = DependencyProperty.Register(
+        "TextTrimming", typeof(TextTrimming), typeof(OutlineText),
+        new PropertyMetadata(default(TextTrimming), OnFormattedTextInvalidated));
+
+    public TextTrimming TextTrimming
+    {
+        get => (TextTrimming) GetValue(TextTrimmingProperty);
+        set => SetValue(TextTrimmingProperty, value);
+    }
+
+    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register(
+        "TextWrapping", typeof(TextWrapping), typeof(OutlineText),
+        new PropertyMetadata(TextWrapping.NoWrap, OnFormattedTextInvalidated));
+
+    public TextWrapping TextWrapping
+    {
+        get => (TextWrapping) GetValue(TextWrappingProperty);
+        set => SetValue(TextWrappingProperty, value);
+    }
+
+    public static readonly DependencyProperty FillProperty = DependencyProperty.Register(
+        "Fill", typeof(Brush), typeof(OutlineText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
+
+    public Brush Fill
+    {
+        get => (Brush) GetValue(FillProperty);
+        set => SetValue(FillProperty, value);
+    }
+
+    public static readonly DependencyProperty StrokeProperty = DependencyProperty.Register(
+        "Stroke", typeof(Brush), typeof(OutlineText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
+
+    public Brush Stroke
+    {
+        get => (Brush) GetValue(StrokeProperty);
+        set => SetValue(StrokeProperty, value);
+    }
+
+    public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
+        "StrokeThickness", typeof(double), typeof(OutlineText), new PropertyMetadata(ValueBoxes.Double0Box, OnFormattedTextUpdated));
+
+    public double StrokeThickness
+    {
+        get => (double) GetValue(StrokeThicknessProperty);
+        set => SetValue(StrokeThicknessProperty, value);
+    }
+
+    public static readonly DependencyProperty FontFamilyProperty = TextElement.FontFamilyProperty.AddOwner(
+        typeof(OutlineText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontFamily FontFamily
+    {
+        get => (FontFamily) GetValue(FontFamilyProperty);
+        set => SetValue(FontFamilyProperty, value);
+    }
+
+    public static readonly DependencyProperty FontSizeProperty = TextElement.FontSizeProperty.AddOwner(
+        typeof(OutlineText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    [TypeConverter(typeof(FontSizeConverter))]
+    public double FontSize
+    {
+        get => (double) GetValue(FontSizeProperty);
+        set => SetValue(FontSizeProperty, value);
+    }
+
+    public static readonly DependencyProperty FontStretchProperty = TextElement.FontStretchProperty.AddOwner(
+        typeof(OutlineText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontStretch FontStretch
+    {
+        get => (FontStretch) GetValue(FontStretchProperty);
+        set => SetValue(FontStretchProperty, value);
+    }
+
+    public static readonly DependencyProperty FontStyleProperty = TextElement.FontStyleProperty.AddOwner(
+        typeof(OutlineText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontStyle FontStyle
+    {
+        get => (FontStyle) GetValue(FontStyleProperty);
+        set => SetValue(FontStyleProperty, value);
+    }
+
+    public static readonly DependencyProperty FontWeightProperty = TextElement.FontWeightProperty.AddOwner(
+        typeof(OutlineText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontWeight FontWeight
+    {
+        get => (FontWeight) GetValue(FontWeightProperty);
+        set => SetValue(FontWeightProperty, value);
+    }
+
+    protected override void OnRender(DrawingContext drawingContext)
+    {
+        if (StrokeThickness > 0)
         {
-            SnapsToDevicePixelsProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
-            UseLayoutRoundingProperty.OverrideMetadata(typeof(OutlineText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
-        }
+            EnsureGeometry();
 
-        public static readonly DependencyProperty StrokePositionProperty = DependencyProperty.Register(
-            "StrokePosition", typeof(StrokePosition), typeof(OutlineText), new PropertyMetadata(default(StrokePosition)));
-
-        public StrokePosition StrokePosition
-        {
-            get => (StrokePosition) GetValue(StrokePositionProperty);
-            set => SetValue(StrokePositionProperty, value);
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(OutlineText), new FrameworkPropertyMetadata(
-                string.Empty,
-                FrameworkPropertyMetadataOptions.AffectsMeasure |
-                FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register(
-            "TextAlignment", typeof(TextAlignment), typeof(OutlineText),
-            new PropertyMetadata(default(TextAlignment), OnFormattedTextUpdated));
-
-        public TextAlignment TextAlignment
-        {
-            get => (TextAlignment) GetValue(TextAlignmentProperty);
-            set => SetValue(TextAlignmentProperty, value);
-        }
-
-        public static readonly DependencyProperty TextTrimmingProperty = DependencyProperty.Register(
-            "TextTrimming", typeof(TextTrimming), typeof(OutlineText),
-            new PropertyMetadata(default(TextTrimming), OnFormattedTextInvalidated));
-
-        public TextTrimming TextTrimming
-        {
-            get => (TextTrimming) GetValue(TextTrimmingProperty);
-            set => SetValue(TextTrimmingProperty, value);
-        }
-
-        public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register(
-            "TextWrapping", typeof(TextWrapping), typeof(OutlineText),
-            new PropertyMetadata(TextWrapping.NoWrap, OnFormattedTextInvalidated));
-
-        public TextWrapping TextWrapping
-        {
-            get => (TextWrapping) GetValue(TextWrappingProperty);
-            set => SetValue(TextWrappingProperty, value);
-        }
-
-        public static readonly DependencyProperty FillProperty = DependencyProperty.Register(
-            "Fill", typeof(Brush), typeof(OutlineText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
-
-        public Brush Fill
-        {
-            get => (Brush) GetValue(FillProperty);
-            set => SetValue(FillProperty, value);
-        }
-
-        public static readonly DependencyProperty StrokeProperty = DependencyProperty.Register(
-            "Stroke", typeof(Brush), typeof(OutlineText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
-
-        public Brush Stroke
-        {
-            get => (Brush) GetValue(StrokeProperty);
-            set => SetValue(StrokeProperty, value);
-        }
-
-        public static readonly DependencyProperty StrokeThicknessProperty = DependencyProperty.Register(
-            "StrokeThickness", typeof(double), typeof(OutlineText), new PropertyMetadata(ValueBoxes.Double0Box, OnFormattedTextUpdated));
-
-        public double StrokeThickness
-        {
-            get => (double) GetValue(StrokeThicknessProperty);
-            set => SetValue(StrokeThicknessProperty, value);
-        }
-
-        public static readonly DependencyProperty FontFamilyProperty = TextElement.FontFamilyProperty.AddOwner(
-            typeof(OutlineText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontFamily FontFamily
-        {
-            get => (FontFamily) GetValue(FontFamilyProperty);
-            set => SetValue(FontFamilyProperty, value);
-        }
-
-        public static readonly DependencyProperty FontSizeProperty = TextElement.FontSizeProperty.AddOwner(
-            typeof(OutlineText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        [TypeConverter(typeof(FontSizeConverter))]
-        public double FontSize
-        {
-            get => (double) GetValue(FontSizeProperty);
-            set => SetValue(FontSizeProperty, value);
-        }
-
-        public static readonly DependencyProperty FontStretchProperty = TextElement.FontStretchProperty.AddOwner(
-            typeof(OutlineText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontStretch FontStretch
-        {
-            get => (FontStretch) GetValue(FontStretchProperty);
-            set => SetValue(FontStretchProperty, value);
-        }
-
-        public static readonly DependencyProperty FontStyleProperty = TextElement.FontStyleProperty.AddOwner(
-            typeof(OutlineText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontStyle FontStyle
-        {
-            get => (FontStyle) GetValue(FontStyleProperty);
-            set => SetValue(FontStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty FontWeightProperty = TextElement.FontWeightProperty.AddOwner(
-            typeof(OutlineText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontWeight FontWeight
-        {
-            get => (FontWeight) GetValue(FontWeightProperty);
-            set => SetValue(FontWeightProperty, value);
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            if (StrokeThickness > 0)
-            {
-                EnsureGeometry();
-
-                drawingContext.DrawGeometry(Fill, null, _textGeometry);
-
-                if (StrokePosition == StrokePosition.Outside)
-                {
-                    drawingContext.PushClip(_clipGeometry);
-                }
-                else if (StrokePosition == StrokePosition.Inside)
-                {
-                    drawingContext.PushClip(_textGeometry);
-                }
-
-                drawingContext.DrawGeometry(null, _pen, _textGeometry);
-
-                if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
-                {
-                    drawingContext.Pop();
-                }
-            }
-            else
-            {
-                UpdateFormattedText();
-                drawingContext.DrawText(_formattedText, new Point());
-            }
-        }
-
-        private void UpdatePen()
-        {
-            _pen = new Pen(Stroke, StrokeThickness);
-
-            if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
-            {
-                _pen.Thickness = StrokeThickness * 2;
-            }
-        }
-
-        private void EnsureFormattedText()
-        {
-            if (_formattedText != null || Text == null)
-            {
-                return;
-            }
-
-            _formattedText = TextHelper.CreateFormattedText(Text, FlowDirection,
-                new Typeface(FontFamily, FontStyle, FontWeight, FontStretch), FontSize);
-
-            UpdateFormattedText();
-        }
-
-        private void EnsureGeometry()
-        {
-            if (_textGeometry != null)
-            {
-                return;
-            }
-
-            EnsureFormattedText();
-            _textGeometry = _formattedText.BuildGeometry(new Point(0, 0));
+            drawingContext.DrawGeometry(Fill, null, _textGeometry);
 
             if (StrokePosition == StrokePosition.Outside)
             {
-                var geometry = new RectangleGeometry(new Rect(0, 0, ActualWidth, ActualHeight));
-                _clipGeometry = Geometry.Combine(geometry, _textGeometry, GeometryCombineMode.Exclude, null);
+                drawingContext.PushClip(_clipGeometry);
             }
-        }
-
-        private void UpdateFormattedText()
-        {
-            if (_formattedText == null)
+            else if (StrokePosition == StrokePosition.Inside)
             {
-                return;
+                drawingContext.PushClip(_textGeometry);
             }
 
-            _formattedText.MaxLineCount = TextWrapping == TextWrapping.NoWrap ? 1 : int.MaxValue;
-            _formattedText.TextAlignment = TextAlignment;
-            _formattedText.Trimming = TextTrimming;
+            drawingContext.DrawGeometry(null, _pen, _textGeometry);
 
-            _formattedText.SetFontSize(FontSize);
-            _formattedText.SetFontStyle(FontStyle);
-            _formattedText.SetFontWeight(FontWeight);
-            _formattedText.SetFontFamily(FontFamily);
-            _formattedText.SetFontStretch(FontStretch);
-            _formattedText.SetForegroundBrush(Fill);
+            if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
+            {
+                drawingContext.Pop();
+            }
         }
-
-        private static void OnFormattedTextUpdated(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else
         {
-            var outlinedTextBlock = (OutlineText) d;
-            outlinedTextBlock.UpdateFormattedText();
-            outlinedTextBlock._textGeometry = null;
-
-            outlinedTextBlock.InvalidateMeasure();
-            outlinedTextBlock.InvalidateVisual();
-        }
-
-        private static void OnFormattedTextInvalidated(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var outlinedTextBlock = (OutlineText) d;
-            outlinedTextBlock._formattedText = null;
-            outlinedTextBlock._textGeometry = null;
-
-            outlinedTextBlock.InvalidateMeasure();
-            outlinedTextBlock.InvalidateVisual();
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            EnsureFormattedText();
-
-            // constrain the formatted text according to the available size
-            // the Math.Min call is important - without this constraint (which seems arbitrary, but is the maximum allowable text width), things blow up when availableSize is infinite in both directions
-            // the Math.Max call is to ensure we don't hit zero, which will cause MaxTextHeight to throw
-            _formattedText.MaxTextWidth = Math.Min(3579139, availableSize.Width);
-            _formattedText.MaxTextHeight = Math.Max(0.0001d, availableSize.Height);
-
-            UpdatePen();
-
-            // return the desired size
-            return new Size(_formattedText.Width, _formattedText.Height);
+            UpdateFormattedText();
+            drawingContext.DrawText(_formattedText, new Point());
         }
     }
-}
+
+    private void UpdatePen()
+    {
+        _pen = new Pen(Stroke, StrokeThickness);
+
+        if (StrokePosition == StrokePosition.Outside || StrokePosition == StrokePosition.Inside)
+        {
+            _pen.Thickness = StrokeThickness * 2;
+        }
+    }
+
+    private void EnsureFormattedText()
+    {
+        if (_formattedText != null || Text == null)
+        {
+            return;
+        }
+
+        _formattedText = TextHelper.CreateFormattedText(Text, FlowDirection,
+            new Typeface(FontFamily, FontStyle, FontWeight, FontStretch), FontSize);
+
+        UpdateFormattedText();
+    }
+
+    private void EnsureGeometry()
+    {
+        if (_textGeometry != null)
+        {
+            return;
+        }
+
+        EnsureFormattedText();
+        _textGeometry = _formattedText.BuildGeometry(new Point(0, 0));
+
+        if (StrokePosition == StrokePosition.Outside)
+        {
+            var geometry = new RectangleGeometry(new Rect(0, 0, ActualWidth, ActualHeight));
+            _clipGeometry = Geometry.Combine(geometry, _textGeometry, GeometryCombineMode.Exclude, null);
+        }
+    }
+
+    private void UpdateFormattedText()
+    {
+        if (_formattedText == null)
+        {
+            return;
+        }
+
+        _formattedText.MaxLineCount = TextWrapping == TextWrapping.NoWrap ? 1 : int.MaxValue;
+        _formattedText.TextAlignment = TextAlignment;
+        _formattedText.Trimming = TextTrimming;
+
+        _formattedText.SetFontSize(FontSize);
+        _formattedText.SetFontStyle(FontStyle);
+        _formattedText.SetFontWeight(FontWeight);
+        _formattedText.SetFontFamily(FontFamily);
+        _formattedText.SetFontStretch(FontStretch);
+        _formattedText.SetForegroundBrush(Fill);
+    }
+
+    private static void OnFormattedTextUpdated(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var outlinedTextBlock = (OutlineText) d;
+        outlinedTextBlock.UpdateFormattedText();
+        outlinedTextBlock._textGeometry = null;
+
+        outlinedTextBlock.InvalidateMeasure();
+        outlinedTextBlock.InvalidateVisual();
+    }
+
+    private static void OnFormattedTextInvalidated(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var outlinedTextBlock = (OutlineText) d;
+        outlinedTextBlock._formattedText = null;
+        outlinedTextBlock._textGeometry = null;
+
+        outlinedTextBlock.InvalidateMeasure();
+        outlinedTextBlock.InvalidateVisual();
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        EnsureFormattedText();
+
+        // constrain the formatted text according to the available size
+        // the Math.Min call is important - without this constraint (which seems arbitrary, but is the maximum allowable text width), things blow up when availableSize is infinite in both directions
+        // the Math.Max call is to ensure we don't hit zero, which will cause MaxTextHeight to throw
+        _formattedText.MaxTextWidth = Math.Min(3579139, availableSize.Width);
+        _formattedText.MaxTextHeight = Math.Max(0.0001d, availableSize.Height);
+
+        UpdatePen();
+
+        // return the desired size
+        return new Size(_formattedText.Width, _formattedText.Height);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
index 4a5dc9bb..421e0a4a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
@@ -6,180 +6,179 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools.Helper;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class SimpleText : FrameworkElement
 {
-    public class SimpleText : FrameworkElement
+    private FormattedText _formattedText;
+
+    static SimpleText()
     {
-        private FormattedText _formattedText;
-
-        static SimpleText()
-        {
-            SnapsToDevicePixelsProperty.OverrideMetadata(typeof(SimpleText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
-            UseLayoutRoundingProperty.OverrideMetadata(typeof(SimpleText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
-        }
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(SimpleText), new FrameworkPropertyMetadata(
-                string.Empty,
-                FrameworkPropertyMetadataOptions.AffectsMeasure |
-                FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
-
-        public string Text
-        {
-            get => (string) GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
-        }
-
-        public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register(
-            "TextAlignment", typeof(TextAlignment), typeof(SimpleText),
-            new PropertyMetadata(default(TextAlignment), OnFormattedTextUpdated));
-
-        public TextAlignment TextAlignment
-        {
-            get => (TextAlignment) GetValue(TextAlignmentProperty);
-            set => SetValue(TextAlignmentProperty, value);
-        }
-
-        public static readonly DependencyProperty TextTrimmingProperty = DependencyProperty.Register(
-            "TextTrimming", typeof(TextTrimming), typeof(SimpleText),
-            new PropertyMetadata(default(TextTrimming), OnFormattedTextInvalidated));
-
-        public TextTrimming TextTrimming
-        {
-            get => (TextTrimming) GetValue(TextTrimmingProperty);
-            set => SetValue(TextTrimmingProperty, value);
-        }
-
-        public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register(
-            "TextWrapping", typeof(TextWrapping), typeof(SimpleText),
-            new PropertyMetadata(TextWrapping.NoWrap, OnFormattedTextInvalidated));
-
-        public TextWrapping TextWrapping
-        {
-            get => (TextWrapping) GetValue(TextWrappingProperty);
-            set => SetValue(TextWrappingProperty, value);
-        }
-
-        public static readonly DependencyProperty ForegroundProperty = DependencyProperty.Register(
-            "Foreground", typeof(Brush), typeof(SimpleText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
-
-        public Brush Foreground
-        {
-            get => (Brush) GetValue(ForegroundProperty);
-            set => SetValue(ForegroundProperty, value);
-        }
-
-        public static readonly DependencyProperty FontFamilyProperty = TextElement.FontFamilyProperty.AddOwner(
-            typeof(SimpleText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontFamily FontFamily
-        {
-            get => (FontFamily) GetValue(FontFamilyProperty);
-            set => SetValue(FontFamilyProperty, value);
-        }
-
-        public static readonly DependencyProperty FontSizeProperty = TextElement.FontSizeProperty.AddOwner(
-            typeof(SimpleText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        [TypeConverter(typeof(FontSizeConverter))]
-        public double FontSize
-        {
-            get => (double) GetValue(FontSizeProperty);
-            set => SetValue(FontSizeProperty, value);
-        }
-
-        public static readonly DependencyProperty FontStretchProperty = TextElement.FontStretchProperty.AddOwner(
-            typeof(SimpleText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontStretch FontStretch
-        {
-            get => (FontStretch) GetValue(FontStretchProperty);
-            set => SetValue(FontStretchProperty, value);
-        }
-
-        public static readonly DependencyProperty FontStyleProperty = TextElement.FontStyleProperty.AddOwner(
-            typeof(SimpleText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontStyle FontStyle
-        {
-            get => (FontStyle) GetValue(FontStyleProperty);
-            set => SetValue(FontStyleProperty, value);
-        }
-
-        public static readonly DependencyProperty FontWeightProperty = TextElement.FontWeightProperty.AddOwner(
-            typeof(SimpleText),
-            new FrameworkPropertyMetadata(OnFormattedTextUpdated));
-
-        public FontWeight FontWeight
-        {
-            get => (FontWeight) GetValue(FontWeightProperty);
-            set => SetValue(FontWeightProperty, value);
-        }
-
-        protected override void OnRender(DrawingContext drawingContext) => drawingContext.DrawText(_formattedText, new Point());
-
-        private void EnsureFormattedText()
-        {
-            if (_formattedText != null || Text == null)
-            {
-                return;
-            }
-
-            _formattedText = TextHelper.CreateFormattedText(Text, FlowDirection,
-                new Typeface(FontFamily, FontStyle, FontWeight, FontStretch), FontSize);
-
-            UpdateFormattedText();
-        }
-
-        private void UpdateFormattedText()
-        {
-            if (_formattedText == null)
-            {
-                return;
-            }
-
-            _formattedText.MaxLineCount = TextWrapping == TextWrapping.NoWrap ? 1 : int.MaxValue;
-            _formattedText.TextAlignment = TextAlignment;
-            _formattedText.Trimming = TextTrimming;
-
-            _formattedText.SetFontSize(FontSize);
-            _formattedText.SetFontStyle(FontStyle);
-            _formattedText.SetFontWeight(FontWeight);
-            _formattedText.SetFontFamily(FontFamily);
-            _formattedText.SetFontStretch(FontStretch);
-            _formattedText.SetForegroundBrush(Foreground);
-        }
-
-        private static void OnFormattedTextUpdated(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var outlinedTextBlock = (SimpleText) d;
-            outlinedTextBlock.UpdateFormattedText();
-
-            outlinedTextBlock.InvalidateMeasure();
-            outlinedTextBlock.InvalidateVisual();
-        }
-
-        private static void OnFormattedTextInvalidated(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var outlinedTextBlock = (SimpleText) d;
-            outlinedTextBlock._formattedText = null;
-
-            outlinedTextBlock.InvalidateMeasure();
-            outlinedTextBlock.InvalidateVisual();
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            EnsureFormattedText();
-
-            _formattedText.MaxTextWidth = Math.Min(3579139, availableSize.Width);
-            _formattedText.MaxTextHeight = Math.Max(0.0001d, availableSize.Height);
-
-            return new Size(_formattedText.Width, _formattedText.Height);
-        }
+        SnapsToDevicePixelsProperty.OverrideMetadata(typeof(SimpleText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
+        UseLayoutRoundingProperty.OverrideMetadata(typeof(SimpleText), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
     }
-}
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(SimpleText), new FrameworkPropertyMetadata(
+            string.Empty,
+            FrameworkPropertyMetadataOptions.AffectsMeasure |
+            FrameworkPropertyMetadataOptions.AffectsRender, OnFormattedTextInvalidated));
+
+    public string Text
+    {
+        get => (string) GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register(
+        "TextAlignment", typeof(TextAlignment), typeof(SimpleText),
+        new PropertyMetadata(default(TextAlignment), OnFormattedTextUpdated));
+
+    public TextAlignment TextAlignment
+    {
+        get => (TextAlignment) GetValue(TextAlignmentProperty);
+        set => SetValue(TextAlignmentProperty, value);
+    }
+
+    public static readonly DependencyProperty TextTrimmingProperty = DependencyProperty.Register(
+        "TextTrimming", typeof(TextTrimming), typeof(SimpleText),
+        new PropertyMetadata(default(TextTrimming), OnFormattedTextInvalidated));
+
+    public TextTrimming TextTrimming
+    {
+        get => (TextTrimming) GetValue(TextTrimmingProperty);
+        set => SetValue(TextTrimmingProperty, value);
+    }
+
+    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register(
+        "TextWrapping", typeof(TextWrapping), typeof(SimpleText),
+        new PropertyMetadata(TextWrapping.NoWrap, OnFormattedTextInvalidated));
+
+    public TextWrapping TextWrapping
+    {
+        get => (TextWrapping) GetValue(TextWrappingProperty);
+        set => SetValue(TextWrappingProperty, value);
+    }
+
+    public static readonly DependencyProperty ForegroundProperty = DependencyProperty.Register(
+        "Foreground", typeof(Brush), typeof(SimpleText), new PropertyMetadata(Brushes.Black, OnFormattedTextUpdated));
+
+    public Brush Foreground
+    {
+        get => (Brush) GetValue(ForegroundProperty);
+        set => SetValue(ForegroundProperty, value);
+    }
+
+    public static readonly DependencyProperty FontFamilyProperty = TextElement.FontFamilyProperty.AddOwner(
+        typeof(SimpleText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontFamily FontFamily
+    {
+        get => (FontFamily) GetValue(FontFamilyProperty);
+        set => SetValue(FontFamilyProperty, value);
+    }
+
+    public static readonly DependencyProperty FontSizeProperty = TextElement.FontSizeProperty.AddOwner(
+        typeof(SimpleText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    [TypeConverter(typeof(FontSizeConverter))]
+    public double FontSize
+    {
+        get => (double) GetValue(FontSizeProperty);
+        set => SetValue(FontSizeProperty, value);
+    }
+
+    public static readonly DependencyProperty FontStretchProperty = TextElement.FontStretchProperty.AddOwner(
+        typeof(SimpleText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontStretch FontStretch
+    {
+        get => (FontStretch) GetValue(FontStretchProperty);
+        set => SetValue(FontStretchProperty, value);
+    }
+
+    public static readonly DependencyProperty FontStyleProperty = TextElement.FontStyleProperty.AddOwner(
+        typeof(SimpleText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontStyle FontStyle
+    {
+        get => (FontStyle) GetValue(FontStyleProperty);
+        set => SetValue(FontStyleProperty, value);
+    }
+
+    public static readonly DependencyProperty FontWeightProperty = TextElement.FontWeightProperty.AddOwner(
+        typeof(SimpleText),
+        new FrameworkPropertyMetadata(OnFormattedTextUpdated));
+
+    public FontWeight FontWeight
+    {
+        get => (FontWeight) GetValue(FontWeightProperty);
+        set => SetValue(FontWeightProperty, value);
+    }
+
+    protected override void OnRender(DrawingContext drawingContext) => drawingContext.DrawText(_formattedText, new Point());
+
+    private void EnsureFormattedText()
+    {
+        if (_formattedText != null || Text == null)
+        {
+            return;
+        }
+
+        _formattedText = TextHelper.CreateFormattedText(Text, FlowDirection,
+            new Typeface(FontFamily, FontStyle, FontWeight, FontStretch), FontSize);
+
+        UpdateFormattedText();
+    }
+
+    private void UpdateFormattedText()
+    {
+        if (_formattedText == null)
+        {
+            return;
+        }
+
+        _formattedText.MaxLineCount = TextWrapping == TextWrapping.NoWrap ? 1 : int.MaxValue;
+        _formattedText.TextAlignment = TextAlignment;
+        _formattedText.Trimming = TextTrimming;
+
+        _formattedText.SetFontSize(FontSize);
+        _formattedText.SetFontStyle(FontStyle);
+        _formattedText.SetFontWeight(FontWeight);
+        _formattedText.SetFontFamily(FontFamily);
+        _formattedText.SetFontStretch(FontStretch);
+        _formattedText.SetForegroundBrush(Foreground);
+    }
+
+    private static void OnFormattedTextUpdated(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var outlinedTextBlock = (SimpleText) d;
+        outlinedTextBlock.UpdateFormattedText();
+
+        outlinedTextBlock.InvalidateMeasure();
+        outlinedTextBlock.InvalidateVisual();
+    }
+
+    private static void OnFormattedTextInvalidated(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var outlinedTextBlock = (SimpleText) d;
+        outlinedTextBlock._formattedText = null;
+
+        outlinedTextBlock.InvalidateMeasure();
+        outlinedTextBlock.InvalidateVisual();
+    }
+
+    protected override Size MeasureOverride(Size availableSize)
+    {
+        EnsureFormattedText();
+
+        _formattedText.MaxTextWidth = Math.Min(3579139, availableSize.Width);
+        _formattedText.MaxTextHeight = Math.Max(0.0001d, availableSize.Height);
+
+        return new Size(_formattedText.Width, _formattedText.Height);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
index 57b2237b..21bbc85f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
@@ -6,252 +6,251 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
+[TemplatePart(Name = ElementClockPresenter, Type = typeof(ContentPresenter))]
+[TemplatePart(Name = ElementCalendarPresenter, Type = typeof(ContentPresenter))]
+public class CalendarWithClock : Control
 {
-    [TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
-    [TemplatePart(Name = ElementClockPresenter, Type = typeof(ContentPresenter))]
-    [TemplatePart(Name = ElementCalendarPresenter, Type = typeof(ContentPresenter))]
-    public class CalendarWithClock : Control
+    #region Constants
+
+    private const string ElementButtonConfirm = "PART_ButtonConfirm";
+
+    private const string ElementClockPresenter = "PART_ClockPresenter";
+
+    private const string ElementCalendarPresenter = "PART_CalendarPresenter";
+
+    #endregion Constants
+
+    #region Data
+
+    private ContentPresenter _clockPresenter;
+
+    private ContentPresenter _calendarPresenter;
+
+    private Clock _clock;
+
+    private Calendar _calendar;
+
+    private Button _buttonConfirm;
+
+    private bool _isLoaded;
+
+    private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
+
+    #endregion Data
+
+    #region Public Events
+
+    public static readonly RoutedEvent SelectedDateTimeChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedDateTimeChanged", RoutingStrategy.Direct,
+            typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(CalendarWithClock));
+
+    public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged
     {
-        #region Constants
-
-        private const string ElementButtonConfirm = "PART_ButtonConfirm";
-
-        private const string ElementClockPresenter = "PART_ClockPresenter";
-
-        private const string ElementCalendarPresenter = "PART_CalendarPresenter";
-
-        #endregion Constants
-
-        #region Data
-
-        private ContentPresenter _clockPresenter;
-
-        private ContentPresenter _calendarPresenter;
-
-        private Clock _clock;
-
-        private Calendar _calendar;
-
-        private Button _buttonConfirm;
-
-        private bool _isLoaded;
-
-        private IDictionary<DependencyProperty, bool> _isHandlerSuspended;
-
-        #endregion Data
-
-        #region Public Events
-
-        public static readonly RoutedEvent SelectedDateTimeChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedDateTimeChanged", RoutingStrategy.Direct,
-                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(CalendarWithClock));
-
-        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged
-        {
-            add => AddHandler(SelectedDateTimeChangedEvent, value);
-            remove => RemoveHandler(SelectedDateTimeChangedEvent, value);
-        }
-
-        public event EventHandler<FunctionEventArgs<DateTime>> DisplayDateTimeChanged;
-
-        public event Action Confirmed;
-
-        #endregion Public Events
-
-        public CalendarWithClock()
-        {
-            InitCalendarAndClock();
-            Loaded += (s, e) =>
-            {
-                if (_isLoaded) return;
-                _isLoaded = true;
-                DisplayDateTime = SelectedDateTime ?? DateTime.Now;
-            };
-        }
-
-        #region Public Properties
-
-        public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
-            "DateTimeFormat", typeof(string), typeof(CalendarWithClock), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
-
-        public string DateTimeFormat
-        {
-            get => (string) GetValue(DateTimeFormatProperty);
-            set => SetValue(DateTimeFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
-            "ShowConfirmButton", typeof(bool), typeof(CalendarWithClock), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowConfirmButton
-        {
-            get => (bool) GetValue(ShowConfirmButtonProperty);
-            set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
-            "SelectedDateTime", typeof(DateTime?), typeof(CalendarWithClock), new PropertyMetadata(default(DateTime?), OnSelectedDateTimeChanged));
-
-        private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (CalendarWithClock) d;
-            var v = (DateTime?) e.NewValue;
-            ctl.OnSelectedDateTimeChanged(new FunctionEventArgs<DateTime?>(SelectedDateTimeChangedEvent, ctl)
-            {
-                Info = v
-            });
-        }
-
-        public DateTime? SelectedDateTime
-        {
-            get => (DateTime?) GetValue(SelectedDateTimeProperty);
-            set => SetValue(SelectedDateTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(
-            "DisplayDateTime", typeof(DateTime), typeof(CalendarWithClock), new FrameworkPropertyMetadata(DateTime.MinValue, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnDisplayDateTimeChanged));
-
-        private static void OnDisplayDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (CalendarWithClock) d;
-            if (ctl.IsHandlerSuspended(DisplayDateTimeProperty)) return;
-            var v = (DateTime) e.NewValue;
-            ctl._clock.SelectedTime = v;
-            ctl._calendar.SelectedDate = v;
-            ctl._calendar.DisplayDate = v;
-            ctl.OnDisplayDateTimeChanged(new FunctionEventArgs<DateTime>(v));
-        }
-
-        public DateTime DisplayDateTime
-        {
-            get => (DateTime) GetValue(DisplayDateTimeProperty);
-            set => SetValue(DisplayDateTimeProperty, value);
-        }
-
-        #endregion
-
-        #region Public Methods
-
-        public override void OnApplyTemplate()
-        {
-            if (_buttonConfirm != null)
-            {
-                _buttonConfirm.Click -= ButtonConfirm_OnClick;
-            }
-
-            base.OnApplyTemplate();
-
-            _buttonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
-            _clockPresenter = GetTemplateChild(ElementClockPresenter) as ContentPresenter;
-            _calendarPresenter = GetTemplateChild(ElementCalendarPresenter) as ContentPresenter;
-
-            CheckNull();
-
-            _clockPresenter.Content = _clock;
-            _calendarPresenter.Content = _calendar;
-
-            _buttonConfirm.Click += ButtonConfirm_OnClick;
-        }
-
-        #endregion
-
-        #region Protected Methods
-
-        protected virtual void OnSelectedDateTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
-
-        protected virtual void OnDisplayDateTimeChanged(FunctionEventArgs<DateTime> e)
-        {
-            var handler = DisplayDateTimeChanged;
-            handler?.Invoke(this, e);
-        }
-
-        #endregion Protected Methods
-
-        #region Private Methods
-
-        private void SetIsHandlerSuspended(DependencyProperty property, bool value)
-        {
-            if (value)
-            {
-                _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
-                _isHandlerSuspended[property] = true;
-            }
-            else
-            {
-                _isHandlerSuspended?.Remove(property);
-            }
-        }
-
-        private void SetValueNoCallback(DependencyProperty property, object value)
-        {
-            SetIsHandlerSuspended(property, true);
-            try
-            {
-                SetCurrentValue(property, value);
-            }
-            finally
-            {
-                SetIsHandlerSuspended(property, false);
-            }
-        }
-
-        private bool IsHandlerSuspended(DependencyProperty property)
-        {
-            return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
-        }
-
-        private void CheckNull()
-        {
-            if (_buttonConfirm == null || _clockPresenter == null || _calendarPresenter == null) throw new Exception();
-        }
-
-        private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
-        {
-            SelectedDateTime = DisplayDateTime;
-            Confirmed?.Invoke();
-        }
-
-        private void InitCalendarAndClock()
-        {
-            _clock = new Clock
-            {
-                BorderThickness = new Thickness(),
-                Background = Brushes.Transparent
-            };
-            TitleElement.SetBackground(_clock, Brushes.Transparent);
-            _clock.DisplayTimeChanged += Clock_DisplayTimeChanged;
-
-            _calendar = new Calendar
-            {
-                BorderThickness = new Thickness(),
-                Background = Brushes.Transparent,
-                Focusable = false
-            };
-            TitleElement.SetBackground(_calendar, Brushes.Transparent);
-            _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-        }
-
-        private void Calendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
-        {
-            Mouse.Capture(null);
-            UpdateDisplayTime();
-        }
-
-        private void Clock_DisplayTimeChanged(object sender, FunctionEventArgs<DateTime> e) => UpdateDisplayTime();
-
-        private void UpdateDisplayTime()
-        {
-            if (_calendar.SelectedDate != null)
-            {
-                var date = _calendar.SelectedDate.Value;
-                var time = _clock.DisplayTime;
-
-                var result = new DateTime(date.Year, date.Month, date.Day, time.Hour, time.Minute, time.Second);
-                SetValueNoCallback(DisplayDateTimeProperty, result);
-            }
-        }
-
-        #endregion
+        add => AddHandler(SelectedDateTimeChangedEvent, value);
+        remove => RemoveHandler(SelectedDateTimeChangedEvent, value);
     }
-}
+
+    public event EventHandler<FunctionEventArgs<DateTime>> DisplayDateTimeChanged;
+
+    public event Action Confirmed;
+
+    #endregion Public Events
+
+    public CalendarWithClock()
+    {
+        InitCalendarAndClock();
+        Loaded += (s, e) =>
+        {
+            if (_isLoaded) return;
+            _isLoaded = true;
+            DisplayDateTime = SelectedDateTime ?? DateTime.Now;
+        };
+    }
+
+    #region Public Properties
+
+    public static readonly DependencyProperty DateTimeFormatProperty = DependencyProperty.Register(
+        "DateTimeFormat", typeof(string), typeof(CalendarWithClock), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
+
+    public string DateTimeFormat
+    {
+        get => (string) GetValue(DateTimeFormatProperty);
+        set => SetValue(DateTimeFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
+        "ShowConfirmButton", typeof(bool), typeof(CalendarWithClock), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowConfirmButton
+    {
+        get => (bool) GetValue(ShowConfirmButtonProperty);
+        set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
+        "SelectedDateTime", typeof(DateTime?), typeof(CalendarWithClock), new PropertyMetadata(default(DateTime?), OnSelectedDateTimeChanged));
+
+    private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (CalendarWithClock) d;
+        var v = (DateTime?) e.NewValue;
+        ctl.OnSelectedDateTimeChanged(new FunctionEventArgs<DateTime?>(SelectedDateTimeChangedEvent, ctl)
+        {
+            Info = v
+        });
+    }
+
+    public DateTime? SelectedDateTime
+    {
+        get => (DateTime?) GetValue(SelectedDateTimeProperty);
+        set => SetValue(SelectedDateTimeProperty, value);
+    }
+
+    public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(
+        "DisplayDateTime", typeof(DateTime), typeof(CalendarWithClock), new FrameworkPropertyMetadata(DateTime.MinValue, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnDisplayDateTimeChanged));
+
+    private static void OnDisplayDateTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (CalendarWithClock) d;
+        if (ctl.IsHandlerSuspended(DisplayDateTimeProperty)) return;
+        var v = (DateTime) e.NewValue;
+        ctl._clock.SelectedTime = v;
+        ctl._calendar.SelectedDate = v;
+        ctl._calendar.DisplayDate = v;
+        ctl.OnDisplayDateTimeChanged(new FunctionEventArgs<DateTime>(v));
+    }
+
+    public DateTime DisplayDateTime
+    {
+        get => (DateTime) GetValue(DisplayDateTimeProperty);
+        set => SetValue(DisplayDateTimeProperty, value);
+    }
+
+    #endregion
+
+    #region Public Methods
+
+    public override void OnApplyTemplate()
+    {
+        if (_buttonConfirm != null)
+        {
+            _buttonConfirm.Click -= ButtonConfirm_OnClick;
+        }
+
+        base.OnApplyTemplate();
+
+        _buttonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
+        _clockPresenter = GetTemplateChild(ElementClockPresenter) as ContentPresenter;
+        _calendarPresenter = GetTemplateChild(ElementCalendarPresenter) as ContentPresenter;
+
+        CheckNull();
+
+        _clockPresenter.Content = _clock;
+        _calendarPresenter.Content = _calendar;
+
+        _buttonConfirm.Click += ButtonConfirm_OnClick;
+    }
+
+    #endregion
+
+    #region Protected Methods
+
+    protected virtual void OnSelectedDateTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
+
+    protected virtual void OnDisplayDateTimeChanged(FunctionEventArgs<DateTime> e)
+    {
+        var handler = DisplayDateTimeChanged;
+        handler?.Invoke(this, e);
+    }
+
+    #endregion Protected Methods
+
+    #region Private Methods
+
+    private void SetIsHandlerSuspended(DependencyProperty property, bool value)
+    {
+        if (value)
+        {
+            _isHandlerSuspended ??= new Dictionary<DependencyProperty, bool>(2);
+            _isHandlerSuspended[property] = true;
+        }
+        else
+        {
+            _isHandlerSuspended?.Remove(property);
+        }
+    }
+
+    private void SetValueNoCallback(DependencyProperty property, object value)
+    {
+        SetIsHandlerSuspended(property, true);
+        try
+        {
+            SetCurrentValue(property, value);
+        }
+        finally
+        {
+            SetIsHandlerSuspended(property, false);
+        }
+    }
+
+    private bool IsHandlerSuspended(DependencyProperty property)
+    {
+        return _isHandlerSuspended != null && _isHandlerSuspended.ContainsKey(property);
+    }
+
+    private void CheckNull()
+    {
+        if (_buttonConfirm == null || _clockPresenter == null || _calendarPresenter == null) throw new Exception();
+    }
+
+    private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
+    {
+        SelectedDateTime = DisplayDateTime;
+        Confirmed?.Invoke();
+    }
+
+    private void InitCalendarAndClock()
+    {
+        _clock = new Clock
+        {
+            BorderThickness = new Thickness(),
+            Background = Brushes.Transparent
+        };
+        TitleElement.SetBackground(_clock, Brushes.Transparent);
+        _clock.DisplayTimeChanged += Clock_DisplayTimeChanged;
+
+        _calendar = new Calendar
+        {
+            BorderThickness = new Thickness(),
+            Background = Brushes.Transparent,
+            Focusable = false
+        };
+        TitleElement.SetBackground(_calendar, Brushes.Transparent);
+        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+    }
+
+    private void Calendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
+    {
+        Mouse.Capture(null);
+        UpdateDisplayTime();
+    }
+
+    private void Clock_DisplayTimeChanged(object sender, FunctionEventArgs<DateTime> e) => UpdateDisplayTime();
+
+    private void UpdateDisplayTime()
+    {
+        if (_calendar.SelectedDate != null)
+        {
+            var date = _calendar.SelectedDate.Value;
+            var time = _clock.DisplayTime;
+
+            var result = new DateTime(date.Year, date.Month, date.Day, time.Hour, time.Minute, time.Second);
+            SetValueNoCallback(DisplayDateTimeProperty, result);
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
index 260aa6d2..4f19b290 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
@@ -8,327 +8,326 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))]
+[TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))]
+[TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))]
+[TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))]
+[TemplatePart(Name = ElementBorderClock, Type = typeof(Border))]
+[TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))]
+[TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))]
+public class Clock : ClockBase
 {
-    [TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))]
-    [TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))]
-    [TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))]
-    [TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))]
-    [TemplatePart(Name = ElementBorderClock, Type = typeof(Border))]
-    [TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))]
-    [TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))]
-    public class Clock : ClockBase
+    #region Constants
+
+    private const string ElementButtonAm = "PART_ButtonAm";
+    private const string ElementButtonPm = "PART_ButtonPm";
+    private const string ElementCanvas = "PART_Canvas";
+    private const string ElementBorderTitle = "PART_BorderTitle";
+    private const string ElementBorderClock = "PART_BorderClock";
+    private const string ElementPanelNum = "PART_PanelNum";
+    private const string ElementTimeStr = "PART_TimeStr";
+
+    #endregion Constants
+
+    #region Data
+
+    private RadioButton _buttonAm;
+
+    private RadioButton _buttonPm;
+
+    private Canvas _canvas;
+
+    private Border _borderTitle;
+
+    private Border _borderClock;
+
+    private ClockRadioButton _currentButton;
+
+    private RotateTransform _rotateTransformClock;
+
+    private CirclePanel _circlePanel;
+
+    private List<ClockRadioButton> _radioButtonList;
+
+    private TextBlock _blockTime;
+
+    private int _secValue;
+
+    #endregion Data
+
+    #region Public Properties
+
+    public static readonly DependencyProperty ClockRadioButtonStyleProperty = DependencyProperty.Register(
+        "ClockRadioButtonStyle", typeof(Style), typeof(Clock), new PropertyMetadata(default(Style)));
+
+    public Style ClockRadioButtonStyle
     {
-        #region Constants
+        get => (Style) GetValue(ClockRadioButtonStyleProperty);
+        set => SetValue(ClockRadioButtonStyleProperty, value);
+    }
 
-        private const string ElementButtonAm = "PART_ButtonAm";
-        private const string ElementButtonPm = "PART_ButtonPm";
-        private const string ElementCanvas = "PART_Canvas";
-        private const string ElementBorderTitle = "PART_BorderTitle";
-        private const string ElementBorderClock = "PART_BorderClock";
-        private const string ElementPanelNum = "PART_PanelNum";
-        private const string ElementTimeStr = "PART_TimeStr";
-
-        #endregion Constants
-
-        #region Data
-
-        private RadioButton _buttonAm;
-
-        private RadioButton _buttonPm;
-
-        private Canvas _canvas;
-
-        private Border _borderTitle;
-
-        private Border _borderClock;
-
-        private ClockRadioButton _currentButton;
-
-        private RotateTransform _rotateTransformClock;
-
-        private CirclePanel _circlePanel;
-
-        private List<ClockRadioButton> _radioButtonList;
-
-        private TextBlock _blockTime;
-
-        private int _secValue;
-
-        #endregion Data
-
-        #region Public Properties
-
-        public static readonly DependencyProperty ClockRadioButtonStyleProperty = DependencyProperty.Register(
-            "ClockRadioButtonStyle", typeof(Style), typeof(Clock), new PropertyMetadata(default(Style)));
-
-        public Style ClockRadioButtonStyle
+    private int SecValue
+    {
+        get => _secValue;
+        set
         {
-            get => (Style) GetValue(ClockRadioButtonStyleProperty);
-            set => SetValue(ClockRadioButtonStyleProperty, value);
-        }
-
-        private int SecValue
-        {
-            get => _secValue;
-            set
+            if (value < 0)
             {
-                if (value < 0)
-                {
-                    _secValue = 59;
-                }
-                else if (value > 59)
-                {
-                    _secValue = 0;
-                }
-                else
-                {
-                    _secValue = value;
-                }
+                _secValue = 59;
             }
-        }
-
-        #endregion Public Properties
-
-        #region Public Methods
-
-        public override void OnApplyTemplate()
-        {
-            AppliedTemplate = false;
-            if (_buttonAm != null)
+            else if (value > 59)
             {
-                _buttonAm.Click -= ButtonAm_OnClick;
-            }
-
-            if (_buttonPm != null)
-            {
-                _buttonPm.Click -= ButtonPm_OnClick;
-            }
-
-            if (ButtonConfirm != null)
-            {
-                ButtonConfirm.Click -= ButtonConfirm_OnClick;
-            }
-
-            if (_borderTitle != null)
-            {
-                _borderTitle.MouseWheel -= BorderTitle_OnMouseWheel;
-            }
-
-            if (_canvas != null)
-            {
-                _canvas.MouseWheel -= Canvas_OnMouseWheel;
-                _canvas.RemoveHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Canvas_OnClick));
-                _canvas.MouseMove -= Canvas_OnMouseMove;
-            }
-
-            base.OnApplyTemplate();
-
-            _buttonAm = GetTemplateChild(ElementButtonAm) as RadioButton;
-            _buttonPm = GetTemplateChild(ElementButtonPm) as RadioButton;
-            ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
-            _borderTitle = GetTemplateChild(ElementBorderTitle) as Border;
-            _canvas = GetTemplateChild(ElementCanvas) as Canvas;
-            _borderClock = GetTemplateChild(ElementBorderClock) as Border;
-            _circlePanel = GetTemplateChild(ElementPanelNum) as CirclePanel;
-            _blockTime = GetTemplateChild(ElementTimeStr) as TextBlock;
-
-            if (!CheckNull()) return;
-
-            _buttonAm.Click += ButtonAm_OnClick;
-            _buttonPm.Click += ButtonPm_OnClick;
-            ButtonConfirm.Click += ButtonConfirm_OnClick;
-            _borderTitle.MouseWheel += BorderTitle_OnMouseWheel;
-
-            _canvas.MouseWheel += Canvas_OnMouseWheel;
-            _canvas.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Canvas_OnClick));
-            _canvas.MouseMove += Canvas_OnMouseMove;
-
-            _rotateTransformClock = new RotateTransform();
-            _borderClock.RenderTransform = _rotateTransformClock;
-
-            _radioButtonList = new List<ClockRadioButton>();
-            for (var i = 0; i < 12; i++)
-            {
-                var num = i + 1;
-                var button = new ClockRadioButton
-                {
-                    Num = num,
-                    Content = num
-                };
-                button.SetBinding(StyleProperty, new Binding(ClockRadioButtonStyleProperty.Name) { Source = this });
-                _radioButtonList.Add(button);
-                _circlePanel.Children.Add(button);
-            }
-
-            AppliedTemplate = true;
-            if (SelectedTime.HasValue)
-            {
-                Update(SelectedTime.Value);
+                _secValue = 0;
             }
             else
             {
-                DisplayTime = DateTime.Now;
-                Update(DisplayTime);
+                _secValue = value;
             }
         }
+    }
 
-        #endregion Public Methods
+    #endregion Public Properties
 
-        #region Private Methods
+    #region Public Methods
 
-        private bool CheckNull()
+    public override void OnApplyTemplate()
+    {
+        AppliedTemplate = false;
+        if (_buttonAm != null)
         {
-            if (_buttonPm == null || _buttonAm == null || ButtonConfirm == null || _canvas == null ||
-                _borderTitle == null || _borderClock == null || _circlePanel == null ||
-                _blockTime == null) return false;
-
-            return true;
+            _buttonAm.Click -= ButtonAm_OnClick;
         }
 
-        private void BorderTitle_OnMouseWheel(object sender, MouseWheelEventArgs e)
+        if (_buttonPm != null)
         {
-            if (e.Delta < 0)
-            {
-                SecValue--;
-                Update();
-            }
-            else
-            {
-                SecValue++;
-                Update();
-            }
-            e.Handled = true;
+            _buttonPm.Click -= ButtonPm_OnClick;
         }
 
-        private void Canvas_OnMouseWheel(object sender, MouseWheelEventArgs e)
+        if (ButtonConfirm != null)
         {
-            var value = (int) _rotateTransformClock.Angle;
-            if (e.Delta < 0)
+            ButtonConfirm.Click -= ButtonConfirm_OnClick;
+        }
+
+        if (_borderTitle != null)
+        {
+            _borderTitle.MouseWheel -= BorderTitle_OnMouseWheel;
+        }
+
+        if (_canvas != null)
+        {
+            _canvas.MouseWheel -= Canvas_OnMouseWheel;
+            _canvas.RemoveHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Canvas_OnClick));
+            _canvas.MouseMove -= Canvas_OnMouseMove;
+        }
+
+        base.OnApplyTemplate();
+
+        _buttonAm = GetTemplateChild(ElementButtonAm) as RadioButton;
+        _buttonPm = GetTemplateChild(ElementButtonPm) as RadioButton;
+        ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
+        _borderTitle = GetTemplateChild(ElementBorderTitle) as Border;
+        _canvas = GetTemplateChild(ElementCanvas) as Canvas;
+        _borderClock = GetTemplateChild(ElementBorderClock) as Border;
+        _circlePanel = GetTemplateChild(ElementPanelNum) as CirclePanel;
+        _blockTime = GetTemplateChild(ElementTimeStr) as TextBlock;
+
+        if (!CheckNull()) return;
+
+        _buttonAm.Click += ButtonAm_OnClick;
+        _buttonPm.Click += ButtonPm_OnClick;
+        ButtonConfirm.Click += ButtonConfirm_OnClick;
+        _borderTitle.MouseWheel += BorderTitle_OnMouseWheel;
+
+        _canvas.MouseWheel += Canvas_OnMouseWheel;
+        _canvas.AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Canvas_OnClick));
+        _canvas.MouseMove += Canvas_OnMouseMove;
+
+        _rotateTransformClock = new RotateTransform();
+        _borderClock.RenderTransform = _rotateTransformClock;
+
+        _radioButtonList = new List<ClockRadioButton>();
+        for (var i = 0; i < 12; i++)
+        {
+            var num = i + 1;
+            var button = new ClockRadioButton
             {
-                value += 6;
-            }
-            else
-            {
-                value -= 6;
-            }
+                Num = num,
+                Content = num
+            };
+            button.SetBinding(StyleProperty, new Binding(ClockRadioButtonStyleProperty.Name) { Source = this });
+            _radioButtonList.Add(button);
+            _circlePanel.Children.Add(button);
+        }
+
+        AppliedTemplate = true;
+        if (SelectedTime.HasValue)
+        {
+            Update(SelectedTime.Value);
+        }
+        else
+        {
+            DisplayTime = DateTime.Now;
+            Update(DisplayTime);
+        }
+    }
+
+    #endregion Public Methods
+
+    #region Private Methods
+
+    private bool CheckNull()
+    {
+        if (_buttonPm == null || _buttonAm == null || ButtonConfirm == null || _canvas == null ||
+            _borderTitle == null || _borderClock == null || _circlePanel == null ||
+            _blockTime == null) return false;
+
+        return true;
+    }
+
+    private void BorderTitle_OnMouseWheel(object sender, MouseWheelEventArgs e)
+    {
+        if (e.Delta < 0)
+        {
+            SecValue--;
+            Update();
+        }
+        else
+        {
+            SecValue++;
+            Update();
+        }
+        e.Handled = true;
+    }
+
+    private void Canvas_OnMouseWheel(object sender, MouseWheelEventArgs e)
+    {
+        var value = (int) _rotateTransformClock.Angle;
+        if (e.Delta < 0)
+        {
+            value += 6;
+        }
+        else
+        {
+            value -= 6;
+        }
+        if (value < 0)
+        {
+            value = value + 360;
+        }
+        _rotateTransformClock.Angle = value;
+
+        Update();
+        e.Handled = true;
+    }
+
+    private void Canvas_OnClick(object sender, RoutedEventArgs e)
+    {
+        _currentButton = e.OriginalSource as ClockRadioButton;
+        if (_currentButton != null)
+        {
+            Update();
+        }
+    }
+
+    private void Canvas_OnMouseMove(object sender, MouseEventArgs e)
+    {
+        if (e.LeftButton == MouseButtonState.Pressed)
+        {
+            var value = ArithmeticHelper.CalAngle(new Point(85, 85), e.GetPosition(_canvas)) + 90;
             if (value < 0)
             {
                 value = value + 360;
             }
+            value = value - value % 6;
             _rotateTransformClock.Angle = value;
-
-            Update();
-            e.Handled = true;
-        }
-
-        private void Canvas_OnClick(object sender, RoutedEventArgs e)
-        {
-            _currentButton = e.OriginalSource as ClockRadioButton;
-            if (_currentButton != null)
-            {
-                Update();
-            }
-        }
-
-        private void Canvas_OnMouseMove(object sender, MouseEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                var value = ArithmeticHelper.CalAngle(new Point(85, 85), e.GetPosition(_canvas)) + 90;
-                if (value < 0)
-                {
-                    value = value + 360;
-                }
-                value = value - value % 6;
-                _rotateTransformClock.Angle = value;
-                Update();
-            }
-        }
-
-        private void Update()
-        {
-            if (!AppliedTemplate) return;
-            var hValue = _currentButton.Num;
-            if (_buttonPm.IsChecked == true)
-            {
-                hValue += 12;
-                if (hValue == 24) hValue = 12;
-            }
-            else if (hValue == 12)
-            {
-                hValue = 0;
-            }
-            if (hValue == 12 && _buttonAm.IsChecked == true)
-            {
-                _buttonPm.IsChecked = true;
-                _buttonAm.IsChecked = false;
-            }
-
-            if (_blockTime != null)
-            {
-                DisplayTime = GetDisplayTime();
-                _blockTime.Text = DisplayTime.ToString(TimeFormat);
-            }
-        }
-
-        /// <summary>
-        ///     更新
-        /// </summary>
-        /// <param name="time"></param>
-        internal override void Update(DateTime time)
-        {
-            if (!AppliedTemplate) return;
-            var h = time.Hour;
-            var m = time.Minute;
-
-            if (h >= 12)
-            {
-                _buttonPm.IsChecked = true;
-                _buttonAm.IsChecked = false;
-            }
-            else
-            {
-                _buttonPm.IsChecked = false;
-                _buttonAm.IsChecked = true;
-            }
-
-            _rotateTransformClock.Angle = m * 6;
-
-            var hRest = h % 12;
-            if (hRest == 0) hRest = 12;
-            var ctl = _radioButtonList[hRest - 1];
-            ctl.IsChecked = true;
-            ctl.RaiseEvent(new RoutedEventArgs { RoutedEvent = ButtonBase.ClickEvent });
-
-            _secValue = time.Second;
             Update();
         }
-
-        /// <summary>
-        ///     获取显示时间
-        /// </summary>
-        /// <returns></returns>
-        private DateTime GetDisplayTime()
-        {
-            var hValue = _currentButton.Num;
-            if (_buttonPm.IsChecked == true)
-            {
-                hValue += 12;
-                if (hValue == 24) hValue = 12;
-            }
-            else if (hValue == 12)
-            {
-                hValue = 0;
-            }
-            var now = DateTime.Now;
-            return new DateTime(now.Year, now.Month, now.Day, hValue, (int) Math.Abs(_rotateTransformClock.Angle) % 360 / 6, _secValue);
-        }
-
-        private void ButtonAm_OnClick(object sender, RoutedEventArgs e) => Update();
-
-        private void ButtonPm_OnClick(object sender, RoutedEventArgs e) => Update();
-
-        #endregion Private Methods       
     }
-}
+
+    private void Update()
+    {
+        if (!AppliedTemplate) return;
+        var hValue = _currentButton.Num;
+        if (_buttonPm.IsChecked == true)
+        {
+            hValue += 12;
+            if (hValue == 24) hValue = 12;
+        }
+        else if (hValue == 12)
+        {
+            hValue = 0;
+        }
+        if (hValue == 12 && _buttonAm.IsChecked == true)
+        {
+            _buttonPm.IsChecked = true;
+            _buttonAm.IsChecked = false;
+        }
+
+        if (_blockTime != null)
+        {
+            DisplayTime = GetDisplayTime();
+            _blockTime.Text = DisplayTime.ToString(TimeFormat);
+        }
+    }
+
+    /// <summary>
+    ///     更新
+    /// </summary>
+    /// <param name="time"></param>
+    internal override void Update(DateTime time)
+    {
+        if (!AppliedTemplate) return;
+        var h = time.Hour;
+        var m = time.Minute;
+
+        if (h >= 12)
+        {
+            _buttonPm.IsChecked = true;
+            _buttonAm.IsChecked = false;
+        }
+        else
+        {
+            _buttonPm.IsChecked = false;
+            _buttonAm.IsChecked = true;
+        }
+
+        _rotateTransformClock.Angle = m * 6;
+
+        var hRest = h % 12;
+        if (hRest == 0) hRest = 12;
+        var ctl = _radioButtonList[hRest - 1];
+        ctl.IsChecked = true;
+        ctl.RaiseEvent(new RoutedEventArgs { RoutedEvent = ButtonBase.ClickEvent });
+
+        _secValue = time.Second;
+        Update();
+    }
+
+    /// <summary>
+    ///     获取显示时间
+    /// </summary>
+    /// <returns></returns>
+    private DateTime GetDisplayTime()
+    {
+        var hValue = _currentButton.Num;
+        if (_buttonPm.IsChecked == true)
+        {
+            hValue += 12;
+            if (hValue == 24) hValue = 12;
+        }
+        else if (hValue == 12)
+        {
+            hValue = 0;
+        }
+        var now = DateTime.Now;
+        return new DateTime(now.Year, now.Month, now.Day, hValue, (int) Math.Abs(_rotateTransformClock.Angle) % 360 / 6, _secValue);
+    }
+
+    private void ButtonAm_OnClick(object sender, RoutedEventArgs e) => Update();
+
+    private void ButtonPm_OnClick(object sender, RoutedEventArgs e) => Update();
+
+    #endregion Private Methods       
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
index d30a02f4..cf869e44 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
@@ -3,104 +3,103 @@ using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
+public abstract class ClockBase : Control
 {
-    [TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
-    public abstract class ClockBase : Control
+    protected const string ElementButtonConfirm = "PART_ButtonConfirm";
+
+    protected Button ButtonConfirm;
+
+    protected bool AppliedTemplate;
+
+    public event Action Confirmed;
+
+    public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
+
+    public static readonly RoutedEvent SelectedTimeChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
+            typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(ClockBase));
+
+    public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
     {
-        protected const string ElementButtonConfirm = "PART_ButtonConfirm";
-
-        protected Button ButtonConfirm;
-
-        protected bool AppliedTemplate;
-
-        public event Action Confirmed;
-
-        public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
-
-        public static readonly RoutedEvent SelectedTimeChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
-                typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(ClockBase));
-
-        public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
-        {
-            add => AddHandler(SelectedTimeChangedEvent, value);
-            remove => RemoveHandler(SelectedTimeChangedEvent, value);
-        }
-
-        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
-            "TimeFormat", typeof(string), typeof(ClockBase), new PropertyMetadata("HH:mm:ss"));
-
-        public string TimeFormat
-        {
-            get => (string) GetValue(TimeFormatProperty);
-            set => SetValue(TimeFormatProperty, value);
-        }
-
-        public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
-            "SelectedTime", typeof(DateTime?), typeof(ClockBase), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
-
-        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ClockBase) d;
-            var v = (DateTime?) e.NewValue;
-            ctl.DisplayTime = v ?? DateTime.Now;
-            ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
-            {
-                Info = v
-            });
-        }
-
-        public DateTime? SelectedTime
-        {
-            get => (DateTime?) GetValue(SelectedTimeProperty);
-            set => SetValue(SelectedTimeProperty, value);
-        }
-
-        public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
-            "DisplayTime", typeof(DateTime), typeof(ClockBase),
-            new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
-                OnDisplayTimeChanged));
-
-        private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (ClockBase) d;
-            var v = (DateTime) e.NewValue;
-            ctl.Update(v);
-            ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
-        }
-
-        public DateTime DisplayTime
-        {
-            get => (DateTime) GetValue(DisplayTimeProperty);
-            set => SetValue(DisplayTimeProperty, value);
-        }
-
-        internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
-            "ShowConfirmButton", typeof(bool), typeof(ClockBase), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        internal bool ShowConfirmButton
-        {
-            get => (bool) GetValue(ShowConfirmButtonProperty);
-            set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
-
-        protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
-        {
-            var handler = DisplayTimeChanged;
-            handler?.Invoke(this, e);
-        }
-
-        protected void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
-        {
-            SelectedTime = DisplayTime;
-            Confirmed?.Invoke();
-        }
-
-        internal abstract void Update(DateTime time);
-
-        protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+        add => AddHandler(SelectedTimeChangedEvent, value);
+        remove => RemoveHandler(SelectedTimeChangedEvent, value);
     }
-}
+
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
+        "TimeFormat", typeof(string), typeof(ClockBase), new PropertyMetadata("HH:mm:ss"));
+
+    public string TimeFormat
+    {
+        get => (string) GetValue(TimeFormatProperty);
+        set => SetValue(TimeFormatProperty, value);
+    }
+
+    public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
+        "SelectedTime", typeof(DateTime?), typeof(ClockBase), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
+
+    private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ClockBase) d;
+        var v = (DateTime?) e.NewValue;
+        ctl.DisplayTime = v ?? DateTime.Now;
+        ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
+        {
+            Info = v
+        });
+    }
+
+    public DateTime? SelectedTime
+    {
+        get => (DateTime?) GetValue(SelectedTimeProperty);
+        set => SetValue(SelectedTimeProperty, value);
+    }
+
+    public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
+        "DisplayTime", typeof(DateTime), typeof(ClockBase),
+        new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+            OnDisplayTimeChanged));
+
+    private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (ClockBase) d;
+        var v = (DateTime) e.NewValue;
+        ctl.Update(v);
+        ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
+    }
+
+    public DateTime DisplayTime
+    {
+        get => (DateTime) GetValue(DisplayTimeProperty);
+        set => SetValue(DisplayTimeProperty, value);
+    }
+
+    internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
+        "ShowConfirmButton", typeof(bool), typeof(ClockBase), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    internal bool ShowConfirmButton
+    {
+        get => (bool) GetValue(ShowConfirmButtonProperty);
+        set => SetValue(ShowConfirmButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
+
+    protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
+    {
+        var handler = DisplayTimeChanged;
+        handler?.Invoke(this, e);
+    }
+
+    protected void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
+    {
+        SelectedTime = DisplayTime;
+        Confirmed?.Invoke();
+    }
+
+    internal abstract void Update(DateTime time);
+
+    protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
index 5242c3cf..170e9998 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
@@ -1,10 +1,9 @@
 using System.Windows.Controls;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class ClockRadioButton : RadioButton
 {
-    public class ClockRadioButton : RadioButton
-    {
-        public int Num { get; set; }
-    }
-}
+    public int Num { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
index ec555c92..545e4b61 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
@@ -4,147 +4,146 @@ using System.Diagnostics.CodeAnalysis;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+[TemplatePart(Name = ElementHourList, Type = typeof(ListBox))]
+[TemplatePart(Name = ElementMinuteList, Type = typeof(ListBox))]
+[TemplatePart(Name = ElementSecondList, Type = typeof(ListBox))]
+public class ListClock : ClockBase
 {
-    [TemplatePart(Name = ElementHourList, Type = typeof(ListBox))]
-    [TemplatePart(Name = ElementMinuteList, Type = typeof(ListBox))]
-    [TemplatePart(Name = ElementSecondList, Type = typeof(ListBox))]
-    public class ListClock : ClockBase
+    #region Constants
+
+    private const string ElementHourList = "PART_HourList";
+    private const string ElementMinuteList = "PART_MinuteList";
+    private const string ElementSecondList = "PART_SecondList";
+
+    #endregion Constants
+
+    #region Data
+
+    private ListBox _hourList;
+
+    private ListBox _minuteList;
+
+    private ListBox _secondList;
+
+    #endregion Data
+
+    public override void OnApplyTemplate()
     {
-        #region Constants
-
-        private const string ElementHourList = "PART_HourList";
-        private const string ElementMinuteList = "PART_MinuteList";
-        private const string ElementSecondList = "PART_SecondList";
-
-        #endregion Constants
-
-        #region Data
-
-        private ListBox _hourList;
-
-        private ListBox _minuteList;
-
-        private ListBox _secondList;
-
-        #endregion Data
-
-        public override void OnApplyTemplate()
+        AppliedTemplate = false;
+        if (ButtonConfirm != null)
         {
-            AppliedTemplate = false;
-            if (ButtonConfirm != null)
-            {
-                ButtonConfirm.Click -= ButtonConfirm_OnClick;
-            }
-
-            if (_hourList != null)
-            {
-                _hourList.SelectionChanged -= HourList_SelectionChanged;
-            }
-
-            if (_minuteList != null)
-            {
-                _minuteList.SelectionChanged -= MinuteList_SelectionChanged;
-            }
-
-            if (_secondList != null)
-            {
-                _secondList.SelectionChanged -= SecondList_SelectionChanged;
-            }
-
-            base.OnApplyTemplate();
-
-            _hourList = GetTemplateChild(ElementHourList) as ListBox;
-            if (_hourList != null)
-            {
-                CreateItemsSource(_hourList, 24);
-                _hourList.SelectionChanged += HourList_SelectionChanged;
-            }
-
-            _minuteList = GetTemplateChild(ElementMinuteList) as ListBox;
-            if (_minuteList != null)
-            {
-                CreateItemsSource(_minuteList, 60);
-                _minuteList.SelectionChanged += MinuteList_SelectionChanged;
-            }
-
-            _secondList = GetTemplateChild(ElementSecondList) as ListBox;
-            if (_secondList != null)
-            {
-                CreateItemsSource(_secondList, 60);
-                _secondList.SelectionChanged += SecondList_SelectionChanged;
-            }
-
-            ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
-
-            if (ButtonConfirm != null)
-            {
-                ButtonConfirm.Click += ButtonConfirm_OnClick;
-            }
-
-            AppliedTemplate = true;
-            if (SelectedTime.HasValue)
-            {
-                Update(SelectedTime.Value);
-            }
-            else
-            {
-                DisplayTime = DateTime.Now;
-                Update(DisplayTime);
-            }
+            ButtonConfirm.Click -= ButtonConfirm_OnClick;
         }
 
-        private void HourList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
-
-        private void MinuteList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
-
-        private void SecondList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
-
-        private void CreateItemsSource(ItemsControl selector, int count)
+        if (_hourList != null)
         {
-            var list = new List<string>();
-            for (var i = 0; i < count; i++)
-            {
-                list.Add(i.ToString("#00"));
-            }
-
-            selector.ItemsSource = list;
+            _hourList.SelectionChanged -= HourList_SelectionChanged;
         }
 
-        [SuppressMessage("ReSharper", "MergeIntoPattern")]
-        private void Update()
+        if (_minuteList != null)
         {
-            if (_hourList.SelectedIndex >= 0 && _hourList.SelectedIndex < 24 &&
-                _minuteList.SelectedIndex >= 0 && _minuteList.SelectedIndex < 60 &&
-                _secondList.SelectedIndex >= 0 && _secondList.SelectedIndex < 60)
-            {
-                var now = DateTime.Now;
-                DisplayTime = new DateTime(now.Year, now.Month, now.Day, _hourList.SelectedIndex,
-                    _minuteList.SelectedIndex, _secondList.SelectedIndex);
-            }
+            _minuteList.SelectionChanged -= MinuteList_SelectionChanged;
         }
 
-        /// <summary>
-        ///     更新
-        /// </summary>
-        /// <param name="time"></param>
-        internal override void Update(DateTime time)
+        if (_secondList != null)
         {
-            if (!AppliedTemplate) return;
+            _secondList.SelectionChanged -= SecondList_SelectionChanged;
+        }
 
-            var h = time.Hour;
-            var m = time.Minute;
-            var s = time.Second;
+        base.OnApplyTemplate();
 
-            _hourList.SelectedIndex = h;
-            _minuteList.SelectedIndex = m;
-            _secondList.SelectedIndex = s;
+        _hourList = GetTemplateChild(ElementHourList) as ListBox;
+        if (_hourList != null)
+        {
+            CreateItemsSource(_hourList, 24);
+            _hourList.SelectionChanged += HourList_SelectionChanged;
+        }
 
-            _hourList.ScrollIntoView(_hourList.SelectedItem);
-            _minuteList.ScrollIntoView(_minuteList.SelectedItem);
-            _secondList.ScrollIntoView(_secondList.SelectedItem);
+        _minuteList = GetTemplateChild(ElementMinuteList) as ListBox;
+        if (_minuteList != null)
+        {
+            CreateItemsSource(_minuteList, 60);
+            _minuteList.SelectionChanged += MinuteList_SelectionChanged;
+        }
 
-            DisplayTime = time;
+        _secondList = GetTemplateChild(ElementSecondList) as ListBox;
+        if (_secondList != null)
+        {
+            CreateItemsSource(_secondList, 60);
+            _secondList.SelectionChanged += SecondList_SelectionChanged;
+        }
+
+        ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
+
+        if (ButtonConfirm != null)
+        {
+            ButtonConfirm.Click += ButtonConfirm_OnClick;
+        }
+
+        AppliedTemplate = true;
+        if (SelectedTime.HasValue)
+        {
+            Update(SelectedTime.Value);
+        }
+        else
+        {
+            DisplayTime = DateTime.Now;
+            Update(DisplayTime);
         }
     }
-}
+
+    private void HourList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+    private void MinuteList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+    private void SecondList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
+
+    private void CreateItemsSource(ItemsControl selector, int count)
+    {
+        var list = new List<string>();
+        for (var i = 0; i < count; i++)
+        {
+            list.Add(i.ToString("#00"));
+        }
+
+        selector.ItemsSource = list;
+    }
+
+    [SuppressMessage("ReSharper", "MergeIntoPattern")]
+    private void Update()
+    {
+        if (_hourList.SelectedIndex >= 0 && _hourList.SelectedIndex < 24 &&
+            _minuteList.SelectedIndex >= 0 && _minuteList.SelectedIndex < 60 &&
+            _secondList.SelectedIndex >= 0 && _secondList.SelectedIndex < 60)
+        {
+            var now = DateTime.Now;
+            DisplayTime = new DateTime(now.Year, now.Month, now.Day, _hourList.SelectedIndex,
+                _minuteList.SelectedIndex, _secondList.SelectedIndex);
+        }
+    }
+
+    /// <summary>
+    ///     更新
+    /// </summary>
+    /// <param name="time"></param>
+    internal override void Update(DateTime time)
+    {
+        if (!AppliedTemplate) return;
+
+        var h = time.Hour;
+        var m = time.Minute;
+        var s = time.Second;
+
+        _hourList.SelectedIndex = h;
+        _minuteList.SelectedIndex = m;
+        _secondList.SelectedIndex = s;
+
+        _hourList.ScrollIntoView(_hourList.SelectedItem);
+        _minuteList.ScrollIntoView(_minuteList.SelectedItem);
+        _secondList.ScrollIntoView(_secondList.SelectedItem);
+
+        DisplayTime = time;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
index 28be2cfa..a1598fcc 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
@@ -4,85 +4,84 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class FlipClock : Control
 {
-    public class FlipClock : Control
+    private readonly DispatcherTimer _dispatcherTimer;
+
+    private bool _isDisposed;
+
+    public static readonly DependencyProperty NumberListProperty = DependencyProperty.Register(
+        "NumberList", typeof(List<int>), typeof(FlipClock), new PropertyMetadata(new List<int> { 0, 0, 0, 0, 0, 0 }));
+
+    public List<int> NumberList
     {
-        private readonly DispatcherTimer _dispatcherTimer;
-
-        private bool _isDisposed;
-
-        public static readonly DependencyProperty NumberListProperty = DependencyProperty.Register(
-            "NumberList", typeof(List<int>), typeof(FlipClock), new PropertyMetadata(new List<int> { 0, 0, 0, 0, 0, 0 }));
-
-        public List<int> NumberList
-        {
-            get => (List<int>) GetValue(NumberListProperty);
-            set => SetValue(NumberListProperty, value);
-        }
-
-        public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
-            "DisplayTime", typeof(DateTime), typeof(FlipClock), new PropertyMetadata(default(DateTime), OnDisplayTimeChanged));
-
-        private static void OnDisplayTimeChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
-        {
-            var ctl = (FlipClock) s;
-            var v = (DateTime) e.NewValue;
-
-            ctl.NumberList = new List<int>
-            {
-                v.Hour / 10,
-                v.Hour % 10,
-                v.Minute / 10,
-                v.Minute % 10,
-                v.Second / 10,
-                v.Second % 10
-            };
-        }
-
-        public DateTime DisplayTime
-        {
-            get => (DateTime) GetValue(DisplayTimeProperty);
-            set => SetValue(DisplayTimeProperty, value);
-        }
-
-        public FlipClock()
-        {
-            _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
-            {
-                Interval = TimeSpan.FromMilliseconds(200)
-            };
-
-            IsVisibleChanged += FlipClock_IsVisibleChanged;
-        }
-
-        ~FlipClock() => Dispose();
-
-        public void Dispose()
-        {
-            if (_isDisposed) return;
-
-            IsVisibleChanged -= FlipClock_IsVisibleChanged;
-            _dispatcherTimer.Stop();
-            _isDisposed = true;
-
-            GC.SuppressFinalize(this);
-        }
-
-        private void FlipClock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (IsVisible)
-            {
-                _dispatcherTimer.Tick += DispatcherTimer_Tick;
-                _dispatcherTimer.Start();
-            }
-            else
-            {
-                _dispatcherTimer.Stop();
-                _dispatcherTimer.Tick -= DispatcherTimer_Tick;
-            }
-        }
-
-        private void DispatcherTimer_Tick(object sender, EventArgs e) => DisplayTime = DateTime.Now;
+        get => (List<int>) GetValue(NumberListProperty);
+        set => SetValue(NumberListProperty, value);
     }
-}
+
+    public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
+        "DisplayTime", typeof(DateTime), typeof(FlipClock), new PropertyMetadata(default(DateTime), OnDisplayTimeChanged));
+
+    private static void OnDisplayTimeChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (FlipClock) s;
+        var v = (DateTime) e.NewValue;
+
+        ctl.NumberList = new List<int>
+        {
+            v.Hour / 10,
+            v.Hour % 10,
+            v.Minute / 10,
+            v.Minute % 10,
+            v.Second / 10,
+            v.Second % 10
+        };
+    }
+
+    public DateTime DisplayTime
+    {
+        get => (DateTime) GetValue(DisplayTimeProperty);
+        set => SetValue(DisplayTimeProperty, value);
+    }
+
+    public FlipClock()
+    {
+        _dispatcherTimer = new DispatcherTimer(DispatcherPriority.Render)
+        {
+            Interval = TimeSpan.FromMilliseconds(200)
+        };
+
+        IsVisibleChanged += FlipClock_IsVisibleChanged;
+    }
+
+    ~FlipClock() => Dispose();
+
+    public void Dispose()
+    {
+        if (_isDisposed) return;
+
+        IsVisibleChanged -= FlipClock_IsVisibleChanged;
+        _dispatcherTimer.Stop();
+        _isDisposed = true;
+
+        GC.SuppressFinalize(this);
+    }
+
+    private void FlipClock_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (IsVisible)
+        {
+            _dispatcherTimer.Tick += DispatcherTimer_Tick;
+            _dispatcherTimer.Start();
+        }
+        else
+        {
+            _dispatcherTimer.Stop();
+            _dispatcherTimer.Tick -= DispatcherTimer_Tick;
+        }
+    }
+
+    private void DispatcherTimer_Tick(object sender, EventArgs e) => DisplayTime = DateTime.Now;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
index 1604730e..641b8ac8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
@@ -7,278 +7,277 @@ using System.Windows.Media.Animation;
 using System.Windows.Media.Media3D;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class FlipNumber : Viewport3D
 {
-    public class FlipNumber : Viewport3D
+    private bool _isLoaded;
+
+    private TextBlock _page1TextDown;
+
+    private TextBlock _page2TextUp;
+
+    private TextBlock _page2TextDown;
+
+    private TextBlock _page3TextUp;
+
+    private ContainerUIElement3D _page1;
+
+    private ContainerUIElement3D _page2;
+
+    private ContainerUIElement3D _page3;
+
+    private ContainerUIElement3D _content;
+
+    private readonly AxisAngleRotation3D _pageRotation3D;
+
+    private readonly DoubleAnimation _animation;
+
+    private bool _isAnimating;
+
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
+        "CornerRadius", typeof(CornerRadius), typeof(FlipNumber), new PropertyMetadata(new CornerRadius(4)));
+
+    public CornerRadius CornerRadius
     {
-        private bool _isLoaded;
+        get => (CornerRadius) GetValue(CornerRadiusProperty);
+        set => SetValue(CornerRadiusProperty, value);
+    }
 
-        private TextBlock _page1TextDown;
+    public static readonly DependencyProperty BackgroundProperty = DependencyProperty.Register(
+        "Background", typeof(Brush), typeof(FlipNumber), new PropertyMetadata(default(Brush)));
 
-        private TextBlock _page2TextUp;
+    public Brush Background
+    {
+        get => (Brush) GetValue(BackgroundProperty);
+        set => SetValue(BackgroundProperty, value);
+    }
 
-        private TextBlock _page2TextDown;
+    public static readonly DependencyProperty ForegroundProperty = DependencyProperty.Register(
+        "Foreground", typeof(Brush), typeof(FlipNumber), new PropertyMetadata(default(Brush)));
 
-        private TextBlock _page3TextUp;
+    public Brush Foreground
+    {
+        get => (Brush) GetValue(ForegroundProperty);
+        set => SetValue(ForegroundProperty, value);
+    }
 
-        private ContainerUIElement3D _page1;
+    public static readonly DependencyProperty FontSizeProperty = DependencyProperty.Register(
+        "FontSize", typeof(double), typeof(FlipNumber), new PropertyMetadata(70.0));
 
-        private ContainerUIElement3D _page2;
+    [TypeConverter(typeof(FontSizeConverter))]
+    public double FontSize
+    {
+        get => (double) GetValue(FontSizeProperty);
+        set => SetValue(FontSizeProperty, value);
+    }
 
-        private ContainerUIElement3D _page3;
+    public static readonly DependencyProperty NumberProperty = DependencyProperty.Register(
+        "Number", typeof(int), typeof(FlipNumber), new PropertyMetadata(ValueBoxes.Int0Box, OnNumberChanged));
 
-        private ContainerUIElement3D _content;
+    private static void OnNumberChanged(DependencyObject s, DependencyPropertyChangedEventArgs e) =>
+        ((FlipNumber) s).OnNumberChanged();
 
-        private readonly AxisAngleRotation3D _pageRotation3D;
+    public int Number
+    {
+        get => (int) GetValue(NumberProperty);
+        set => SetValue(NumberProperty, value);
+    }
 
-        private readonly DoubleAnimation _animation;
-
-        private bool _isAnimating;
-
-        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
-            "CornerRadius", typeof(CornerRadius), typeof(FlipNumber), new PropertyMetadata(new CornerRadius(4)));
-
-        public CornerRadius CornerRadius
+    public FlipNumber()
+    {
+        var visual3D = new ModelVisual3D
         {
-            get => (CornerRadius) GetValue(CornerRadiusProperty);
-            set => SetValue(CornerRadiusProperty, value);
-        }
+            Content = new DirectionalLight()
+        };
+        Children.Add(visual3D);
 
-        public static readonly DependencyProperty BackgroundProperty = DependencyProperty.Register(
-            "Background", typeof(Brush), typeof(FlipNumber), new PropertyMetadata(default(Brush)));
-
-        public Brush Background
+        _pageRotation3D = new AxisAngleRotation3D
         {
-            get => (Brush) GetValue(BackgroundProperty);
-            set => SetValue(BackgroundProperty, value);
-        }
+            Angle = 0,
+            Axis = new Vector3D(1, 0, 0)
+        };
 
-        public static readonly DependencyProperty ForegroundProperty = DependencyProperty.Register(
-            "Foreground", typeof(Brush), typeof(FlipNumber), new PropertyMetadata(default(Brush)));
-
-        public Brush Foreground
+        _animation = new DoubleAnimation(0, 180, new Duration(TimeSpan.FromSeconds(0.8)))
         {
-            get => (Brush) GetValue(ForegroundProperty);
-            set => SetValue(ForegroundProperty, value);
-        }
+            FillBehavior = FillBehavior.Stop
+        };
+        _animation.Completed += Animation_Completed;
 
-        public static readonly DependencyProperty FontSizeProperty = DependencyProperty.Register(
-            "FontSize", typeof(double), typeof(FlipNumber), new PropertyMetadata(70.0));
-
-        [TypeConverter(typeof(FontSizeConverter))]
-        public double FontSize
+        Loaded += (s, e) =>
         {
-            get => (double) GetValue(FontSizeProperty);
-            set => SetValue(FontSizeProperty, value);
-        }
+            if (_isLoaded) return;
+            _isLoaded = true;
+            InitNumber();
+            var transform3D = new RotateTransform3D(_pageRotation3D);
+            _page2.Transform = transform3D;
+        };
+    }
 
-        public static readonly DependencyProperty NumberProperty = DependencyProperty.Register(
-            "Number", typeof(int), typeof(FlipNumber), new PropertyMetadata(ValueBoxes.Int0Box, OnNumberChanged));
+    private void Animation_Completed(object sender, EventArgs e)
+    {
+        _isAnimating = false;
+        UpdateNumber();
+    }
 
-        private static void OnNumberChanged(DependencyObject s, DependencyPropertyChangedEventArgs e) =>
-            ((FlipNumber) s).OnNumberChanged();
+    private void InitNumber()
+    {
+        _page1 = new ContainerUIElement3D();
+        var num1 = Number > 8 ? 0 : Number + 1;
+        var page1NumDown = CreateNumber(num1, false, out _page1TextDown);
+        _page1.Children.Add(page1NumDown);
 
-        public int Number
+        _page2 = new ContainerUIElement3D();
+        var page2NumUp = CreateNumber(num1, true, out _page2TextUp);
+        var page2NumDown = CreateNumber(Number, false, out _page2TextDown);
+        _page2.Children.Add(page2NumUp);
+        _page2.Children.Add(page2NumDown);
+
+        _page3 = new ContainerUIElement3D();
+        var page3NumUp = CreateNumber(Number, true, out _page3TextUp);
+        _page3.Children.Add(page3NumUp);
+        var transform3D = new RotateTransform3D(new AxisAngleRotation3D
         {
-            get => (int) GetValue(NumberProperty);
-            set => SetValue(NumberProperty, value);
-        }
+            Angle = 180,
+            Axis = new Vector3D(1, 0, 0)
+        });
+        _page3.Transform = transform3D;
 
-        public FlipNumber()
+        _content = new ContainerUIElement3D
         {
-            var visual3D = new ModelVisual3D
+            Children =
             {
-                Content = new DirectionalLight()
-            };
-            Children.Add(visual3D);
+                _page1,
+                _page2,
+                _page3
+            }
+        };
+        Children.Add(_content);
+    }
 
-            _pageRotation3D = new AxisAngleRotation3D
-            {
-                Angle = 0,
-                Axis = new Vector3D(1, 0, 0)
-            };
+    private bool CheckNull() => _page1TextDown != null && _page2TextUp != null && _page2TextDown != null && _page3TextUp != null;
 
-            _animation = new DoubleAnimation(0, 180, new Duration(TimeSpan.FromSeconds(0.8)))
-            {
-                FillBehavior = FillBehavior.Stop
-            };
-            _animation.Completed += Animation_Completed;
+    private void OnNumberChanged()
+    {
+        if (!CheckNull()) return;
 
-            Loaded += (s, e) =>
-            {
-                if (_isLoaded) return;
-                _isLoaded = true;
-                InitNumber();
-                var transform3D = new RotateTransform3D(_pageRotation3D);
-                _page2.Transform = transform3D;
-            };
-        }
+        InitNewNumber();
 
-        private void Animation_Completed(object sender, EventArgs e)
+        if (_isAnimating)
         {
             _isAnimating = false;
             UpdateNumber();
+            return;
         }
 
-        private void InitNumber()
-        {
-            _page1 = new ContainerUIElement3D();
-            var num1 = Number > 8 ? 0 : Number + 1;
-            var page1NumDown = CreateNumber(num1, false, out _page1TextDown);
-            _page1.Children.Add(page1NumDown);
-
-            _page2 = new ContainerUIElement3D();
-            var page2NumUp = CreateNumber(num1, true, out _page2TextUp);
-            var page2NumDown = CreateNumber(Number, false, out _page2TextDown);
-            _page2.Children.Add(page2NumUp);
-            _page2.Children.Add(page2NumDown);
-
-            _page3 = new ContainerUIElement3D();
-            var page3NumUp = CreateNumber(Number, true, out _page3TextUp);
-            _page3.Children.Add(page3NumUp);
-            var transform3D = new RotateTransform3D(new AxisAngleRotation3D
-            {
-                Angle = 180,
-                Axis = new Vector3D(1, 0, 0)
-            });
-            _page3.Transform = transform3D;
-
-            _content = new ContainerUIElement3D
-            {
-                Children =
-                {
-                    _page1,
-                    _page2,
-                    _page3
-                }
-            };
-            Children.Add(_content);
-        }
-
-        private bool CheckNull() => _page1TextDown != null && _page2TextUp != null && _page2TextDown != null && _page3TextUp != null;
-
-        private void OnNumberChanged()
-        {
-            if (!CheckNull()) return;
-
-            InitNewNumber();
-
-            if (_isAnimating)
-            {
-                _isAnimating = false;
-                UpdateNumber();
-                return;
-            }
-
-            _isAnimating = true;
-            _pageRotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty, _animation);
-        }
-
-        private void InitNewNumber()
-        {
-            var num1 = Number.ToString();
-            _page1TextDown.Text = num1;
-            _page2TextUp.Text = num1;
-        }
-
-        private void UpdateNumber()
-        {
-            _pageRotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty, null);
-            _pageRotation3D.Angle = 0;
-
-            var num = Number.ToString();
-            _page2TextDown.Text = num;
-            _page3TextUp.Text = num;
-
-            _isAnimating = false;
-        }
-
-        private Viewport2DVisual3D CreateNumber(int num, bool isUp, out TextBlock textBlock)
-        {
-            int flag;
-            var rotateTransform = new RotateTransform();
-
-            if (isUp)
-            {
-                flag = -1;
-                rotateTransform.Angle = 180;
-            }
-            else
-            {
-                flag = 1;
-            }
-            var halfWidth = ActualWidth / 2;
-            var quarterWidth = ActualWidth / 4;
-            var quarterHeight = ActualHeight / 4;
-
-            var meMaterial = new DiffuseMaterial();
-            Viewport2DVisual3D.SetIsVisualHostMaterial(meMaterial, true);
-
-            textBlock = new TextBlock
-            {
-                RenderTransformOrigin = new Point(0.5, 0.5),
-                Foreground = Foreground,
-                FontSize = FontSize,
-                VerticalAlignment = VerticalAlignment.Center,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                TextAlignment = TextAlignment.Center,
-                Text = num.ToString(),
-                RenderTransform = rotateTransform,
-                Margin = new Thickness(0, 0, 0, -quarterHeight),
-                FontFamily = new FontFamily("Consolas")
-            };
-
-            var border = new Border
-            {
-                ClipToBounds = true,
-                CornerRadius = new CornerRadius(CornerRadius.TopLeft, CornerRadius.TopRight, 0, 0),
-                Background = Background,
-                Width = halfWidth,
-                Height = quarterHeight,
-                Child = textBlock
-            };
-
-            var positions = new Point3DCollection
-            {
-                new(-quarterWidth * flag, quarterHeight, 0),
-                new(-quarterWidth * flag, 0, 0),
-                new(quarterWidth * flag, 0, 0),
-                new(quarterWidth * flag, quarterHeight, 0)
-            };
-
-            var triangleIndices = new Int32Collection
-            {
-                0,
-                1,
-                2,
-                0,
-                2,
-                3
-            };
-
-            var textureCoordinates = new PointCollection
-            {
-                new(0, 0),
-                new(0, 1),
-                new(1, 1),
-                new(1, 0)
-            };
-
-            var geometry3D = new MeshGeometry3D
-            {
-                Positions = positions,
-                TriangleIndices = triangleIndices,
-                TextureCoordinates = textureCoordinates
-            };
-
-            var child = new Viewport2DVisual3D
-            {
-                Geometry = geometry3D,
-                Visual = border,
-                Material = meMaterial
-            };
-
-            return child;
-        }
+        _isAnimating = true;
+        _pageRotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty, _animation);
     }
-}
+
+    private void InitNewNumber()
+    {
+        var num1 = Number.ToString();
+        _page1TextDown.Text = num1;
+        _page2TextUp.Text = num1;
+    }
+
+    private void UpdateNumber()
+    {
+        _pageRotation3D.BeginAnimation(AxisAngleRotation3D.AngleProperty, null);
+        _pageRotation3D.Angle = 0;
+
+        var num = Number.ToString();
+        _page2TextDown.Text = num;
+        _page3TextUp.Text = num;
+
+        _isAnimating = false;
+    }
+
+    private Viewport2DVisual3D CreateNumber(int num, bool isUp, out TextBlock textBlock)
+    {
+        int flag;
+        var rotateTransform = new RotateTransform();
+
+        if (isUp)
+        {
+            flag = -1;
+            rotateTransform.Angle = 180;
+        }
+        else
+        {
+            flag = 1;
+        }
+        var halfWidth = ActualWidth / 2;
+        var quarterWidth = ActualWidth / 4;
+        var quarterHeight = ActualHeight / 4;
+
+        var meMaterial = new DiffuseMaterial();
+        Viewport2DVisual3D.SetIsVisualHostMaterial(meMaterial, true);
+
+        textBlock = new TextBlock
+        {
+            RenderTransformOrigin = new Point(0.5, 0.5),
+            Foreground = Foreground,
+            FontSize = FontSize,
+            VerticalAlignment = VerticalAlignment.Center,
+            HorizontalAlignment = HorizontalAlignment.Center,
+            TextAlignment = TextAlignment.Center,
+            Text = num.ToString(),
+            RenderTransform = rotateTransform,
+            Margin = new Thickness(0, 0, 0, -quarterHeight),
+            FontFamily = new FontFamily("Consolas")
+        };
+
+        var border = new Border
+        {
+            ClipToBounds = true,
+            CornerRadius = new CornerRadius(CornerRadius.TopLeft, CornerRadius.TopRight, 0, 0),
+            Background = Background,
+            Width = halfWidth,
+            Height = quarterHeight,
+            Child = textBlock
+        };
+
+        var positions = new Point3DCollection
+        {
+            new(-quarterWidth * flag, quarterHeight, 0),
+            new(-quarterWidth * flag, 0, 0),
+            new(quarterWidth * flag, 0, 0),
+            new(quarterWidth * flag, quarterHeight, 0)
+        };
+
+        var triangleIndices = new Int32Collection
+        {
+            0,
+            1,
+            2,
+            0,
+            2,
+            3
+        };
+
+        var textureCoordinates = new PointCollection
+        {
+            new(0, 0),
+            new(0, 1),
+            new(1, 1),
+            new(1, 0)
+        };
+
+        var geometry3D = new MeshGeometry3D
+        {
+            Positions = positions,
+            TriangleIndices = triangleIndices,
+            TextureCoordinates = textureCoordinates
+        };
+
+        var child = new Viewport2DVisual3D
+        {
+            Geometry = geometry3D,
+            Visual = border,
+            Material = meMaterial
+        };
+
+        return child;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
index 97810796..ee9b8471 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
@@ -2,50 +2,49 @@
 using System.Windows.Controls;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     作为刻度使用的文字块
+/// </summary>
+internal class SpeTextBlock : TextBlock
 {
-    /// <summary>
-    ///     作为刻度使用的文字块
-    /// </summary>
-    internal class SpeTextBlock : TextBlock
+    public double X { get; set; }
+
+    public SpeTextBlock() => Width = 60;
+
+    public SpeTextBlock(double x) : this()
     {
-        public double X { get; set; }
-
-        public SpeTextBlock() => Width = 60;
-
-        public SpeTextBlock(double x) : this()
-        {
-            X = x;
-            Canvas.SetLeft(this, X);
-        }
-
-        /// <summary>
-        ///     时间
-        /// </summary>
-        private DateTime _time;
-
-        /// <summary>
-        ///     时间
-        /// </summary>
-        public DateTime Time
-        {
-            get => _time;
-            set
-            {
-                _time = value;
-                Text = $"{value.ToString(TimeFormat)}\r\n|";
-            }
-        }
-
-        /// <summary>
-        ///     时间格式
-        /// </summary>
-        public string TimeFormat { get; set; } = "HH:mm";
-
-        /// <summary>
-        ///     横向移动
-        /// </summary>
-        /// <param name="offsetX"></param>
-        public void MoveX(double offsetX) => Canvas.SetLeft(this, X + offsetX);
+        X = x;
+        Canvas.SetLeft(this, X);
     }
-}
+
+    /// <summary>
+    ///     时间
+    /// </summary>
+    private DateTime _time;
+
+    /// <summary>
+    ///     时间
+    /// </summary>
+    public DateTime Time
+    {
+        get => _time;
+        set
+        {
+            _time = value;
+            Text = $"{value.ToString(TimeFormat)}\r\n|";
+        }
+    }
+
+    /// <summary>
+    ///     时间格式
+    /// </summary>
+    public string TimeFormat { get; set; } = "HH:mm";
+
+    /// <summary>
+    ///     横向移动
+    /// </summary>
+    /// <param name="offsetX"></param>
+    public void MoveX(double offsetX) => Canvas.SetLeft(this, X + offsetX);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
index b20295ce..b08929bb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
@@ -14,579 +14,578 @@ using HandyControl.Interactivity;
 using HandyControl.Tools;
 
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     时间条
+/// </summary>
+[TemplatePart(Name = ElementBorderTop, Type = typeof(Border))]
+[TemplatePart(Name = ElementTextBlockMove, Type = typeof(TextBlock))]
+[TemplatePart(Name = ElementTextBlockSelected, Type = typeof(TextBlock))]
+[TemplatePart(Name = ElementCanvasSpe, Type = typeof(Canvas))]
+[TemplatePart(Name = ElementHotspots, Type = typeof(Panel))]
+public class TimeBar : Control
 {
-    /// <summary>
-    ///     时间条
-    /// </summary>
-    [TemplatePart(Name = ElementBorderTop, Type = typeof(Border))]
-    [TemplatePart(Name = ElementTextBlockMove, Type = typeof(TextBlock))]
-    [TemplatePart(Name = ElementTextBlockSelected, Type = typeof(TextBlock))]
-    [TemplatePart(Name = ElementCanvasSpe, Type = typeof(Canvas))]
-    [TemplatePart(Name = ElementHotspots, Type = typeof(Panel))]
-    public class TimeBar : Control
+    #region Constants
+
+    private const string ElementBorderTop = "PART_BorderTop";
+
+    private const string ElementTextBlockMove = "PART_TextBlockMove";
+
+    private const string ElementTextBlockSelected = "PART_TextBlockSelected";
+
+    private const string ElementCanvasSpe = "PART_CanvasSpe";
+
+    private const string ElementHotspots = "PART_Hotspots";
+
+    #endregion Constants
+
+    #region Data
+
+    private Border _borderTop;
+
+    private TextBlock _textBlockMove;
+
+    private TextBlock _textBlockSelected;
+
+    private Canvas _canvasSpe;
+
+    private Panel _panelHotspots;
+
+    #endregion Data
+
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+    [Bindable(true)]
+    public Collection<DateTimeRange> Hotspots { get; }
+
+    public static readonly DependencyProperty HotspotsBrushProperty = DependencyProperty.Register(
+        "HotspotsBrush", typeof(Brush), typeof(TimeBar), new PropertyMetadata(default(Brush)));
+
+    public Brush HotspotsBrush
     {
-        #region Constants
+        get => (Brush) GetValue(HotspotsBrushProperty);
+        set => SetValue(HotspotsBrushProperty, value);
+    }
 
-        private const string ElementBorderTop = "PART_BorderTop";
+    /// <summary>
+    ///     是否显示刻度字符串
+    /// </summary>
+    public static readonly DependencyProperty ShowSpeStrProperty = DependencyProperty.Register(
+        "ShowSpeStr", typeof(bool), typeof(TimeBar), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        private const string ElementTextBlockMove = "PART_TextBlockMove";
+    /// <summary>
+    ///     是否显示刻度字符串
+    /// </summary>
+    public bool ShowSpeStr
+    {
+        get => (bool) GetValue(ShowSpeStrProperty);
+        set => SetValue(ShowSpeStrProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private const string ElementTextBlockSelected = "PART_TextBlockSelected";
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
+        "TimeFormat", typeof(string), typeof(TimeBar), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
 
-        private const string ElementCanvasSpe = "PART_CanvasSpe";
+    public string TimeFormat
+    {
+        get => (string) GetValue(TimeFormatProperty);
+        set => SetValue(TimeFormatProperty, value);
+    }
 
-        private const string ElementHotspots = "PART_Hotspots";
+    /// <summary>
+    ///     刻度字符串
+    /// </summary>
+    internal static readonly DependencyProperty SpeStrProperty = DependencyProperty.Register(
+        "SpeStr", typeof(string), typeof(TimeBar), new PropertyMetadata(Properties.Langs.Lang.Interval1h));
 
-        #endregion Constants
+    /// <summary>
+    ///     刻度字符串
+    /// </summary>
+    internal string SpeStr
+    {
+        get => (string) GetValue(SpeStrProperty);
+        set => SetValue(SpeStrProperty, value);
+    }
 
-        #region Data
+    /// <summary>
+    ///     选中时间
+    /// </summary>
+    public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
+        "SelectedTime", typeof(DateTime), typeof(TimeBar), new PropertyMetadata(default(DateTime), OnSelectedTimeChanged));
 
-        private Border _borderTop;
-
-        private TextBlock _textBlockMove;
-
-        private TextBlock _textBlockSelected;
-
-        private Canvas _canvasSpe;
-
-        private Panel _panelHotspots;
-
-        #endregion Data
-
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
-        [Bindable(true)]
-        public Collection<DateTimeRange> Hotspots { get; }
-
-        public static readonly DependencyProperty HotspotsBrushProperty = DependencyProperty.Register(
-            "HotspotsBrush", typeof(Brush), typeof(TimeBar), new PropertyMetadata(default(Brush)));
-
-        public Brush HotspotsBrush
+    private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TimeBar { _textBlockSelected: { } } timeBar)
         {
-            get => (Brush) GetValue(HotspotsBrushProperty);
-            set => SetValue(HotspotsBrushProperty, value);
+            timeBar.OnSelectedTimeChanged((DateTime) e.NewValue);
         }
+    }
 
-        /// <summary>
-        ///     是否显示刻度字符串
-        /// </summary>
-        public static readonly DependencyProperty ShowSpeStrProperty = DependencyProperty.Register(
-            "ShowSpeStr", typeof(bool), typeof(TimeBar), new PropertyMetadata(ValueBoxes.FalseBox));
+    /// <summary>
+    ///     选中时间
+    /// </summary>
+    public DateTime SelectedTime
+    {
+        get => (DateTime) GetValue(SelectedTimeProperty);
+        set => SetValue(SelectedTimeProperty, value);
+    }
 
-        /// <summary>
-        ///     是否显示刻度字符串
-        /// </summary>
-        public bool ShowSpeStr
+    private void OnSelectedTimeChanged(DateTime time)
+    {
+        _textBlockSelected.Text = time.ToString(TimeFormat);
+        if (!(_isDragging || _borderTopIsMouseLeftButtonDown))
         {
-            get => (bool) GetValue(ShowSpeStrProperty);
-            set => SetValue(ShowSpeStrProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
-            "TimeFormat", typeof(string), typeof(TimeBar), new PropertyMetadata("yyyy-MM-dd HH:mm:ss"));
-
-        public string TimeFormat
-        {
-            get => (string) GetValue(TimeFormatProperty);
-            set => SetValue(TimeFormatProperty, value);
-        }
-
-        /// <summary>
-        ///     刻度字符串
-        /// </summary>
-        internal static readonly DependencyProperty SpeStrProperty = DependencyProperty.Register(
-            "SpeStr", typeof(string), typeof(TimeBar), new PropertyMetadata(Properties.Langs.Lang.Interval1h));
-
-        /// <summary>
-        ///     刻度字符串
-        /// </summary>
-        internal string SpeStr
-        {
-            get => (string) GetValue(SpeStrProperty);
-            set => SetValue(SpeStrProperty, value);
-        }
-
-        /// <summary>
-        ///     选中时间
-        /// </summary>
-        public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
-            "SelectedTime", typeof(DateTime), typeof(TimeBar), new PropertyMetadata(default(DateTime), OnSelectedTimeChanged));
-
-        private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is TimeBar { _textBlockSelected: { } } timeBar)
-            {
-                timeBar.OnSelectedTimeChanged((DateTime) e.NewValue);
-            }
-        }
-
-        /// <summary>
-        ///     选中时间
-        /// </summary>
-        public DateTime SelectedTime
-        {
-            get => (DateTime) GetValue(SelectedTimeProperty);
-            set => SetValue(SelectedTimeProperty, value);
-        }
-
-        private void OnSelectedTimeChanged(DateTime time)
-        {
-            _textBlockSelected.Text = time.ToString(TimeFormat);
-            if (!(_isDragging || _borderTopIsMouseLeftButtonDown))
-            {
-                _totalOffsetX = (_starTime - SelectedTime).TotalMilliseconds / _timeSpeList[SpeIndex] * _itemWidth;
-            }
-            UpdateSpeBlock();
-            UpdateMouseFollowBlockPos();
-        }
-
-        /// <summary>
-        ///     时间改变事件
-        /// </summary>
-        public static readonly RoutedEvent TimeChangedEvent =
-            EventManager.RegisterRoutedEvent("TimeChanged", RoutingStrategy.Bubble,
-                typeof(EventHandler<FunctionEventArgs<DateTime>>), typeof(TimeBar));
-
-        /// <summary>
-        ///     刻度集合
-        /// </summary>
-        private readonly List<SpeTextBlock> _speBlockList = new();
-
-        /// <summary>
-        ///     初始化时时间
-        /// </summary>
-        private readonly DateTime _starTime;
-
-        /// <summary>
-        ///     时间段集合
-        /// </summary>
-        private readonly List<int> _timeSpeList = new()
-        {
-            7200000,
-            3600000,
-            1800000,
-            600000,
-            300000,
-            60000,
-            30000
-        };
-
-        /// <summary>
-        ///     顶部border是否被按下
-        /// </summary>
-        private bool _borderTopIsMouseLeftButtonDown;
-
-        /// <summary>
-        ///     控件是否处于拖动中
-        /// </summary>
-        private bool _isDragging;
-
-        /// <summary>
-        ///     刻度单项宽度
-        /// </summary>
-        private double _itemWidth;
-
-        /// <summary>
-        ///     鼠标按下拖动时选中的时间
-        /// </summary>
-        private DateTime _mouseDownTime;
-
-        /// <summary>
-        ///     显示的刻度数目
-        /// </summary>
-        private int _speCount = 13;
-
-        /// <summary>
-        ///     刻度区间编号
-        /// </summary>
-        private int _speIndex = 1;
-
-        /// <summary>
-        ///     刻度单次偏移
-        /// </summary>
-        private double _tempOffsetX;
-
-        /// <summary>
-        ///     刻度总偏移
-        /// </summary>
-        private double _totalOffsetX;
-
-        private readonly bool _isLoaded;
-
-        private readonly SortedSet<DateTimeRange> _dateTimeRanges;
-
-        public TimeBar()
-        {
-            _starTime = DateTime.Now;
-            SelectedTime = new DateTime(_starTime.Year, _starTime.Month, _starTime.Day, 0, 0, 0);
-            _starTime = SelectedTime;
-            _isLoaded = true;
-
-            var hotspots = new ObservableCollection<DateTimeRange>();
-            _dateTimeRanges = new SortedSet<DateTimeRange>(ComparerGenerator.GetComparer<DateTimeRange>());
-            hotspots.CollectionChanged += Items_CollectionChanged;
-            Hotspots = hotspots;
-        }
-
-        private void Items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (e.Action == NotifyCollectionChangedAction.Add)
-            {
-                foreach (DateTimeRange item in e.NewItems)
-                {
-                    _dateTimeRanges.Add(item);
-                }
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Remove)
-            {
-                foreach (DateTimeRange item in e.OldItems)
-                {
-                    _dateTimeRanges.Remove(item);
-                }
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Replace)
-            {
-                foreach (DateTimeRange item in e.OldItems)
-                {
-                    _dateTimeRanges.Remove(item);
-                }
-
-                foreach (DateTimeRange item in e.NewItems)
-                {
-                    _dateTimeRanges.Add(item);
-                }
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Reset)
-            {
-                _dateTimeRanges.Clear();
-            }
-        }
-
-        public override void OnApplyTemplate()
-        {
-            if (_borderTop != null)
-            {
-                _borderTop.MouseLeftButtonDown -= BorderTop_OnMouseLeftButtonDown;
-                _borderTop.PreviewMouseLeftButtonUp -= BorderTop_OnPreviewMouseLeftButtonUp;
-            }
-
-            base.OnApplyTemplate();
-
-            _borderTop = GetTemplateChild(ElementBorderTop) as Border;
-            _textBlockMove = GetTemplateChild(ElementTextBlockMove) as TextBlock;
-            _textBlockSelected = GetTemplateChild(ElementTextBlockSelected) as TextBlock;
-            _canvasSpe = GetTemplateChild(ElementCanvasSpe) as Canvas;
-            _panelHotspots = GetTemplateChild(ElementHotspots) as Panel;
-
-            CheckNull();
-            _borderTop.MouseLeftButtonDown += BorderTop_OnMouseLeftButtonDown;
-            _borderTop.PreviewMouseLeftButtonUp += BorderTop_OnPreviewMouseLeftButtonUp;
-            var behavior = new MouseDragElementBehaviorEx
-            {
-                LockY = true,
-            };
-            behavior.DragBegun += DragElementBehavior_OnDragBegun;
-            behavior.Dragging += MouseDragElementBehavior_OnDragging;
-            behavior.DragFinished += MouseDragElementBehavior_OnDragFinished;
-            var collection = Interaction.GetBehaviors(_borderTop);
-            collection.Add(behavior);
-
-            if (_isLoaded)
-            {
-                Update();
-            }
-            _textBlockSelected.Text = SelectedTime.ToString(TimeFormat);
-        }
-
-        private void CheckNull()
-        {
-            if (_borderTop == null || _textBlockMove == null || _textBlockSelected == null || _canvasSpe == null) throw new Exception();
-        }
-
-        /// <summary>
-        ///     刻度区间编号
-        /// </summary>
-        public int SpeIndex
-        {
-            get => _speIndex;
-            private set
-            {
-                if (_speIndex == value) return;
-
-                if (value < 0)
-                {
-                    SpeStr = Properties.Langs.Lang.Interval2h;
-                    _speIndex = 0;
-                    return;
-                }
-                if (value > 6)
-                {
-                    SpeStr = Properties.Langs.Lang.Interval30s;
-                    _speIndex = 6;
-                    return;
-                }
-                SetSpeTimeFormat("HH:mm");
-                switch (value)
-                {
-                    case 0:
-                        SpeStr = Properties.Langs.Lang.Interval2h;
-                        break;
-                    case 1:
-                        SpeStr = Properties.Langs.Lang.Interval1h;
-                        break;
-                    case 2:
-                        SpeStr = Properties.Langs.Lang.Interval30m;
-                        break;
-                    case 3:
-                        SpeStr = Properties.Langs.Lang.Interval10m;
-                        break;
-                    case 4:
-                        SpeStr = Properties.Langs.Lang.Interval5m;
-                        break;
-                    case 5:
-                        SpeStr = Properties.Langs.Lang.Interval1m;
-                        break;
-                    case 6:
-                        SetSpeTimeFormat("HH:mm:ss");
-                        SpeStr = Properties.Langs.Lang.Interval30s;
-                        break;
-                }
-                _speIndex = value;
-            }
-        }
-
-        /// <summary>
-        ///     时间改变事件
-        /// </summary>
-        public event EventHandler<FunctionEventArgs<DateTime>> TimeChanged
-        {
-            add => AddHandler(TimeChangedEvent, value);
-            remove => RemoveHandler(TimeChangedEvent, value);
-        }
-
-        /// <summary>
-        ///     设置刻度时间格式
-        /// </summary>
-        /// <param name="format"></param>
-        private void SetSpeTimeFormat(string format)
-        {
-            foreach (var item in _speBlockList)
-                item.TimeFormat = format;
-        }
-
-        /// <summary>
-        ///     更新刻度
-        /// </summary>
-        private void UpdateSpeBlock()
-        {
-            var rest = (_totalOffsetX + _tempOffsetX) % _itemWidth;
-            for (var i = 0; i < _speCount; i++)
-            {
-                var item = _speBlockList[i];
-                item.MoveX(rest + (_itemWidth - item.Width) / 2);
-            }
-            var sub = rest <= 0 ? _speCount / 2 : _speCount / 2 - 1;
-
-            for (var i = 0; i < _speCount; i++)
-                _speBlockList[i].Time = TimeConvert(SelectedTime).AddMilliseconds((i - sub) * _timeSpeList[_speIndex]);
-
-            if (_panelHotspots != null && _dateTimeRanges.Any())
-            {
-                UpdateHotspots();
-            }
-        }
-
-        /// <summary>
-        ///     时间转换
-        /// </summary>
-        /// <param name="time"></param>
-        /// <returns></returns>
-        private DateTime TimeConvert(DateTime time)
-        {
-            return _speIndex switch
-            {
-                0 => new DateTime(time.Year, time.Month, time.Day, time.Hour / 2 * 2, 0, 0),
-                1 => new DateTime(time.Year, time.Month, time.Day, time.Hour, 0, 0),
-                2 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 30 * 30, 0),
-                3 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 10 * 10, 0),
-                4 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 5 * 5, 0),
-                5 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute, 0),
-                6 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute, time.Second / 30 * 30),
-                _ => time
-            };
-        }
-
-        /// <summary>
-        ///     鼠标滚轮滚动时改变刻度区间
-        /// </summary>
-        /// <param name="e"></param>
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
-        {
-            base.OnMouseWheel(e);
-            if (Mouse.LeftButton == MouseButtonState.Pressed) return;
-            SpeIndex += e.Delta > 0 ? 1 : -1;
             _totalOffsetX = (_starTime - SelectedTime).TotalMilliseconds / _timeSpeList[SpeIndex] * _itemWidth;
-            UpdateSpeBlock();
-            UpdateMouseFollowBlockPos();
-            e.Handled = true;
+        }
+        UpdateSpeBlock();
+        UpdateMouseFollowBlockPos();
+    }
+
+    /// <summary>
+    ///     时间改变事件
+    /// </summary>
+    public static readonly RoutedEvent TimeChangedEvent =
+        EventManager.RegisterRoutedEvent("TimeChanged", RoutingStrategy.Bubble,
+            typeof(EventHandler<FunctionEventArgs<DateTime>>), typeof(TimeBar));
+
+    /// <summary>
+    ///     刻度集合
+    /// </summary>
+    private readonly List<SpeTextBlock> _speBlockList = new();
+
+    /// <summary>
+    ///     初始化时时间
+    /// </summary>
+    private readonly DateTime _starTime;
+
+    /// <summary>
+    ///     时间段集合
+    /// </summary>
+    private readonly List<int> _timeSpeList = new()
+    {
+        7200000,
+        3600000,
+        1800000,
+        600000,
+        300000,
+        60000,
+        30000
+    };
+
+    /// <summary>
+    ///     顶部border是否被按下
+    /// </summary>
+    private bool _borderTopIsMouseLeftButtonDown;
+
+    /// <summary>
+    ///     控件是否处于拖动中
+    /// </summary>
+    private bool _isDragging;
+
+    /// <summary>
+    ///     刻度单项宽度
+    /// </summary>
+    private double _itemWidth;
+
+    /// <summary>
+    ///     鼠标按下拖动时选中的时间
+    /// </summary>
+    private DateTime _mouseDownTime;
+
+    /// <summary>
+    ///     显示的刻度数目
+    /// </summary>
+    private int _speCount = 13;
+
+    /// <summary>
+    ///     刻度区间编号
+    /// </summary>
+    private int _speIndex = 1;
+
+    /// <summary>
+    ///     刻度单次偏移
+    /// </summary>
+    private double _tempOffsetX;
+
+    /// <summary>
+    ///     刻度总偏移
+    /// </summary>
+    private double _totalOffsetX;
+
+    private readonly bool _isLoaded;
+
+    private readonly SortedSet<DateTimeRange> _dateTimeRanges;
+
+    public TimeBar()
+    {
+        _starTime = DateTime.Now;
+        SelectedTime = new DateTime(_starTime.Year, _starTime.Month, _starTime.Day, 0, 0, 0);
+        _starTime = SelectedTime;
+        _isLoaded = true;
+
+        var hotspots = new ObservableCollection<DateTimeRange>();
+        _dateTimeRanges = new SortedSet<DateTimeRange>(ComparerGenerator.GetComparer<DateTimeRange>());
+        hotspots.CollectionChanged += Items_CollectionChanged;
+        Hotspots = hotspots;
+    }
+
+    private void Items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (e.Action == NotifyCollectionChangedAction.Add)
+        {
+            foreach (DateTimeRange item in e.NewItems)
+            {
+                _dateTimeRanges.Add(item);
+            }
+        }
+        else if (e.Action == NotifyCollectionChangedAction.Remove)
+        {
+            foreach (DateTimeRange item in e.OldItems)
+            {
+                _dateTimeRanges.Remove(item);
+            }
+        }
+        else if (e.Action == NotifyCollectionChangedAction.Replace)
+        {
+            foreach (DateTimeRange item in e.OldItems)
+            {
+                _dateTimeRanges.Remove(item);
+            }
+
+            foreach (DateTimeRange item in e.NewItems)
+            {
+                _dateTimeRanges.Add(item);
+            }
+        }
+        else if (e.Action == NotifyCollectionChangedAction.Reset)
+        {
+            _dateTimeRanges.Clear();
+        }
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_borderTop != null)
+        {
+            _borderTop.MouseLeftButtonDown -= BorderTop_OnMouseLeftButtonDown;
+            _borderTop.PreviewMouseLeftButtonUp -= BorderTop_OnPreviewMouseLeftButtonUp;
         }
 
-        private void MouseDragElementBehavior_OnDragging(object sender, MouseEventArgs e)
-        {
-            _isDragging = true;
-            _tempOffsetX = _borderTop.RenderTransform.Value.OffsetX;
+        base.OnApplyTemplate();
 
-            SelectedTime = _mouseDownTime - TimeSpan.FromMilliseconds(_tempOffsetX / _itemWidth * _timeSpeList[_speIndex]);
+        _borderTop = GetTemplateChild(ElementBorderTop) as Border;
+        _textBlockMove = GetTemplateChild(ElementTextBlockMove) as TextBlock;
+        _textBlockSelected = GetTemplateChild(ElementTextBlockSelected) as TextBlock;
+        _canvasSpe = GetTemplateChild(ElementCanvasSpe) as Canvas;
+        _panelHotspots = GetTemplateChild(ElementHotspots) as Panel;
+
+        CheckNull();
+        _borderTop.MouseLeftButtonDown += BorderTop_OnMouseLeftButtonDown;
+        _borderTop.PreviewMouseLeftButtonUp += BorderTop_OnPreviewMouseLeftButtonUp;
+        var behavior = new MouseDragElementBehaviorEx
+        {
+            LockY = true,
+        };
+        behavior.DragBegun += DragElementBehavior_OnDragBegun;
+        behavior.Dragging += MouseDragElementBehavior_OnDragging;
+        behavior.DragFinished += MouseDragElementBehavior_OnDragFinished;
+        var collection = Interaction.GetBehaviors(_borderTop);
+        collection.Add(behavior);
+
+        if (_isLoaded)
+        {
+            Update();
+        }
+        _textBlockSelected.Text = SelectedTime.ToString(TimeFormat);
+    }
+
+    private void CheckNull()
+    {
+        if (_borderTop == null || _textBlockMove == null || _textBlockSelected == null || _canvasSpe == null) throw new Exception();
+    }
+
+    /// <summary>
+    ///     刻度区间编号
+    /// </summary>
+    public int SpeIndex
+    {
+        get => _speIndex;
+        private set
+        {
+            if (_speIndex == value) return;
+
+            if (value < 0)
+            {
+                SpeStr = Properties.Langs.Lang.Interval2h;
+                _speIndex = 0;
+                return;
+            }
+            if (value > 6)
+            {
+                SpeStr = Properties.Langs.Lang.Interval30s;
+                _speIndex = 6;
+                return;
+            }
+            SetSpeTimeFormat("HH:mm");
+            switch (value)
+            {
+                case 0:
+                    SpeStr = Properties.Langs.Lang.Interval2h;
+                    break;
+                case 1:
+                    SpeStr = Properties.Langs.Lang.Interval1h;
+                    break;
+                case 2:
+                    SpeStr = Properties.Langs.Lang.Interval30m;
+                    break;
+                case 3:
+                    SpeStr = Properties.Langs.Lang.Interval10m;
+                    break;
+                case 4:
+                    SpeStr = Properties.Langs.Lang.Interval5m;
+                    break;
+                case 5:
+                    SpeStr = Properties.Langs.Lang.Interval1m;
+                    break;
+                case 6:
+                    SetSpeTimeFormat("HH:mm:ss");
+                    SpeStr = Properties.Langs.Lang.Interval30s;
+                    break;
+            }
+            _speIndex = value;
+        }
+    }
+
+    /// <summary>
+    ///     时间改变事件
+    /// </summary>
+    public event EventHandler<FunctionEventArgs<DateTime>> TimeChanged
+    {
+        add => AddHandler(TimeChangedEvent, value);
+        remove => RemoveHandler(TimeChangedEvent, value);
+    }
+
+    /// <summary>
+    ///     设置刻度时间格式
+    /// </summary>
+    /// <param name="format"></param>
+    private void SetSpeTimeFormat(string format)
+    {
+        foreach (var item in _speBlockList)
+            item.TimeFormat = format;
+    }
+
+    /// <summary>
+    ///     更新刻度
+    /// </summary>
+    private void UpdateSpeBlock()
+    {
+        var rest = (_totalOffsetX + _tempOffsetX) % _itemWidth;
+        for (var i = 0; i < _speCount; i++)
+        {
+            var item = _speBlockList[i];
+            item.MoveX(rest + (_itemWidth - item.Width) / 2);
+        }
+        var sub = rest <= 0 ? _speCount / 2 : _speCount / 2 - 1;
+
+        for (var i = 0; i < _speCount; i++)
+            _speBlockList[i].Time = TimeConvert(SelectedTime).AddMilliseconds((i - sub) * _timeSpeList[_speIndex]);
+
+        if (_panelHotspots != null && _dateTimeRanges.Any())
+        {
+            UpdateHotspots();
+        }
+    }
+
+    /// <summary>
+    ///     时间转换
+    /// </summary>
+    /// <param name="time"></param>
+    /// <returns></returns>
+    private DateTime TimeConvert(DateTime time)
+    {
+        return _speIndex switch
+        {
+            0 => new DateTime(time.Year, time.Month, time.Day, time.Hour / 2 * 2, 0, 0),
+            1 => new DateTime(time.Year, time.Month, time.Day, time.Hour, 0, 0),
+            2 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 30 * 30, 0),
+            3 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 10 * 10, 0),
+            4 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute / 5 * 5, 0),
+            5 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute, 0),
+            6 => new DateTime(time.Year, time.Month, time.Day, time.Hour, time.Minute, time.Second / 30 * 30),
+            _ => time
+        };
+    }
+
+    /// <summary>
+    ///     鼠标滚轮滚动时改变刻度区间
+    /// </summary>
+    /// <param name="e"></param>
+    protected override void OnMouseWheel(MouseWheelEventArgs e)
+    {
+        base.OnMouseWheel(e);
+        if (Mouse.LeftButton == MouseButtonState.Pressed) return;
+        SpeIndex += e.Delta > 0 ? 1 : -1;
+        _totalOffsetX = (_starTime - SelectedTime).TotalMilliseconds / _timeSpeList[SpeIndex] * _itemWidth;
+        UpdateSpeBlock();
+        UpdateMouseFollowBlockPos();
+        e.Handled = true;
+    }
+
+    private void MouseDragElementBehavior_OnDragging(object sender, MouseEventArgs e)
+    {
+        _isDragging = true;
+        _tempOffsetX = _borderTop.RenderTransform.Value.OffsetX;
+
+        SelectedTime = _mouseDownTime - TimeSpan.FromMilliseconds(_tempOffsetX / _itemWidth * _timeSpeList[_speIndex]);
+        _borderTopIsMouseLeftButtonDown = false;
+    }
+
+    private void MouseDragElementBehavior_OnDragFinished(object sender, MouseEventArgs e)
+    {
+        _tempOffsetX = 0;
+        _totalOffsetX = (_totalOffsetX + _borderTop.RenderTransform.Value.OffsetX) % ActualWidth;
+        _borderTop.RenderTransform = new TranslateTransform();
+        RaiseEvent(new FunctionEventArgs<DateTime>(TimeChangedEvent, this)
+        {
+            Info = SelectedTime
+        });
+        _isDragging = false;
+    }
+
+    private void DragElementBehavior_OnDragBegun(object sender, MouseEventArgs e) => _mouseDownTime = SelectedTime;
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        Update();
+    }
+
+    /// <summary>
+    ///     更新
+    /// </summary>
+    private void Update()
+    {
+        if (_canvasSpe == null) return;
+
+        _speBlockList.Clear();
+        _canvasSpe.Children.Clear();
+        _speCount = (int) (ActualWidth / 800 * 9) | 1;
+
+        var itemWidthOld = _itemWidth;
+        _itemWidth = ActualWidth / _speCount;
+        _totalOffsetX = _itemWidth / itemWidthOld * _totalOffsetX % ActualWidth;
+        if (double.IsNaN(_totalOffsetX))
+        {
+            _totalOffsetX = 0;
+        }
+
+        var rest = (_totalOffsetX + _tempOffsetX) % _itemWidth;
+        var sub = rest <= 0 || double.IsNaN(rest) ? _speCount / 2 : _speCount / 2 - 1;
+        for (var i = 0; i < _speCount; i++)
+        {
+            var block = new SpeTextBlock
+            {
+                Time = TimeConvert(SelectedTime).AddMilliseconds((i - sub) * _timeSpeList[_speIndex]),
+                TextAlignment = TextAlignment.Center,
+                TimeFormat = "HH:mm"
+            };
+            _speBlockList.Add(block);
+            _canvasSpe.Children.Add(block);
+        }
+
+        if (_speIndex == 6)
+        {
+            SetSpeTimeFormat("HH:mm:ss");
+        }
+
+        ShowSpeStr = ActualWidth > 320;
+        for (var i = 0; i < _speCount; i++)
+        {
+            var item = _speBlockList[i];
+            item.X = _itemWidth * i;
+            item.MoveX((_itemWidth - item.Width) / 2);
+        }
+
+        UpdateSpeBlock();
+        UpdateMouseFollowBlockPos();
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+        base.OnMouseMove(e);
+        UpdateMouseFollowBlockPos();
+    }
+
+    /// <summary>
+    ///     更新鼠标跟随块位置
+    /// </summary>
+    private void UpdateMouseFollowBlockPos()
+    {
+        var p = Mouse.GetPosition(this);
+        var mlliseconds = (p.X - ActualWidth / 2) / _itemWidth * _timeSpeList[_speIndex];
+        if (double.IsNaN(mlliseconds) || double.IsInfinity(mlliseconds)) return;
+        _textBlockMove.Text = mlliseconds < 0
+            ? (SelectedTime - TimeSpan.FromMilliseconds(-mlliseconds)).ToString(TimeFormat)
+            : (SelectedTime + TimeSpan.FromMilliseconds(mlliseconds)).ToString(TimeFormat);
+        _textBlockMove.Margin = new Thickness(p.X - _textBlockMove.ActualWidth / 2, 2, 0, 0);
+    }
+
+    private void UpdateHotspots()
+    {
+        var mlliseconds = ActualWidth * 0.5 / _itemWidth * _timeSpeList[_speIndex];
+        if (double.IsNaN(mlliseconds) || double.IsInfinity(mlliseconds)) return;
+        _panelHotspots.Children.Clear();
+
+        foreach (var rect in GetHotspotsRectangle(mlliseconds))
+        {
+            _panelHotspots.Children.Add(rect);
+        }
+    }
+
+    private void BorderTop_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e) => _borderTopIsMouseLeftButtonDown = true;
+
+    private void BorderTop_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        if (_borderTopIsMouseLeftButtonDown)
+        {
             _borderTopIsMouseLeftButtonDown = false;
-        }
 
-        private void MouseDragElementBehavior_OnDragFinished(object sender, MouseEventArgs e)
-        {
+            var p = Mouse.GetPosition(this);
+            _tempOffsetX = ActualWidth / 2 - p.X;
+            SelectedTime -= TimeSpan.FromMilliseconds(_tempOffsetX / _itemWidth * _timeSpeList[_speIndex]);
+            _totalOffsetX = (_totalOffsetX + _tempOffsetX) % ActualWidth;
             _tempOffsetX = 0;
-            _totalOffsetX = (_totalOffsetX + _borderTop.RenderTransform.Value.OffsetX) % ActualWidth;
-            _borderTop.RenderTransform = new TranslateTransform();
+            UpdateMouseFollowBlockPos();
             RaiseEvent(new FunctionEventArgs<DateTime>(TimeChangedEvent, this)
             {
                 Info = SelectedTime
             });
-            _isDragging = false;
-        }
-
-        private void DragElementBehavior_OnDragBegun(object sender, MouseEventArgs e) => _mouseDownTime = SelectedTime;
-
-        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
-        {
-            base.OnRenderSizeChanged(sizeInfo);
-            Update();
-        }
-
-        /// <summary>
-        ///     更新
-        /// </summary>
-        private void Update()
-        {
-            if (_canvasSpe == null) return;
-
-            _speBlockList.Clear();
-            _canvasSpe.Children.Clear();
-            _speCount = (int) (ActualWidth / 800 * 9) | 1;
-
-            var itemWidthOld = _itemWidth;
-            _itemWidth = ActualWidth / _speCount;
-            _totalOffsetX = _itemWidth / itemWidthOld * _totalOffsetX % ActualWidth;
-            if (double.IsNaN(_totalOffsetX))
-            {
-                _totalOffsetX = 0;
-            }
-
-            var rest = (_totalOffsetX + _tempOffsetX) % _itemWidth;
-            var sub = rest <= 0 || double.IsNaN(rest) ? _speCount / 2 : _speCount / 2 - 1;
-            for (var i = 0; i < _speCount; i++)
-            {
-                var block = new SpeTextBlock
-                {
-                    Time = TimeConvert(SelectedTime).AddMilliseconds((i - sub) * _timeSpeList[_speIndex]),
-                    TextAlignment = TextAlignment.Center,
-                    TimeFormat = "HH:mm"
-                };
-                _speBlockList.Add(block);
-                _canvasSpe.Children.Add(block);
-            }
-
-            if (_speIndex == 6)
-            {
-                SetSpeTimeFormat("HH:mm:ss");
-            }
-
-            ShowSpeStr = ActualWidth > 320;
-            for (var i = 0; i < _speCount; i++)
-            {
-                var item = _speBlockList[i];
-                item.X = _itemWidth * i;
-                item.MoveX((_itemWidth - item.Width) / 2);
-            }
-
-            UpdateSpeBlock();
-            UpdateMouseFollowBlockPos();
-        }
-
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-            UpdateMouseFollowBlockPos();
-        }
-
-        /// <summary>
-        ///     更新鼠标跟随块位置
-        /// </summary>
-        private void UpdateMouseFollowBlockPos()
-        {
-            var p = Mouse.GetPosition(this);
-            var mlliseconds = (p.X - ActualWidth / 2) / _itemWidth * _timeSpeList[_speIndex];
-            if (double.IsNaN(mlliseconds) || double.IsInfinity(mlliseconds)) return;
-            _textBlockMove.Text = mlliseconds < 0
-                ? (SelectedTime - TimeSpan.FromMilliseconds(-mlliseconds)).ToString(TimeFormat)
-                : (SelectedTime + TimeSpan.FromMilliseconds(mlliseconds)).ToString(TimeFormat);
-            _textBlockMove.Margin = new Thickness(p.X - _textBlockMove.ActualWidth / 2, 2, 0, 0);
-        }
-
-        private void UpdateHotspots()
-        {
-            var mlliseconds = ActualWidth * 0.5 / _itemWidth * _timeSpeList[_speIndex];
-            if (double.IsNaN(mlliseconds) || double.IsInfinity(mlliseconds)) return;
-            _panelHotspots.Children.Clear();
-
-            foreach (var rect in GetHotspotsRectangle(mlliseconds))
-            {
-                _panelHotspots.Children.Add(rect);
-            }
-        }
-
-        private void BorderTop_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e) => _borderTopIsMouseLeftButtonDown = true;
-
-        private void BorderTop_OnPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (_borderTopIsMouseLeftButtonDown)
-            {
-                _borderTopIsMouseLeftButtonDown = false;
-
-                var p = Mouse.GetPosition(this);
-                _tempOffsetX = ActualWidth / 2 - p.X;
-                SelectedTime -= TimeSpan.FromMilliseconds(_tempOffsetX / _itemWidth * _timeSpeList[_speIndex]);
-                _totalOffsetX = (_totalOffsetX + _tempOffsetX) % ActualWidth;
-                _tempOffsetX = 0;
-                UpdateMouseFollowBlockPos();
-                RaiseEvent(new FunctionEventArgs<DateTime>(TimeChangedEvent, this)
-                {
-                    Info = SelectedTime
-                });
-            }
-        }
-
-        private IEnumerable<Rectangle> GetHotspotsRectangle(double mlliseconds)
-        {
-            var timeSpan = TimeSpan.FromMilliseconds(mlliseconds);
-            var selectedTime = SelectedTime;
-            var start = selectedTime - timeSpan;
-            var end = selectedTime + timeSpan;
-
-            var set = _dateTimeRanges.GetViewBetween(new DateTimeRange(start), new DateTimeRange(end));
-            var unitLength = ActualWidth / mlliseconds * 0.5;
-
-            foreach (var range in set)
-            {
-                var width = range.TotalMilliseconds * unitLength;
-                var sub = range.Start - start;
-                var x = sub.TotalMilliseconds * unitLength;
-                yield return new Rectangle
-                {
-                    Fill = HotspotsBrush,
-                    Height = 4,
-                    Width = width,
-                    Margin = new Thickness(x, 0, 0, 0),
-                    HorizontalAlignment = HorizontalAlignment.Left
-                };
-            }
         }
     }
-}
+
+    private IEnumerable<Rectangle> GetHotspotsRectangle(double mlliseconds)
+    {
+        var timeSpan = TimeSpan.FromMilliseconds(mlliseconds);
+        var selectedTime = SelectedTime;
+        var start = selectedTime - timeSpan;
+        var end = selectedTime + timeSpan;
+
+        var set = _dateTimeRanges.GetViewBetween(new DateTimeRange(start), new DateTimeRange(end));
+        var unitLength = ActualWidth / mlliseconds * 0.5;
+
+        foreach (var range in set)
+        {
+            var width = range.TotalMilliseconds * unitLength;
+            var sub = range.Start - start;
+            var x = sub.TotalMilliseconds * unitLength;
+            yield return new Rectangle
+            {
+                Fill = HotspotsBrush,
+                Height = 4,
+                Width = width,
+                Margin = new Thickness(x, 0, 0, 0),
+                HorizontalAlignment = HorizontalAlignment.Left
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
index d0c40a87..ab2ce568 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
@@ -9,281 +9,280 @@ using System.Windows.Input;
 using HandyControl.Interactivity;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     穿梭框
+/// </summary>
+[TemplatePart(Name = ElementItemsOrigin, Type = typeof(SimpleItemsControl))]
+[TemplatePart(Name = ElementItemsSelected, Type = typeof(SimpleItemsControl))]
+public class Transfer : SimpleItemsControl
 {
-    /// <summary>
-    ///     穿梭框
-    /// </summary>
-    [TemplatePart(Name = ElementItemsOrigin, Type = typeof(SimpleItemsControl))]
-    [TemplatePart(Name = ElementItemsSelected, Type = typeof(SimpleItemsControl))]
-    public class Transfer : SimpleItemsControl
+    private const string ElementItemsOrigin = "PART_ItemsOrigin";
+
+    private const string ElementItemsSelected = "PART_ItemsSelected";
+
+    private readonly Dictionary<object, TransferEntry> _entryDic = new();
+
+    private readonly List<TransferEntry> _entryList = new();
+
+    private SimpleItemsControl _itemsOrigin;
+
+    private SimpleItemsControl _itemsSelected;
+
+    private IEnumerable _itemsSourceInternal;
+
+    private IEnumerable _initEnumerable;
+
+    private NotifyCollectionChangedEventArgs _initArgs;
+
+    public static readonly RoutedEvent SelectionChangedEvent =
+        EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
+            typeof(SelectionChangedEventHandler), typeof(Transfer));
+
+    public event SelectionChangedEventHandler SelectionChanged
     {
-        private const string ElementItemsOrigin = "PART_ItemsOrigin";
+        add => AddHandler(SelectionChangedEvent, value);
+        remove => RemoveHandler(SelectionChangedEvent, value);
+    }
 
-        private const string ElementItemsSelected = "PART_ItemsSelected";
+    private static readonly DependencyPropertyKey SelectedItemsPropertyKey =
+        DependencyProperty.RegisterReadOnly(
+            "SelectedItems",
+            typeof(IList),
+            typeof(Transfer),
+            new FrameworkPropertyMetadata(default(IList)));
 
-        private readonly Dictionary<object, TransferEntry> _entryDic = new();
+    public static readonly DependencyProperty SelectedItemsProperty = SelectedItemsPropertyKey.DependencyProperty;
 
-        private readonly List<TransferEntry> _entryList = new();
+    public IList SelectedItems
+    {
+        get => (IList) GetValue(SelectedItemsProperty);
+        set => SetValue(SelectedItemsProperty, value);
+    }
 
-        private SimpleItemsControl _itemsOrigin;
+    public Transfer()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, DeselectItems));
 
-        private SimpleItemsControl _itemsSelected;
+        SetValue(SelectedItemsPropertyKey, new ObservableCollection<object>());
+    }
 
-        private IEnumerable _itemsSourceInternal;
+    public override void OnApplyTemplate()
+    {
+        _itemsOrigin?.ItemsHost.Children.Clear();
+        _itemsSelected?.ItemsHost.Children.Clear();
 
-        private IEnumerable _initEnumerable;
+        _itemsOrigin = GetTemplateChild(ElementItemsOrigin) as SimpleItemsControl;
+        _itemsSelected = GetTemplateChild(ElementItemsSelected) as SimpleItemsControl;
 
-        private NotifyCollectionChangedEventArgs _initArgs;
-
-        public static readonly RoutedEvent SelectionChangedEvent =
-            EventManager.RegisterRoutedEvent("SelectionChanged", RoutingStrategy.Bubble,
-                typeof(SelectionChangedEventHandler), typeof(Transfer));
-
-        public event SelectionChangedEventHandler SelectionChanged
+        if (_itemsOrigin != null && _itemsSelected != null)
         {
-            add => AddHandler(SelectionChangedEvent, value);
-            remove => RemoveHandler(SelectionChangedEvent, value);
-        }
-
-        private static readonly DependencyPropertyKey SelectedItemsPropertyKey =
-            DependencyProperty.RegisterReadOnly(
-                "SelectedItems",
-                typeof(IList),
-                typeof(Transfer),
-                new FrameworkPropertyMetadata(default(IList)));
-
-        public static readonly DependencyProperty SelectedItemsProperty = SelectedItemsPropertyKey.DependencyProperty;
-
-        public IList SelectedItems
-        {
-            get => (IList) GetValue(SelectedItemsProperty);
-            set => SetValue(SelectedItemsProperty, value);
-        }
-
-        public Transfer()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Selected, SelectItems));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, DeselectItems));
-
-            SetValue(SelectedItemsPropertyKey, new ObservableCollection<object>());
-        }
-
-        public override void OnApplyTemplate()
-        {
-            _itemsOrigin?.ItemsHost.Children.Clear();
-            _itemsSelected?.ItemsHost.Children.Clear();
-
-            _itemsOrigin = GetTemplateChild(ElementItemsOrigin) as SimpleItemsControl;
-            _itemsSelected = GetTemplateChild(ElementItemsSelected) as SimpleItemsControl;
-
-            if (_itemsOrigin != null && _itemsSelected != null)
+            if (_initEnumerable != null)
             {
-                if (_initEnumerable != null)
-                {
-                    OnItemsSourceChanged(null, _initEnumerable);
-                    _initEnumerable = null;
-                }
-
-                if (_initArgs != null)
-                {
-                    InternalCollectionChanged(null, _initArgs);
-                    _initArgs = null;
-                }
-
-                if (_itemsOrigin.Items.Count == 0)
-                {
-                    Refresh();
-                }
-            }
-        }
-
-        private void InsertItem(int index, object item, bool isTransferred = false)
-        {
-            var origin = new TransferItem
-            {
-                Content = item,
-                IsTransferred = isTransferred
-            };
-            var selected = new TransferItem
-            {
-                Content = item,
-                IsOrigin = false,
-                IsTransferred = isTransferred
-            };
-            var entry = new TransferEntry
-            {
-                OriginItem = origin,
-                SelectedItem = selected
-            };
-            _entryDic.Add(item, entry);
-            _entryList.Insert(index, entry);
-            _itemsOrigin.Items.Insert(index, origin);
-            _itemsSelected.Items.Insert(index, selected);
-        }
-
-        private void AddItem(object item) => InsertItem(_entryDic.Count, item);
-
-        private void RemoveItem(object item)
-        {
-            if (_entryDic.TryGetValue(item, out var entry))
-            {
-                _itemsOrigin.Items.Remove(entry.OriginItem);
-                _itemsSelected.Items.Remove(entry.SelectedItem);
-                _entryDic.Remove(item);
-                _entryList.Remove(entry);
-            }
-        }
-
-        private void ClearItems()
-        {
-            _entryDic.Clear();
-            _entryList.Clear();
-            _itemsOrigin.Items.Clear();
-            _itemsSelected.Items.Clear();
-        }
-
-        protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
-        {
-            if (_itemsOrigin == null || _itemsSelected == null)
-            {
-                _initEnumerable = newValue;
-                return;
+                OnItemsSourceChanged(null, _initEnumerable);
+                _initEnumerable = null;
             }
 
-            if (_itemsSourceInternal != null)
+            if (_initArgs != null)
             {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged -= InternalCollectionChanged;
-                }
-
-                ClearItems();
-            }
-            _itemsSourceInternal = newValue;
-            if (_itemsSourceInternal != null)
-            {
-                if (_itemsSourceInternal is INotifyCollectionChanged s)
-                {
-                    s.CollectionChanged += InternalCollectionChanged;
-                }
-                foreach (var item in _itemsSourceInternal)
-                {
-                    AddItem(item);
-                }
-            }
-        }
-
-        private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (_itemsOrigin == null || _itemsSelected == null)
-            {
-                _initArgs = e;
-                return;
+                InternalCollectionChanged(null, _initArgs);
+                _initArgs = null;
             }
 
-            switch (e.Action)
+            if (_itemsOrigin.Items.Count == 0)
             {
-                case NotifyCollectionChangedAction.Add:
-                    if (e.NewItems != null)
-                    {
-                        foreach (var item in e.NewItems)
-                        {
-                            AddItem(item);
-                        }
-                    }
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    if (e.OldItems != null)
-                    {
-                        foreach (var item in e.OldItems)
-                        {
-                            RemoveItem(item);
-                        }
-                    }
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                case NotifyCollectionChangedAction.Move:
-                    if (e.OldItems != null && e.NewItems != null)
-                    {
-                        var oldItem = e.OldItems[0];
-                        if (_entryDic.TryGetValue(oldItem, out var entry))
-                        {
-                            var isTransferred = entry.SelectedItem.IsTransferred;
-                            RemoveItem(oldItem);
-                            InsertItem(e.NewStartingIndex, e.NewItems[0], isTransferred);
-                        }
-                    }
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    ClearItems();
-                    break;
-            }
-        }
-
-        protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
-
-        private void SelectItems(object sender, ExecutedRoutedEventArgs e)
-        {
-            var list = _entryDic.Where(item => item.Value.OriginItem.IsSelected).ToList();
-            list.Do(item => item.Value.StatusSwitch(true)).Do(item => SelectedItems.Add(item.Key));
-            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, new List<object>(), list));
-        }
-
-        private void DeselectItems(object sender, ExecutedRoutedEventArgs e)
-        {
-            var list = _entryDic.Where(item => item.Value.SelectedItem.IsSelected).ToList();
-            list.Do(item => item.Value.StatusSwitch(false)).Do(item => SelectedItems.Remove(item.Key));
-            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, list, new List<object>()));
-        }
-
-        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void Refresh()
-        {
-            if (_entryList.Count > 0)
-            {
-                _entryList.Select(item => item.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
-                _entryList.Select(item => item.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
-            }
-        }
-
-        private struct TransferEntry
-        {
-            public TransferItem OriginItem { get; set; }
-
-            public TransferItem SelectedItem { get; set; }
-
-            public void StatusSwitch(bool isTransferred)
-            {
-                if (isTransferred)
-                {
-                    OriginItem.IsTransferred = true;
-                    SelectedItem.IsTransferred = true;
-                    OriginItem.IsSelected = false;
-                }
-                else
-                {
-                    OriginItem.IsTransferred = false;
-                    SelectedItem.IsTransferred = false;
-                    SelectedItem.IsSelected = false;
-                }
+                Refresh();
             }
         }
     }
-}
+
+    private void InsertItem(int index, object item, bool isTransferred = false)
+    {
+        var origin = new TransferItem
+        {
+            Content = item,
+            IsTransferred = isTransferred
+        };
+        var selected = new TransferItem
+        {
+            Content = item,
+            IsOrigin = false,
+            IsTransferred = isTransferred
+        };
+        var entry = new TransferEntry
+        {
+            OriginItem = origin,
+            SelectedItem = selected
+        };
+        _entryDic.Add(item, entry);
+        _entryList.Insert(index, entry);
+        _itemsOrigin.Items.Insert(index, origin);
+        _itemsSelected.Items.Insert(index, selected);
+    }
+
+    private void AddItem(object item) => InsertItem(_entryDic.Count, item);
+
+    private void RemoveItem(object item)
+    {
+        if (_entryDic.TryGetValue(item, out var entry))
+        {
+            _itemsOrigin.Items.Remove(entry.OriginItem);
+            _itemsSelected.Items.Remove(entry.SelectedItem);
+            _entryDic.Remove(item);
+            _entryList.Remove(entry);
+        }
+    }
+
+    private void ClearItems()
+    {
+        _entryDic.Clear();
+        _entryList.Clear();
+        _itemsOrigin.Items.Clear();
+        _itemsSelected.Items.Clear();
+    }
+
+    protected override void OnItemsSourceChanged(IEnumerable oldValue, IEnumerable newValue)
+    {
+        if (_itemsOrigin == null || _itemsSelected == null)
+        {
+            _initEnumerable = newValue;
+            return;
+        }
+
+        if (_itemsSourceInternal != null)
+        {
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
+            {
+                s.CollectionChanged -= InternalCollectionChanged;
+            }
+
+            ClearItems();
+        }
+        _itemsSourceInternal = newValue;
+        if (_itemsSourceInternal != null)
+        {
+            if (_itemsSourceInternal is INotifyCollectionChanged s)
+            {
+                s.CollectionChanged += InternalCollectionChanged;
+            }
+            foreach (var item in _itemsSourceInternal)
+            {
+                AddItem(item);
+            }
+        }
+    }
+
+    private void InternalCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (_itemsOrigin == null || _itemsSelected == null)
+        {
+            _initArgs = e;
+            return;
+        }
+
+        switch (e.Action)
+        {
+            case NotifyCollectionChangedAction.Add:
+                if (e.NewItems != null)
+                {
+                    foreach (var item in e.NewItems)
+                    {
+                        AddItem(item);
+                    }
+                }
+                break;
+            case NotifyCollectionChangedAction.Remove:
+                if (e.OldItems != null)
+                {
+                    foreach (var item in e.OldItems)
+                    {
+                        RemoveItem(item);
+                    }
+                }
+                break;
+            case NotifyCollectionChangedAction.Replace:
+            case NotifyCollectionChangedAction.Move:
+                if (e.OldItems != null && e.NewItems != null)
+                {
+                    var oldItem = e.OldItems[0];
+                    if (_entryDic.TryGetValue(oldItem, out var entry))
+                    {
+                        var isTransferred = entry.SelectedItem.IsTransferred;
+                        RemoveItem(oldItem);
+                        InsertItem(e.NewStartingIndex, e.NewItems[0], isTransferred);
+                    }
+                }
+                break;
+            case NotifyCollectionChangedAction.Reset:
+                ClearItems();
+                break;
+        }
+    }
+
+    protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
+
+    private void SelectItems(object sender, ExecutedRoutedEventArgs e)
+    {
+        var list = _entryDic.Where(item => item.Value.OriginItem.IsSelected).ToList();
+        list.Do(item => item.Value.StatusSwitch(true)).Do(item => SelectedItems.Add(item.Key));
+        RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, new List<object>(), list));
+    }
+
+    private void DeselectItems(object sender, ExecutedRoutedEventArgs e)
+    {
+        var list = _entryDic.Where(item => item.Value.SelectedItem.IsSelected).ToList();
+        list.Do(item => item.Value.StatusSwitch(false)).Do(item => SelectedItems.Remove(item.Key));
+        RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, list, new List<object>()));
+    }
+
+    protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+
+    }
+
+    protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override void Refresh()
+    {
+        if (_entryList.Count > 0)
+        {
+            _entryList.Select(item => item.OriginItem).Do(item => _itemsOrigin.Items.Add(item));
+            _entryList.Select(item => item.SelectedItem).Do(item => _itemsSelected.Items.Add(item));
+        }
+    }
+
+    private struct TransferEntry
+    {
+        public TransferItem OriginItem { get; set; }
+
+        public TransferItem SelectedItem { get; set; }
+
+        public void StatusSwitch(bool isTransferred)
+        {
+            if (isTransferred)
+            {
+                OriginItem.IsTransferred = true;
+                SelectedItem.IsTransferred = true;
+                OriginItem.IsSelected = false;
+            }
+            else
+            {
+                OriginItem.IsTransferred = false;
+                SelectedItem.IsTransferred = false;
+                SelectedItem.IsSelected = false;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
index 39f14780..569621de 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
@@ -1,65 +1,64 @@
 using System.Collections.Specialized;
 using System.Windows;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TransferGroup : SimpleItemsControl
 {
-    public class TransferGroup : SimpleItemsControl
+    protected override void Refresh()
     {
-        protected override void Refresh()
+        if (Items.Count > 0)
         {
-            if (Items.Count > 0)
+            foreach (FrameworkElement item in Items)
             {
-                foreach (FrameworkElement item in Items)
-                {
-                    item.Style = ItemContainerStyle;
-                    ItemsHost.Children.Add(item);
-                }
-            }
-        }
-
-        protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
-        {
-
-        }
-
-        protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
-
-        protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
-
-        protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (ItemsHost == null) return;
-
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    if (e.NewItems != null)
-                    {
-                        if (e.NewItems[0] is FrameworkElement item)
-                        {
-                            item.Style = ItemContainerStyle;
-                            ItemsHost.Children.Insert(e.NewStartingIndex, item);
-                        }
-                    }
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    if (e.OldItems != null)
-                    {
-                        foreach (FrameworkElement item in e.OldItems)
-                        {
-                            ItemsHost.Children.Remove(item);
-                        }
-                    }
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    ItemsHost.Children.Clear();
-                    break;
+                item.Style = ItemContainerStyle;
+                ItemsHost.Children.Add(item);
             }
         }
     }
-}
+
+    protected override void OnItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override void OnItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+    {
+
+    }
+
+    protected override DependencyObject GetContainerForItemOverride() => new TransferItem();
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is TransferItem;
+
+    protected override void OnItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        if (ItemsHost == null) return;
+
+        switch (e.Action)
+        {
+            case NotifyCollectionChangedAction.Add:
+                if (e.NewItems != null)
+                {
+                    if (e.NewItems[0] is FrameworkElement item)
+                    {
+                        item.Style = ItemContainerStyle;
+                        ItemsHost.Children.Insert(e.NewStartingIndex, item);
+                    }
+                }
+                break;
+            case NotifyCollectionChangedAction.Remove:
+                if (e.OldItems != null)
+                {
+                    foreach (FrameworkElement item in e.OldItems)
+                    {
+                        ItemsHost.Children.Remove(item);
+                    }
+                }
+                break;
+            case NotifyCollectionChangedAction.Reset:
+                ItemsHost.Children.Clear();
+                break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
index c5bf5557..1fd01ca5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
@@ -1,26 +1,25 @@
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class TransferItem : SelectableItem
 {
-    public class TransferItem : SelectableItem
+    public static readonly DependencyProperty IsTransferredProperty = DependencyProperty.Register(
+        "IsTransferred", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool IsTransferred
     {
-        public static readonly DependencyProperty IsTransferredProperty = DependencyProperty.Register(
-            "IsTransferred", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool IsTransferred
-        {
-            get => (bool) GetValue(IsTransferredProperty);
-            set => SetValue(IsTransferredProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty IsOriginProperty = DependencyProperty.Register(
-            "IsOrigin", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool IsOrigin
-        {
-            get => (bool) GetValue(IsOriginProperty);
-            internal set => SetValue(IsOriginProperty, ValueBoxes.BooleanBox(value));
-        }
+        get => (bool) GetValue(IsTransferredProperty);
+        set => SetValue(IsTransferredProperty, ValueBoxes.BooleanBox(value));
     }
-}
+
+    public static readonly DependencyProperty IsOriginProperty = DependencyProperty.Register(
+        "IsOrigin", typeof(bool), typeof(TransferItem), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool IsOrigin
+    {
+        get => (bool) GetValue(IsOriginProperty);
+        internal set => SetValue(IsOriginProperty, ValueBoxes.BooleanBox(value));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
index 005fad7a..d8948eef 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
@@ -5,86 +5,85 @@ using HandyControl.Tools;
 using HandyControl.Tools.Helper;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class BlurWindow : Window
 {
-    public class BlurWindow : Window
+    protected override void OnSourceInitialized(EventArgs e)
     {
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
+        base.OnSourceInitialized(e);
 
-            var versionInfo = SystemHelper.GetSystemVersionInfo();
-            if (versionInfo >= SystemVersionInfo.Windows10_1903)
-            {
-                this.GetHwndSource()?.AddHook(HwndSourceHook);
-            }
+        var versionInfo = SystemHelper.GetSystemVersionInfo();
+        if (versionInfo >= SystemVersionInfo.Windows10_1903)
+        {
+            this.GetHwndSource()?.AddHook(HwndSourceHook);
+        }
+    }
+
+    private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+    {
+        switch (msg)
+        {
+            case InteropValues.WM_ENTERSIZEMOVE:
+                EnableBlur(this, false);
+                break;
+            case InteropValues.WM_EXITSIZEMOVE:
+                EnableBlur(this, true);
+                break;
         }
 
-        private IntPtr HwndSourceHook(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+        return IntPtr.Zero;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+        EnableBlur(this, true);
+    }
+
+    private static void EnableBlur(Window window, bool isEnabled)
+    {
+        var versionInfo = SystemHelper.GetSystemVersionInfo();
+
+        var accentPolicy = new InteropValues.ACCENTPOLICY();
+        var accentPolicySize = Marshal.SizeOf(accentPolicy);
+
+        accentPolicy.AccentFlags = 2;
+
+        if (isEnabled)
         {
-            switch (msg)
+            if (versionInfo >= SystemVersionInfo.Windows10_1809)
             {
-                case InteropValues.WM_ENTERSIZEMOVE:
-                    EnableBlur(this, false);
-                    break;
-                case InteropValues.WM_EXITSIZEMOVE:
-                    EnableBlur(this, true);
-                    break;
+                accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_ACRYLICBLURBEHIND;
             }
-
-            return IntPtr.Zero;
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            EnableBlur(this, true);
-        }
-
-        private static void EnableBlur(Window window, bool isEnabled)
-        {
-            var versionInfo = SystemHelper.GetSystemVersionInfo();
-
-            var accentPolicy = new InteropValues.ACCENTPOLICY();
-            var accentPolicySize = Marshal.SizeOf(accentPolicy);
-
-            accentPolicy.AccentFlags = 2;
-
-            if (isEnabled)
-            {
-                if (versionInfo >= SystemVersionInfo.Windows10_1809)
-                {
-                    accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_ACRYLICBLURBEHIND;
-                }
-                else if (versionInfo >= SystemVersionInfo.Windows10)
-                {
-                    accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_BLURBEHIND;
-                }
-                else
-                {
-                    accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_TRANSPARENTGRADIENT;
-                }
-            }
-            else
+            else if (versionInfo >= SystemVersionInfo.Windows10)
             {
                 accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_BLURBEHIND;
             }
-
-            accentPolicy.GradientColor = ResourceHelper.GetResource<uint>(ResourceToken.BlurGradientValue);
-
-            var accentPtr = Marshal.AllocHGlobal(accentPolicySize);
-            Marshal.StructureToPtr(accentPolicy, accentPtr, false);
-
-            var data = new InteropValues.WINCOMPATTRDATA
+            else
             {
-                Attribute = InteropValues.WINDOWCOMPOSITIONATTRIB.WCA_ACCENT_POLICY,
-                DataSize = accentPolicySize,
-                Data = accentPtr
-            };
-
-            InteropMethods.Gdip.SetWindowCompositionAttribute(window.GetHandle(), ref data);
-
-            Marshal.FreeHGlobal(accentPtr);
+                accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_TRANSPARENTGRADIENT;
+            }
         }
+        else
+        {
+            accentPolicy.AccentState = InteropValues.ACCENTSTATE.ACCENT_ENABLE_BLURBEHIND;
+        }
+
+        accentPolicy.GradientColor = ResourceHelper.GetResource<uint>(ResourceToken.BlurGradientValue);
+
+        var accentPtr = Marshal.AllocHGlobal(accentPolicySize);
+        Marshal.StructureToPtr(accentPolicy, accentPtr, false);
+
+        var data = new InteropValues.WINCOMPATTRDATA
+        {
+            Attribute = InteropValues.WINDOWCOMPOSITIONATTRIB.WCA_ACCENT_POLICY,
+            DataSize = accentPolicySize,
+            Data = accentPtr
+        };
+
+        InteropMethods.Gdip.SetWindowCompositionAttribute(window.GetHandle(), ref data);
+
+        Marshal.FreeHGlobal(accentPtr);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index 0247440f..eba8f68a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -12,455 +12,454 @@ using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+public class GlowWindow : Window
 {
-    public class GlowWindow : Window
+    internal int DeferGlowChangesCount;
+
+    private readonly GlowEdge[] _glowEdges = new GlowEdge[4];
+
+    private DispatcherTimer _makeGlowVisibleTimer;
+
+    private bool _isGlowVisible;
+
+    private bool _useLogicalSizeForRestore;
+
+    private bool _updatingZOrder;
+
+    private Rect _logicalSizeForRestore = Rect.Empty;
+
+    public static readonly DependencyProperty ActiveGlowColorProperty = DependencyProperty.Register(
+        "ActiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
+
+    public Color ActiveGlowColor
     {
-        internal int DeferGlowChangesCount;
+        get => (Color) GetValue(ActiveGlowColorProperty);
+        set => SetValue(ActiveGlowColorProperty, value);
+    }
 
-        private readonly GlowEdge[] _glowEdges = new GlowEdge[4];
+    public static readonly DependencyProperty InactiveGlowColorProperty = DependencyProperty.Register(
+        "InactiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
 
-        private DispatcherTimer _makeGlowVisibleTimer;
+    public Color InactiveGlowColor
+    {
+        get => (Color) GetValue(InactiveGlowColorProperty);
+        set => SetValue(InactiveGlowColorProperty, value);
+    }
 
-        private bool _isGlowVisible;
+    #region internal
 
-        private bool _useLogicalSizeForRestore;
+    internal void EndDeferGlowChanges()
+    {
+        foreach (var current in LoadedGlowWindows) current.CommitChanges();
+    }
 
-        private bool _updatingZOrder;
+    #endregion
 
-        private Rect _logicalSizeForRestore = Rect.Empty;
+    #region protected
 
-        public static readonly DependencyProperty ActiveGlowColorProperty = DependencyProperty.Register(
-            "ActiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
-
-        public Color ActiveGlowColor
+    protected virtual bool ShouldShowGlow
+    {
+        get
         {
-            get => (Color) GetValue(ActiveGlowColorProperty);
-            set => SetValue(ActiveGlowColorProperty, value);
+            var handle = this.GetHandle();
+            return InteropMethods.IsWindowVisible(handle) && !InteropMethods.IsIconic(handle) &&
+                   !InteropMethods.IsZoomed(handle) && ResizeMode != ResizeMode.NoResize;
         }
+    }
 
-        public static readonly DependencyProperty InactiveGlowColorProperty = DependencyProperty.Register(
-            "InactiveGlowColor", typeof(Color), typeof(GlowWindow), new PropertyMetadata(default(Color), OnGlowColorChanged));
-
-        public Color InactiveGlowColor
+    private IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        if (msg <= InteropValues.WM_WINDOWPOSCHANGED)
         {
-            get => (Color) GetValue(InactiveGlowColorProperty);
-            set => SetValue(InactiveGlowColorProperty, value);
-        }
-
-        #region internal
-
-        internal void EndDeferGlowChanges()
-        {
-            foreach (var current in LoadedGlowWindows) current.CommitChanges();
-        }
-
-        #endregion
-
-        #region protected
-
-        protected virtual bool ShouldShowGlow
-        {
-            get
+            if (msg == InteropValues.WM_ACTIVATE)
             {
-                var handle = this.GetHandle();
-                return InteropMethods.IsWindowVisible(handle) && !InteropMethods.IsIconic(handle) &&
-                       !InteropMethods.IsZoomed(handle) && ResizeMode != ResizeMode.NoResize;
+                return IntPtr.Zero;
+            }
+
+            if (msg != InteropValues.WM_QUIT)
+            {
+                switch (msg)
+                {
+                    case InteropValues.WM_WINDOWPOSCHANGING:
+                        WmWindowPosChanging(lParam);
+                        return IntPtr.Zero;
+                    case InteropValues.WM_WINDOWPOSCHANGED:
+                        WmWindowPosChanged(lParam);
+                        return IntPtr.Zero;
+                    default:
+                        return IntPtr.Zero;
+                }
             }
         }
-
-        private IntPtr HwndSourceHook(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        else
         {
-            if (msg <= InteropValues.WM_WINDOWPOSCHANGED)
+            if (msg <= InteropValues.WM_NCRBUTTONDBLCLK)
             {
-                if (msg == InteropValues.WM_ACTIVATE)
+                switch (msg)
                 {
-                    return IntPtr.Zero;
-                }
-
-                if (msg != InteropValues.WM_QUIT)
-                {
-                    switch (msg)
-                    {
-                        case InteropValues.WM_WINDOWPOSCHANGING:
-                            WmWindowPosChanging(lParam);
-                            return IntPtr.Zero;
-                        case InteropValues.WM_WINDOWPOSCHANGED:
-                            WmWindowPosChanged(lParam);
-                            return IntPtr.Zero;
-                        default:
-                            return IntPtr.Zero;
-                    }
+                    case InteropValues.WM_SETICON:
+                        break;
+                    case InteropValues.WM_NCCREATE:
+                    case InteropValues.WM_NCDESTROY:
+                        return IntPtr.Zero;
+                    case InteropValues.WM_NCACTIVATE:
+                        handled = true;
+                        return WmNcActivate(hWnd, wParam);
+                    default:
+                        switch (msg)
+                        {
+                            case InteropValues.WM_NCRBUTTONDOWN:
+                            case InteropValues.WM_NCRBUTTONUP:
+                            case InteropValues.WM_NCRBUTTONDBLCLK:
+                                handled = true;
+                                return IntPtr.Zero;
+                            default:
+                                return IntPtr.Zero;
+                        }
                 }
             }
             else
             {
-                if (msg <= InteropValues.WM_NCRBUTTONDBLCLK)
+                switch (msg)
                 {
-                    switch (msg)
-                    {
-                        case InteropValues.WM_SETICON:
-                            break;
-                        case InteropValues.WM_NCCREATE:
-                        case InteropValues.WM_NCDESTROY:
-                            return IntPtr.Zero;
-                        case InteropValues.WM_NCACTIVATE:
-                            handled = true;
-                            return WmNcActivate(hWnd, wParam);
-                        default:
-                            switch (msg)
-                            {
-                                case InteropValues.WM_NCRBUTTONDOWN:
-                                case InteropValues.WM_NCRBUTTONUP:
-                                case InteropValues.WM_NCRBUTTONDBLCLK:
-                                    handled = true;
-                                    return IntPtr.Zero;
-                                default:
-                                    return IntPtr.Zero;
-                            }
-                    }
+                    case InteropValues.WM_NCUAHDRAWCAPTION:
+                    case InteropValues.WM_NCUAHDRAWFRAME:
+                        handled = true;
+                        return IntPtr.Zero;
+                    default:
+                        if (msg != InteropValues.WM_SYSCOMMAND) return IntPtr.Zero;
+                        WmSysCommand(hWnd, wParam);
+                        return IntPtr.Zero;
+                }
+            }
+        }
+
+        handled = true;
+        return CallDefWindowProcWithoutVisibleStyle(hWnd, msg, wParam, lParam);
+    }
+
+    protected override void OnActivated(EventArgs e)
+    {
+        UpdateGlowActiveState();
+        base.OnActivated(e);
+    }
+
+    protected override void OnDeactivated(EventArgs e)
+    {
+        UpdateGlowActiveState();
+        base.OnDeactivated(e);
+    }
+
+    protected override void OnClosed(EventArgs e)
+    {
+        StopTimer();
+        DestroyGlowWindows();
+        base.OnClosed(e);
+    }
+
+    protected override void OnSourceInitialized(EventArgs e)
+    {
+        base.OnSourceInitialized(e);
+
+        var hwndSource = this.GetHwndSource();
+        if (hwndSource != null)
+        {
+            hwndSource.AddHook(HwndSourceHook);
+            CreateGlowWindowHandles();
+        }
+    }
+
+    #endregion
+
+    #region private
+
+    private IEnumerable<GlowEdge> LoadedGlowWindows => from w in _glowEdges where w != null select w;
+
+    private bool IsGlowVisible
+    {
+        get => _isGlowVisible;
+        set
+        {
+            if (_isGlowVisible != value)
+            {
+                _isGlowVisible = value;
+                for (var i = 0; i < _glowEdges.Length; i++)
+                {
+                    GetOrCreateGlowWindow(i).IsVisible = value;
+                }
+            }
+        }
+    }
+
+    private GlowEdge GetOrCreateGlowWindow(int direction)
+    {
+        return _glowEdges[direction] ?? (_glowEdges[direction] = new GlowEdge(this, (Dock) direction)
+        {
+            ActiveGlowColor = ActiveGlowColor,
+            InactiveGlowColor = InactiveGlowColor,
+            IsActive = IsActive
+        });
+    }
+
+    private static void OnResizeModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
+    {
+        var customChromeWindow = (GlowWindow) obj;
+        customChromeWindow.UpdateGlowVisibility(false);
+    }
+
+    private static void OnGlowColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args) => ((GlowWindow) obj).UpdateGlowColors();
+
+    private void UpdateGlowColors()
+    {
+        using (DeferGlowChanges())
+        {
+            foreach (var current in LoadedGlowWindows)
+            {
+                current.ActiveGlowColor = ActiveGlowColor;
+                current.InactiveGlowColor = InactiveGlowColor;
+            }
+        }
+    }
+
+    private void UpdateGlowVisibility(bool delayIfNecessary)
+    {
+        var shouldShowGlow = ShouldShowGlow;
+        if (shouldShowGlow != IsGlowVisible)
+        {
+            if (SystemParameters.MinimizeAnimation && shouldShowGlow && delayIfNecessary)
+            {
+                if (_makeGlowVisibleTimer != null)
+                {
+                    _makeGlowVisibleTimer.Stop();
                 }
                 else
                 {
-                    switch (msg)
+                    _makeGlowVisibleTimer = new DispatcherTimer
                     {
-                        case InteropValues.WM_NCUAHDRAWCAPTION:
-                        case InteropValues.WM_NCUAHDRAWFRAME:
-                            handled = true;
-                            return IntPtr.Zero;
-                        default:
-                            if (msg != InteropValues.WM_SYSCOMMAND) return IntPtr.Zero;
-                            WmSysCommand(hWnd, wParam);
-                            return IntPtr.Zero;
-                    }
+                        Interval = TimeSpan.FromMilliseconds(200.0)
+                    };
+                    _makeGlowVisibleTimer.Tick += OnDelayedVisibilityTimerTick;
                 }
+
+                _makeGlowVisibleTimer.Start();
+                return;
             }
 
-            handled = true;
-            return CallDefWindowProcWithoutVisibleStyle(hWnd, msg, wParam, lParam);
-        }
-
-        protected override void OnActivated(EventArgs e)
-        {
-            UpdateGlowActiveState();
-            base.OnActivated(e);
-        }
-
-        protected override void OnDeactivated(EventArgs e)
-        {
-            UpdateGlowActiveState();
-            base.OnDeactivated(e);
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
             StopTimer();
-            DestroyGlowWindows();
-            base.OnClosed(e);
+            IsGlowVisible = shouldShowGlow;
         }
+    }
 
-        protected override void OnSourceInitialized(EventArgs e)
+    private void StopTimer()
+    {
+        if (_makeGlowVisibleTimer != null)
         {
-            base.OnSourceInitialized(e);
+            _makeGlowVisibleTimer.Stop();
+            _makeGlowVisibleTimer.Tick -= OnDelayedVisibilityTimerTick;
+            _makeGlowVisibleTimer = null;
+        }
+    }
 
-            var hwndSource = this.GetHwndSource();
-            if (hwndSource != null)
+    private void OnDelayedVisibilityTimerTick(object sender, EventArgs e)
+    {
+        StopTimer();
+        UpdateGlowWindowPositions(false);
+    }
+
+    private void UpdateGlowWindowPositions(bool delayIfNecessary)
+    {
+        using (DeferGlowChanges())
+        {
+            UpdateGlowVisibility(delayIfNecessary);
+            foreach (var current in LoadedGlowWindows) current.UpdateWindowPos();
+        }
+    }
+
+    private IDisposable DeferGlowChanges() => new ChangeScope(this);
+
+    private void UpdateGlowActiveState()
+    {
+        using (DeferGlowChanges())
+        {
+            foreach (var current in LoadedGlowWindows)
             {
-                hwndSource.AddHook(HwndSourceHook);
-                CreateGlowWindowHandles();
+                current.IsActive = IsActive;
             }
         }
+    }
 
-        #endregion
-
-        #region private
-
-        private IEnumerable<GlowEdge> LoadedGlowWindows => from w in _glowEdges where w != null select w;
-
-        private bool IsGlowVisible
+    private void DestroyGlowWindows()
+    {
+        for (var i = 0; i < _glowEdges.Length; i++)
         {
-            get => _isGlowVisible;
-            set
+            using (_glowEdges[i])
             {
-                if (_isGlowVisible != value)
-                {
-                    _isGlowVisible = value;
-                    for (var i = 0; i < _glowEdges.Length; i++)
-                    {
-                        GetOrCreateGlowWindow(i).IsVisible = value;
-                    }
-                }
+                _glowEdges[i] = null;
             }
         }
+    }
 
-        private GlowEdge GetOrCreateGlowWindow(int direction)
+    private void WmWindowPosChanging(IntPtr lParam)
+    {
+        var windowpos = (InteropValues.WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
+        if ((windowpos.flags & 2u) == 0u && (windowpos.flags & 1u) == 0u && windowpos.cx > 0 && windowpos.cy > 0)
         {
-            return _glowEdges[direction] ?? (_glowEdges[direction] = new GlowEdge(this, (Dock) direction)
+            var rect = new Rect(windowpos.x, windowpos.y, windowpos.cx, windowpos.cy);
+            rect = rect.DeviceToLogicalUnits();
+            if (_useLogicalSizeForRestore)
             {
-                ActiveGlowColor = ActiveGlowColor,
-                InactiveGlowColor = InactiveGlowColor,
-                IsActive = IsActive
-            });
-        }
-
-        private static void OnResizeModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            var customChromeWindow = (GlowWindow) obj;
-            customChromeWindow.UpdateGlowVisibility(false);
-        }
-
-        private static void OnGlowColorChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args) => ((GlowWindow) obj).UpdateGlowColors();
-
-        private void UpdateGlowColors()
-        {
-            using (DeferGlowChanges())
-            {
-                foreach (var current in LoadedGlowWindows)
-                {
-                    current.ActiveGlowColor = ActiveGlowColor;
-                    current.InactiveGlowColor = InactiveGlowColor;
-                }
+                rect = _logicalSizeForRestore;
+                _logicalSizeForRestore = Rect.Empty;
+                _useLogicalSizeForRestore = false;
             }
-        }
 
-        private void UpdateGlowVisibility(bool delayIfNecessary)
+            var logicalRect = GetOnScreenPosition(rect);
+            logicalRect = logicalRect.LogicalToDeviceUnits();
+            windowpos.x = (int) logicalRect.X;
+            windowpos.y = (int) logicalRect.Y;
+            Marshal.StructureToPtr(windowpos, lParam, true);
+        }
+    }
+
+    private void UpdateZOrderOfOwner(IntPtr hwndOwner)
+    {
+        var lastOwnedWindow = IntPtr.Zero;
+        InteropMethods.EnumThreadWindows(InteropMethods.GetCurrentThreadId(), delegate (IntPtr hwnd, IntPtr lParam)
         {
-            var shouldShowGlow = ShouldShowGlow;
-            if (shouldShowGlow != IsGlowVisible)
+            if (InteropMethods.GetWindow(hwnd, 4) == hwndOwner) lastOwnedWindow = hwnd;
+            return true;
+        }, IntPtr.Zero);
+
+        if (lastOwnedWindow != IntPtr.Zero && InteropMethods.GetWindow(hwndOwner, 3) != lastOwnedWindow)
+            InteropMethods.SetWindowPos(hwndOwner, lastOwnedWindow, 0, 0, 0, 0, 19);
+    }
+
+    private void UpdateZOrderOfThisAndOwner()
+    {
+        if (_updatingZOrder) return;
+        try
+        {
+            _updatingZOrder = true;
+            var windowInteropHelper = new WindowInteropHelper(this);
+            var handle = windowInteropHelper.Handle;
+            foreach (var current in LoadedGlowWindows)
             {
-                if (SystemParameters.MinimizeAnimation && shouldShowGlow && delayIfNecessary)
-                {
-                    if (_makeGlowVisibleTimer != null)
-                    {
-                        _makeGlowVisibleTimer.Stop();
-                    }
-                    else
-                    {
-                        _makeGlowVisibleTimer = new DispatcherTimer
-                        {
-                            Interval = TimeSpan.FromMilliseconds(200.0)
-                        };
-                        _makeGlowVisibleTimer.Tick += OnDelayedVisibilityTimerTick;
-                    }
-
-                    _makeGlowVisibleTimer.Start();
-                    return;
-                }
-
-                StopTimer();
-                IsGlowVisible = shouldShowGlow;
+                var window = InteropMethods.GetWindow(current.Handle, 3);
+                if (window != handle) InteropMethods.SetWindowPos(current.Handle, handle, 0, 0, 0, 0, 19);
+                handle = current.Handle;
             }
-        }
 
-        private void StopTimer()
+            var owner = windowInteropHelper.Owner;
+            if (owner != IntPtr.Zero) UpdateZOrderOfOwner(owner);
+        }
+        finally
         {
-            if (_makeGlowVisibleTimer != null)
-            {
-                _makeGlowVisibleTimer.Stop();
-                _makeGlowVisibleTimer.Tick -= OnDelayedVisibilityTimerTick;
-                _makeGlowVisibleTimer = null;
-            }
+            _updatingZOrder = false;
         }
+    }
 
-        private void OnDelayedVisibilityTimerTick(object sender, EventArgs e)
-        {
-            StopTimer();
-            UpdateGlowWindowPositions(false);
-        }
-
-        private void UpdateGlowWindowPositions(bool delayIfNecessary)
-        {
-            using (DeferGlowChanges())
-            {
-                UpdateGlowVisibility(delayIfNecessary);
-                foreach (var current in LoadedGlowWindows) current.UpdateWindowPos();
-            }
-        }
-
-        private IDisposable DeferGlowChanges() => new ChangeScope(this);
-
-        private void UpdateGlowActiveState()
-        {
-            using (DeferGlowChanges())
-            {
-                foreach (var current in LoadedGlowWindows)
-                {
-                    current.IsActive = IsActive;
-                }
-            }
-        }
-
-        private void DestroyGlowWindows()
-        {
-            for (var i = 0; i < _glowEdges.Length; i++)
-            {
-                using (_glowEdges[i])
-                {
-                    _glowEdges[i] = null;
-                }
-            }
-        }
-
-        private void WmWindowPosChanging(IntPtr lParam)
+    private void WmWindowPosChanged(IntPtr lParam)
+    {
+        try
         {
             var windowpos = (InteropValues.WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
-            if ((windowpos.flags & 2u) == 0u && (windowpos.flags & 1u) == 0u && windowpos.cx > 0 && windowpos.cy > 0)
-            {
-                var rect = new Rect(windowpos.x, windowpos.y, windowpos.cx, windowpos.cy);
-                rect = rect.DeviceToLogicalUnits();
-                if (_useLogicalSizeForRestore)
-                {
-                    rect = _logicalSizeForRestore;
-                    _logicalSizeForRestore = Rect.Empty;
-                    _useLogicalSizeForRestore = false;
-                }
 
-                var logicalRect = GetOnScreenPosition(rect);
-                logicalRect = logicalRect.LogicalToDeviceUnits();
-                windowpos.x = (int) logicalRect.X;
-                windowpos.y = (int) logicalRect.Y;
-                Marshal.StructureToPtr(windowpos, lParam, true);
-            }
+            UpdateGlowWindowPositions((windowpos.flags & 64u) == 0u);
+            UpdateZOrderOfThisAndOwner();
         }
-
-        private void UpdateZOrderOfOwner(IntPtr hwndOwner)
+        catch
         {
-            var lastOwnedWindow = IntPtr.Zero;
-            InteropMethods.EnumThreadWindows(InteropMethods.GetCurrentThreadId(), delegate (IntPtr hwnd, IntPtr lParam)
-            {
-                if (InteropMethods.GetWindow(hwnd, 4) == hwndOwner) lastOwnedWindow = hwnd;
-                return true;
-            }, IntPtr.Zero);
-
-            if (lastOwnedWindow != IntPtr.Zero && InteropMethods.GetWindow(hwndOwner, 3) != lastOwnedWindow)
-                InteropMethods.SetWindowPos(hwndOwner, lastOwnedWindow, 0, 0, 0, 0, 19);
+            // ignored
         }
-
-        private void UpdateZOrderOfThisAndOwner()
-        {
-            if (_updatingZOrder) return;
-            try
-            {
-                _updatingZOrder = true;
-                var windowInteropHelper = new WindowInteropHelper(this);
-                var handle = windowInteropHelper.Handle;
-                foreach (var current in LoadedGlowWindows)
-                {
-                    var window = InteropMethods.GetWindow(current.Handle, 3);
-                    if (window != handle) InteropMethods.SetWindowPos(current.Handle, handle, 0, 0, 0, 0, 19);
-                    handle = current.Handle;
-                }
-
-                var owner = windowInteropHelper.Owner;
-                if (owner != IntPtr.Zero) UpdateZOrderOfOwner(owner);
-            }
-            finally
-            {
-                _updatingZOrder = false;
-            }
-        }
-
-        private void WmWindowPosChanged(IntPtr lParam)
-        {
-            try
-            {
-                var windowpos = (InteropValues.WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
-
-                UpdateGlowWindowPositions((windowpos.flags & 64u) == 0u);
-                UpdateZOrderOfThisAndOwner();
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        private Rect GetOnScreenPosition(Rect floatRect)
-        {
-            var result = floatRect;
-            floatRect = floatRect.LogicalToDeviceUnits();
-            ScreenHelper.FindMaximumSingleMonitorRectangle(floatRect, out _, out var rect2);
-            if (!floatRect.IntersectsWith(rect2))
-            {
-                ScreenHelper.FindMonitorRectsFromPoint(InteropMethods.GetCursorPos(), out _, out rect2);
-                rect2 = rect2.DeviceToLogicalUnits();
-                if (result.Width > rect2.Width) result.Width = rect2.Width;
-                if (result.Height > rect2.Height) result.Height = rect2.Height;
-                if (rect2.Right <= result.X) result.X = rect2.Right - result.Width;
-                if (rect2.Left > result.X + result.Width) result.X = rect2.Left;
-                if (rect2.Bottom <= result.Y) result.Y = rect2.Bottom - result.Height;
-                if (rect2.Top > result.Y + result.Height) result.Y = rect2.Top;
-            }
-
-            return result;
-        }
-
-        private static InteropValues.MONITORINFO MonitorInfoFromWindow(IntPtr hWnd)
-        {
-            var hMonitor = InteropMethods.MonitorFromWindow(hWnd, 2);
-            var result = default(InteropValues.MONITORINFO);
-            result.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
-            InteropMethods.GetMonitorInfo(hMonitor, ref result);
-            return result;
-        }
-
-        private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam) => InteropMethods.DefWindowProc(hWnd, InteropValues.WM_NCACTIVATE, wParam, InteropMethods.HRGN_NONE);
-
-        private bool IsAeroSnappedToMonitor(IntPtr hWnd)
-        {
-            var monitorinfo = MonitorInfoFromWindow(hWnd);
-            var logicalRect = new Rect(Left, Top, Width, Height);
-            logicalRect = logicalRect.LogicalToDeviceUnits();
-            return MathHelper.AreClose(monitorinfo.rcWork.Height, logicalRect.Height) && MathHelper.AreClose(monitorinfo.rcWork.Top, logicalRect.Top);
-        }
-
-        private void WmSysCommand(IntPtr hWnd, IntPtr wParam)
-        {
-            var num = InteropMethods.GET_SC_WPARAM(wParam);
-
-            if (num == InteropValues.SC_MOVE)
-            {
-                InteropMethods.RedrawWindow(hWnd, IntPtr.Zero, IntPtr.Zero,
-                    InteropValues.RedrawWindowFlags.Invalidate | InteropValues.RedrawWindowFlags.NoChildren |
-                    InteropValues.RedrawWindowFlags.UpdateNow | InteropValues.RedrawWindowFlags.Frame);
-            }
-
-            if ((num == InteropValues.SC_MAXIMIZE || num == InteropValues.SC_MINIMIZE || num == InteropValues.SC_MOVE ||
-                 num == InteropValues.SC_SIZE) && WindowState == WindowState.Normal && !IsAeroSnappedToMonitor(hWnd))
-            {
-                _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
-            }
-
-            if (num == InteropValues.SC_MOVE && WindowState == WindowState.Maximized && _logicalSizeForRestore == Rect.Empty)
-            {
-                _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
-            }
-
-            if (num == InteropValues.SC_RESTORE && WindowState != WindowState.Minimized &&
-                _logicalSizeForRestore.Width > 0.0 && _logicalSizeForRestore.Height > 0.0)
-            {
-                Left = _logicalSizeForRestore.Left;
-                Top = _logicalSizeForRestore.Top;
-                Width = _logicalSizeForRestore.Width;
-                Height = _logicalSizeForRestore.Height;
-                _useLogicalSizeForRestore = true;
-            }
-        }
-
-        private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
-        {
-            var flag = VisualHelper.ModifyStyle(hWnd, InteropValues.WS_VISIBLE, 0);
-            var result = InteropMethods.DefWindowProc(hWnd, msg, wParam, lParam);
-            if (flag) VisualHelper.ModifyStyle(hWnd, 0, InteropValues.WS_VISIBLE);
-            return result;
-        }
-
-        private void CreateGlowWindowHandles()
-        {
-            for (var i = 0; i < _glowEdges.Length; i++) GetOrCreateGlowWindow(i).EnsureHandle();
-        }
-
-        #endregion
-
     }
-}
+
+    private Rect GetOnScreenPosition(Rect floatRect)
+    {
+        var result = floatRect;
+        floatRect = floatRect.LogicalToDeviceUnits();
+        ScreenHelper.FindMaximumSingleMonitorRectangle(floatRect, out _, out var rect2);
+        if (!floatRect.IntersectsWith(rect2))
+        {
+            ScreenHelper.FindMonitorRectsFromPoint(InteropMethods.GetCursorPos(), out _, out rect2);
+            rect2 = rect2.DeviceToLogicalUnits();
+            if (result.Width > rect2.Width) result.Width = rect2.Width;
+            if (result.Height > rect2.Height) result.Height = rect2.Height;
+            if (rect2.Right <= result.X) result.X = rect2.Right - result.Width;
+            if (rect2.Left > result.X + result.Width) result.X = rect2.Left;
+            if (rect2.Bottom <= result.Y) result.Y = rect2.Bottom - result.Height;
+            if (rect2.Top > result.Y + result.Height) result.Y = rect2.Top;
+        }
+
+        return result;
+    }
+
+    private static InteropValues.MONITORINFO MonitorInfoFromWindow(IntPtr hWnd)
+    {
+        var hMonitor = InteropMethods.MonitorFromWindow(hWnd, 2);
+        var result = default(InteropValues.MONITORINFO);
+        result.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
+        InteropMethods.GetMonitorInfo(hMonitor, ref result);
+        return result;
+    }
+
+    private IntPtr WmNcActivate(IntPtr hWnd, IntPtr wParam) => InteropMethods.DefWindowProc(hWnd, InteropValues.WM_NCACTIVATE, wParam, InteropMethods.HRGN_NONE);
+
+    private bool IsAeroSnappedToMonitor(IntPtr hWnd)
+    {
+        var monitorinfo = MonitorInfoFromWindow(hWnd);
+        var logicalRect = new Rect(Left, Top, Width, Height);
+        logicalRect = logicalRect.LogicalToDeviceUnits();
+        return MathHelper.AreClose(monitorinfo.rcWork.Height, logicalRect.Height) && MathHelper.AreClose(monitorinfo.rcWork.Top, logicalRect.Top);
+    }
+
+    private void WmSysCommand(IntPtr hWnd, IntPtr wParam)
+    {
+        var num = InteropMethods.GET_SC_WPARAM(wParam);
+
+        if (num == InteropValues.SC_MOVE)
+        {
+            InteropMethods.RedrawWindow(hWnd, IntPtr.Zero, IntPtr.Zero,
+                InteropValues.RedrawWindowFlags.Invalidate | InteropValues.RedrawWindowFlags.NoChildren |
+                InteropValues.RedrawWindowFlags.UpdateNow | InteropValues.RedrawWindowFlags.Frame);
+        }
+
+        if ((num == InteropValues.SC_MAXIMIZE || num == InteropValues.SC_MINIMIZE || num == InteropValues.SC_MOVE ||
+             num == InteropValues.SC_SIZE) && WindowState == WindowState.Normal && !IsAeroSnappedToMonitor(hWnd))
+        {
+            _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
+        }
+
+        if (num == InteropValues.SC_MOVE && WindowState == WindowState.Maximized && _logicalSizeForRestore == Rect.Empty)
+        {
+            _logicalSizeForRestore = new Rect(Left, Top, Width, Height);
+        }
+
+        if (num == InteropValues.SC_RESTORE && WindowState != WindowState.Minimized &&
+            _logicalSizeForRestore.Width > 0.0 && _logicalSizeForRestore.Height > 0.0)
+        {
+            Left = _logicalSizeForRestore.Left;
+            Top = _logicalSizeForRestore.Top;
+            Width = _logicalSizeForRestore.Width;
+            Height = _logicalSizeForRestore.Height;
+            _useLogicalSizeForRestore = true;
+        }
+    }
+
+    private IntPtr CallDefWindowProcWithoutVisibleStyle(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam)
+    {
+        var flag = VisualHelper.ModifyStyle(hWnd, InteropValues.WS_VISIBLE, 0);
+        var result = InteropMethods.DefWindowProc(hWnd, msg, wParam, lParam);
+        if (flag) VisualHelper.ModifyStyle(hWnd, 0, InteropValues.WS_VISIBLE);
+        return result;
+    }
+
+    private void CreateGlowWindowHandles()
+    {
+        for (var i = 0; i < _glowEdges.Length; i++) GetOrCreateGlowWindow(i).EnsureHandle();
+    }
+
+    #endregion
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
index bd8b9d79..ea4055f8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
@@ -7,124 +7,123 @@ using System.Windows.Media.Imaging;
 using HandyControl.Data;
 using HandyControl.Interactivity;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     图片浏览器
+/// </summary>
+[TemplatePart(Name = ElementPanelTop, Type = typeof(Panel))]
+[TemplatePart(Name = ElementImageViewer, Type = typeof(ImageViewer))]
+public class ImageBrowser : Window
 {
-    /// <summary>
-    ///     图片浏览器
-    /// </summary>
-    [TemplatePart(Name = ElementPanelTop, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementImageViewer, Type = typeof(ImageViewer))]
-    public class ImageBrowser : Window
+    #region Constants
+
+    private const string ElementPanelTop = "PART_PanelTop";
+
+    private const string ElementImageViewer = "PART_ImageViewer";
+
+    #endregion Constants
+
+    #region Data
+
+    private Panel _panelTop;
+
+    private ImageViewer _imageViewer;
+
+    #endregion Data
+
+    static ImageBrowser()
     {
-        #region Constants
+        IsFullScreenProperty.AddOwner(typeof(ImageBrowser), new PropertyMetadata(ValueBoxes.FalseBox));
+    }
 
-        private const string ElementPanelTop = "PART_PanelTop";
+    public ImageBrowser()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
 
-        private const string ElementImageViewer = "PART_ImageViewer";
+        WindowStartupLocation = WindowStartupLocation.CenterScreen;
+        WindowStyle = WindowStyle.None;
+        AllowsTransparency = true;
+    }
 
-        #endregion Constants
-
-        #region Data
-
-        private Panel _panelTop;
-
-        private ImageViewer _imageViewer;
-
-        #endregion Data
-
-        static ImageBrowser()
+    /// <summary>
+    ///     带一个图片Uri的构造函数
+    /// </summary>
+    /// <param name="uri"></param>
+    public ImageBrowser(Uri uri) : this()
+    {
+        Loaded += (s, e) =>
         {
-            IsFullScreenProperty.AddOwner(typeof(ImageBrowser), new PropertyMetadata(ValueBoxes.FalseBox));
-        }
-
-        public ImageBrowser()
-        {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, ButtonClose_OnClick));
-
-            WindowStartupLocation = WindowStartupLocation.CenterScreen;
-            WindowStyle = WindowStyle.None;
-            AllowsTransparency = true;
-        }
-
-        /// <summary>
-        ///     带一个图片Uri的构造函数
-        /// </summary>
-        /// <param name="uri"></param>
-        public ImageBrowser(Uri uri) : this()
-        {
-            Loaded += (s, e) =>
+            try
             {
-                try
+                _imageViewer.ImageSource = BitmapFrame.Create(uri);
+                _imageViewer.ImgPath = uri.AbsolutePath;
+
+                if (File.Exists(_imageViewer.ImgPath))
                 {
-                    _imageViewer.ImageSource = BitmapFrame.Create(uri);
-                    _imageViewer.ImgPath = uri.AbsolutePath;
-
-                    if (File.Exists(_imageViewer.ImgPath))
-                    {
-                        var info = new FileInfo(_imageViewer.ImgPath);
-                        _imageViewer.ImgSize = info.Length;
-                    }
+                    var info = new FileInfo(_imageViewer.ImgPath);
+                    _imageViewer.ImgSize = info.Length;
                 }
-                catch
-                {
-                    MessageBox.Show(Properties.Langs.Lang.ErrorImgPath);
-                }
-            };
+            }
+            catch
+            {
+                MessageBox.Show(Properties.Langs.Lang.ErrorImgPath);
+            }
+        };
+    }
+
+    /// <summary>
+    ///     带一个图片路径的构造函数
+    /// </summary>
+    /// <param name="path"></param>
+    public ImageBrowser(string path) : this(new Uri(path))
+    {
+
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_panelTop != null)
+        {
+            _panelTop.MouseLeftButtonDown -= PanelTopOnMouseLeftButtonDown;
         }
 
-        /// <summary>
-        ///     带一个图片路径的构造函数
-        /// </summary>
-        /// <param name="path"></param>
-        public ImageBrowser(string path) : this(new Uri(path))
+        if (_imageViewer != null)
         {
-
+            _imageViewer.MouseLeftButtonDown -= ImageViewer_MouseLeftButtonDown;
         }
 
-        public override void OnApplyTemplate()
+        base.OnApplyTemplate();
+
+        _panelTop = GetTemplateChild(ElementPanelTop) as Panel;
+        _imageViewer = GetTemplateChild(ElementImageViewer) as ImageViewer;
+
+        if (_panelTop != null)
         {
-            if (_panelTop != null)
-            {
-                _panelTop.MouseLeftButtonDown -= PanelTopOnMouseLeftButtonDown;
-            }
-
-            if (_imageViewer != null)
-            {
-                _imageViewer.MouseLeftButtonDown -= ImageViewer_MouseLeftButtonDown;
-            }
-
-            base.OnApplyTemplate();
-
-            _panelTop = GetTemplateChild(ElementPanelTop) as Panel;
-            _imageViewer = GetTemplateChild(ElementImageViewer) as ImageViewer;
-
-            if (_panelTop != null)
-            {
-                _panelTop.MouseLeftButtonDown += PanelTopOnMouseLeftButtonDown;
-            }
-
-            if (_imageViewer != null)
-            {
-                _imageViewer.MouseLeftButtonDown += ImageViewer_MouseLeftButtonDown;
-            }
+            _panelTop.MouseLeftButtonDown += PanelTopOnMouseLeftButtonDown;
         }
 
-        private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
-
-        private void PanelTopOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        if (_imageViewer != null)
         {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                DragMove();
-            }
-        }
-
-        private void ImageViewer_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed && !(_imageViewer.ImageWidth > ActualWidth || _imageViewer.ImageHeight > ActualHeight))
-            {
-                DragMove();
-            }
+            _imageViewer.MouseLeftButtonDown += ImageViewer_MouseLeftButtonDown;
         }
     }
-}
+
+    private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
+
+    private void PanelTopOnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.LeftButton == MouseButtonState.Pressed)
+        {
+            DragMove();
+        }
+    }
+
+    private void ImageViewer_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.LeftButton == MouseButtonState.Pressed && !(_imageViewer.ImageWidth > ActualWidth || _imageViewer.ImageHeight > ActualHeight))
+        {
+            DragMove();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 577a7de2..780b9e27 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -13,642 +13,641 @@ using HandyControl.Properties.Langs;
 using HandyControl.Tools;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     消息框
+/// </summary>
+[SuppressMessage("ReSharper", "RedundantDelegateCreation")]
+[TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
+[TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
+
+public sealed class MessageBox : Window
 {
-    /// <summary>
-    ///     消息框
-    /// </summary>
-    [SuppressMessage("ReSharper", "RedundantDelegateCreation")]
-    [TemplatePart(Name = ElementPanel, Type = typeof(Panel))]
-    [TemplatePart(Name = ElementButtonClose, Type = typeof(Button))]
+    private const string ElementPanel = "PART_Panel";
 
-    public sealed class MessageBox : Window
+    private const string ElementButtonClose = "PART_ButtonClose";
+
+    private Button _buttonClose;
+
+    private Panel _panel;
+
+    private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
+
+    private Button _buttonOk;
+
+    private Button _buttonCancel;
+
+    private Button _buttonYes;
+
+    private Button _buttonNo;
+
+    private bool _showOk;
+
+    private bool _showCancel;
+
+    private bool _showYes;
+
+    private bool _showNo;
+
+    private IntPtr _lastActiveWindowIntPtr;
+
+    public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
+        "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
+
+    public string Message
     {
-        private const string ElementPanel = "PART_Panel";
+        get => (string) GetValue(MessageProperty);
+        set => SetValue(MessageProperty, value);
+    }
 
-        private const string ElementButtonClose = "PART_ButtonClose";
+    public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
+        "Image", typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
 
-        private Button _buttonClose;
+    public Geometry Image
+    {
+        get => (Geometry) GetValue(ImageProperty);
+        set => SetValue(ImageProperty, value);
+    }
 
-        private Panel _panel;
+    public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
+        "ImageBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
 
-        private MessageBoxResult _messageBoxResult = MessageBoxResult.Cancel;
+    public Brush ImageBrush
+    {
+        get => (Brush) GetValue(ImageBrushProperty);
+        set => SetValue(ImageBrushProperty, value);
+    }
 
-        private Button _buttonOk;
+    public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
+        "ShowImage", typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
 
-        private Button _buttonCancel;
+    public bool ShowImage
+    {
+        get => (bool) GetValue(ShowImageProperty);
+        set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private Button _buttonYes;
-
-        private Button _buttonNo;
-
-        private bool _showOk;
-
-        private bool _showCancel;
-
-        private bool _showYes;
-
-        private bool _showNo;
-
-        private IntPtr _lastActiveWindowIntPtr;
-
-        public static readonly DependencyProperty MessageProperty = DependencyProperty.Register(
-            "Message", typeof(string), typeof(MessageBox), new PropertyMetadata(default(string)));
-
-        public string Message
+    private MessageBox()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
         {
-            get => (string) GetValue(MessageProperty);
-            set => SetValue(MessageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageProperty = DependencyProperty.Register(
-            "Image", typeof(Geometry), typeof(MessageBox), new PropertyMetadata(default(Geometry)));
-
-        public Geometry Image
+            _messageBoxResult = MessageBoxResult.OK;
+            Close();
+        }, (s, e) => e.CanExecute = _showOk));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
         {
-            get => (Geometry) GetValue(ImageProperty);
-            set => SetValue(ImageProperty, value);
-        }
-
-        public static readonly DependencyProperty ImageBrushProperty = DependencyProperty.Register(
-            "ImageBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(default(Brush)));
-
-        public Brush ImageBrush
+            _messageBoxResult = MessageBoxResult.Cancel;
+            Close();
+        }, (s, e) => e.CanExecute = _showCancel));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
         {
-            get => (Brush) GetValue(ImageBrushProperty);
-            set => SetValue(ImageBrushProperty, value);
-        }
-
-        public static readonly DependencyProperty ShowImageProperty = DependencyProperty.Register(
-            "ShowImage", typeof(bool), typeof(MessageBox), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowImage
+            _messageBoxResult = MessageBoxResult.Yes;
+            Close();
+        }, (s, e) => e.CanExecute = _showYes));
+        CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
         {
-            get => (bool) GetValue(ShowImageProperty);
-            set => SetValue(ShowImageProperty, ValueBoxes.BooleanBox(value));
-        }
+            _messageBoxResult = MessageBoxResult.No;
+            Close();
+        }, (s, e) => e.CanExecute = _showNo));
+    }
 
-        private MessageBox()
+    protected override void OnSourceInitialized(EventArgs e)
+    {
+        if (_showYes && !_showCancel)
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, (s, e) =>
+            var hMenu = InteropMethods.GetSystemMenu(this.GetHandle(), false);
+            if (hMenu != IntPtr.Zero)
             {
-                _messageBoxResult = MessageBoxResult.OK;
-                Close();
-            }, (s, e) => e.CanExecute = _showOk));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Cancel;
-                Close();
-            }, (s, e) => e.CanExecute = _showCancel));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Yes, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.Yes;
-                Close();
-            }, (s, e) => e.CanExecute = _showYes));
-            CommandBindings.Add(new CommandBinding(ControlCommands.No, (s, e) =>
-            {
-                _messageBoxResult = MessageBoxResult.No;
-                Close();
-            }, (s, e) => e.CanExecute = _showNo));
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            if (_showYes && !_showCancel)
-            {
-                var hMenu = InteropMethods.GetSystemMenu(this.GetHandle(), false);
-                if (hMenu != IntPtr.Zero)
-                {
-                    InteropMethods.EnableMenuItem(hMenu, InteropValues.SC_CLOSE, InteropValues.MF_BYCOMMAND | InteropValues.MF_GRAYED);
-                }
-
-                if (_buttonClose != null)
-                {
-                    _buttonClose.IsEnabled = false;
-                }
+                InteropMethods.EnableMenuItem(hMenu, InteropValues.SC_CLOSE, InteropValues.MF_BYCOMMAND | InteropValues.MF_GRAYED);
             }
 
-            base.OnSourceInitialized(e);
-
-            _lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
-            Activate();
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
-
-            base.OnClosed(e);
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            _panel = GetTemplateChild(ElementPanel) as Panel;
-            if (_panel != null)
-            {
-                if (_buttonOk != null)
-                {
-                    _panel.Children.Add(_buttonOk);
-                }
-
-                if (_buttonYes != null)
-                {
-                    _panel.Children.Add(_buttonYes);
-                }
-
-                if (_buttonNo != null)
-                {
-                    _panel.Children.Add(_buttonNo);
-                }
-
-                if (_buttonCancel != null)
-                {
-                    _panel.Children.Add(_buttonCancel);
-                }
-            }
-
-            _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
             if (_buttonClose != null)
             {
-                _buttonClose.Click += ButtonClose_Click;
+                _buttonClose.IsEnabled = false;
             }
         }
 
-        private void ButtonClose_Click(object sender, RoutedEventArgs e) => Close();
+        base.OnSourceInitialized(e);
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
+        _lastActiveWindowIntPtr = InteropMethods.GetForegroundWindow();
+        Activate();
+    }
+
+    protected override void OnClosed(EventArgs e)
+    {
+        InteropMethods.SetForegroundWindow(_lastActiveWindowIntPtr);
+
+        base.OnClosed(e);
+    }
+
+    public override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
+
+        _panel = GetTemplateChild(ElementPanel) as Panel;
+        if (_panel != null)
         {
-            if (e.Key == Key.System && e.SystemKey == Key.F4)
+            if (_buttonOk != null)
             {
-                e.Handled = true;
-                return;
+                _panel.Children.Add(_buttonOk);
             }
 
-            if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
+            if (_buttonYes != null)
             {
-                var builder = new StringBuilder();
-                var line = new string('-', 27);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Title);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                builder.Append(Message);
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
-                if (_showOk)
-                {
-                    builder.Append(Lang.Confirm);
-                    builder.Append("   ");
-                }
-                if (_showYes)
-                {
-                    builder.Append(Lang.Yes);
-                    builder.Append("   ");
-                }
-                if (_showNo)
-                {
-                    builder.Append(Lang.No);
-                    builder.Append("   ");
-                }
-                if (_showCancel)
-                {
-                    builder.Append(Lang.Cancel);
-                    builder.Append("   ");
-                }
-                builder.Append(Environment.NewLine);
-                builder.Append(line);
-                builder.Append(Environment.NewLine);
+                _panel.Children.Add(_buttonYes);
+            }
 
-                try
-                {
-                    Clipboard.SetDataObject(builder.ToString());
-                }
-                catch
-                {
-                    // ignored
-                }
+            if (_buttonNo != null)
+            {
+                _panel.Children.Add(_buttonNo);
+            }
+
+            if (_buttonCancel != null)
+            {
+                _panel.Children.Add(_buttonCancel);
             }
         }
 
-        /// <summary>
-        ///     成功
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Success(string messageBoxText, string caption = null)
+        _buttonClose = GetTemplateChild(ElementButtonClose) as Button;
+        if (_buttonClose != null)
         {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
-                messageBox.ShowImage = true;
-                messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.SuccessGeometry);
-                messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.SuccessBrush);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     消息
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Info(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
-                SetImage(messageBox, MessageBoxImage.Information);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     警告
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Warning(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
-                SetImage(messageBox, MessageBoxImage.Warning);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     错误
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Error(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
-                SetImage(messageBox, MessageBoxImage.Error);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     严重
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
-                SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
-                messageBox.ShowImage = true;
-                messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.FatalGeometry);
-                messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryTextBrush);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     询问
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        public static MessageBoxResult Ask(string messageBoxText, string caption = null)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
-                SetButtonStatus(messageBox, MessageBoxButton.OKCancel, MessageBoxResult.Cancel);
-                SetImage(messageBox, MessageBoxImage.Question);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     自定义信息展示
-        /// </summary>
-        /// <param name="info"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(MessageBoxInfo info)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(null, info.Message, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
-                SetButtonStatus(messageBox, info.Button, info.DefaultResult);
-
-                if (!string.IsNullOrEmpty(info.IconKey))
-                {
-                    messageBox.ShowImage = true;
-                    messageBox.Image = ResourceHelper.GetResource<Geometry>(info.IconKey) ?? info.Icon;
-                    messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey) ?? info.IconBrush;
-                }
-
-                if (info.StyleKey != null)
-                {
-                    messageBox.Style = ResourceHelper.GetResource<Style>(info.StyleKey) ?? info.Style;
-                }
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(string messageBoxText, string caption = null,
-            MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
-            MessageBoxResult defaultResult = MessageBoxResult.None) =>
-            Show(null, messageBoxText, caption, button, icon, defaultResult);
-
-        /// <summary>
-        ///     信息展示
-        /// </summary>
-        /// <param name="owner"></param>
-        /// <param name="messageBoxText"></param>
-        /// <param name="caption"></param>
-        /// <param name="button"></param>
-        /// <param name="icon"></param>
-        /// <param name="defaultResult"></param>
-        /// <returns></returns>
-        public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
-        {
-            MessageBox messageBox = null;
-            Application.Current.Dispatcher.Invoke(new Action(() =>
-            {
-                messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
-                SetButtonStatus(messageBox, button, defaultResult);
-                SetImage(messageBox, icon);
-                SystemSounds.Asterisk.Play();
-                messageBox.ShowDialog();
-            }));
-
-            return messageBox._messageBoxResult;
-        }
-
-        private static MessageBox CreateMessageBox(
-            System.Windows.Window owner,
-            string messageBoxText,
-            string caption,
-            MessageBoxButton button,
-            MessageBoxImage icon,
-            MessageBoxResult defaultResult)
-        {
-            if (!IsValidMessageBoxButton(button))
-            {
-                throw new InvalidEnumArgumentException(nameof(button), (int) button, typeof(MessageBoxButton));
-            }
-            if (!IsValidMessageBoxImage(icon))
-            {
-                throw new InvalidEnumArgumentException(nameof(icon), (int) icon, typeof(MessageBoxImage));
-            }
-            if (!IsValidMessageBoxResult(defaultResult))
-            {
-                throw new InvalidEnumArgumentException(nameof(defaultResult), (int) defaultResult, typeof(MessageBoxResult));
-            }
-
-            var ownerWindow = owner ?? WindowHelper.GetActiveWindow();
-            var ownerIsNull = ownerWindow is null;
-
-            return new MessageBox
-            {
-                Message = messageBoxText,
-                Owner = ownerWindow,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ShowTitle = true,
-                Title = caption ?? string.Empty,
-                Topmost = ownerIsNull,
-                _messageBoxResult = defaultResult
-            };
-        }
-
-        private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton, MessageBoxResult defaultResult)
-        {
-            switch (messageBoxButton)
-            {
-                case MessageBoxButton.OK:
-                    messageBox._showOk = true;
-                    messageBox._buttonOk = new Button
-                    {
-                        IsCancel = true,
-                        IsDefault = true,
-                        Content = Lang.Confirm,
-                        Command = ControlCommands.Confirm,
-                        Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle")
-                    };
-
-                    break;
-                case MessageBoxButton.OKCancel:
-                    messageBox._showOk = true;
-                    messageBox._buttonOk = new Button
-                    {
-                        Content = Lang.Confirm,
-                        Command = ControlCommands.Confirm
-                    };
-
-                    messageBox._showCancel = true;
-                    messageBox._buttonCancel = new Button
-                    {
-                        IsCancel = true,
-                        Content = Lang.Cancel,
-                        Command = ControlCommands.Cancel
-                    };
-
-                    if (defaultResult == MessageBoxResult.Cancel)
-                    {
-                        messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonCancel.IsDefault = true;
-                    }
-                    else
-                    {
-                        messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonOk.IsDefault = true;
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                    }
-
-                    break;
-                case MessageBoxButton.YesNo:
-                    messageBox._showYes = true;
-                    messageBox._buttonYes = new Button
-                    {
-                        Content = Lang.Yes,
-                        Command = ControlCommands.Yes
-                    };
-
-                    messageBox._showNo = true;
-                    messageBox._buttonNo = new Button
-                    {
-                        Content = Lang.No,
-                        Command = ControlCommands.No
-                    };
-
-                    if (defaultResult == MessageBoxResult.No)
-                    {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonNo.IsDefault = true;
-                    }
-                    else
-                    {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonYes.IsDefault = true;
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                    }
-
-                    break;
-                case MessageBoxButton.YesNoCancel:
-                    messageBox._showYes = true;
-                    messageBox._buttonYes = new Button
-                    {
-                        Content = Lang.Yes,
-                        Command = ControlCommands.Yes
-                    };
-
-                    messageBox._showNo = true;
-                    messageBox._buttonNo = new Button
-                    {
-                        Content = Lang.No,
-                        Command = ControlCommands.No
-                    };
-
-                    messageBox._showCancel = true;
-                    messageBox._buttonCancel = new Button
-                    {
-                        IsCancel = true,
-                        Content = Lang.Cancel,
-                        Command = ControlCommands.Cancel
-                    };
-
-                    if (defaultResult == MessageBoxResult.No)
-                    {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonNo.IsDefault = true;
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                    }
-                    else if (defaultResult == MessageBoxResult.Cancel)
-                    {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonCancel.IsDefault = true;
-                    }
-                    else
-                    {
-                        messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
-                        messageBox._buttonYes.IsDefault = true;
-                        messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                        messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
-                    }
-
-                    break;
-            }
-        }
-
-        private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
-        {
-            var iconKey = string.Empty;
-            var iconBrushKey = string.Empty;
-
-            switch (messageBoxImage)
-            {
-                case MessageBoxImage.Error:
-                    iconKey = ResourceToken.ErrorGeometry;
-                    iconBrushKey = ResourceToken.DangerBrush;
-                    break;
-                case MessageBoxImage.Question:
-                    iconKey = ResourceToken.AskGeometry;
-                    iconBrushKey = ResourceToken.AccentBrush;
-                    break;
-                case MessageBoxImage.Warning:
-                    iconKey = ResourceToken.WarningGeometry;
-                    iconBrushKey = ResourceToken.WarningBrush;
-                    break;
-                case MessageBoxImage.Information:
-                    iconKey = ResourceToken.InfoGeometry;
-                    iconBrushKey = ResourceToken.InfoBrush;
-                    break;
-            }
-
-            if (string.IsNullOrEmpty(iconKey)) return;
-            messageBox.ShowImage = true;
-            messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(iconKey);
-            messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(iconBrushKey);
-        }
-
-        private static bool IsValidMessageBoxButton(MessageBoxButton value)
-        {
-            return value == MessageBoxButton.OK
-                   || value == MessageBoxButton.OKCancel
-                   || value == MessageBoxButton.YesNo
-                   || value == MessageBoxButton.YesNoCancel;
-        }
-
-        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
-        private static bool IsValidMessageBoxImage(MessageBoxImage value)
-        {
-            return value == MessageBoxImage.Asterisk
-                   || value == MessageBoxImage.Error
-                   || value == MessageBoxImage.Exclamation
-                   || value == MessageBoxImage.Hand
-                   || value == MessageBoxImage.Information
-                   || value == MessageBoxImage.None
-                   || value == MessageBoxImage.Question
-                   || value == MessageBoxImage.Stop
-                   || value == MessageBoxImage.Warning;
-        }
-
-        private static bool IsValidMessageBoxResult(MessageBoxResult value)
-        {
-            return value == MessageBoxResult.Cancel
-                   || value == MessageBoxResult.No
-                   || value == MessageBoxResult.None
-                   || value == MessageBoxResult.OK
-                   || value == MessageBoxResult.Yes;
+            _buttonClose.Click += ButtonClose_Click;
         }
     }
-}
+
+    private void ButtonClose_Click(object sender, RoutedEventArgs e) => Close();
+
+    protected override void OnPreviewKeyDown(KeyEventArgs e)
+    {
+        if (e.Key == Key.System && e.SystemKey == Key.F4)
+        {
+            e.Handled = true;
+            return;
+        }
+
+        if (e.KeyboardDevice.Modifiers == ModifierKeys.Control && e.Key == Key.C)
+        {
+            var builder = new StringBuilder();
+            var line = new string('-', 27);
+            builder.Append(line);
+            builder.Append(Environment.NewLine);
+            builder.Append(Title);
+            builder.Append(Environment.NewLine);
+            builder.Append(line);
+            builder.Append(Environment.NewLine);
+            builder.Append(Message);
+            builder.Append(Environment.NewLine);
+            builder.Append(line);
+            builder.Append(Environment.NewLine);
+            if (_showOk)
+            {
+                builder.Append(Lang.Confirm);
+                builder.Append("   ");
+            }
+            if (_showYes)
+            {
+                builder.Append(Lang.Yes);
+                builder.Append("   ");
+            }
+            if (_showNo)
+            {
+                builder.Append(Lang.No);
+                builder.Append("   ");
+            }
+            if (_showCancel)
+            {
+                builder.Append(Lang.Cancel);
+                builder.Append("   ");
+            }
+            builder.Append(Environment.NewLine);
+            builder.Append(line);
+            builder.Append(Environment.NewLine);
+
+            try
+            {
+                Clipboard.SetDataObject(builder.ToString());
+            }
+            catch
+            {
+                // ignored
+            }
+        }
+    }
+
+    /// <summary>
+    ///     成功
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Success(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+            messageBox.ShowImage = true;
+            messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.SuccessGeometry);
+            messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.SuccessBrush);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     消息
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Info(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+            SetImage(messageBox, MessageBoxImage.Information);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     警告
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Warning(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Warning, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+            SetImage(messageBox, MessageBoxImage.Warning);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     错误
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Error(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+            SetImage(messageBox, MessageBoxImage.Error);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     严重
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Fatal(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.OK);
+            SetButtonStatus(messageBox, MessageBoxButton.OK, MessageBoxResult.OK);
+            messageBox.ShowImage = true;
+            messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(ResourceToken.FatalGeometry);
+            messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryTextBrush);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     询问
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    public static MessageBoxResult Ask(string messageBoxText, string caption = null)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, messageBoxText, caption, MessageBoxButton.OKCancel, MessageBoxImage.Question, MessageBoxResult.Cancel);
+            SetButtonStatus(messageBox, MessageBoxButton.OKCancel, MessageBoxResult.Cancel);
+            SetImage(messageBox, MessageBoxImage.Question);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     自定义信息展示
+    /// </summary>
+    /// <param name="info"></param>
+    /// <returns></returns>
+    public static MessageBoxResult Show(MessageBoxInfo info)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(null, info.Message, info.Caption, info.Button, MessageBoxImage.None, info.DefaultResult);
+            SetButtonStatus(messageBox, info.Button, info.DefaultResult);
+
+            if (!string.IsNullOrEmpty(info.IconKey))
+            {
+                messageBox.ShowImage = true;
+                messageBox.Image = ResourceHelper.GetResource<Geometry>(info.IconKey) ?? info.Icon;
+                messageBox.ImageBrush = ResourceHelper.GetResource<Brush>(info.IconBrushKey) ?? info.IconBrush;
+            }
+
+            if (info.StyleKey != null)
+            {
+                messageBox.Style = ResourceHelper.GetResource<Style>(info.StyleKey) ?? info.Style;
+            }
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    /// <summary>
+    ///     信息展示
+    /// </summary>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    /// <param name="button"></param>
+    /// <param name="icon"></param>
+    /// <param name="defaultResult"></param>
+    /// <returns></returns>
+    public static MessageBoxResult Show(string messageBoxText, string caption = null,
+        MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None,
+        MessageBoxResult defaultResult = MessageBoxResult.None) =>
+        Show(null, messageBoxText, caption, button, icon, defaultResult);
+
+    /// <summary>
+    ///     信息展示
+    /// </summary>
+    /// <param name="owner"></param>
+    /// <param name="messageBoxText"></param>
+    /// <param name="caption"></param>
+    /// <param name="button"></param>
+    /// <param name="icon"></param>
+    /// <param name="defaultResult"></param>
+    /// <returns></returns>
+    public static MessageBoxResult Show(System.Windows.Window owner, string messageBoxText, string caption = null, MessageBoxButton button = MessageBoxButton.OK, MessageBoxImage icon = MessageBoxImage.None, MessageBoxResult defaultResult = MessageBoxResult.None)
+    {
+        MessageBox messageBox = null;
+        Application.Current.Dispatcher.Invoke(new Action(() =>
+        {
+            messageBox = CreateMessageBox(owner, messageBoxText, caption, button, icon, defaultResult);
+            SetButtonStatus(messageBox, button, defaultResult);
+            SetImage(messageBox, icon);
+            SystemSounds.Asterisk.Play();
+            messageBox.ShowDialog();
+        }));
+
+        return messageBox._messageBoxResult;
+    }
+
+    private static MessageBox CreateMessageBox(
+        System.Windows.Window owner,
+        string messageBoxText,
+        string caption,
+        MessageBoxButton button,
+        MessageBoxImage icon,
+        MessageBoxResult defaultResult)
+    {
+        if (!IsValidMessageBoxButton(button))
+        {
+            throw new InvalidEnumArgumentException(nameof(button), (int) button, typeof(MessageBoxButton));
+        }
+        if (!IsValidMessageBoxImage(icon))
+        {
+            throw new InvalidEnumArgumentException(nameof(icon), (int) icon, typeof(MessageBoxImage));
+        }
+        if (!IsValidMessageBoxResult(defaultResult))
+        {
+            throw new InvalidEnumArgumentException(nameof(defaultResult), (int) defaultResult, typeof(MessageBoxResult));
+        }
+
+        var ownerWindow = owner ?? WindowHelper.GetActiveWindow();
+        var ownerIsNull = ownerWindow is null;
+
+        return new MessageBox
+        {
+            Message = messageBoxText,
+            Owner = ownerWindow,
+            WindowStartupLocation = WindowStartupLocation.CenterScreen,
+            ShowTitle = true,
+            Title = caption ?? string.Empty,
+            Topmost = ownerIsNull,
+            _messageBoxResult = defaultResult
+        };
+    }
+
+    private static void SetButtonStatus(MessageBox messageBox, MessageBoxButton messageBoxButton, MessageBoxResult defaultResult)
+    {
+        switch (messageBoxButton)
+        {
+            case MessageBoxButton.OK:
+                messageBox._showOk = true;
+                messageBox._buttonOk = new Button
+                {
+                    IsCancel = true,
+                    IsDefault = true,
+                    Content = Lang.Confirm,
+                    Command = ControlCommands.Confirm,
+                    Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle")
+                };
+
+                break;
+            case MessageBoxButton.OKCancel:
+                messageBox._showOk = true;
+                messageBox._buttonOk = new Button
+                {
+                    Content = Lang.Confirm,
+                    Command = ControlCommands.Confirm
+                };
+
+                messageBox._showCancel = true;
+                messageBox._buttonCancel = new Button
+                {
+                    IsCancel = true,
+                    Content = Lang.Cancel,
+                    Command = ControlCommands.Cancel
+                };
+
+                if (defaultResult == MessageBoxResult.Cancel)
+                {
+                    messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonCancel.IsDefault = true;
+                }
+                else
+                {
+                    messageBox._buttonOk.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonOk.IsDefault = true;
+                    messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                }
+
+                break;
+            case MessageBoxButton.YesNo:
+                messageBox._showYes = true;
+                messageBox._buttonYes = new Button
+                {
+                    Content = Lang.Yes,
+                    Command = ControlCommands.Yes
+                };
+
+                messageBox._showNo = true;
+                messageBox._buttonNo = new Button
+                {
+                    Content = Lang.No,
+                    Command = ControlCommands.No
+                };
+
+                if (defaultResult == MessageBoxResult.No)
+                {
+                    messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonNo.IsDefault = true;
+                }
+                else
+                {
+                    messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonYes.IsDefault = true;
+                    messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                }
+
+                break;
+            case MessageBoxButton.YesNoCancel:
+                messageBox._showYes = true;
+                messageBox._buttonYes = new Button
+                {
+                    Content = Lang.Yes,
+                    Command = ControlCommands.Yes
+                };
+
+                messageBox._showNo = true;
+                messageBox._buttonNo = new Button
+                {
+                    Content = Lang.No,
+                    Command = ControlCommands.No
+                };
+
+                messageBox._showCancel = true;
+                messageBox._buttonCancel = new Button
+                {
+                    IsCancel = true,
+                    Content = Lang.Cancel,
+                    Command = ControlCommands.Cancel
+                };
+
+                if (defaultResult == MessageBoxResult.No)
+                {
+                    messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonNo.IsDefault = true;
+                    messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                }
+                else if (defaultResult == MessageBoxResult.Cancel)
+                {
+                    messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonCancel.IsDefault = true;
+                }
+                else
+                {
+                    messageBox._buttonYes.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxPrimaryButtonStyle");
+                    messageBox._buttonYes.IsDefault = true;
+                    messageBox._buttonNo.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                    messageBox._buttonCancel.Style = ResourceHelper.GetResourceInternal<Style>("MessageBoxButtonStyle");
+                }
+
+                break;
+        }
+    }
+
+    private static void SetImage(MessageBox messageBox, MessageBoxImage messageBoxImage)
+    {
+        var iconKey = string.Empty;
+        var iconBrushKey = string.Empty;
+
+        switch (messageBoxImage)
+        {
+            case MessageBoxImage.Error:
+                iconKey = ResourceToken.ErrorGeometry;
+                iconBrushKey = ResourceToken.DangerBrush;
+                break;
+            case MessageBoxImage.Question:
+                iconKey = ResourceToken.AskGeometry;
+                iconBrushKey = ResourceToken.AccentBrush;
+                break;
+            case MessageBoxImage.Warning:
+                iconKey = ResourceToken.WarningGeometry;
+                iconBrushKey = ResourceToken.WarningBrush;
+                break;
+            case MessageBoxImage.Information:
+                iconKey = ResourceToken.InfoGeometry;
+                iconBrushKey = ResourceToken.InfoBrush;
+                break;
+        }
+
+        if (string.IsNullOrEmpty(iconKey)) return;
+        messageBox.ShowImage = true;
+        messageBox.Image = ResourceHelper.GetResourceInternal<Geometry>(iconKey);
+        messageBox.ImageBrush = ResourceHelper.GetResourceInternal<Brush>(iconBrushKey);
+    }
+
+    private static bool IsValidMessageBoxButton(MessageBoxButton value)
+    {
+        return value == MessageBoxButton.OK
+               || value == MessageBoxButton.OKCancel
+               || value == MessageBoxButton.YesNo
+               || value == MessageBoxButton.YesNoCancel;
+    }
+
+    [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
+    private static bool IsValidMessageBoxImage(MessageBoxImage value)
+    {
+        return value == MessageBoxImage.Asterisk
+               || value == MessageBoxImage.Error
+               || value == MessageBoxImage.Exclamation
+               || value == MessageBoxImage.Hand
+               || value == MessageBoxImage.Information
+               || value == MessageBoxImage.None
+               || value == MessageBoxImage.Question
+               || value == MessageBoxImage.Stop
+               || value == MessageBoxImage.Warning;
+    }
+
+    private static bool IsValidMessageBoxResult(MessageBoxResult value)
+    {
+        return value == MessageBoxResult.Cancel
+               || value == MessageBoxResult.No
+               || value == MessageBoxResult.None
+               || value == MessageBoxResult.OK
+               || value == MessageBoxResult.Yes;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
index 0e87786e..feefd561 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
@@ -7,229 +7,228 @@ using HandyControl.Data;
 using HandyControl.Interactivity;
 using HandyControl.Tools;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+///     弹出窗口
+/// </summary>
+[TemplatePart(Name = ElementMainBorder, Type = typeof(Border))]
+[TemplatePart(Name = ElementTitleBlock, Type = typeof(TextBlock))]
+public class PopupWindow : System.Windows.Window
 {
-    /// <summary>
-    ///     弹出窗口
-    /// </summary>
-    [TemplatePart(Name = ElementMainBorder, Type = typeof(Border))]
-    [TemplatePart(Name = ElementTitleBlock, Type = typeof(TextBlock))]
-    public class PopupWindow : System.Windows.Window
+    #region Constants
+
+    private const string ElementMainBorder = "PART_MainBorder";
+
+    private const string ElementTitleBlock = "PART_TitleBlock";
+
+    #endregion Constants
+
+    private Border _mainBorder;
+
+    private TextBlock _titleBlock;
+
+    private bool _showBackground = true;
+
+    private FrameworkElement _targetElement;
+
+    public override void OnApplyTemplate()
     {
-        #region Constants
-
-        private const string ElementMainBorder = "PART_MainBorder";
-
-        private const string ElementTitleBlock = "PART_TitleBlock";
-
-        #endregion Constants
-
-        private Border _mainBorder;
-
-        private TextBlock _titleBlock;
-
-        private bool _showBackground = true;
-
-        private FrameworkElement _targetElement;
-
-        public override void OnApplyTemplate()
+        if (_titleBlock != null)
         {
-            if (_titleBlock != null)
-            {
-                _titleBlock.MouseLeftButtonDown -= TitleBlock_OnMouseLeftButtonDown;
-            }
-
-            base.OnApplyTemplate();
-
-            _mainBorder = GetTemplateChild(ElementMainBorder) as Border;
-            _titleBlock = GetTemplateChild(ElementTitleBlock) as TextBlock;
-
-            if (_titleBlock != null)
-            {
-                _titleBlock.MouseLeftButtonDown += TitleBlock_OnMouseLeftButtonDown;
-            }
-
-            if (PopupElement != null)
-            {
-                _mainBorder.Child = PopupElement;
-            }
+            _titleBlock.MouseLeftButtonDown -= TitleBlock_OnMouseLeftButtonDown;
         }
 
-        internal static readonly DependencyProperty ContentStrProperty = DependencyProperty.Register(
-            "ContentStr", typeof(string), typeof(PopupWindow), new PropertyMetadata(default(string)));
+        base.OnApplyTemplate();
 
-        internal string ContentStr
+        _mainBorder = GetTemplateChild(ElementMainBorder) as Border;
+        _titleBlock = GetTemplateChild(ElementTitleBlock) as TextBlock;
+
+        if (_titleBlock != null)
         {
-            get => (string) GetValue(ContentStrProperty);
-            set => SetValue(ContentStrProperty, value);
+            _titleBlock.MouseLeftButtonDown += TitleBlock_OnMouseLeftButtonDown;
         }
 
-        private bool IsDialog { get; set; }
-
-        public PopupWindow()
+        if (PopupElement != null)
         {
-            CommandBindings.Add(new CommandBinding(ControlCommands.Close, CloseButton_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
-            CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancle_OnClick));
-
-            Closing += (sender, args) =>
-            {
-                if (!IsDialog)
-                    Owner?.Focus();
-            };
-            Loaded += (s, e) =>
-            {
-                if (!_showBackground)
-                {
-                    var point = ArithmeticHelper.CalSafePoint(_targetElement, PopupElement, BorderThickness);
-                    Left = point.X;
-                    Top = point.Y;
-                    Opacity = 1;
-                }
-            };
-            try
-            {
-                Owner = Application.Current.MainWindow;
-            }
-            catch
-            {
-                // ignored
-            }
-        }
-
-        public PopupWindow(System.Windows.Window owner) : this() => Owner = owner;
-
-        private void CloseButton_OnClick(object sender, RoutedEventArgs e) => Close();
-
-        public FrameworkElement PopupElement { get; set; }
-
-        public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
-            "ShowTitle", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.TrueBox));
-
-        public bool ShowTitle
-        {
-            get => (bool) GetValue(ShowTitleProperty);
-            set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ShowCancelProperty = DependencyProperty.Register(
-            "ShowCancel", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowCancel
-        {
-            get => (bool) GetValue(ShowCancelProperty);
-            set => SetValue(ShowCancelProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public static readonly DependencyProperty ShowBorderProperty = DependencyProperty.Register(
-            "ShowBorder", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.FalseBox));
-
-        public bool ShowBorder
-        {
-            get => (bool) GetValue(ShowBorderProperty);
-            set => SetValue(ShowBorderProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private void TitleBlock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                DragMove();
-            }
-        }
-
-        public void Show(FrameworkElement element, bool showBackground = true)
-        {
-            if (!showBackground)
-            {
-                Opacity = 0;
-                AllowsTransparency = true;
-                WindowStyle = WindowStyle.None;
-                ShowTitle = false;
-                MinWidth = 0;
-                MinHeight = 0;
-            }
-
-            _showBackground = showBackground;
-            _targetElement = element;
-            Show();
-        }
-
-        public void ShowDialog(FrameworkElement element, bool showBackground = true)
-        {
-            if (!showBackground)
-            {
-                Opacity = 0;
-                AllowsTransparency = true;
-                WindowStyle = WindowStyle.None;
-                ShowTitle = false;
-                MinWidth = 0;
-                MinHeight = 0;
-            }
-
-            _showBackground = showBackground;
-            _targetElement = element;
-            ShowDialog();
-        }
-
-        public void Show(System.Windows.Window element, Point point)
-        {
-            Left = element.Left + point.X;
-            Top = element.Top + point.Y;
-            Show();
-        }
-
-        public static void Show(string message)
-        {
-            var window = new PopupWindow
-            {
-                AllowsTransparency = true,
-                WindowStyle = WindowStyle.None,
-                ContentStr = message,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                Background = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryBrush)
-            };
-            window.Show();
-        }
-
-        public static bool? ShowDialog(string message, string title = default, bool showCancel = false)
-        {
-            var window = new PopupWindow
-            {
-                AllowsTransparency = true,
-                WindowStyle = WindowStyle.None,
-                ContentStr = message,
-                IsDialog = true,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ShowBorder = true,
-                Title = string.IsNullOrEmpty(title) ? Properties.Langs.Lang.Tip : title,
-                ShowCancel = showCancel
-            };
-            return window.ShowDialog();
-        }
-
-        private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (IsDialog)
-            {
-                DialogResult = true;
-            }
-            Close();
-        }
-
-        private void ButtonCancle_OnClick(object sender, RoutedEventArgs e)
-        {
-            if (IsDialog)
-            {
-                DialogResult = false;
-            }
-            Close();
-        }
-
-        protected override void OnClosed(EventArgs e)
-        {
-            base.OnClosed(e);
-            PopupElement = null;
+            _mainBorder.Child = PopupElement;
         }
     }
-}
+
+    internal static readonly DependencyProperty ContentStrProperty = DependencyProperty.Register(
+        "ContentStr", typeof(string), typeof(PopupWindow), new PropertyMetadata(default(string)));
+
+    internal string ContentStr
+    {
+        get => (string) GetValue(ContentStrProperty);
+        set => SetValue(ContentStrProperty, value);
+    }
+
+    private bool IsDialog { get; set; }
+
+    public PopupWindow()
+    {
+        CommandBindings.Add(new CommandBinding(ControlCommands.Close, CloseButton_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Confirm, ButtonOk_OnClick));
+        CommandBindings.Add(new CommandBinding(ControlCommands.Cancel, ButtonCancle_OnClick));
+
+        Closing += (sender, args) =>
+        {
+            if (!IsDialog)
+                Owner?.Focus();
+        };
+        Loaded += (s, e) =>
+        {
+            if (!_showBackground)
+            {
+                var point = ArithmeticHelper.CalSafePoint(_targetElement, PopupElement, BorderThickness);
+                Left = point.X;
+                Top = point.Y;
+                Opacity = 1;
+            }
+        };
+        try
+        {
+            Owner = Application.Current.MainWindow;
+        }
+        catch
+        {
+            // ignored
+        }
+    }
+
+    public PopupWindow(System.Windows.Window owner) : this() => Owner = owner;
+
+    private void CloseButton_OnClick(object sender, RoutedEventArgs e) => Close();
+
+    public FrameworkElement PopupElement { get; set; }
+
+    public static readonly DependencyProperty ShowTitleProperty = DependencyProperty.Register(
+        "ShowTitle", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    public bool ShowTitle
+    {
+        get => (bool) GetValue(ShowTitleProperty);
+        set => SetValue(ShowTitleProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ShowCancelProperty = DependencyProperty.Register(
+        "ShowCancel", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowCancel
+    {
+        get => (bool) GetValue(ShowCancelProperty);
+        set => SetValue(ShowCancelProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static readonly DependencyProperty ShowBorderProperty = DependencyProperty.Register(
+        "ShowBorder", typeof(bool), typeof(PopupWindow), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public bool ShowBorder
+    {
+        get => (bool) GetValue(ShowBorderProperty);
+        set => SetValue(ShowBorderProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private void TitleBlock_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (e.LeftButton == MouseButtonState.Pressed)
+        {
+            DragMove();
+        }
+    }
+
+    public void Show(FrameworkElement element, bool showBackground = true)
+    {
+        if (!showBackground)
+        {
+            Opacity = 0;
+            AllowsTransparency = true;
+            WindowStyle = WindowStyle.None;
+            ShowTitle = false;
+            MinWidth = 0;
+            MinHeight = 0;
+        }
+
+        _showBackground = showBackground;
+        _targetElement = element;
+        Show();
+    }
+
+    public void ShowDialog(FrameworkElement element, bool showBackground = true)
+    {
+        if (!showBackground)
+        {
+            Opacity = 0;
+            AllowsTransparency = true;
+            WindowStyle = WindowStyle.None;
+            ShowTitle = false;
+            MinWidth = 0;
+            MinHeight = 0;
+        }
+
+        _showBackground = showBackground;
+        _targetElement = element;
+        ShowDialog();
+    }
+
+    public void Show(System.Windows.Window element, Point point)
+    {
+        Left = element.Left + point.X;
+        Top = element.Top + point.Y;
+        Show();
+    }
+
+    public static void Show(string message)
+    {
+        var window = new PopupWindow
+        {
+            AllowsTransparency = true,
+            WindowStyle = WindowStyle.None,
+            ContentStr = message,
+            WindowStartupLocation = WindowStartupLocation.CenterScreen,
+            Background = ResourceHelper.GetResourceInternal<Brush>(ResourceToken.PrimaryBrush)
+        };
+        window.Show();
+    }
+
+    public static bool? ShowDialog(string message, string title = default, bool showCancel = false)
+    {
+        var window = new PopupWindow
+        {
+            AllowsTransparency = true,
+            WindowStyle = WindowStyle.None,
+            ContentStr = message,
+            IsDialog = true,
+            WindowStartupLocation = WindowStartupLocation.CenterScreen,
+            ShowBorder = true,
+            Title = string.IsNullOrEmpty(title) ? Properties.Langs.Lang.Tip : title,
+            ShowCancel = showCancel
+        };
+        return window.ShowDialog();
+    }
+
+    private void ButtonOk_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (IsDialog)
+        {
+            DialogResult = true;
+        }
+        Close();
+    }
+
+    private void ButtonCancle_OnClick(object sender, RoutedEventArgs e)
+    {
+        if (IsDialog)
+        {
+            DialogResult = false;
+        }
+        Close();
+    }
+
+    protected override void OnClosed(EventArgs e)
+    {
+        base.OnClosed(e);
+        PopupElement = null;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
index 57460083..2fa3d025 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
@@ -1,13 +1,12 @@
 using System.Windows;
 
-namespace HandyControl.Data
-{
-    public class CancelRoutedEventArgs : RoutedEventArgs
-    {
-        public CancelRoutedEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
-        {
-        }
+namespace HandyControl.Data;
 
-        public bool Cancel { get; set; }
+public class CancelRoutedEventArgs : RoutedEventArgs
+{
+    public CancelRoutedEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
+    {
     }
-}
+
+    public bool Cancel { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs b/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
index 48e53ff8..279d0d4d 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
@@ -1,19 +1,18 @@
 using System.Windows;
 
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class FunctionEventArgs<T> : RoutedEventArgs
 {
-    public class FunctionEventArgs<T> : RoutedEventArgs
+    public FunctionEventArgs(T info)
     {
-        public FunctionEventArgs(T info)
-        {
-            Info = info;
-        }
-
-        public FunctionEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
-        {
-        }
-
-        public T Info { get; set; }
+        Info = info;
     }
-}
+
+    public FunctionEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
+    {
+    }
+
+    public T Info { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
index 52246981..1d591109 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
@@ -1,18 +1,17 @@
 using System;
 using System.Windows.Input;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class KeyboardHookEventArgs : EventArgs
 {
-    public class KeyboardHookEventArgs : EventArgs
+    public bool IsSystemKey { get; }
+
+    public Key Key { get; }
+
+    public KeyboardHookEventArgs(int virtualKey, bool isSystemKey)
     {
-        public bool IsSystemKey { get; }
-
-        public Key Key { get; }
-
-        public KeyboardHookEventArgs(int virtualKey, bool isSystemKey)
-        {
-            IsSystemKey = isSystemKey;
-            Key = KeyInterop.KeyFromVirtualKey(virtualKey);
-        }
+        IsSystemKey = isSystemKey;
+        Key = KeyInterop.KeyFromVirtualKey(virtualKey);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
index 8f1685f4..4887d481 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
@@ -1,12 +1,11 @@
 using System;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
-{
-    internal class MouseHookEventArgs : EventArgs
-    {
-        public MouseHookMessageType MessageType { get; set; }
+namespace HandyControl.Data;
 
-        public InteropValues.POINT Point { get; set; }
-    }
-}
+internal class MouseHookEventArgs : EventArgs
+{
+    public MouseHookMessageType MessageType { get; set; }
+
+    public InteropValues.POINT Point { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/DisposableObject.cs b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
index 28e2b551..d89aaee1 100644
--- a/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
+++ b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
@@ -1,69 +1,68 @@
 using System;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class DisposableObject : IDisposable
 {
-    public class DisposableObject : IDisposable
+    private EventHandler _disposing;
+
+    public bool IsDisposed { get; private set; }
+
+    public void Dispose()
     {
-        private EventHandler _disposing;
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        public bool IsDisposed { get; private set; }
+    ~DisposableObject()
+    {
+        Dispose(false);
+    }
 
-        public void Dispose()
+    public event EventHandler Disposing
+    {
+        add
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            ThrowIfDisposed();
+            _disposing += value;
         }
-
-        ~DisposableObject()
-        {
-            Dispose(false);
-        }
-
-        public event EventHandler Disposing
-        {
-            add
-            {
-                ThrowIfDisposed();
-                _disposing += value;
-            }
-            remove
-            {
-                _disposing -= value;
-            }
-        }
-
-        protected void ThrowIfDisposed()
-        {
-            if (IsDisposed) throw new ObjectDisposedException(GetType().Name);
-        }
-
-        protected void Dispose(bool disposing)
-        {
-            if (IsDisposed) return;
-
-            try
-            {
-                if (disposing)
-                {
-                    _disposing?.Invoke(this, EventArgs.Empty);
-                    _disposing = null;
-                    DisposeManagedResources();
-                }
-
-                DisposeNativeResources();
-            }
-            finally
-            {
-                IsDisposed = true;
-            }
-        }
-
-        protected virtual void DisposeManagedResources()
-        {
-        }
-
-        protected virtual void DisposeNativeResources()
+        remove
         {
+            _disposing -= value;
         }
     }
-}
+
+    protected void ThrowIfDisposed()
+    {
+        if (IsDisposed) throw new ObjectDisposedException(GetType().Name);
+    }
+
+    protected void Dispose(bool disposing)
+    {
+        if (IsDisposed) return;
+
+        try
+        {
+            if (disposing)
+            {
+                _disposing?.Invoke(this, EventArgs.Empty);
+                _disposing = null;
+                DisposeManagedResources();
+            }
+
+            DisposeNativeResources();
+        }
+        finally
+        {
+            IsDisposed = true;
+        }
+    }
+
+    protected virtual void DisposeManagedResources()
+    {
+    }
+
+    protected virtual void DisposeNativeResources()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
index f5bf0df2..91b36fa5 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum BadgeStatus
 {
-    public enum BadgeStatus
-    {
-        Text,
-        Dot,
-        Processing
-    }
-}
+    Text,
+    Dot,
+    Processing
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
index 8d7b4759..5090808b 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
@@ -1,10 +1,9 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum ChatMessageType
 {
-    public enum ChatMessageType
-    {
-        String,
-        Image,
-        Audio,
-        Custom
-    }
-}
+    String,
+    Image,
+    Audio,
+    Custom
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
index 372cb2a9..72f05148 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum ChatRoleType
 {
-    public enum ChatRoleType
-    {
-        Sender,
-        Receiver
-    }
-}
+    Sender,
+    Receiver
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
index 9da0c2f4..600c7fbe 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
@@ -1,13 +1,12 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum ColLayoutStatus
 {
-    public enum ColLayoutStatus
-    {
-        Xs,
-        Sm,
-        Md,
-        Lg,
-        Xl,
-        Xxl,
-        Auto
-    }
-}
+    Xs,
+    Sm,
+    Md,
+    Lg,
+    Xl,
+    Xxl,
+    Auto
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
index a02ff814..edd0d8a6 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum DrawerShowMode
 {
-    public enum DrawerShowMode
-    {
-        Cover,
-        Push,
-        Press
-    }
-}
+    Cover,
+    Push,
+    Press
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs b/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
index 94073dcf..a07f287d 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
@@ -3,76 +3,75 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows.Data;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class EnumDataProvider : ObjectDataProvider
 {
-    public class EnumDataProvider : ObjectDataProvider
+    public EnumDataProvider()
     {
-        public EnumDataProvider()
+        MethodName = nameof(GetValues);
+    }
+
+    private Type _type;
+    public Type Type
+    {
+        get => _type;
+        set
         {
-            MethodName = nameof(GetValues);
+            _type = value;
+            MethodParameters.Add(value);
+            ObjectType = typeof(System.Enum);
+        }
+    }
+
+    private bool _useAttributes;
+
+    public bool UseAttributes
+    {
+        get => _useAttributes;
+        set
+        {
+            _useAttributes = value;
+            ObjectType = value ? typeof(EnumDataProvider) : typeof(System.Enum);
+        }
+    }
+
+    public static IEnumerable<EnumItem> GetValues(Type enumType)
+    {
+        if (enumType == null)
+        {
+            throw new ArgumentNullException(nameof(enumType));
         }
 
-        private Type _type;
-        public Type Type
-        {
-            get => _type;
-            set
-            {
-                _type = value;
-                MethodParameters.Add(value);
-                ObjectType = typeof(System.Enum);
-            }
-        }
+        var resultList = new List<EnumItem>();
 
-        private bool _useAttributes;
-
-        public bool UseAttributes
+        var values = System.Enum.GetValues(enumType);
+        foreach (System.Enum value in values)
         {
-            get => _useAttributes;
-            set
+            var fieldInfo = enumType.GetField(value.ToString());
+            if (fieldInfo == null)
             {
-                _useAttributes = value;
-                ObjectType = value ? typeof(EnumDataProvider) : typeof(System.Enum);
-            }
-        }
-
-        public static IEnumerable<EnumItem> GetValues(Type enumType)
-        {
-            if (enumType == null)
-            {
-                throw new ArgumentNullException(nameof(enumType));
+                continue;
             }
 
-            var resultList = new List<EnumItem>();
-
-            var values = System.Enum.GetValues(enumType);
-            foreach (System.Enum value in values)
+            if (fieldInfo.GetCustomAttributes(typeof(BrowsableAttribute), true) is BrowsableAttribute[] { Length: > 0 } browsableAttributes)
             {
-                var fieldInfo = enumType.GetField(value.ToString());
-                if (fieldInfo == null)
+                if (!browsableAttributes[0].Browsable)
                 {
                     continue;
                 }
-
-                if (fieldInfo.GetCustomAttributes(typeof(BrowsableAttribute), true) is BrowsableAttribute[] { Length: > 0 } browsableAttributes)
-                {
-                    if (!browsableAttributes[0].Browsable)
-                    {
-                        continue;
-                    }
-                }
-
-                if (fieldInfo.GetCustomAttributes(typeof(DescriptionAttribute), true) is DescriptionAttribute[] { Length: > 0 } descriptionAttributes)
-                {
-                    resultList.Add(new EnumItem
-                    {
-                        Description = descriptionAttributes[0].Description,
-                        Value = value
-                    });
-                }
             }
 
-            return resultList;
+            if (fieldInfo.GetCustomAttributes(typeof(DescriptionAttribute), true) is DescriptionAttribute[] { Length: > 0 } descriptionAttributes)
+            {
+                resultList.Add(new EnumItem
+                {
+                    Description = descriptionAttributes[0].Description,
+                    Value = value
+                });
+            }
         }
+
+        return resultList;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
index 128c5aaf..e9b11023 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
@@ -1,25 +1,24 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum ExpandMode
 {
-    public enum ExpandMode
-    {
-        /// <summary>
-        ///     最多只能显示一项，且不可折叠
-        /// </summary>
-        ShowOne,
+    /// <summary>
+    ///     最多只能显示一项，且不可折叠
+    /// </summary>
+    ShowOne,
 
-        /// <summary>
-        ///     显示所有项，且不可折叠
-        /// </summary>
-        ShowAll,
+    /// <summary>
+    ///     显示所有项，且不可折叠
+    /// </summary>
+    ShowAll,
 
-        /// <summary>
-        ///     类似ShowOne，但是控件的尺寸不随项的数量而改变
-        /// </summary>
-        Accordion,
+    /// <summary>
+    ///     类似ShowOne，但是控件的尺寸不随项的数量而改变
+    /// </summary>
+    Accordion,
 
-        /// <summary>
-        ///     没有任何限制
-        /// </summary>
-        Freedom
-    }
-}
+    /// <summary>
+    ///     没有任何限制
+    /// </summary>
+    Freedom
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs b/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
index 79abd5d8..454ed25c 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
@@ -1,59 +1,58 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum HatchStyle
 {
-    public enum HatchStyle
-    {
-        Horizontal,
-        Vertical,
-        ForwardDiagonal,
-        BackwardDiagonal,
-        Cross,
-        DiagonalCross,
-        Percent05,
-        Percent10,
-        Percent20,
-        Percent25,
-        Percent30,
-        Percent40,
-        Percent50,
-        Percent60,
-        Percent70,
-        Percent75,
-        Percent80,
-        Percent90,
-        LightDownwardDiagonal,
-        LightUpwardDiagonal,
-        DarkDownwardDiagonal,
-        DarkUpwardDiagonal,
-        WideDownwardDiagonal,
-        WideUpwardDiagonal,
-        LightVertical,
-        LightHorizontal,
-        NarrowVertical,
-        NarrowHorizontal,
-        DarkVertical,
-        DarkHorizontal,
-        DashedDownwardDiagonal,
-        DashedUpwardDiagonal,
-        DashedHorizontal,
-        DashedVertical,
-        SmallConfetti,
-        LargeConfetti,
-        ZigZag,
-        Wave,
-        DiagonalBrick,
-        HorizontalBrick,
-        Weave,
-        Plaid,
-        Divot,
-        DottedGrid,
-        DottedDiamond,
-        Shingle,
-        Trellis,
-        Sphere,
-        SmallGrid,
-        SmallCheckerBoard,
-        LargeCheckerBoard,
-        OutlinedDiamond,
-        SolidDiamond
-    }
-}
+    Horizontal,
+    Vertical,
+    ForwardDiagonal,
+    BackwardDiagonal,
+    Cross,
+    DiagonalCross,
+    Percent05,
+    Percent10,
+    Percent20,
+    Percent25,
+    Percent30,
+    Percent40,
+    Percent50,
+    Percent60,
+    Percent70,
+    Percent75,
+    Percent80,
+    Percent90,
+    LightDownwardDiagonal,
+    LightUpwardDiagonal,
+    DarkDownwardDiagonal,
+    DarkUpwardDiagonal,
+    WideDownwardDiagonal,
+    WideUpwardDiagonal,
+    LightVertical,
+    LightHorizontal,
+    NarrowVertical,
+    NarrowHorizontal,
+    DarkVertical,
+    DarkHorizontal,
+    DashedDownwardDiagonal,
+    DashedUpwardDiagonal,
+    DashedHorizontal,
+    DashedVertical,
+    SmallConfetti,
+    LargeConfetti,
+    ZigZag,
+    Wave,
+    DiagonalBrick,
+    HorizontalBrick,
+    Weave,
+    Plaid,
+    Divot,
+    DottedGrid,
+    DottedDiamond,
+    Shingle,
+    Trellis,
+    Sphere,
+    SmallGrid,
+    SmallCheckerBoard,
+    LargeCheckerBoard,
+    OutlinedDiamond,
+    SolidDiamond
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
index 400e2de3..1bf1f2ea 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
@@ -1,10 +1,9 @@
-namespace HandyControl.Data.Enum
+namespace HandyControl.Data.Enum;
+
+public enum HitMode
 {
-    public enum HitMode
-    {
-        Click,
-        Hover,
-        Focus,
-        None
-    }
-}
+    Click,
+    Hover,
+    Focus,
+    None
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs b/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
index 45801718..5d27e636 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
@@ -1,18 +1,17 @@
 using System;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+[Flags]
+internal enum ImageCodecFlags
 {
-    [Flags]
-    internal enum ImageCodecFlags
-    {
-        Encoder = 0x00000001,
-        Decoder = 0x00000002,
-        SupportBitmap = 0x00000004,
-        SupportVector = 0x00000008,
-        SeekableEncode = 0x00000010,
-        BlockingDecode = 0x00000020,
-        Builtin = 0x00010000,
-        System = 0x00020000,
-        User = 0x00040000
-    }
-}
+    Encoder = 0x00000001,
+    Decoder = 0x00000002,
+    SupportBitmap = 0x00000004,
+    SupportVector = 0x00000008,
+    SeekableEncode = 0x00000010,
+    BlockingDecode = 0x00000020,
+    Builtin = 0x00010000,
+    System = 0x00020000,
+    User = 0x00040000
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs b/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
index d5922d4e..e5380cdb 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
@@ -1,13 +1,12 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum InfoType
 {
-    public enum InfoType
-    {
-        Success = 0,
-        Info,
-        Warning,
-        Error,
-        Fatal,
-        Ask
-    }
-}
+    Success = 0,
+    Info,
+    Warning,
+    Error,
+    Fatal,
+    Ask
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs b/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
index 24d7eae4..7fd8d7d4 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
@@ -1,30 +1,29 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+/// IP类型枚举
+/// </summary>
+public enum IpType
 {
     /// <summary>
-    /// IP类型枚举
+    /// A类IP地址
     /// </summary>
-    public enum IpType
-    {
-        /// <summary>
-        /// A类IP地址
-        /// </summary>
-        A = 0,
-        /// <summary>
-        /// B类IP地址
-        /// </summary>
-        B,
-        /// <summary>
-        /// C类IP地址
-        /// </summary>
-        C,
-        /// <summary>
-        /// D类IP地址
-        /// </summary>
-        D,
-        /// <summary>
-        /// E类IP地址
-        /// </summary>
-        E
-    }
-}
+    A = 0,
+    /// <summary>
+    /// B类IP地址
+    /// </summary>
+    B,
+    /// <summary>
+    /// C类IP地址
+    /// </summary>
+    C,
+    /// <summary>
+    /// D类IP地址
+    /// </summary>
+    D,
+    /// <summary>
+    /// E类IP地址
+    /// </summary>
+    E
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
index 5aa6c542..2193f66a 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
-{
-    public enum LinearLayout
-    {
-        Stack,
+namespace HandyControl.Data;
 
-        Uniform
-    }
-}
+public enum LinearLayout
+{
+    Stack,
+
+    Uniform
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs b/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
index dec7ac09..453a24c7 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
@@ -1,12 +1,11 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum MouseHookMessageType
 {
-    public enum MouseHookMessageType
-    {
-        LeftButtonDown = 0x0201,
-        LeftButtonUp = 0x0202,
-        MouseMove = 0x0200,
-        MouseWheel = 0x020A,
-        RightButtonDown = 0x0204,
-        RightButtonUp = 0x0205
-    }
-}
+    LeftButtonDown = 0x0201,
+    LeftButtonUp = 0x0202,
+    MouseMove = 0x0200,
+    MouseWheel = 0x020A,
+    RightButtonDown = 0x0204,
+    RightButtonUp = 0x0205
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs b/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
index 3842c47d..9ce26a3a 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
@@ -1,25 +1,24 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum NotifyIconInfoType
 {
-    public enum NotifyIconInfoType
-    {
-        /// <summary>
-        ///  No Icon.
-        /// </summary>
-        None,
+    /// <summary>
+    ///  No Icon.
+    /// </summary>
+    None,
 
-        /// <summary>
-        ///  A Information Icon.
-        /// </summary>
-        Info,
+    /// <summary>
+    ///  A Information Icon.
+    /// </summary>
+    Info,
 
-        /// <summary>
-        ///  A Warning Icon.
-        /// </summary>
-        Warning,
+    /// <summary>
+    ///  A Warning Icon.
+    /// </summary>
+    Warning,
 
-        /// <summary>
-        ///  A Error Icon.
-        /// </summary>
-        Error
-    }
-}
+    /// <summary>
+    ///  A Error Icon.
+    /// </summary>
+    Error
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs b/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
index 9b8eece1..a739b61e 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
@@ -1,66 +1,65 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum PlacementType
 {
-    public enum PlacementType
-    {
-        /// <summary>
-        /// 左上
-        /// </summary>
-        LeftTop,
+    /// <summary>
+    /// 左上
+    /// </summary>
+    LeftTop,
 
-        /// <summary>
-        /// 左
-        /// </summary>
-        Left,
+    /// <summary>
+    /// 左
+    /// </summary>
+    Left,
 
-        /// <summary>
-        /// 左下
-        /// </summary>
-        LeftBottom,
+    /// <summary>
+    /// 左下
+    /// </summary>
+    LeftBottom,
 
-        /// <summary>
-        /// 上左
-        /// </summary>
-        TopLeft,
+    /// <summary>
+    /// 上左
+    /// </summary>
+    TopLeft,
 
-        /// <summary>
-        /// 上
-        /// </summary>
-        Top,
+    /// <summary>
+    /// 上
+    /// </summary>
+    Top,
 
-        /// <summary>
-        /// 上右
-        /// </summary>
-        TopRight,
+    /// <summary>
+    /// 上右
+    /// </summary>
+    TopRight,
 
-        /// <summary>
-        /// 右上
-        /// </summary>
-        RightTop,
+    /// <summary>
+    /// 右上
+    /// </summary>
+    RightTop,
 
-        /// <summary>
-        /// 右
-        /// </summary>
-        Right,
+    /// <summary>
+    /// 右
+    /// </summary>
+    Right,
 
-        /// <summary>
-        /// 右下
-        /// </summary>
-        RightBottom,
+    /// <summary>
+    /// 右下
+    /// </summary>
+    RightBottom,
 
-        /// <summary>
-        /// 下左
-        /// </summary>
-        BottomLeft,
+    /// <summary>
+    /// 下左
+    /// </summary>
+    BottomLeft,
 
-        /// <summary>
-        /// 下
-        /// </summary>
-        Bottom,
+    /// <summary>
+    /// 下
+    /// </summary>
+    Bottom,
 
-        /// <summary>
-        /// 下右
-        /// </summary>
-        BottomRight,
-    }
-}
+    /// <summary>
+    /// 下右
+    /// </summary>
+    BottomRight,
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
index 094c23d8..38f39194 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
@@ -1,24 +1,23 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     表示一个操作的返回结果类型
+/// </summary>
+public enum ResultType
 {
     /// <summary>
-    ///     表示一个操作的返回结果类型
+    ///     成功
     /// </summary>
-    public enum ResultType
-    {
-        /// <summary>
-        ///     成功
-        /// </summary>
-        Success,
+    Success,
 
-        /// <summary>
-        ///     失败
-        /// </summary>
-        Failed,
+    /// <summary>
+    ///     失败
+    /// </summary>
+    Failed,
 
-        /// <summary>
-        ///     无数据
-        /// </summary>
-        None
-    }
-}
+    /// <summary>
+    ///     无数据
+    /// </summary>
+    None
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
index dcadfbaa..4238ed12 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
@@ -1,10 +1,9 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum ShowAnimation
 {
-    public enum ShowAnimation
-    {
-        None,
-        HorizontalMove,
-        VerticalMove,
-        Fade
-    }
-}
+    None,
+    HorizontalMove,
+    VerticalMove,
+    Fade
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs b/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
index 2f1ff5c9..870b356b 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum SideMenuItemRole
 {
-    public enum SideMenuItemRole
-    {
-        Header,
-        Item
-    }
-}
+    Header,
+    Item
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs b/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
index 5518c231..4c37d8c5 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
@@ -1,10 +1,9 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum SkinType
 {
-    public enum SkinType
-    {
-        Default,
-        Dark,
-        Violet
-    }
-}
+    Default,
+    Dark,
+    Violet
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
index 86784c5d..e979cdf6 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
@@ -1,23 +1,22 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     步骤状态
+/// </summary>
+public enum StepStatus
 {
     /// <summary>
-    ///     步骤状态
+    ///     完成
     /// </summary>
-    public enum StepStatus
-    {
-        /// <summary>
-        ///     完成
-        /// </summary>
-        Complete,
+    Complete,
 
-        /// <summary>
-        ///     进行中
-        /// </summary>
-        UnderWay,
+    /// <summary>
+    ///     进行中
+    /// </summary>
+    UnderWay,
 
-        /// <summary>
-        ///     等待中
-        /// </summary>
-        Waiting
-    }
-}
+    /// <summary>
+    ///     等待中
+    /// </summary>
+    Waiting
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
index b3462ade..7be77f34 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum StrokePosition
 {
-    public enum StrokePosition
-    {
-        Center,
-        Outside,
-        Inside
-    }
-}
+    Center,
+    Outside,
+    Inside
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs b/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
index 970a52bc..61132b77 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
@@ -1,27 +1,26 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     文本类型枚举
+/// </summary>
+public enum TextType
 {
-    /// <summary>
-    ///     文本类型枚举
-    /// </summary>
-    public enum TextType
-    {
-        Common,
-        Phone,
-        Mail,
-        Url,
-        Chinese,
-        Number,
-        Digits,
-        PInt,
-        NInt,
-        Int,
-        NnInt,
-        NpInt,
-        PDouble,
-        NDouble,
-        Double,
-        NnDouble,
-        NpDouble
-    }
-}
+    Common,
+    Phone,
+    Mail,
+    Url,
+    Chinese,
+    Number,
+    Digits,
+    PInt,
+    NInt,
+    Int,
+    NnInt,
+    NpInt,
+    PDouble,
+    NDouble,
+    Double,
+    NnDouble,
+    NpDouble
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs b/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
index 8df94559..6386f83f 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
@@ -1,12 +1,11 @@
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     标题对齐方式
+/// </summary>
+public enum TitlePlacementType
 {
-    /// <summary>
-    ///     标题对齐方式
-    /// </summary>
-    public enum TitlePlacementType
-    {
-        Left,
-        Top
-    }
-}
+    Left,
+    Top
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
index 35b33fdf..0d96a718 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
@@ -1,16 +1,15 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum TransitionMode
 {
-    public enum TransitionMode
-    {
-        Right2Left,
-        Left2Right,
-        Bottom2Top,
-        Top2Bottom,
-        Right2LeftWithFade,
-        Left2RightWithFade,
-        Bottom2TopWithFade,
-        Top2BottomWithFade,
-        Fade,
-        Custom
-    }
-}
+    Right2Left,
+    Left2Right,
+    Bottom2Top,
+    Top2Bottom,
+    Right2LeftWithFade,
+    Left2RightWithFade,
+    Bottom2TopWithFade,
+    Top2BottomWithFade,
+    Fade,
+    Custom
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs b/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
index 02631d6e..702ef2ae 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum VisualWrapping
 {
-    public enum VisualWrapping
-    {
-        NoWrap,
-        Wrap
-    }
-}
+    NoWrap,
+    Wrap
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/EnumItem.cs b/src/Shared/HandyControl_Shared/Data/EnumItem.cs
index 191115e4..d0f340cf 100644
--- a/src/Shared/HandyControl_Shared/Data/EnumItem.cs
+++ b/src/Shared/HandyControl_Shared/Data/EnumItem.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
-{
-    public class EnumItem
-    {
-        public string Description { get; set; }
+namespace HandyControl.Data;
 
-        public System.Enum Value { get; set; }
-    }
-}
+public class EnumItem
+{
+    public string Description { get; set; }
+
+    public System.Enum Value { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
index da1d816f..3e40977a 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
@@ -1,12 +1,11 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexContentAlignment
 {
-    public enum FlexContentAlignment
-    {
-        Stretch,
-        FlexStart,
-        FlexEnd,
-        Center,
-        SpaceBetween,
-        SpaceAround
-    }
-}
+    Stretch,
+    FlexStart,
+    FlexEnd,
+    Center,
+    SpaceBetween,
+    SpaceAround
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
index 94278877..67ac711d 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
@@ -1,11 +1,10 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexContentJustify
 {
-    public enum FlexContentJustify
-    {
-        FlexStart,
-        FlexEnd,
-        Center,
-        SpaceBetween,
-        SpaceAround
-    }
-}
+    FlexStart,
+    FlexEnd,
+    Center,
+    SpaceBetween,
+    SpaceAround
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
index 6d3b0d85..8af6afa8 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
@@ -1,10 +1,9 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexDirection
 {
-    public enum FlexDirection
-    {
-        Row,
-        RowReverse,
-        Column,
-        ColumnReverse
-    }
-}
+    Row,
+    RowReverse,
+    Column,
+    ColumnReverse
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
index 0f9e3c2b..99c332a6 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
@@ -1,12 +1,11 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexItemAlignment
 {
-    public enum FlexItemAlignment
-    {
-        Auto,
-        FlexStart,
-        FlexEnd,
-        Center,
-        Baseline,
-        Stretch
-    }
-}
+    Auto,
+    FlexStart,
+    FlexEnd,
+    Center,
+    Baseline,
+    Stretch
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
index c51b62d3..ffe13439 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
@@ -1,11 +1,10 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexItemsAlignment
 {
-    public enum FlexItemsAlignment
-    {
-        Stretch,
-        FlexStart,
-        FlexEnd,
-        Center,
-        Baseline
-    }
-}
+    Stretch,
+    FlexStart,
+    FlexEnd,
+    Center,
+    Baseline
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
index de1cfc9b..650c93f8 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public enum FlexWrap
 {
-    public enum FlexWrap
-    {
-        NoWrap,
-        Wrap,
-        WrapReverse
-    }
-}
+    NoWrap,
+    Wrap,
+    WrapReverse
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs b/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
index c8d8b24b..324b8577 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
@@ -5,267 +5,266 @@ using System.Runtime.InteropServices;
 using System.Security.Permissions;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+// ReSharper disable once InconsistentNaming
+internal class GPStream : InteropValues.IStream
 {
-    // ReSharper disable once InconsistentNaming
-    internal class GPStream : InteropValues.IStream
+    protected Stream DataStream;
+
+    // to support seeking ahead of the stream length...
+    long _virtualPosition = -1;
+
+    internal GPStream(Stream stream)
     {
-        protected Stream DataStream;
-
-        // to support seeking ahead of the stream length...
-        long _virtualPosition = -1;
-
-        internal GPStream(Stream stream)
+        if (!stream.CanSeek)
         {
-            if (!stream.CanSeek)
+            const int readBlock = 256;
+            var bytes = new byte[readBlock];
+            int readLen;
+            var current = 0;
+            do
             {
-                const int readBlock = 256;
-                var bytes = new byte[readBlock];
-                int readLen;
-                var current = 0;
-                do
+                if (bytes.Length < current + readBlock)
                 {
-                    if (bytes.Length < current + readBlock)
-                    {
-                        var newData = new byte[bytes.Length * 2];
-                        Array.Copy(bytes, newData, bytes.Length);
-                        bytes = newData;
-                    }
-                    readLen = stream.Read(bytes, current, readBlock);
-                    current += readLen;
-                } while (readLen != 0);
-
-                DataStream = new MemoryStream(bytes);
-            }
-            else
-            {
-                DataStream = stream;
-            }
-        }
-
-        private void ActualizeVirtualPosition()
-        {
-            if (_virtualPosition == -1) return;
-
-            if (_virtualPosition > DataStream.Length)
-                DataStream.SetLength(_virtualPosition);
-
-            DataStream.Position = _virtualPosition;
-
-            _virtualPosition = -1;
-        }
-
-        public virtual InteropValues.IStream Clone()
-        {
-            NotImplemented();
-            return null;
-        }
-
-        public virtual void Commit(int grfCommitFlags)
-        {
-            DataStream.Flush();
-            // Extend the length of the file if needed.
-            ActualizeVirtualPosition();
-        }
-
-        [
-            UIPermission(SecurityAction.Demand, Window = UIPermissionWindow.AllWindows),
-            SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)
-        ]
-        public virtual long CopyTo(InteropValues.IStream pstm, long cb, long[] pcbRead)
-        {
-
-            const int bufsize = 4096;
-            var buffer = Marshal.AllocHGlobal(bufsize);
-            if (buffer == IntPtr.Zero) throw new OutOfMemoryException();
-            long written = 0;
-            try
-            {
-                while (written < cb)
-                {
-                    var toRead = bufsize;
-                    if (written + toRead > cb) toRead = (int) (cb - written);
-                    var read = Read(buffer, toRead);
-                    if (read == 0) break;
-                    if (pstm.Write(buffer, read) != read)
-                    {
-                        throw EFail("Wrote an incorrect number of bytes");
-                    }
-                    written += read;
+                    var newData = new byte[bytes.Length * 2];
+                    Array.Copy(bytes, newData, bytes.Length);
+                    bytes = newData;
                 }
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(buffer);
-            }
-            if (pcbRead != null && pcbRead.Length > 0)
-            {
-                pcbRead[0] = written;
-            }
+                readLen = stream.Read(bytes, current, readBlock);
+                current += readLen;
+            } while (readLen != 0);
 
-            return written;
+            DataStream = new MemoryStream(bytes);
         }
-
-        public virtual Stream GetDataStream()
+        else
         {
-            return DataStream;
-        }
-
-        public virtual void LockRegion(long libOffset, long cb, int dwLockType)
-        {
-        }
-
-        protected static ExternalException EFail(string msg)
-        {
-            throw new ExternalException(msg, InteropMethods.E_FAIL);
-        }
-
-        protected static void NotImplemented()
-        {
-            throw new ExternalException("NotImplemented");
-        }
-
-        public virtual int Read(IntPtr buf, int length)
-        {
-            var buffer = new byte[length];
-            var count = Read(buffer, length);
-            Marshal.Copy(buffer, 0, buf, length);
-            return count;
-        }
-
-        public virtual int Read(byte[] buffer, int length)
-        {
-            ActualizeVirtualPosition();
-            return DataStream.Read(buffer, 0, length);
-        }
-
-        public virtual void Revert()
-        {
-            NotImplemented();
-        }
-
-        public virtual long Seek(long offset, int origin)
-        {
-            var pos = _virtualPosition;
-            if (_virtualPosition == -1)
-            {
-                pos = DataStream.Position;
-            }
-            var len = DataStream.Length;
-            switch (origin)
-            {
-                case InteropValues.StreamConsts.STREAM_SEEK_SET:
-                    if (offset <= len)
-                    {
-                        DataStream.Position = offset;
-                        _virtualPosition = -1;
-                    }
-                    else
-                    {
-                        _virtualPosition = offset;
-                    }
-                    break;
-                case InteropValues.StreamConsts.STREAM_SEEK_END:
-                    if (offset <= 0)
-                    {
-                        DataStream.Position = len + offset;
-                        _virtualPosition = -1;
-                    }
-                    else
-                    {
-                        _virtualPosition = len + offset;
-                    }
-                    break;
-                case InteropValues.StreamConsts.STREAM_SEEK_CUR:
-                    if (offset + pos <= len)
-                    {
-                        DataStream.Position = pos + offset;
-                        _virtualPosition = -1;
-                    }
-                    else
-                    {
-                        _virtualPosition = offset + pos;
-                    }
-                    break;
-            }
-            return _virtualPosition != -1 ? _virtualPosition : DataStream.Position;
-        }
-
-        public virtual void SetSize(long value)
-        {
-            DataStream.SetLength(value);
-        }
-
-        public void Stat(IntPtr pstatstg, int grfStatFlag)
-        {
-            var stats = new STATSTG { cbSize = DataStream.Length };
-            Marshal.StructureToPtr(stats, pstatstg, true);
-        }
-
-        public virtual void UnlockRegion(long libOffset, long cb, int dwLockType)
-        {
-        }
-
-        public virtual int Write(IntPtr buf, int length)
-        {
-            var buffer = new byte[length];
-            Marshal.Copy(buf, buffer, 0, length);
-            return Write(buffer, length);
-        }
-
-        public virtual int Write(byte[] buffer, int length)
-        {
-            ActualizeVirtualPosition();
-            DataStream.Write(buffer, 0, length);
-            return length;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        public class STATSTG
-        {
-
-            [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
-            public IntPtr pwcsName = IntPtr.Zero;
-            public int type;
-            [MarshalAs(UnmanagedType.I8)]
-            public long cbSize;
-            [MarshalAs(UnmanagedType.I8)]
-            public long mtime;
-            [MarshalAs(UnmanagedType.I8)]
-            public long ctime;
-            [MarshalAs(UnmanagedType.I8)]
-            public long atime;
-            [MarshalAs(UnmanagedType.I4)]
-            public int grfMode;
-            [MarshalAs(UnmanagedType.I4)]
-            public int grfLocksSupported;
-
-            public int clsid_data1;
-            [MarshalAs(UnmanagedType.I2)]
-            public short clsid_data2;
-            [MarshalAs(UnmanagedType.I2)]
-            public short clsid_data3;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b0;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b1;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b2;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b3;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b4;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b5;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b6;
-            [MarshalAs(UnmanagedType.U1)]
-            public byte clsid_b7;
-            [MarshalAs(UnmanagedType.I4)]
-            public int grfStateBits;
-            [MarshalAs(UnmanagedType.I4)]
-            public int reserved;
+            DataStream = stream;
         }
     }
-}
+
+    private void ActualizeVirtualPosition()
+    {
+        if (_virtualPosition == -1) return;
+
+        if (_virtualPosition > DataStream.Length)
+            DataStream.SetLength(_virtualPosition);
+
+        DataStream.Position = _virtualPosition;
+
+        _virtualPosition = -1;
+    }
+
+    public virtual InteropValues.IStream Clone()
+    {
+        NotImplemented();
+        return null;
+    }
+
+    public virtual void Commit(int grfCommitFlags)
+    {
+        DataStream.Flush();
+        // Extend the length of the file if needed.
+        ActualizeVirtualPosition();
+    }
+
+    [
+        UIPermission(SecurityAction.Demand, Window = UIPermissionWindow.AllWindows),
+        SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)
+    ]
+    public virtual long CopyTo(InteropValues.IStream pstm, long cb, long[] pcbRead)
+    {
+
+        const int bufsize = 4096;
+        var buffer = Marshal.AllocHGlobal(bufsize);
+        if (buffer == IntPtr.Zero) throw new OutOfMemoryException();
+        long written = 0;
+        try
+        {
+            while (written < cb)
+            {
+                var toRead = bufsize;
+                if (written + toRead > cb) toRead = (int) (cb - written);
+                var read = Read(buffer, toRead);
+                if (read == 0) break;
+                if (pstm.Write(buffer, read) != read)
+                {
+                    throw EFail("Wrote an incorrect number of bytes");
+                }
+                written += read;
+            }
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(buffer);
+        }
+        if (pcbRead != null && pcbRead.Length > 0)
+        {
+            pcbRead[0] = written;
+        }
+
+        return written;
+    }
+
+    public virtual Stream GetDataStream()
+    {
+        return DataStream;
+    }
+
+    public virtual void LockRegion(long libOffset, long cb, int dwLockType)
+    {
+    }
+
+    protected static ExternalException EFail(string msg)
+    {
+        throw new ExternalException(msg, InteropMethods.E_FAIL);
+    }
+
+    protected static void NotImplemented()
+    {
+        throw new ExternalException("NotImplemented");
+    }
+
+    public virtual int Read(IntPtr buf, int length)
+    {
+        var buffer = new byte[length];
+        var count = Read(buffer, length);
+        Marshal.Copy(buffer, 0, buf, length);
+        return count;
+    }
+
+    public virtual int Read(byte[] buffer, int length)
+    {
+        ActualizeVirtualPosition();
+        return DataStream.Read(buffer, 0, length);
+    }
+
+    public virtual void Revert()
+    {
+        NotImplemented();
+    }
+
+    public virtual long Seek(long offset, int origin)
+    {
+        var pos = _virtualPosition;
+        if (_virtualPosition == -1)
+        {
+            pos = DataStream.Position;
+        }
+        var len = DataStream.Length;
+        switch (origin)
+        {
+            case InteropValues.StreamConsts.STREAM_SEEK_SET:
+                if (offset <= len)
+                {
+                    DataStream.Position = offset;
+                    _virtualPosition = -1;
+                }
+                else
+                {
+                    _virtualPosition = offset;
+                }
+                break;
+            case InteropValues.StreamConsts.STREAM_SEEK_END:
+                if (offset <= 0)
+                {
+                    DataStream.Position = len + offset;
+                    _virtualPosition = -1;
+                }
+                else
+                {
+                    _virtualPosition = len + offset;
+                }
+                break;
+            case InteropValues.StreamConsts.STREAM_SEEK_CUR:
+                if (offset + pos <= len)
+                {
+                    DataStream.Position = pos + offset;
+                    _virtualPosition = -1;
+                }
+                else
+                {
+                    _virtualPosition = offset + pos;
+                }
+                break;
+        }
+        return _virtualPosition != -1 ? _virtualPosition : DataStream.Position;
+    }
+
+    public virtual void SetSize(long value)
+    {
+        DataStream.SetLength(value);
+    }
+
+    public void Stat(IntPtr pstatstg, int grfStatFlag)
+    {
+        var stats = new STATSTG { cbSize = DataStream.Length };
+        Marshal.StructureToPtr(stats, pstatstg, true);
+    }
+
+    public virtual void UnlockRegion(long libOffset, long cb, int dwLockType)
+    {
+    }
+
+    public virtual int Write(IntPtr buf, int length)
+    {
+        var buffer = new byte[length];
+        Marshal.Copy(buf, buffer, 0, length);
+        return Write(buffer, length);
+    }
+
+    public virtual int Write(byte[] buffer, int length)
+    {
+        ActualizeVirtualPosition();
+        DataStream.Write(buffer, 0, length);
+        return length;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    public class STATSTG
+    {
+
+        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
+        public IntPtr pwcsName = IntPtr.Zero;
+        public int type;
+        [MarshalAs(UnmanagedType.I8)]
+        public long cbSize;
+        [MarshalAs(UnmanagedType.I8)]
+        public long mtime;
+        [MarshalAs(UnmanagedType.I8)]
+        public long ctime;
+        [MarshalAs(UnmanagedType.I8)]
+        public long atime;
+        [MarshalAs(UnmanagedType.I4)]
+        public int grfMode;
+        [MarshalAs(UnmanagedType.I4)]
+        public int grfLocksSupported;
+
+        public int clsid_data1;
+        [MarshalAs(UnmanagedType.I2)]
+        public short clsid_data2;
+        [MarshalAs(UnmanagedType.I2)]
+        public short clsid_data3;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b0;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b1;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b2;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b3;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b4;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b5;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b6;
+        [MarshalAs(UnmanagedType.U1)]
+        public byte clsid_b7;
+        [MarshalAs(UnmanagedType.I4)]
+        public int grfStateBits;
+        [MarshalAs(UnmanagedType.I4)]
+        public int reserved;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
index deca9536..91daf735 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
@@ -1,29 +1,28 @@
 using System;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal class GifFrameDimension
 {
-    internal class GifFrameDimension
+    public GifFrameDimension(Guid guid) => Guid = guid;
+
+    public Guid Guid { get; }
+
+    public static GifFrameDimension Time { get; } = new(new Guid("{6aedbd6d-3fb5-418a-83a6-7f45229dc872}"));
+
+    public static GifFrameDimension Resolution { get; } = new(new Guid("{84236f7b-3bd3-428f-8dab-4ea1439ca315}"));
+
+    public static GifFrameDimension Page { get; } = new(new Guid("{7462dc86-6180-4c7e-8e3f-ee7333a7a483}"));
+
+    public override bool Equals(object o) => o is GifFrameDimension format && Guid == format.Guid;
+
+    public override int GetHashCode() => Guid.GetHashCode();
+
+    public override string ToString()
     {
-        public GifFrameDimension(Guid guid) => Guid = guid;
-
-        public Guid Guid { get; }
-
-        public static GifFrameDimension Time { get; } = new(new Guid("{6aedbd6d-3fb5-418a-83a6-7f45229dc872}"));
-
-        public static GifFrameDimension Resolution { get; } = new(new Guid("{84236f7b-3bd3-428f-8dab-4ea1439ca315}"));
-
-        public static GifFrameDimension Page { get; } = new(new Guid("{7462dc86-6180-4c7e-8e3f-ee7333a7a483}"));
-
-        public override bool Equals(object o) => o is GifFrameDimension format && Guid == format.Guid;
-
-        public override int GetHashCode() => Guid.GetHashCode();
-
-        public override string ToString()
-        {
-            if (Equals(this, Time)) return "Time";
-            if (Equals(this, Resolution)) return "Resolution";
-            if (Equals(this, Page)) return "Page";
-            return "[FrameDimension: " + Guid + "]";
-        }
+        if (Equals(this, Time)) return "Time";
+        if (Equals(this, Resolution)) return "Resolution";
+        if (Equals(this, Page)) return "Page";
+        return "[FrameDimension: " + Guid + "]";
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
index 68087516..5aa0fda6 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
@@ -2,95 +2,94 @@
 using HandyControl.Controls;
 using HandyControl.Tools;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class GifImageInfo
 {
-    public class GifImageInfo
+    private const int PropertyTagFrameDelay = 0x5100;
+
+    private int _frame;
+
+    private readonly int[] _frameDelay;
+
+    public int FrameCount { get; }
+
+    internal GifImage Image { get; }
+
+    public bool Animated { get; }
+
+    public EventHandler FrameChangedHandler { get; set; }
+
+    internal int FrameTimer { get; set; }
+
+    public bool FrameDirty { get; private set; }
+
+    public int Frame
     {
-        private const int PropertyTagFrameDelay = 0x5100;
-
-        private int _frame;
-
-        private readonly int[] _frameDelay;
-
-        public int FrameCount { get; }
-
-        internal GifImage Image { get; }
-
-        public bool Animated { get; }
-
-        public EventHandler FrameChangedHandler { get; set; }
-
-        internal int FrameTimer { get; set; }
-
-        public bool FrameDirty { get; private set; }
-
-        public int Frame
+        get => _frame;
+        set
         {
-            get => _frame;
-            set
+            if (_frame != value)
             {
-                if (_frame != value)
+                if (value < 0 || value >= FrameCount)
                 {
-                    if (value < 0 || value >= FrameCount)
-                    {
-                        throw new ArgumentException("InvalidFrame");
-                    }
+                    throw new ArgumentException("InvalidFrame");
+                }
 
-                    if (Animated)
-                    {
-                        _frame = value;
-                        FrameDirty = true;
+                if (Animated)
+                {
+                    _frame = value;
+                    FrameDirty = true;
 
-                        OnFrameChanged(EventArgs.Empty);
-                    }
+                    OnFrameChanged(EventArgs.Empty);
                 }
             }
         }
-
-        public GifImageInfo(GifImage image)
-        {
-            Image = image;
-            Animated = ImageAnimator.CanAnimate(image);
-
-            if (Animated)
-            {
-                FrameCount = image.GetFrameCount(GifFrameDimension.Time);
-
-                var frameDelayItem = image.GetPropertyItem(PropertyTagFrameDelay);
-
-                // If the image does not have a frame delay, we just return 0.                                     
-                //
-                if (frameDelayItem != null)
-                {
-                    // Convert the frame delay from byte[] to int
-                    //
-                    var values = frameDelayItem.Value;
-                    _frameDelay = new int[FrameCount];
-                    for (var i = 0; i < FrameCount; ++i)
-                    {
-                        _frameDelay[i] = values[i * 4] + 256 * values[i * 4 + 1] + 256 * 256 * values[i * 4 + 2] + 256 * 256 * 256 * values[i * 4 + 3];
-                    }
-                }
-            }
-            else
-            {
-                FrameCount = 1;
-            }
-
-            _frameDelay ??= new int[FrameCount];
-        }
-
-        public int FrameDelay(int frame) => _frameDelay[frame];
-
-        internal void UpdateFrame()
-        {
-            if (FrameDirty)
-            {
-                Image.SelectActiveFrame(GifFrameDimension.Time, Frame);
-                FrameDirty = false;
-            }
-        }
-
-        protected void OnFrameChanged(EventArgs e) => FrameChangedHandler?.Invoke(Image, e);
     }
-}
+
+    public GifImageInfo(GifImage image)
+    {
+        Image = image;
+        Animated = ImageAnimator.CanAnimate(image);
+
+        if (Animated)
+        {
+            FrameCount = image.GetFrameCount(GifFrameDimension.Time);
+
+            var frameDelayItem = image.GetPropertyItem(PropertyTagFrameDelay);
+
+            // If the image does not have a frame delay, we just return 0.                                     
+            //
+            if (frameDelayItem != null)
+            {
+                // Convert the frame delay from byte[] to int
+                //
+                var values = frameDelayItem.Value;
+                _frameDelay = new int[FrameCount];
+                for (var i = 0; i < FrameCount; ++i)
+                {
+                    _frameDelay[i] = values[i * 4] + 256 * values[i * 4 + 1] + 256 * 256 * values[i * 4 + 2] + 256 * 256 * 256 * values[i * 4 + 3];
+                }
+            }
+        }
+        else
+        {
+            FrameCount = 1;
+        }
+
+        _frameDelay ??= new int[FrameCount];
+    }
+
+    public int FrameDelay(int frame) => _frameDelay[frame];
+
+    internal void UpdateFrame()
+    {
+        if (FrameDirty)
+        {
+            Image.SelectActiveFrame(GifFrameDimension.Time, Frame);
+            FrameDirty = false;
+        }
+    }
+
+    protected void OnFrameChanged(EventArgs e) => FrameChangedHandler?.Invoke(Image, e);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
index 9be7bd19..1ef4dcc0 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
@@ -1,13 +1,12 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class GifPropertyItem
 {
-    public class GifPropertyItem
-    {
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        public int Len { get; set; }
+    public int Len { get; set; }
 
-        public short Type { get; set; }
+    public short Type { get; set; }
 
-        public byte[] Value { get; set; }
-    }
-}
+    public byte[] Value { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
index 228e0f91..020ae038 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
@@ -2,113 +2,112 @@
 using System.Runtime.InteropServices;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+[StructLayout(LayoutKind.Sequential)]
+public class GifPropertyItemInternal : IDisposable
 {
-    [StructLayout(LayoutKind.Sequential)]
-    public class GifPropertyItemInternal : IDisposable
+    public int id;
+    public int len;
+    public short type;
+    public IntPtr value = IntPtr.Zero;
+
+    internal GifPropertyItemInternal()
     {
-        public int id;
-        public int len;
-        public short type;
-        public IntPtr value = IntPtr.Zero;
+    }
 
-        internal GifPropertyItemInternal()
+    public byte[] Value
+    {
+        get
         {
-        }
+            if (len == 0)
+                return null;
 
-        public byte[] Value
-        {
-            get
-            {
-                if (len == 0)
-                    return null;
+            var bytes = new byte[len];
 
-                var bytes = new byte[len];
-
-                Marshal.Copy(value,
-                    bytes,
-                    0,
-                    len);
-                return bytes;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        ~GifPropertyItemInternal()
-        {
-            Dispose(false);
-        }
-
-        private void Dispose(bool disposing)
-        {
-            if (value != IntPtr.Zero)
-            {
-                Marshal.FreeHGlobal(value);
-                value = IntPtr.Zero;
-            }
-
-            if (disposing)
-                GC.SuppressFinalize(this);
-        }
-
-        internal static GifPropertyItemInternal ConvertFromPropertyItem(GifPropertyItem propItem)
-        {
-            var propItemInternal = new GifPropertyItemInternal
-            {
-                id = propItem.Id,
-                len = 0,
-                type = propItem.Type
-            };
-
-            var propItemValue = propItem.Value;
-            if (propItemValue != null)
-            {
-                var length = propItemValue.Length;
-                propItemInternal.len = length;
-                propItemInternal.value = Marshal.AllocHGlobal(length);
-                Marshal.Copy(propItemValue, 0, propItemInternal.value, length);
-            }
-
-            return propItemInternal;
-        }
-
-        internal static GifPropertyItem[] ConvertFromMemory(IntPtr propdata, int count)
-        {
-            var props = new GifPropertyItem[count];
-
-            for (var i = 0; i < count; i++)
-            {
-                GifPropertyItemInternal propcopy = null;
-                try
-                {
-                    propcopy = (GifPropertyItemInternal) InteropMethods.PtrToStructure(propdata,
-                        typeof(GifPropertyItemInternal));
-
-                    props[i] = new GifPropertyItem
-                    {
-                        Id = propcopy.id,
-                        Len = propcopy.len,
-                        Type = propcopy.type,
-                        Value = propcopy.Value
-                    };
-
-                    // this calls Marshal.Copy and creates a copy of the original memory into a byte array.
-
-                    propcopy.value = IntPtr.Zero; // we dont actually own this memory so dont free it.
-                }
-                finally
-                {
-                    propcopy?.Dispose();
-                }
-
-                propdata = (IntPtr) ((long) propdata + Marshal.SizeOf(typeof(GifPropertyItemInternal)));
-            }
-
-            return props;
+            Marshal.Copy(value,
+                bytes,
+                0,
+                len);
+            return bytes;
         }
     }
-}
+
+    public void Dispose()
+    {
+        Dispose(true);
+    }
+
+    ~GifPropertyItemInternal()
+    {
+        Dispose(false);
+    }
+
+    private void Dispose(bool disposing)
+    {
+        if (value != IntPtr.Zero)
+        {
+            Marshal.FreeHGlobal(value);
+            value = IntPtr.Zero;
+        }
+
+        if (disposing)
+            GC.SuppressFinalize(this);
+    }
+
+    internal static GifPropertyItemInternal ConvertFromPropertyItem(GifPropertyItem propItem)
+    {
+        var propItemInternal = new GifPropertyItemInternal
+        {
+            id = propItem.Id,
+            len = 0,
+            type = propItem.Type
+        };
+
+        var propItemValue = propItem.Value;
+        if (propItemValue != null)
+        {
+            var length = propItemValue.Length;
+            propItemInternal.len = length;
+            propItemInternal.value = Marshal.AllocHGlobal(length);
+            Marshal.Copy(propItemValue, 0, propItemInternal.value, length);
+        }
+
+        return propItemInternal;
+    }
+
+    internal static GifPropertyItem[] ConvertFromMemory(IntPtr propdata, int count)
+    {
+        var props = new GifPropertyItem[count];
+
+        for (var i = 0; i < count; i++)
+        {
+            GifPropertyItemInternal propcopy = null;
+            try
+            {
+                propcopy = (GifPropertyItemInternal) InteropMethods.PtrToStructure(propdata,
+                    typeof(GifPropertyItemInternal));
+
+                props[i] = new GifPropertyItem
+                {
+                    Id = propcopy.id,
+                    Len = propcopy.len,
+                    Type = propcopy.type,
+                    Value = propcopy.Value
+                };
+
+                // this calls Marshal.Copy and creates a copy of the original memory into a byte array.
+
+                propcopy.value = IntPtr.Zero; // we dont actually own this memory so dont free it.
+            }
+            finally
+            {
+                propcopy?.Dispose();
+            }
+
+            propdata = (IntPtr) ((long) propdata + Marshal.SizeOf(typeof(GifPropertyItemInternal)));
+        }
+
+        return props;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
index 699461c2..8efe87f3 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
@@ -1,21 +1,20 @@
 using HandyControl.Controls;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal class ChangeScope : DisposableObject
 {
-    internal class ChangeScope : DisposableObject
+    private readonly GlowWindow _window;
+
+    public ChangeScope(GlowWindow window)
     {
-        private readonly GlowWindow _window;
-
-        public ChangeScope(GlowWindow window)
-        {
-            _window = window;
-            _window.DeferGlowChangesCount++;
-        }
-
-        protected override void DisposeManagedResources()
-        {
-            _window.DeferGlowChangesCount--;
-            if (_window.DeferGlowChangesCount == 0) _window.EndDeferGlowChanges();
-        }
+        _window = window;
+        _window.DeferGlowChangesCount++;
     }
-}
+
+    protected override void DisposeManagedResources()
+    {
+        _window.DeferGlowChangesCount--;
+        if (_window.DeferGlowChangesCount == 0) _window.EndDeferGlowChanges();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
index 271fb3ce..cdeef002 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
@@ -4,111 +4,110 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal class GlowBitmap : DisposableObject
 {
-    internal class GlowBitmap : DisposableObject
+    internal const int GlowBitmapPartCount = 16;
+
+    private const int BytesPerPixelBgra32 = 4;
+
+    private static readonly CachedBitmapInfo[] _transparencyMasks = new CachedBitmapInfo[GlowBitmapPartCount];
+
+    private readonly InteropValues.BITMAPINFO _bitmapInfo;
+
+    private readonly IntPtr _pbits;
+
+    internal GlowBitmap(IntPtr hdcScreen, int width, int height)
     {
-        internal const int GlowBitmapPartCount = 16;
+        _bitmapInfo.biSize = Marshal.SizeOf(typeof(InteropValues.BITMAPINFOHEADER));
+        _bitmapInfo.biPlanes = 1;
+        _bitmapInfo.biBitCount = 32;
+        _bitmapInfo.biCompression = 0;
+        _bitmapInfo.biXPelsPerMeter = 0;
+        _bitmapInfo.biYPelsPerMeter = 0;
+        _bitmapInfo.biWidth = width;
+        _bitmapInfo.biHeight = -height;
 
-        private const int BytesPerPixelBgra32 = 4;
+        Handle = InteropMethods.CreateDIBSection(
+            hdcScreen,
+            ref _bitmapInfo,
+            0u,
+            out _pbits,
+            IntPtr.Zero,
+            0u);
+    }
 
-        private static readonly CachedBitmapInfo[] _transparencyMasks = new CachedBitmapInfo[GlowBitmapPartCount];
+    internal IntPtr Handle { get; }
 
-        private readonly InteropValues.BITMAPINFO _bitmapInfo;
+    internal IntPtr DIBits => _pbits;
 
-        private readonly IntPtr _pbits;
+    internal int Width => _bitmapInfo.biWidth;
 
-        internal GlowBitmap(IntPtr hdcScreen, int width, int height)
+    internal int Height => -_bitmapInfo.biHeight;
+
+    protected override void DisposeNativeResources() => InteropMethods.DeleteObject(Handle);
+
+    private static byte PremultiplyAlpha(byte channel, byte alpha) => (byte) (channel * alpha / 255.0);
+
+    internal static GlowBitmap Create(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart, Color color)
+    {
+        var orCreateAlphaMask =
+            GetOrCreateAlphaMask(bitmapPart);
+
+        var glowBitmap =
+            new GlowBitmap(
+                drawingContext.ScreenDC,
+                orCreateAlphaMask.Width,
+                orCreateAlphaMask.Height);
+
+        for (var i = 0; i < orCreateAlphaMask.DIBits.Length; i += BytesPerPixelBgra32)
         {
-            _bitmapInfo.biSize = Marshal.SizeOf(typeof(InteropValues.BITMAPINFOHEADER));
-            _bitmapInfo.biPlanes = 1;
-            _bitmapInfo.biBitCount = 32;
-            _bitmapInfo.biCompression = 0;
-            _bitmapInfo.biXPelsPerMeter = 0;
-            _bitmapInfo.biYPelsPerMeter = 0;
-            _bitmapInfo.biWidth = width;
-            _bitmapInfo.biHeight = -height;
-
-            Handle = InteropMethods.CreateDIBSection(
-                hdcScreen,
-                ref _bitmapInfo,
-                0u,
-                out _pbits,
-                IntPtr.Zero,
-                0u);
+            var b = orCreateAlphaMask.DIBits[i + 3];
+            var val = PremultiplyAlpha(color.R, b);
+            var val2 = PremultiplyAlpha(color.G, b);
+            var val3 = PremultiplyAlpha(color.B, b);
+            Marshal.WriteByte(glowBitmap.DIBits, i, val3);
+            Marshal.WriteByte(glowBitmap.DIBits, i + 1, val2);
+            Marshal.WriteByte(glowBitmap.DIBits, i + 2, val);
+            Marshal.WriteByte(glowBitmap.DIBits, i + 3, b);
         }
 
-        internal IntPtr Handle { get; }
+        return glowBitmap;
+    }
 
-        internal IntPtr DIBits => _pbits;
-
-        internal int Width => _bitmapInfo.biWidth;
-
-        internal int Height => -_bitmapInfo.biHeight;
-
-        protected override void DisposeNativeResources() => InteropMethods.DeleteObject(Handle);
-
-        private static byte PremultiplyAlpha(byte channel, byte alpha) => (byte) (channel * alpha / 255.0);
-
-        internal static GlowBitmap Create(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart, Color color)
+    private static CachedBitmapInfo GetOrCreateAlphaMask(GlowBitmapPart bitmapPart)
+    {
+        if (_transparencyMasks[(int) bitmapPart] == null)
         {
-            var orCreateAlphaMask =
-                GetOrCreateAlphaMask(bitmapPart);
+            var bitmapImage = new BitmapImage(new Uri($"pack://application:,,,/HandyControl;Component/Resources/Images/GlowWindow/{bitmapPart}.png"));
 
-            var glowBitmap =
-                new GlowBitmap(
-                    drawingContext.ScreenDC,
-                    orCreateAlphaMask.Width,
-                    orCreateAlphaMask.Height);
+            var array = new byte[BytesPerPixelBgra32 * bitmapImage.PixelWidth * bitmapImage.PixelHeight];
+            var stride = BytesPerPixelBgra32 * bitmapImage.PixelWidth;
+            bitmapImage.CopyPixels(array, stride, 0);
+            bitmapImage.Freeze();
 
-            for (var i = 0; i < orCreateAlphaMask.DIBits.Length; i += BytesPerPixelBgra32)
-            {
-                var b = orCreateAlphaMask.DIBits[i + 3];
-                var val = PremultiplyAlpha(color.R, b);
-                var val2 = PremultiplyAlpha(color.G, b);
-                var val3 = PremultiplyAlpha(color.B, b);
-                Marshal.WriteByte(glowBitmap.DIBits, i, val3);
-                Marshal.WriteByte(glowBitmap.DIBits, i + 1, val2);
-                Marshal.WriteByte(glowBitmap.DIBits, i + 2, val);
-                Marshal.WriteByte(glowBitmap.DIBits, i + 3, b);
-            }
-
-            return glowBitmap;
+            _transparencyMasks[(int) bitmapPart] =
+                new CachedBitmapInfo(
+                    array,
+                    bitmapImage.PixelWidth,
+                    bitmapImage.PixelHeight);
         }
 
-        private static CachedBitmapInfo GetOrCreateAlphaMask(GlowBitmapPart bitmapPart)
+        return _transparencyMasks[(int) bitmapPart];
+    }
+
+    private sealed class CachedBitmapInfo
+    {
+        internal readonly byte[] DIBits;
+        internal readonly int Height;
+        internal readonly int Width;
+
+        internal CachedBitmapInfo(byte[] diBits, int width, int height)
         {
-            if (_transparencyMasks[(int) bitmapPart] == null)
-            {
-                var bitmapImage = new BitmapImage(new Uri($"pack://application:,,,/HandyControl;Component/Resources/Images/GlowWindow/{bitmapPart}.png"));
-
-                var array = new byte[BytesPerPixelBgra32 * bitmapImage.PixelWidth * bitmapImage.PixelHeight];
-                var stride = BytesPerPixelBgra32 * bitmapImage.PixelWidth;
-                bitmapImage.CopyPixels(array, stride, 0);
-                bitmapImage.Freeze();
-
-                _transparencyMasks[(int) bitmapPart] =
-                    new CachedBitmapInfo(
-                        array,
-                        bitmapImage.PixelWidth,
-                        bitmapImage.PixelHeight);
-            }
-
-            return _transparencyMasks[(int) bitmapPart];
-        }
-
-        private sealed class CachedBitmapInfo
-        {
-            internal readonly byte[] DIBits;
-            internal readonly int Height;
-            internal readonly int Width;
-
-            internal CachedBitmapInfo(byte[] diBits, int width, int height)
-            {
-                Width = width;
-                Height = height;
-                DIBits = diBits;
-            }
+            Width = width;
+            Height = height;
+            DIBits = diBits;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
index b1c0b061..cd838b1d 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
@@ -1,22 +1,21 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal enum GlowBitmapPart
 {
-    internal enum GlowBitmapPart
-    {
-        CornerTopLeft,
-        CornerTopRight,
-        CornerBottomLeft,
-        CornerBottomRight,
-        TopLeft,
-        Top,
-        TopRight,
-        LeftTop,
-        Left,
-        LeftBottom,
-        BottomLeft,
-        Bottom,
-        BottomRight,
-        RightTop,
-        Right,
-        RightBottom
-    }
-}
+    CornerTopLeft,
+    CornerTopRight,
+    CornerBottomLeft,
+    CornerBottomRight,
+    TopLeft,
+    Top,
+    TopRight,
+    LeftTop,
+    Left,
+    LeftBottom,
+    BottomLeft,
+    Bottom,
+    BottomRight,
+    RightTop,
+    Right,
+    RightBottom
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
index e9cb7cf9..aa770a87 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
@@ -1,51 +1,50 @@
 using System;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal class GlowDrawingContext : DisposableObject
 {
-    internal class GlowDrawingContext : DisposableObject
+    private readonly GlowBitmap _windowBitmap;
+
+    internal InteropValues.BLENDFUNCTION Blend;
+
+    internal GlowDrawingContext(int width, int height)
     {
-        private readonly GlowBitmap _windowBitmap;
-
-        internal InteropValues.BLENDFUNCTION Blend;
-
-        internal GlowDrawingContext(int width, int height)
-        {
-            ScreenDC = InteropMethods.GetDC(IntPtr.Zero);
-            if (ScreenDC == IntPtr.Zero) return;
-            WindowDC = InteropMethods.CreateCompatibleDC(ScreenDC);
-            if (WindowDC == IntPtr.Zero) return;
-            BackgroundDC = InteropMethods.CreateCompatibleDC(ScreenDC);
-            if (BackgroundDC == IntPtr.Zero) return;
-            Blend.BlendOp = 0;
-            Blend.BlendFlags = 0;
-            Blend.SourceConstantAlpha = 255;
-            Blend.AlphaFormat = 1;
-            _windowBitmap = new GlowBitmap(ScreenDC, width, height);
-            InteropMethods.SelectObject(WindowDC, _windowBitmap.Handle);
-        }
-
-        internal bool IsInitialized =>
-            ScreenDC != IntPtr.Zero && WindowDC != IntPtr.Zero &&
-            BackgroundDC != IntPtr.Zero && _windowBitmap != null;
-
-        internal IntPtr ScreenDC { get; }
-
-        internal IntPtr WindowDC { get; }
-
-        internal IntPtr BackgroundDC { get; }
-
-        internal int Width => _windowBitmap.Width;
-
-        internal int Height => _windowBitmap.Height;
-
-        protected override void DisposeManagedResources() => _windowBitmap.Dispose();
-
-        protected override void DisposeNativeResources()
-        {
-            if (ScreenDC != IntPtr.Zero) InteropMethods.ReleaseDC(IntPtr.Zero, ScreenDC);
-            if (WindowDC != IntPtr.Zero) InteropMethods.DeleteDC(WindowDC);
-            if (BackgroundDC != IntPtr.Zero) InteropMethods.DeleteDC(BackgroundDC);
-        }
+        ScreenDC = InteropMethods.GetDC(IntPtr.Zero);
+        if (ScreenDC == IntPtr.Zero) return;
+        WindowDC = InteropMethods.CreateCompatibleDC(ScreenDC);
+        if (WindowDC == IntPtr.Zero) return;
+        BackgroundDC = InteropMethods.CreateCompatibleDC(ScreenDC);
+        if (BackgroundDC == IntPtr.Zero) return;
+        Blend.BlendOp = 0;
+        Blend.BlendFlags = 0;
+        Blend.SourceConstantAlpha = 255;
+        Blend.AlphaFormat = 1;
+        _windowBitmap = new GlowBitmap(ScreenDC, width, height);
+        InteropMethods.SelectObject(WindowDC, _windowBitmap.Handle);
     }
-}
+
+    internal bool IsInitialized =>
+        ScreenDC != IntPtr.Zero && WindowDC != IntPtr.Zero &&
+        BackgroundDC != IntPtr.Zero && _windowBitmap != null;
+
+    internal IntPtr ScreenDC { get; }
+
+    internal IntPtr WindowDC { get; }
+
+    internal IntPtr BackgroundDC { get; }
+
+    internal int Width => _windowBitmap.Width;
+
+    internal int Height => _windowBitmap.Height;
+
+    protected override void DisposeManagedResources() => _windowBitmap.Dispose();
+
+    protected override void DisposeNativeResources()
+    {
+        if (ScreenDC != IntPtr.Zero) InteropMethods.ReleaseDC(IntPtr.Zero, ScreenDC);
+        if (WindowDC != IntPtr.Zero) InteropMethods.DeleteDC(WindowDC);
+        if (BackgroundDC != IntPtr.Zero) InteropMethods.DeleteDC(BackgroundDC);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
index 4534c259..c9a04e7d 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
@@ -6,582 +6,581 @@ using System.Windows.Media;
 using HandyControl.Controls;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal class GlowEdge : HwndWrapper
 {
-    internal class GlowEdge : HwndWrapper
+    private const string GlowEdgeClassName = "HandyControlGlowEdge";
+
+    private const int GlowDepth = 9;
+
+    private const int CornerGripThickness = 18;
+
+    private static ushort _sharedWindowClassAtom;
+
+    // ReSharper disable once NotAccessedField.Local
+    private static InteropValues.WndProc _sharedWndProc;
+
+    private readonly GlowBitmap[] _activeGlowBitmaps = new GlowBitmap[16];
+
+    private readonly GlowBitmap[] _inactiveGlowBitmaps = new GlowBitmap[16];
+
+    private readonly Dock _orientation;
+
+    private readonly GlowWindow _targetWindow;
+
+    private Color _activeGlowColor = Colors.Transparent;
+
+    private int _height;
+
+    private Color _inactiveGlowColor = Colors.Transparent;
+
+    private FieldInvalidationTypes _invalidatedValues;
+
+    private bool _isActive;
+
+    private bool _isVisible;
+
+    private int _left;
+
+    private bool _pendingDelayRender;
+
+    private int _top;
+
+    private int _width;
+
+    internal static long CreatedGlowEdges { get; private set; }
+
+    internal static long DisposedGlowEdges { get; private set; }
+
+    internal GlowEdge(GlowWindow owner, Dock orientation)
     {
-        private const string GlowEdgeClassName = "HandyControlGlowEdge";
+        _targetWindow = owner ?? throw new ArgumentNullException(nameof(owner));
+        _orientation = orientation;
+        CreatedGlowEdges += 1L;
+    }
 
-        private const int GlowDepth = 9;
+    private bool IsDeferringChanges => _targetWindow.DeferGlowChangesCount > 0;
 
-        private const int CornerGripThickness = 18;
-
-        private static ushort _sharedWindowClassAtom;
-
-        // ReSharper disable once NotAccessedField.Local
-        private static InteropValues.WndProc _sharedWndProc;
-
-        private readonly GlowBitmap[] _activeGlowBitmaps = new GlowBitmap[16];
-
-        private readonly GlowBitmap[] _inactiveGlowBitmaps = new GlowBitmap[16];
-
-        private readonly Dock _orientation;
-
-        private readonly GlowWindow _targetWindow;
-
-        private Color _activeGlowColor = Colors.Transparent;
-
-        private int _height;
-
-        private Color _inactiveGlowColor = Colors.Transparent;
-
-        private FieldInvalidationTypes _invalidatedValues;
-
-        private bool _isActive;
-
-        private bool _isVisible;
-
-        private int _left;
-
-        private bool _pendingDelayRender;
-
-        private int _top;
-
-        private int _width;
-
-        internal static long CreatedGlowEdges { get; private set; }
-
-        internal static long DisposedGlowEdges { get; private set; }
-
-        internal GlowEdge(GlowWindow owner, Dock orientation)
+    private static ushort SharedWindowClassAtom
+    {
+        get
         {
-            _targetWindow = owner ?? throw new ArgumentNullException(nameof(owner));
-            _orientation = orientation;
-            CreatedGlowEdges += 1L;
-        }
-
-        private bool IsDeferringChanges => _targetWindow.DeferGlowChangesCount > 0;
-
-        private static ushort SharedWindowClassAtom
-        {
-            get
+            if (_sharedWindowClassAtom == 0)
             {
-                if (_sharedWindowClassAtom == 0)
-                {
-                    var wndclass = default(InteropValues.WNDCLASS);
+                var wndclass = default(InteropValues.WNDCLASS);
 
-                    wndclass.cbClsExtra = 0;
-                    wndclass.cbWndExtra = 0;
-                    wndclass.hbrBackground = IntPtr.Zero;
-                    wndclass.hCursor = IntPtr.Zero;
-                    wndclass.hIcon = IntPtr.Zero;
-                    wndclass.lpfnWndProc = _sharedWndProc = InteropMethods.DefWindowProc;
-                    wndclass.lpszClassName = GlowEdgeClassName;
-                    wndclass.lpszMenuName = null;
-                    wndclass.style = 0u;
+                wndclass.cbClsExtra = 0;
+                wndclass.cbWndExtra = 0;
+                wndclass.hbrBackground = IntPtr.Zero;
+                wndclass.hCursor = IntPtr.Zero;
+                wndclass.hIcon = IntPtr.Zero;
+                wndclass.lpfnWndProc = _sharedWndProc = InteropMethods.DefWindowProc;
+                wndclass.lpszClassName = GlowEdgeClassName;
+                wndclass.lpszMenuName = null;
+                wndclass.style = 0u;
 
-                    _sharedWindowClassAtom = InteropMethods.RegisterClass(ref wndclass);
-                }
+                _sharedWindowClassAtom = InteropMethods.RegisterClass(ref wndclass);
+            }
 
-                return _sharedWindowClassAtom;
+            return _sharedWindowClassAtom;
+        }
+    }
+
+    internal bool IsVisible
+    {
+        get => _isVisible;
+        set => UpdateProperty(ref _isVisible, value, FieldInvalidationTypes.Render | FieldInvalidationTypes.Visibility);
+    }
+
+    internal int Left
+    {
+        get => _left;
+        set => UpdateProperty(ref _left, value, FieldInvalidationTypes.Location);
+    }
+
+    internal int Top
+    {
+        get => _top;
+        set => UpdateProperty(ref _top, value, FieldInvalidationTypes.Location);
+    }
+
+    internal int Width
+    {
+        get => _width;
+        set => UpdateProperty(ref _width, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
+    }
+
+    internal int Height
+    {
+        get => _height;
+        set => UpdateProperty(ref _height, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
+    }
+
+    internal bool IsActive
+    {
+        get => _isActive;
+        set => UpdateProperty(ref _isActive, value, FieldInvalidationTypes.Render);
+    }
+
+    internal Color ActiveGlowColor
+    {
+        get => _activeGlowColor;
+        set => UpdateProperty(ref _activeGlowColor, value, FieldInvalidationTypes.ActiveColor | FieldInvalidationTypes.Render);
+    }
+
+    internal Color InactiveGlowColor
+    {
+        get => _inactiveGlowColor;
+        set => UpdateProperty(ref _inactiveGlowColor, value, FieldInvalidationTypes.InactiveColor | FieldInvalidationTypes.Render);
+    }
+
+    private IntPtr TargetWindowHandle => new WindowInteropHelper(_targetWindow).Handle;
+
+    protected override bool IsWindowSubclassed => true;
+
+    private bool IsPositionValid => (_invalidatedValues & (FieldInvalidationTypes.Location | FieldInvalidationTypes.Size | FieldInvalidationTypes.Visibility)) == FieldInvalidationTypes.None;
+
+    private void UpdateProperty<T>(ref T field, T value, FieldInvalidationTypes invalidatedValues) where T : struct
+    {
+        if (!field.Equals(value))
+        {
+            field = value;
+            _invalidatedValues |= invalidatedValues;
+            if (!IsDeferringChanges) CommitChanges();
+        }
+    }
+
+    protected override ushort CreateWindowClassCore() => SharedWindowClassAtom;
+
+    protected override void DestroyWindowClassCore()
+    {
+    }
+
+    protected override IntPtr CreateWindowCore()
+    {
+        return InteropMethods.CreateWindowEx(
+            524416,
+            new IntPtr(WindowClassAtom),
+            string.Empty,
+            -2046820352,
+            0,
+            0,
+            0,
+            0,
+            new WindowInteropHelper(_targetWindow).Owner,
+            IntPtr.Zero,
+            IntPtr.Zero,
+            IntPtr.Zero);
+    }
+
+    internal void ChangeOwner(IntPtr newOwner) => InteropMethods.SetWindowLongPtr(Handle, InteropValues.GWLP.HWNDPARENT, newOwner);
+
+    protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam)
+    {
+        if (msg <= 70)
+        {
+            if (msg == 6) return IntPtr.Zero;
+            if (msg == 70)
+            {
+                var windowpos = (InteropValues.WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
+                windowpos.flags |= 16u;
+                Marshal.StructureToPtr(windowpos, lParam, true);
             }
         }
-
-        internal bool IsVisible
+        else
         {
-            get => _isVisible;
-            set => UpdateProperty(ref _isVisible, value, FieldInvalidationTypes.Render | FieldInvalidationTypes.Visibility);
-        }
-
-        internal int Left
-        {
-            get => _left;
-            set => UpdateProperty(ref _left, value, FieldInvalidationTypes.Location);
-        }
-
-        internal int Top
-        {
-            get => _top;
-            set => UpdateProperty(ref _top, value, FieldInvalidationTypes.Location);
-        }
-
-        internal int Width
-        {
-            get => _width;
-            set => UpdateProperty(ref _width, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
-        }
-
-        internal int Height
-        {
-            get => _height;
-            set => UpdateProperty(ref _height, value, FieldInvalidationTypes.Size | FieldInvalidationTypes.Render);
-        }
-
-        internal bool IsActive
-        {
-            get => _isActive;
-            set => UpdateProperty(ref _isActive, value, FieldInvalidationTypes.Render);
-        }
-
-        internal Color ActiveGlowColor
-        {
-            get => _activeGlowColor;
-            set => UpdateProperty(ref _activeGlowColor, value, FieldInvalidationTypes.ActiveColor | FieldInvalidationTypes.Render);
-        }
-
-        internal Color InactiveGlowColor
-        {
-            get => _inactiveGlowColor;
-            set => UpdateProperty(ref _inactiveGlowColor, value, FieldInvalidationTypes.InactiveColor | FieldInvalidationTypes.Render);
-        }
-
-        private IntPtr TargetWindowHandle => new WindowInteropHelper(_targetWindow).Handle;
-
-        protected override bool IsWindowSubclassed => true;
-
-        private bool IsPositionValid => (_invalidatedValues & (FieldInvalidationTypes.Location | FieldInvalidationTypes.Size | FieldInvalidationTypes.Visibility)) == FieldInvalidationTypes.None;
-
-        private void UpdateProperty<T>(ref T field, T value, FieldInvalidationTypes invalidatedValues) where T : struct
-        {
-            if (!field.Equals(value))
+            if (msg != 126)
             {
-                field = value;
-                _invalidatedValues |= invalidatedValues;
-                if (!IsDeferringChanges) CommitChanges();
-            }
-        }
-
-        protected override ushort CreateWindowClassCore() => SharedWindowClassAtom;
-
-        protected override void DestroyWindowClassCore()
-        {
-        }
-
-        protected override IntPtr CreateWindowCore()
-        {
-            return InteropMethods.CreateWindowEx(
-                524416,
-                new IntPtr(WindowClassAtom),
-                string.Empty,
-                -2046820352,
-                0,
-                0,
-                0,
-                0,
-                new WindowInteropHelper(_targetWindow).Owner,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                IntPtr.Zero);
-        }
-
-        internal void ChangeOwner(IntPtr newOwner) => InteropMethods.SetWindowLongPtr(Handle, InteropValues.GWLP.HWNDPARENT, newOwner);
-
-        protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam)
-        {
-            if (msg <= 70)
-            {
-                if (msg == 6) return IntPtr.Zero;
-                if (msg == 70)
+                if (msg == 132) return new IntPtr(WmNcHitTest(lParam));
+                switch (msg)
                 {
-                    var windowpos = (InteropValues.WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(InteropValues.WINDOWPOS));
-                    windowpos.flags |= 16u;
-                    Marshal.StructureToPtr(windowpos, lParam, true);
+                    case 161:
+                    case 163:
+                    case 164:
+                    case 166:
+                    case 167:
+                    case 169:
+                    case 171:
+                    case 173:
+                    {
+                        var targetWindowHandle = TargetWindowHandle;
+                        InteropMethods.SendMessage(targetWindowHandle, 6, new IntPtr(2), IntPtr.Zero);
+                        InteropMethods.SendMessage(targetWindowHandle, msg, wParam, IntPtr.Zero);
+                        return IntPtr.Zero;
+                    }
                 }
             }
             else
             {
-                if (msg != 126)
-                {
-                    if (msg == 132) return new IntPtr(WmNcHitTest(lParam));
-                    switch (msg)
-                    {
-                        case 161:
-                        case 163:
-                        case 164:
-                        case 166:
-                        case 167:
-                        case 169:
-                        case 171:
-                        case 173:
-                            {
-                                var targetWindowHandle = TargetWindowHandle;
-                                InteropMethods.SendMessage(targetWindowHandle, 6, new IntPtr(2), IntPtr.Zero);
-                                InteropMethods.SendMessage(targetWindowHandle, msg, wParam, IntPtr.Zero);
-                                return IntPtr.Zero;
-                            }
-                    }
-                }
-                else
-                {
-                    if (IsVisible) RenderLayeredWindow();
-                }
+                if (IsVisible) RenderLayeredWindow();
             }
-
-            return base.WndProc(hwnd, msg, wParam, lParam);
         }
 
-        private int WmNcHitTest(IntPtr lParam)
+        return base.WndProc(hwnd, msg, wParam, lParam);
+    }
+
+    private int WmNcHitTest(IntPtr lParam)
+    {
+        var xLParam = InteropMethods.GetXLParam(lParam.ToInt32());
+        var yLParam = InteropMethods.GetYLParam(lParam.ToInt32());
+        InteropMethods.GetWindowRect(Handle, out var rect);
+        switch (_orientation)
+        {
+            case Dock.Left:
+                if (yLParam - CornerGripThickness < rect.Top) return 13;
+                if (yLParam + CornerGripThickness > rect.Bottom) return 16;
+                return 10;
+            case Dock.Top:
+                if (xLParam - CornerGripThickness < rect.Left) return 13;
+                if (xLParam + CornerGripThickness > rect.Right) return 14;
+                return 12;
+            case Dock.Right:
+                if (yLParam - CornerGripThickness < rect.Top) return 14;
+                if (yLParam + CornerGripThickness > rect.Bottom) return 17;
+                return 11;
+            default:
+                if (xLParam - CornerGripThickness < rect.Left) return 16;
+                if (xLParam + CornerGripThickness > rect.Right) return 17;
+                return 15;
+        }
+    }
+
+    internal void CommitChanges()
+    {
+        InvalidateCachedBitmaps();
+        UpdateWindowPosCore();
+        UpdateLayeredWindowCore();
+        _invalidatedValues = FieldInvalidationTypes.None;
+    }
+
+    private void InvalidateCachedBitmaps()
+    {
+        if (_invalidatedValues.HasFlag(FieldInvalidationTypes.ActiveColor)) ClearCache(_activeGlowBitmaps);
+        if (_invalidatedValues.HasFlag(FieldInvalidationTypes.InactiveColor)) ClearCache(_inactiveGlowBitmaps);
+    }
+
+    private void UpdateWindowPosCore()
+    {
+        if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Location) ||
+            _invalidatedValues.HasFlag(FieldInvalidationTypes.Size) ||
+            _invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
+        {
+            var num = 532;
+            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
+            {
+                if (IsVisible)
+                    num |= 64;
+                else
+                    num |= 131;
+            }
+
+            if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Location)) num |= 2;
+            if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Size)) num |= 1;
+            InteropMethods.SetWindowPos(Handle, IntPtr.Zero, Left, Top, Width, Height, num);
+        }
+    }
+
+    private void UpdateLayeredWindowCore()
+    {
+        if (IsVisible && _invalidatedValues.HasFlag(FieldInvalidationTypes.Render))
+        {
+            if (IsPositionValid)
+            {
+                BeginDelayedRender();
+                return;
+            }
+
+            CancelDelayedRender();
+            RenderLayeredWindow();
+        }
+    }
+
+    private void BeginDelayedRender()
+    {
+        if (!_pendingDelayRender)
+        {
+            _pendingDelayRender = true;
+            CompositionTarget.Rendering += CommitDelayedRender;
+        }
+    }
+
+    private void CancelDelayedRender()
+    {
+        if (_pendingDelayRender)
+        {
+            _pendingDelayRender = false;
+            CompositionTarget.Rendering -= CommitDelayedRender;
+        }
+    }
+
+    private void CommitDelayedRender(object sender, EventArgs e)
+    {
+        CancelDelayedRender();
+        if (IsVisible) RenderLayeredWindow();
+    }
+
+    private void RenderLayeredWindow()
+    {
+        using var glowDrawingContext = new GlowDrawingContext(Width, Height);
+        if (glowDrawingContext.IsInitialized)
         {
-            var xLParam = InteropMethods.GetXLParam(lParam.ToInt32());
-            var yLParam = InteropMethods.GetYLParam(lParam.ToInt32());
-            InteropMethods.GetWindowRect(Handle, out var rect);
             switch (_orientation)
             {
                 case Dock.Left:
-                    if (yLParam - CornerGripThickness < rect.Top) return 13;
-                    if (yLParam + CornerGripThickness > rect.Bottom) return 16;
-                    return 10;
+                    DrawLeft(glowDrawingContext);
+                    break;
                 case Dock.Top:
-                    if (xLParam - CornerGripThickness < rect.Left) return 13;
-                    if (xLParam + CornerGripThickness > rect.Right) return 14;
-                    return 12;
+                    DrawTop(glowDrawingContext);
+                    break;
                 case Dock.Right:
-                    if (yLParam - CornerGripThickness < rect.Top) return 14;
-                    if (yLParam + CornerGripThickness > rect.Bottom) return 17;
-                    return 11;
+                    DrawRight(glowDrawingContext);
+                    break;
                 default:
-                    if (xLParam - CornerGripThickness < rect.Left) return 16;
-                    if (xLParam + CornerGripThickness > rect.Right) return 17;
-                    return 15;
+                    DrawBottom(glowDrawingContext);
+                    break;
             }
-        }
 
-        internal void CommitChanges()
-        {
-            InvalidateCachedBitmaps();
-            UpdateWindowPosCore();
-            UpdateLayeredWindowCore();
-            _invalidatedValues = FieldInvalidationTypes.None;
-        }
-
-        private void InvalidateCachedBitmaps()
-        {
-            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.ActiveColor)) ClearCache(_activeGlowBitmaps);
-            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.InactiveColor)) ClearCache(_inactiveGlowBitmaps);
-        }
-
-        private void UpdateWindowPosCore()
-        {
-            if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Location) ||
-                _invalidatedValues.HasFlag(FieldInvalidationTypes.Size) ||
-                _invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
+            var point = new InteropValues.POINT
             {
-                var num = 532;
-                if (_invalidatedValues.HasFlag(FieldInvalidationTypes.Visibility))
-                {
-                    if (IsVisible)
-                        num |= 64;
-                    else
-                        num |= 131;
-                }
-
-                if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Location)) num |= 2;
-                if (!_invalidatedValues.HasFlag(FieldInvalidationTypes.Size)) num |= 1;
-                InteropMethods.SetWindowPos(Handle, IntPtr.Zero, Left, Top, Width, Height, num);
-            }
-        }
-
-        private void UpdateLayeredWindowCore()
-        {
-            if (IsVisible && _invalidatedValues.HasFlag(FieldInvalidationTypes.Render))
+                X = Left,
+                Y = Top
+            };
+            var size = new InteropValues.SIZE
             {
-                if (IsPositionValid)
-                {
-                    BeginDelayedRender();
-                    return;
-                }
-
-                CancelDelayedRender();
-                RenderLayeredWindow();
-            }
-        }
-
-        private void BeginDelayedRender()
-        {
-            if (!_pendingDelayRender)
+                cx = Width,
+                cy = Height
+            };
+            var point2 = new InteropValues.POINT
             {
-                _pendingDelayRender = true;
-                CompositionTarget.Rendering += CommitDelayedRender;
-            }
-        }
+                X = 0,
+                Y = 0
+            };
 
-        private void CancelDelayedRender()
-        {
-            if (_pendingDelayRender)
-            {
-                _pendingDelayRender = false;
-                CompositionTarget.Rendering -= CommitDelayedRender;
-            }
-        }
-
-        private void CommitDelayedRender(object sender, EventArgs e)
-        {
-            CancelDelayedRender();
-            if (IsVisible) RenderLayeredWindow();
-        }
-
-        private void RenderLayeredWindow()
-        {
-            using var glowDrawingContext = new GlowDrawingContext(Width, Height);
-            if (glowDrawingContext.IsInitialized)
-            {
-                switch (_orientation)
-                {
-                    case Dock.Left:
-                        DrawLeft(glowDrawingContext);
-                        break;
-                    case Dock.Top:
-                        DrawTop(glowDrawingContext);
-                        break;
-                    case Dock.Right:
-                        DrawRight(glowDrawingContext);
-                        break;
-                    default:
-                        DrawBottom(glowDrawingContext);
-                        break;
-                }
-
-                var point = new InteropValues.POINT
-                {
-                    X = Left,
-                    Y = Top
-                };
-                var size = new InteropValues.SIZE
-                {
-                    cx = Width,
-                    cy = Height
-                };
-                var point2 = new InteropValues.POINT
-                {
-                    X = 0,
-                    Y = 0
-                };
-
-                InteropMethods.UpdateLayeredWindow(
-                    Handle,
-                    glowDrawingContext.ScreenDC,
-                    ref point,
-                    ref size,
-                    glowDrawingContext.WindowDC,
-                    ref point2,
-                    0u,
-                    ref glowDrawingContext.Blend,
-                    2u);
-            }
-        }
-
-        private GlowBitmap GetOrCreateBitmap(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart)
-        {
-            GlowBitmap[] array;
-            Color color;
-            if (IsActive)
-            {
-                array = _activeGlowBitmaps;
-                color = ActiveGlowColor;
-            }
-            else
-            {
-                array = _inactiveGlowBitmaps;
-                color = InactiveGlowColor;
-            }
-
-            return array[(int) bitmapPart] ?? (array[(int) bitmapPart] = GlowBitmap.Create(drawingContext, bitmapPart, color));
-        }
-
-        private void ClearCache(GlowBitmap[] cache)
-        {
-            for (var i = 0; i < cache.Length; i++)
-                using (cache[i])
-                {
-                    cache[i] = null;
-                }
-        }
-
-        protected override void DisposeManagedResources()
-        {
-            ClearCache(_activeGlowBitmaps);
-            ClearCache(_inactiveGlowBitmaps);
-        }
-
-        protected override void DisposeNativeResources()
-        {
-            base.DisposeNativeResources();
-            DisposedGlowEdges += 1L;
-        }
-
-        private void DrawLeft(GlowDrawingContext drawingContext)
-        {
-            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopLeft);
-            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftTop);
-            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Left);
-            var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftBottom);
-            var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomLeft);
-            var height = orCreateBitmap.Height;
-            var num = height + orCreateBitmap2.Height;
-            var num2 = drawingContext.Height - orCreateBitmap5.Height;
-            var num3 = num2 - orCreateBitmap4.Height;
-            var num4 = num3 - num;
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.Blend);
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
-                orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
-                orCreateBitmap2.Height, drawingContext.Blend);
-            if (num4 > 0)
-            {
-                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
-                InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
-                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
-                    drawingContext.Blend);
-            }
-
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
-                orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
-                orCreateBitmap4.Height, drawingContext.Blend);
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
-                orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
-                orCreateBitmap5.Height, drawingContext.Blend);
-        }
-
-        private void DrawRight(GlowDrawingContext drawingContext)
-        {
-            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopRight);
-            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightTop);
-            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Right);
-            var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightBottom);
-            var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomRight);
-            var height = orCreateBitmap.Height;
-            var num = height + orCreateBitmap2.Height;
-            var num2 = drawingContext.Height - orCreateBitmap5.Height;
-            var num3 = num2 - orCreateBitmap4.Height;
-            var num4 = num3 - num;
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.Blend);
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
-                orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
-                orCreateBitmap2.Height, drawingContext.Blend);
-            if (num4 > 0)
-            {
-                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
-                InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
-                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
-                    drawingContext.Blend);
-            }
-
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
-                orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
-                orCreateBitmap4.Height, drawingContext.Blend);
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
-                orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
-                orCreateBitmap5.Height, drawingContext.Blend);
-        }
-
-        private void DrawTop(GlowDrawingContext drawingContext)
-        {
-            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopLeft);
-            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Top);
-            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopRight);
-            var num2 = GlowDepth + orCreateBitmap.Width;
-            var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
-            var num4 = num3 - num2;
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.Blend);
-            if (num4 > 0)
-            {
-                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
-                InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
-                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
-                    drawingContext.Blend);
-            }
-
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
-                orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
-                orCreateBitmap3.Height, drawingContext.Blend);
-        }
-
-        private void DrawBottom(GlowDrawingContext drawingContext)
-        {
-            var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomLeft);
-            var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Bottom);
-            var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomRight);
-            var num2 = GlowDepth + orCreateBitmap.Width;
-            var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
-            var num4 = num3 - num2;
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
-                drawingContext.Blend);
-            if (num4 > 0)
-            {
-                InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
-                InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
-                    drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
-                    drawingContext.Blend);
-            }
-
-            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
-            InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
-                orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
-                orCreateBitmap3.Height, drawingContext.Blend);
-        }
-
-        internal void UpdateWindowPos()
-        {
-            var targetWindowHandle = TargetWindowHandle;
-            InteropMethods.GetWindowRect(targetWindowHandle, out var rect);
-            InteropMethods.GetWindowPlacement(targetWindowHandle);
-            if (IsVisible)
-                switch (_orientation)
-                {
-                    case Dock.Left:
-                        Left = rect.Left - GlowDepth;
-                        Top = rect.Top - GlowDepth;
-                        Width = GlowDepth;
-                        Height = rect.Height + CornerGripThickness;
-                        return;
-                    case Dock.Top:
-                        Left = rect.Left - GlowDepth;
-                        Top = rect.Top - GlowDepth;
-                        Width = rect.Width + CornerGripThickness;
-                        Height = GlowDepth;
-                        return;
-                    case Dock.Right:
-                        Left = rect.Right;
-                        Top = rect.Top - GlowDepth;
-                        Width = GlowDepth;
-                        Height = rect.Height + CornerGripThickness;
-                        return;
-                    default:
-                        Left = rect.Left - GlowDepth;
-                        Top = rect.Bottom;
-                        Width = rect.Width + CornerGripThickness;
-                        Height = GlowDepth;
-                        break;
-                }
-        }
-
-        [Flags]
-        private enum FieldInvalidationTypes
-        {
-            None = 0,
-            Location = 1,
-            Size = 2,
-            ActiveColor = 4,
-            InactiveColor = 8,
-            Render = 16,
-            Visibility = 32
+            InteropMethods.UpdateLayeredWindow(
+                Handle,
+                glowDrawingContext.ScreenDC,
+                ref point,
+                ref size,
+                glowDrawingContext.WindowDC,
+                ref point2,
+                0u,
+                ref glowDrawingContext.Blend,
+                2u);
         }
     }
-}
+
+    private GlowBitmap GetOrCreateBitmap(GlowDrawingContext drawingContext, GlowBitmapPart bitmapPart)
+    {
+        GlowBitmap[] array;
+        Color color;
+        if (IsActive)
+        {
+            array = _activeGlowBitmaps;
+            color = ActiveGlowColor;
+        }
+        else
+        {
+            array = _inactiveGlowBitmaps;
+            color = InactiveGlowColor;
+        }
+
+        return array[(int) bitmapPart] ?? (array[(int) bitmapPart] = GlowBitmap.Create(drawingContext, bitmapPart, color));
+    }
+
+    private void ClearCache(GlowBitmap[] cache)
+    {
+        for (var i = 0; i < cache.Length; i++)
+            using (cache[i])
+            {
+                cache[i] = null;
+            }
+    }
+
+    protected override void DisposeManagedResources()
+    {
+        ClearCache(_activeGlowBitmaps);
+        ClearCache(_inactiveGlowBitmaps);
+    }
+
+    protected override void DisposeNativeResources()
+    {
+        base.DisposeNativeResources();
+        DisposedGlowEdges += 1L;
+    }
+
+    private void DrawLeft(GlowDrawingContext drawingContext)
+    {
+        var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopLeft);
+        var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftTop);
+        var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Left);
+        var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.LeftBottom);
+        var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomLeft);
+        var height = orCreateBitmap.Height;
+        var num = height + orCreateBitmap2.Height;
+        var num2 = drawingContext.Height - orCreateBitmap5.Height;
+        var num3 = num2 - orCreateBitmap4.Height;
+        var num4 = num3 - num;
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.Blend);
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
+            orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
+            orCreateBitmap2.Height, drawingContext.Blend);
+        if (num4 > 0)
+        {
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
+                drawingContext.Blend);
+        }
+
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
+            orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
+            orCreateBitmap4.Height, drawingContext.Blend);
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
+            orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
+            orCreateBitmap5.Height, drawingContext.Blend);
+    }
+
+    private void DrawRight(GlowDrawingContext drawingContext)
+    {
+        var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerTopRight);
+        var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightTop);
+        var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Right);
+        var orCreateBitmap4 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.RightBottom);
+        var orCreateBitmap5 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.CornerBottomRight);
+        var height = orCreateBitmap.Height;
+        var num = height + orCreateBitmap2.Height;
+        var num2 = drawingContext.Height - orCreateBitmap5.Height;
+        var num3 = num2 - orCreateBitmap4.Height;
+        var num4 = num3 - num;
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.Blend);
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, height, orCreateBitmap2.Width,
+            orCreateBitmap2.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width,
+            orCreateBitmap2.Height, drawingContext.Blend);
+        if (num4 > 0)
+        {
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num, orCreateBitmap3.Width, num4,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width, orCreateBitmap3.Height,
+                drawingContext.Blend);
+        }
+
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap4.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num3, orCreateBitmap4.Width,
+            orCreateBitmap4.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap4.Width,
+            orCreateBitmap4.Height, drawingContext.Blend);
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap5.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, 0, num2, orCreateBitmap5.Width,
+            orCreateBitmap5.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap5.Width,
+            orCreateBitmap5.Height, drawingContext.Blend);
+    }
+
+    private void DrawTop(GlowDrawingContext drawingContext)
+    {
+        var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopLeft);
+        var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Top);
+        var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.TopRight);
+        var num2 = GlowDepth + orCreateBitmap.Width;
+        var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
+        var num4 = num3 - num2;
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.Blend);
+        if (num4 > 0)
+        {
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
+                drawingContext.Blend);
+        }
+
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
+            orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
+            orCreateBitmap3.Height, drawingContext.Blend);
+    }
+
+    private void DrawBottom(GlowDrawingContext drawingContext)
+    {
+        var orCreateBitmap = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomLeft);
+        var orCreateBitmap2 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.Bottom);
+        var orCreateBitmap3 = GetOrCreateBitmap(drawingContext, GlowBitmapPart.BottomRight);
+        var num2 = GlowDepth + orCreateBitmap.Width;
+        var num3 = drawingContext.Width - GlowDepth - orCreateBitmap3.Width;
+        var num4 = num3 - num2;
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, GlowDepth, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.BackgroundDC, 0, 0, orCreateBitmap.Width, orCreateBitmap.Height,
+            drawingContext.Blend);
+        if (num4 > 0)
+        {
+            InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap2.Handle);
+            InteropMethods.AlphaBlend(drawingContext.WindowDC, num2, 0, num4, orCreateBitmap2.Height,
+                drawingContext.BackgroundDC, 0, 0, orCreateBitmap2.Width, orCreateBitmap2.Height,
+                drawingContext.Blend);
+        }
+
+        InteropMethods.SelectObject(drawingContext.BackgroundDC, orCreateBitmap3.Handle);
+        InteropMethods.AlphaBlend(drawingContext.WindowDC, num3, 0, orCreateBitmap3.Width,
+            orCreateBitmap3.Height, drawingContext.BackgroundDC, 0, 0, orCreateBitmap3.Width,
+            orCreateBitmap3.Height, drawingContext.Blend);
+    }
+
+    internal void UpdateWindowPos()
+    {
+        var targetWindowHandle = TargetWindowHandle;
+        InteropMethods.GetWindowRect(targetWindowHandle, out var rect);
+        InteropMethods.GetWindowPlacement(targetWindowHandle);
+        if (IsVisible)
+            switch (_orientation)
+            {
+                case Dock.Left:
+                    Left = rect.Left - GlowDepth;
+                    Top = rect.Top - GlowDepth;
+                    Width = GlowDepth;
+                    Height = rect.Height + CornerGripThickness;
+                    return;
+                case Dock.Top:
+                    Left = rect.Left - GlowDepth;
+                    Top = rect.Top - GlowDepth;
+                    Width = rect.Width + CornerGripThickness;
+                    Height = GlowDepth;
+                    return;
+                case Dock.Right:
+                    Left = rect.Right;
+                    Top = rect.Top - GlowDepth;
+                    Width = GlowDepth;
+                    Height = rect.Height + CornerGripThickness;
+                    return;
+                default:
+                    Left = rect.Left - GlowDepth;
+                    Top = rect.Bottom;
+                    Width = rect.Width + CornerGripThickness;
+                    Height = GlowDepth;
+                    break;
+            }
+    }
+
+    [Flags]
+    private enum FieldInvalidationTypes
+    {
+        None = 0,
+        Location = 1,
+        Size = 2,
+        ActiveColor = 4,
+        InactiveColor = 8,
+        Render = 16,
+        Visibility = 32
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
index 46499c21..ca6fd743 100644
--- a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
+++ b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
-{
-    public class HandyControlConfig
-    {
-        public string Lang { get; set; }
+namespace HandyControl.Data;
 
-        public int TimelineFrameRate { get; set; } = 60;
-    }
-}
+public class HandyControlConfig
+{
+    public string Lang { get; set; }
+
+    public int TimelineFrameRate { get; set; } = 60;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
index cda1c276..239bb221 100644
--- a/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
+++ b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
@@ -2,101 +2,100 @@
 using System.Runtime.InteropServices;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public abstract class HwndWrapper : DisposableObject
 {
-    public abstract class HwndWrapper : DisposableObject
+    private IntPtr _handle;
+
+    private bool _isHandleCreationAllowed = true;
+
+    private ushort _wndClassAtom;
+
+    private Delegate _wndProc;
+
+    protected ushort WindowClassAtom
     {
-        private IntPtr _handle;
-
-        private bool _isHandleCreationAllowed = true;
-
-        private ushort _wndClassAtom;
-
-        private Delegate _wndProc;
-
-        protected ushort WindowClassAtom
+        get
         {
-            get
-            {
-                if (_wndClassAtom == 0) _wndClassAtom = CreateWindowClassCore();
-                return _wndClassAtom;
-            }
-        }
-
-        public IntPtr Handle
-        {
-            get
-            {
-                EnsureHandle();
-                return _handle;
-            }
-        }
-
-        protected virtual bool IsWindowSubclassed => false;
-
-        protected virtual ushort CreateWindowClassCore() => RegisterClass(Guid.NewGuid().ToString());
-
-        protected virtual void DestroyWindowClassCore()
-        {
-            if (_wndClassAtom != 0)
-            {
-                var moduleHandle = InteropMethods.GetModuleHandle(null);
-                InteropMethods.UnregisterClass(new IntPtr(_wndClassAtom), moduleHandle);
-                _wndClassAtom = 0;
-            }
-        }
-
-        protected ushort RegisterClass(string className)
-        {
-            var wndClass = default(InteropValues.WNDCLASS);
-            wndClass.cbClsExtra = 0;
-            wndClass.cbWndExtra = 0;
-            wndClass.hbrBackground = IntPtr.Zero;
-            wndClass.hCursor = IntPtr.Zero;
-            wndClass.hIcon = IntPtr.Zero;
-            wndClass.lpfnWndProc = _wndProc = new InteropValues.WndProc(WndProc);
-            wndClass.lpszClassName = className;
-            wndClass.lpszMenuName = null;
-            wndClass.style = 0u;
-            return InteropMethods.RegisterClass(ref wndClass);
-        }
-
-        private void SubclassWndProc()
-        {
-            _wndProc = new InteropValues.WndProc(WndProc);
-            InteropMethods.SetWindowLong(_handle, -4, Marshal.GetFunctionPointerForDelegate(_wndProc));
-        }
-
-        protected abstract IntPtr CreateWindowCore();
-
-        protected virtual void DestroyWindowCore()
-        {
-            if (_handle != IntPtr.Zero)
-            {
-                InteropMethods.DestroyWindow(_handle);
-                _handle = IntPtr.Zero;
-            }
-        }
-
-        protected virtual IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam) =>
-            InteropMethods.DefWindowProc(hwnd, msg, wParam, lParam);
-
-        public void EnsureHandle()
-        {
-            if (_handle == IntPtr.Zero)
-            {
-                if (!_isHandleCreationAllowed) return;
-                _isHandleCreationAllowed = false;
-                _handle = CreateWindowCore();
-                if (IsWindowSubclassed) SubclassWndProc();
-            }
-        }
-
-        protected override void DisposeNativeResources()
-        {
-            _isHandleCreationAllowed = false;
-            DestroyWindowCore();
-            DestroyWindowClassCore();
+            if (_wndClassAtom == 0) _wndClassAtom = CreateWindowClassCore();
+            return _wndClassAtom;
         }
     }
-}
+
+    public IntPtr Handle
+    {
+        get
+        {
+            EnsureHandle();
+            return _handle;
+        }
+    }
+
+    protected virtual bool IsWindowSubclassed => false;
+
+    protected virtual ushort CreateWindowClassCore() => RegisterClass(Guid.NewGuid().ToString());
+
+    protected virtual void DestroyWindowClassCore()
+    {
+        if (_wndClassAtom != 0)
+        {
+            var moduleHandle = InteropMethods.GetModuleHandle(null);
+            InteropMethods.UnregisterClass(new IntPtr(_wndClassAtom), moduleHandle);
+            _wndClassAtom = 0;
+        }
+    }
+
+    protected ushort RegisterClass(string className)
+    {
+        var wndClass = default(InteropValues.WNDCLASS);
+        wndClass.cbClsExtra = 0;
+        wndClass.cbWndExtra = 0;
+        wndClass.hbrBackground = IntPtr.Zero;
+        wndClass.hCursor = IntPtr.Zero;
+        wndClass.hIcon = IntPtr.Zero;
+        wndClass.lpfnWndProc = _wndProc = new InteropValues.WndProc(WndProc);
+        wndClass.lpszClassName = className;
+        wndClass.lpszMenuName = null;
+        wndClass.style = 0u;
+        return InteropMethods.RegisterClass(ref wndClass);
+    }
+
+    private void SubclassWndProc()
+    {
+        _wndProc = new InteropValues.WndProc(WndProc);
+        InteropMethods.SetWindowLong(_handle, -4, Marshal.GetFunctionPointerForDelegate(_wndProc));
+    }
+
+    protected abstract IntPtr CreateWindowCore();
+
+    protected virtual void DestroyWindowCore()
+    {
+        if (_handle != IntPtr.Zero)
+        {
+            InteropMethods.DestroyWindow(_handle);
+            _handle = IntPtr.Zero;
+        }
+    }
+
+    protected virtual IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam) =>
+        InteropMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+
+    public void EnsureHandle()
+    {
+        if (_handle == IntPtr.Zero)
+        {
+            if (!_isHandleCreationAllowed) return;
+            _isHandleCreationAllowed = false;
+            _handle = CreateWindowCore();
+            if (IsWindowSubclassed) SubclassWndProc();
+        }
+    }
+
+    protected override void DisposeNativeResources()
+    {
+        _isHandleCreationAllowed = false;
+        DestroyWindowCore();
+        DestroyWindowClassCore();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
index 27f012d6..1c5e1cc3 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
@@ -2,40 +2,39 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class GrowlInfo
 {
-    public class GrowlInfo
-    {
-        public string Message { get; set; }
+    public string Message { get; set; }
 
-        public bool ShowDateTime { get; set; } = true;
+    public bool ShowDateTime { get; set; } = true;
 
-        public int WaitTime { get; set; } = 6;
+    public int WaitTime { get; set; } = 6;
 
-        public string CancelStr { get; set; } = Properties.Langs.Lang.Cancel;
+    public string CancelStr { get; set; } = Properties.Langs.Lang.Cancel;
 
-        public string ConfirmStr { get; set; } = Properties.Langs.Lang.Confirm;
+    public string ConfirmStr { get; set; } = Properties.Langs.Lang.Confirm;
 
-        public Func<bool, bool> ActionBeforeClose { get; set; }
+    public Func<bool, bool> ActionBeforeClose { get; set; }
 
-        public bool StaysOpen { get; set; }
+    public bool StaysOpen { get; set; }
 
-        public bool IsCustom { get; set; }
+    public bool IsCustom { get; set; }
 
-        public InfoType Type { get; set; }
+    public InfoType Type { get; set; }
 
-        public Geometry Icon { get; set; }
+    public Geometry Icon { get; set; }
 
-        public string IconKey { get; set; }
+    public string IconKey { get; set; }
 
-        public Brush IconBrush { get; set; }
+    public Brush IconBrush { get; set; }
 
-        public string IconBrushKey { get; set; }
+    public string IconBrushKey { get; set; }
 
-        public bool ShowCloseButton { get; set; } = true;
+    public bool ShowCloseButton { get; set; } = true;
 
-        public string Token { get; set; }
+    public string Token { get; set; }
 
-        public FlowDirection FlowDirection { get; set; }
-    }
-}
+    public FlowDirection FlowDirection { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
index 2d4deccc..9263a5c2 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
@@ -3,156 +3,155 @@ using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal sealed class ImageCodecInfo
 {
-    internal sealed class ImageCodecInfo
+    private string _dllName;
+
+    public Guid Clsid { get; set; }
+
+    public Guid FormatID { get; set; }
+
+    public string CodecName { get; set; }
+
+    public string DllName
     {
-        private string _dllName;
-
-        public Guid Clsid { get; set; }
-
-        public Guid FormatID { get; set; }
-
-        public string CodecName { get; set; }
-
-        public string DllName
+        [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")]
+        get
         {
-            [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")]
-            get
+            if (_dllName != null)
             {
-                if (_dllName != null)
-                {
-                    new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.PathDiscovery, _dllName).Demand();
-                }
-                return _dllName;
-            }
-            [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")]
-            set
-            {
-                if (value != null)
-                {
-                    new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.PathDiscovery, value).Demand();
-                }
-                _dllName = value;
+                new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.PathDiscovery, _dllName).Demand();
             }
+            return _dllName;
         }
-
-        public string FormatDescription { get; set; }
-
-        public string FilenameExtension { get; set; }
-
-        public string MimeType { get; set; }
-
-        public ImageCodecFlags Flags { get; set; }
-
-        public int Version { get; set; }
-
-        public byte[][] SignaturePatterns { get; set; }
-
-        public byte[][] SignatureMasks { get; set; }
-
-        public static ImageCodecInfo[] GetImageDecoders()
+        [SuppressMessage("Microsoft.Security", "CA2103:ReviewImperativeSecurity")]
+        set
         {
-            ImageCodecInfo[] imageCodecs;
-
-            var status = InteropMethods.Gdip.GdipGetImageDecodersSize(out var numDecoders, out var size);
-
-            if (status != InteropMethods.Gdip.Ok)
+            if (value != null)
             {
-                throw InteropMethods.Gdip.StatusException(status);
+                new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.PathDiscovery, value).Demand();
             }
-
-            var memory = Marshal.AllocHGlobal(size);
-
-            try
-            {
-                status = InteropMethods.Gdip.GdipGetImageDecoders(numDecoders, size, memory);
-
-                if (status != InteropMethods.Gdip.Ok)
-                {
-                    throw InteropMethods.Gdip.StatusException(status);
-                }
-
-                imageCodecs = ConvertFromMemory(memory, numDecoders);
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(memory);
-            }
-
-            return imageCodecs;
-        }
-
-        public static ImageCodecInfo[] GetImageEncoders()
-        {
-            ImageCodecInfo[] imageCodecs;
-
-            var status = InteropMethods.Gdip.GdipGetImageEncodersSize(out var numEncoders, out var size);
-
-            if (status != InteropMethods.Gdip.Ok)
-            {
-                throw InteropMethods.Gdip.StatusException(status);
-            }
-
-            var memory = Marshal.AllocHGlobal(size);
-
-            try
-            {
-                status = InteropMethods.Gdip.GdipGetImageEncoders(numEncoders, size, memory);
-
-                if (status != InteropMethods.Gdip.Ok)
-                {
-                    throw InteropMethods.Gdip.StatusException(status);
-                }
-
-                imageCodecs = ConvertFromMemory(memory, numEncoders);
-            }
-            finally
-            {
-                Marshal.FreeHGlobal(memory);
-            }
-
-            return imageCodecs;
-        }
-
-        public static ImageCodecInfo[] ConvertFromMemory(IntPtr memoryStart, int numCodecs)
-        {
-            var codecs = new ImageCodecInfo[numCodecs];
-
-            int index;
-
-            for (index = 0; index < numCodecs; index++)
-            {
-                var curcodec = (IntPtr) ((long) memoryStart + Marshal.SizeOf(typeof(InteropValues.ImageCodecInfoPrivate)) * index);
-                var codecp = new InteropValues.ImageCodecInfoPrivate();
-                InteropMethods.PtrToStructure(curcodec, codecp);
-
-                codecs[index] = new ImageCodecInfo
-                {
-                    Clsid = codecp.Clsid,
-                    FormatID = codecp.FormatID,
-                    CodecName = Marshal.PtrToStringUni(codecp.CodecName),
-                    DllName = Marshal.PtrToStringUni(codecp.DllName),
-                    FormatDescription = Marshal.PtrToStringUni(codecp.FormatDescription),
-                    FilenameExtension = Marshal.PtrToStringUni(codecp.FilenameExtension),
-                    MimeType = Marshal.PtrToStringUni(codecp.MimeType),
-                    Flags = (ImageCodecFlags) codecp.Flags,
-                    Version = codecp.Version,
-                    SignaturePatterns = new byte[codecp.SigCount][],
-                    SignatureMasks = new byte[codecp.SigCount][]
-                };
-
-                for (var j = 0; j < codecp.SigCount; j++)
-                {
-                    codecs[index].SignaturePatterns[j] = new byte[codecp.SigSize];
-                    codecs[index].SignatureMasks[j] = new byte[codecp.SigSize];
-
-                    Marshal.Copy((IntPtr) ((long) codecp.SigMask + j * codecp.SigSize), codecs[index].SignatureMasks[j], 0, codecp.SigSize);
-                    Marshal.Copy((IntPtr) ((long) codecp.SigPattern + j * codecp.SigSize), codecs[index].SignaturePatterns[j], 0, codecp.SigSize);
-                }
-            }
-
-            return codecs;
+            _dllName = value;
         }
     }
-}
+
+    public string FormatDescription { get; set; }
+
+    public string FilenameExtension { get; set; }
+
+    public string MimeType { get; set; }
+
+    public ImageCodecFlags Flags { get; set; }
+
+    public int Version { get; set; }
+
+    public byte[][] SignaturePatterns { get; set; }
+
+    public byte[][] SignatureMasks { get; set; }
+
+    public static ImageCodecInfo[] GetImageDecoders()
+    {
+        ImageCodecInfo[] imageCodecs;
+
+        var status = InteropMethods.Gdip.GdipGetImageDecodersSize(out var numDecoders, out var size);
+
+        if (status != InteropMethods.Gdip.Ok)
+        {
+            throw InteropMethods.Gdip.StatusException(status);
+        }
+
+        var memory = Marshal.AllocHGlobal(size);
+
+        try
+        {
+            status = InteropMethods.Gdip.GdipGetImageDecoders(numDecoders, size, memory);
+
+            if (status != InteropMethods.Gdip.Ok)
+            {
+                throw InteropMethods.Gdip.StatusException(status);
+            }
+
+            imageCodecs = ConvertFromMemory(memory, numDecoders);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(memory);
+        }
+
+        return imageCodecs;
+    }
+
+    public static ImageCodecInfo[] GetImageEncoders()
+    {
+        ImageCodecInfo[] imageCodecs;
+
+        var status = InteropMethods.Gdip.GdipGetImageEncodersSize(out var numEncoders, out var size);
+
+        if (status != InteropMethods.Gdip.Ok)
+        {
+            throw InteropMethods.Gdip.StatusException(status);
+        }
+
+        var memory = Marshal.AllocHGlobal(size);
+
+        try
+        {
+            status = InteropMethods.Gdip.GdipGetImageEncoders(numEncoders, size, memory);
+
+            if (status != InteropMethods.Gdip.Ok)
+            {
+                throw InteropMethods.Gdip.StatusException(status);
+            }
+
+            imageCodecs = ConvertFromMemory(memory, numEncoders);
+        }
+        finally
+        {
+            Marshal.FreeHGlobal(memory);
+        }
+
+        return imageCodecs;
+    }
+
+    public static ImageCodecInfo[] ConvertFromMemory(IntPtr memoryStart, int numCodecs)
+    {
+        var codecs = new ImageCodecInfo[numCodecs];
+
+        int index;
+
+        for (index = 0; index < numCodecs; index++)
+        {
+            var curcodec = (IntPtr) ((long) memoryStart + Marshal.SizeOf(typeof(InteropValues.ImageCodecInfoPrivate)) * index);
+            var codecp = new InteropValues.ImageCodecInfoPrivate();
+            InteropMethods.PtrToStructure(curcodec, codecp);
+
+            codecs[index] = new ImageCodecInfo
+            {
+                Clsid = codecp.Clsid,
+                FormatID = codecp.FormatID,
+                CodecName = Marshal.PtrToStringUni(codecp.CodecName),
+                DllName = Marshal.PtrToStringUni(codecp.DllName),
+                FormatDescription = Marshal.PtrToStringUni(codecp.FormatDescription),
+                FilenameExtension = Marshal.PtrToStringUni(codecp.FilenameExtension),
+                MimeType = Marshal.PtrToStringUni(codecp.MimeType),
+                Flags = (ImageCodecFlags) codecp.Flags,
+                Version = codecp.Version,
+                SignaturePatterns = new byte[codecp.SigCount][],
+                SignatureMasks = new byte[codecp.SigCount][]
+            };
+
+            for (var j = 0; j < codecp.SigCount; j++)
+            {
+                codecs[index].SignaturePatterns[j] = new byte[codecp.SigSize];
+                codecs[index].SignatureMasks[j] = new byte[codecp.SigSize];
+
+                Marshal.Copy((IntPtr) ((long) codecp.SigMask + j * codecp.SigSize), codecs[index].SignatureMasks[j], 0, codecp.SigSize);
+                Marshal.Copy((IntPtr) ((long) codecp.SigPattern + j * codecp.SigSize), codecs[index].SignaturePatterns[j], 0, codecp.SigSize);
+            }
+        }
+
+        return codecs;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
index 607a380b..66fb57de 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
@@ -1,28 +1,27 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class MessageBoxInfo
 {
-    public class MessageBoxInfo
-    {
-        public string Message { get; set; }
+    public string Message { get; set; }
 
-        public string Caption { get; set; }
+    public string Caption { get; set; }
 
-        public MessageBoxButton Button { get; set; } = MessageBoxButton.OK;
+    public MessageBoxButton Button { get; set; } = MessageBoxButton.OK;
 
-        public Geometry Icon { get; set; }
+    public Geometry Icon { get; set; }
 
-        public string IconKey { get; set; }
+    public string IconKey { get; set; }
 
-        public Brush IconBrush { get; set; }
+    public Brush IconBrush { get; set; }
 
-        public string IconBrushKey { get; set; }
+    public string IconBrushKey { get; set; }
 
-        public MessageBoxResult DefaultResult { get; set; } = MessageBoxResult.None;
+    public MessageBoxResult DefaultResult { get; set; } = MessageBoxResult.None;
 
-        public Style Style { get; set; }
+    public Style Style { get; set; }
 
-        public string StyleKey { get; set; }
-    }
-}
+    public string StyleKey { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
index 7f584af6..1af033f6 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
@@ -3,77 +3,76 @@
 
 using System;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public readonly struct SystemVersionInfo
 {
-    public readonly struct SystemVersionInfo
+    public static SystemVersionInfo Windows10 => new(10, 0, 10240);
+
+    public static SystemVersionInfo Windows10_1809 => new(10, 0, 17763);
+
+    public static SystemVersionInfo Windows10_1903 => new(10, 0, 18362);
+
+    public SystemVersionInfo(int major, int minor, int build)
     {
-        public static SystemVersionInfo Windows10 => new(10, 0, 10240);
-
-        public static SystemVersionInfo Windows10_1809 => new(10, 0, 17763);
-
-        public static SystemVersionInfo Windows10_1903 => new(10, 0, 18362);
-
-        public SystemVersionInfo(int major, int minor, int build)
-        {
-            Major = major;
-            Minor = minor;
-            Build = build;
-        }
-
-        public int Major { get; }
-
-        public int Minor { get; }
-
-        public int Build { get; }
-
-        public bool Equals(SystemVersionInfo other) => Major == other.Major && Minor == other.Minor && Build == other.Build;
-
-        public override bool Equals(object obj) => obj is SystemVersionInfo other && Equals(other);
-
-        public override int GetHashCode() => Major.GetHashCode() ^ Minor.GetHashCode() ^ Build.GetHashCode();
-
-        public static bool operator ==(SystemVersionInfo left, SystemVersionInfo right) => left.Equals(right);
-
-        public static bool operator !=(SystemVersionInfo left, SystemVersionInfo right) => !(left == right);
-
-        public int CompareTo(SystemVersionInfo other)
-        {
-            if (Major != other.Major)
-            {
-                return Major.CompareTo(other.Major);
-            }
-
-            if (Minor != other.Minor)
-            {
-                return Minor.CompareTo(other.Minor);
-            }
-
-            if (Build != other.Build)
-            {
-                return Build.CompareTo(other.Build);
-            }
-
-            return 0;
-        }
-
-        public int CompareTo(object obj)
-        {
-            if (!(obj is SystemVersionInfo other))
-            {
-                throw new ArgumentException();
-            }
-
-            return CompareTo(other);
-        }
-
-        public static bool operator <(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) < 0;
-
-        public static bool operator <=(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) <= 0;
-
-        public static bool operator >(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) > 0;
-
-        public static bool operator >=(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) >= 0;
-
-        public override string ToString() => $"{Major}.{Minor}.{Build}";
+        Major = major;
+        Minor = minor;
+        Build = build;
     }
-}
+
+    public int Major { get; }
+
+    public int Minor { get; }
+
+    public int Build { get; }
+
+    public bool Equals(SystemVersionInfo other) => Major == other.Major && Minor == other.Minor && Build == other.Build;
+
+    public override bool Equals(object obj) => obj is SystemVersionInfo other && Equals(other);
+
+    public override int GetHashCode() => Major.GetHashCode() ^ Minor.GetHashCode() ^ Build.GetHashCode();
+
+    public static bool operator ==(SystemVersionInfo left, SystemVersionInfo right) => left.Equals(right);
+
+    public static bool operator !=(SystemVersionInfo left, SystemVersionInfo right) => !(left == right);
+
+    public int CompareTo(SystemVersionInfo other)
+    {
+        if (Major != other.Major)
+        {
+            return Major.CompareTo(other.Major);
+        }
+
+        if (Minor != other.Minor)
+        {
+            return Minor.CompareTo(other.Minor);
+        }
+
+        if (Build != other.Build)
+        {
+            return Build.CompareTo(other.Build);
+        }
+
+        return 0;
+    }
+
+    public int CompareTo(object obj)
+    {
+        if (!(obj is SystemVersionInfo other))
+        {
+            throw new ArgumentException();
+        }
+
+        return CompareTo(other);
+    }
+
+    public static bool operator <(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) < 0;
+
+    public static bool operator <=(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) <= 0;
+
+    public static bool operator >(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) > 0;
+
+    public static bool operator >=(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) >= 0;
+
+    public override string ToString() => $"{Major}.{Minor}.{Build}";
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
index aee7f18f..a196584c 100644
--- a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
+++ b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
@@ -1,25 +1,24 @@
-namespace HandyControl.Data
-{
-    public class OperationResult
-    {
-        public static OperationResult<bool> Failed(string message = "")
-        {
-            return new()
-            {
-                ResultType = ResultType.Failed,
-                Message = message,
-                Data = false
-            };
-        }
+namespace HandyControl.Data;
 
-        public static OperationResult<bool> Success(string message = "")
+public class OperationResult
+{
+    public static OperationResult<bool> Failed(string message = "")
+    {
+        return new()
         {
-            return new()
-            {
-                ResultType = ResultType.Success,
-                Message = message,
-                Data = true
-            };
-        }
+            ResultType = ResultType.Failed,
+            Message = message,
+            Data = false
+        };
     }
-}
+
+    public static OperationResult<bool> Success(string message = "")
+    {
+        return new()
+        {
+            ResultType = ResultType.Success,
+            Message = message,
+            Data = true
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
index f74a1302..f6cad51d 100644
--- a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
+++ b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
@@ -1,23 +1,22 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     表示一个操作的返回结果信息
+/// </summary>
+public class OperationResult<T> : OperationResult
 {
     /// <summary>
-    ///     表示一个操作的返回结果信息
+    ///     操作结果
     /// </summary>
-    public class OperationResult<T> : OperationResult
-    {
-        /// <summary>
-        ///     操作结果
-        /// </summary>
-        public ResultType ResultType { get; set; }
+    public ResultType ResultType { get; set; }
 
-        /// <summary>
-        ///     返回数据
-        /// </summary>
-        public T Data { get; set; }
+    /// <summary>
+    ///     返回数据
+    /// </summary>
+    public T Data { get; set; }
 
-        /// <summary>
-        ///     操作消息（包含错误原因等数据）
-        /// </summary>
-        public string Message { get; set; }
-    }
-}
+    /// <summary>
+    ///     操作消息（包含错误原因等数据）
+    /// </summary>
+    public string Message { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs b/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
index ff00ac97..c1df851d 100644
--- a/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
+++ b/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
@@ -1,70 +1,69 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+internal struct PanelUvSize
 {
-    internal struct PanelUvSize
+    private readonly Orientation _orientation;
+
+    public Size ScreenSize => new(U, V);
+
+    public double U { get; set; }
+
+    public double V { get; set; }
+
+    public double Width
     {
-        private readonly Orientation _orientation;
-
-        public Size ScreenSize => new(U, V);
-
-        public double U { get; set; }
-
-        public double V { get; set; }
-
-        public double Width
+        get => _orientation == Orientation.Horizontal ? U : V;
+        private set
         {
-            get => _orientation == Orientation.Horizontal ? U : V;
-            private set
+            if (_orientation == Orientation.Horizontal)
             {
-                if (_orientation == Orientation.Horizontal)
-                {
-                    U = value;
-                }
-                else
-                {
-                    V = value;
-                }
+                U = value;
             }
-        }
-
-        public double Height
-        {
-            get => _orientation == Orientation.Horizontal ? V : U;
-            private set
+            else
             {
-                if (_orientation == Orientation.Horizontal)
-                {
-                    V = value;
-                }
-                else
-                {
-                    U = value;
-                }
+                V = value;
             }
         }
-
-        public PanelUvSize(Orientation orientation, double width, double height)
-        {
-            U = V = 0d;
-            _orientation = orientation;
-            Width = width;
-            Height = height;
-        }
-
-        public PanelUvSize(Orientation orientation, Size size)
-        {
-            U = V = 0d;
-            _orientation = orientation;
-            Width = size.Width;
-            Height = size.Height;
-        }
-
-        public PanelUvSize(Orientation orientation)
-        {
-            U = V = 0d;
-            _orientation = orientation;
-        }
     }
-}
+
+    public double Height
+    {
+        get => _orientation == Orientation.Horizontal ? V : U;
+        private set
+        {
+            if (_orientation == Orientation.Horizontal)
+            {
+                V = value;
+            }
+            else
+            {
+                U = value;
+            }
+        }
+    }
+
+    public PanelUvSize(Orientation orientation, double width, double height)
+    {
+        U = V = 0d;
+        _orientation = orientation;
+        Width = width;
+        Height = height;
+    }
+
+    public PanelUvSize(Orientation orientation, Size size)
+    {
+        U = V = 0d;
+        _orientation = orientation;
+        Width = size.Width;
+        Height = size.Height;
+    }
+
+    public PanelUvSize(Orientation orientation)
+    {
+        U = V = 0d;
+        _orientation = orientation;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs b/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
index 08e70a08..d89584c5 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
@@ -1,63 +1,62 @@
 using System.Windows.Media;
 
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     颜色范围
+/// </summary>
+public class ColorRange : IValueRange<Color>
 {
-    /// <summary>
-    ///     颜色范围
-    /// </summary>
-    public class ColorRange : IValueRange<Color>
+    private Color _start;
+
+    public Color Start
     {
-        private Color _start;
-
-        public Color Start
+        get => _start;
+        set
         {
-            get => _start;
-            set
-            {
-                _start = value;
-                Update();
-            }
-        }
-
-        private Color _end;
-
-        public Color End
-        {
-            get => _end;
-            set
-            {
-                _end = value;
-                Update();
-            }
-        }
-
-        /// <summary>
-        ///     颜色差值
-        /// </summary>
-        private readonly int[] _subColorArr = new int[4];
-
-        /// <summary>
-        ///     更新
-        /// </summary>
-        private void Update()
-        {
-            _subColorArr[0] = _start.A - _end.A;
-            _subColorArr[1] = _start.R - _end.R;
-            _subColorArr[2] = _start.G - _end.G;
-            _subColorArr[3] = _start.B - _end.B;
-        }
-
-        /// <summary>
-        ///     获取指定比例处的颜色
-        /// </summary>
-        /// <param name="range">范围（0-1）</param>
-        /// <returns></returns>
-        public Color GetColor(double range)
-        {
-            if (range < 0 || range > 1) return default;
-            return Color.FromArgb((byte) (_start.A - _subColorArr[0] * range), (byte) (_start.R - _subColorArr[1] * range),
-                (byte) (_start.G - _subColorArr[2] * range), (byte) (_start.B - _subColorArr[3] * range));
+            _start = value;
+            Update();
         }
     }
-}
+
+    private Color _end;
+
+    public Color End
+    {
+        get => _end;
+        set
+        {
+            _end = value;
+            Update();
+        }
+    }
+
+    /// <summary>
+    ///     颜色差值
+    /// </summary>
+    private readonly int[] _subColorArr = new int[4];
+
+    /// <summary>
+    ///     更新
+    /// </summary>
+    private void Update()
+    {
+        _subColorArr[0] = _start.A - _end.A;
+        _subColorArr[1] = _start.R - _end.R;
+        _subColorArr[2] = _start.G - _end.G;
+        _subColorArr[3] = _start.B - _end.B;
+    }
+
+    /// <summary>
+    ///     获取指定比例处的颜色
+    /// </summary>
+    /// <param name="range">范围（0-1）</param>
+    /// <returns></returns>
+    public Color GetColor(double range)
+    {
+        if (range < 0 || range > 1) return default;
+        return Color.FromArgb((byte) (_start.A - _subColorArr[0] * range), (byte) (_start.R - _subColorArr[1] * range),
+            (byte) (_start.G - _subColorArr[2] * range), (byte) (_start.B - _subColorArr[3] * range));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs b/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
index 65d2ba95..bd15e86b 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
@@ -1,25 +1,24 @@
 using System;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public struct DateTimeRange : IValueRange<DateTime>
 {
-    public struct DateTimeRange : IValueRange<DateTime>
+    public DateTimeRange(DateTime start)
     {
-        public DateTimeRange(DateTime start)
-        {
-            Start = start;
-            End = start;
-        }
-
-        public DateTimeRange(DateTime start, DateTime end)
-        {
-            Start = start;
-            End = end;
-        }
-
-        public DateTime Start { get; set; }
-
-        public DateTime End { get; set; }
-
-        public double TotalMilliseconds => (End - Start).TotalMilliseconds;
+        Start = start;
+        End = start;
     }
-}
+
+    public DateTimeRange(DateTime start, DateTime end)
+    {
+        Start = start;
+        End = end;
+    }
+
+    public DateTime Start { get; set; }
+
+    public DateTime End { get; set; }
+
+    public double TotalMilliseconds => (End - Start).TotalMilliseconds;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs b/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
index c90a80fa..5081c9ff 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
-{
-    public struct DoubleRange : IValueRange<double>
-    {
-        public double Start { get; set; }
+namespace HandyControl.Data;
 
-        public double End { get; set; }
-    }
-}
+public struct DoubleRange : IValueRange<double>
+{
+    public double Start { get; set; }
+
+    public double End { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs b/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
index 644a2eb5..baf71755 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Data
-{
-    public interface IValueRange<T>
-    {
-        T Start { get; set; }
+namespace HandyControl.Data;
 
-        T End { get; set; }
-    }
-}
+public interface IValueRange<T>
+{
+    T Start { get; set; }
+
+    T End { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
index 9c10187a..b3e244d9 100644
--- a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
+++ b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
@@ -1,375 +1,374 @@
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+public class ResourceToken
 {
-    public class ResourceToken
-    {
-        #region Basic
+    #region Basic
 
-        #region Geometry
+    #region Geometry
 
-        public const string CalendarGeometry = nameof(CalendarGeometry);
+    public const string CalendarGeometry = nameof(CalendarGeometry);
 
-        public const string DeleteGeometry = nameof(DeleteGeometry);
+    public const string DeleteGeometry = nameof(DeleteGeometry);
 
-        public const string DeleteFillCircleGeometry = nameof(DeleteFillCircleGeometry);
+    public const string DeleteFillCircleGeometry = nameof(DeleteFillCircleGeometry);
 
-        public const string CloseGeometry = nameof(CloseGeometry);
+    public const string CloseGeometry = nameof(CloseGeometry);
 
-        public const string UpGeometry = nameof(UpGeometry);
+    public const string UpGeometry = nameof(UpGeometry);
 
-        public const string DownGeometry = nameof(DownGeometry);
+    public const string DownGeometry = nameof(DownGeometry);
 
-        public const string ClockGeometry = nameof(ClockGeometry);
+    public const string ClockGeometry = nameof(ClockGeometry);
 
-        public const string LeftGeometry = nameof(LeftGeometry);
+    public const string LeftGeometry = nameof(LeftGeometry);
 
-        public const string RightGeometry = nameof(RightGeometry);
+    public const string RightGeometry = nameof(RightGeometry);
 
-        public const string RotateLeftGeometry = nameof(RotateLeftGeometry);
+    public const string RotateLeftGeometry = nameof(RotateLeftGeometry);
 
-        public const string EnlargeGeometry = nameof(EnlargeGeometry);
+    public const string EnlargeGeometry = nameof(EnlargeGeometry);
 
-        public const string ReduceGeometry = nameof(ReduceGeometry);
+    public const string ReduceGeometry = nameof(ReduceGeometry);
 
-        public const string DownloadGeometry = nameof(DownloadGeometry);
+    public const string DownloadGeometry = nameof(DownloadGeometry);
 
-        public const string SaveGeometry = nameof(SaveGeometry);
+    public const string SaveGeometry = nameof(SaveGeometry);
 
-        public const string WindowsGeometry = nameof(WindowsGeometry);
+    public const string WindowsGeometry = nameof(WindowsGeometry);
 
-        public const string FullScreenGeometry = nameof(FullScreenGeometry);
+    public const string FullScreenGeometry = nameof(FullScreenGeometry);
 
-        public const string FullScreenReturnGeometry = nameof(FullScreenReturnGeometry);
+    public const string FullScreenReturnGeometry = nameof(FullScreenReturnGeometry);
 
-        public const string SearchGeometry = nameof(SearchGeometry);
+    public const string SearchGeometry = nameof(SearchGeometry);
 
-        public const string UpDownGeometry = nameof(UpDownGeometry);
+    public const string UpDownGeometry = nameof(UpDownGeometry);
 
-        public const string WindowMinGeometry = nameof(WindowMinGeometry);
+    public const string WindowMinGeometry = nameof(WindowMinGeometry);
 
-        public const string CheckedGeometry = nameof(CheckedGeometry);
+    public const string CheckedGeometry = nameof(CheckedGeometry);
 
-        public const string EyeOpenGeometry = nameof(EyeOpenGeometry);
+    public const string EyeOpenGeometry = nameof(EyeOpenGeometry);
 
-        public const string EyeCloseGeometry = nameof(EyeCloseGeometry);
+    public const string EyeCloseGeometry = nameof(EyeCloseGeometry);
 
-        public const string WindowRestoreGeometry = nameof(WindowRestoreGeometry);
+    public const string WindowRestoreGeometry = nameof(WindowRestoreGeometry);
 
-        public const string WindowMaxGeometry = nameof(WindowMaxGeometry);
+    public const string WindowMaxGeometry = nameof(WindowMaxGeometry);
 
-        public const string AudioGeometry = nameof(AudioGeometry);
+    public const string AudioGeometry = nameof(AudioGeometry);
 
-        public const string BubbleTailGeometry = nameof(BubbleTailGeometry);
+    public const string BubbleTailGeometry = nameof(BubbleTailGeometry);
 
-        public const string StarGeometry = nameof(StarGeometry);
+    public const string StarGeometry = nameof(StarGeometry);
 
-        public const string AddGeometry = nameof(AddGeometry);
+    public const string AddGeometry = nameof(AddGeometry);
 
-        public const string SubGeometry = nameof(SubGeometry);
+    public const string SubGeometry = nameof(SubGeometry);
 
-        public const string AllGeometry = nameof(AllGeometry);
+    public const string AllGeometry = nameof(AllGeometry);
 
-        public const string DragGeometry = nameof(DragGeometry);
+    public const string DragGeometry = nameof(DragGeometry);
 
-        public const string DropperGeometry = nameof(DropperGeometry);
+    public const string DropperGeometry = nameof(DropperGeometry);
 
-        public const string SuccessGeometry = nameof(SuccessGeometry);
+    public const string SuccessGeometry = nameof(SuccessGeometry);
 
-        public const string InfoGeometry = nameof(InfoGeometry);
+    public const string InfoGeometry = nameof(InfoGeometry);
 
-        public const string ErrorGeometry = nameof(ErrorGeometry);
+    public const string ErrorGeometry = nameof(ErrorGeometry);
 
-        public const string WarningGeometry = nameof(WarningGeometry);
+    public const string WarningGeometry = nameof(WarningGeometry);
 
-        public const string AskGeometry = nameof(AskGeometry);
+    public const string AskGeometry = nameof(AskGeometry);
 
-        public const string FatalGeometry = nameof(FatalGeometry);
+    public const string FatalGeometry = nameof(FatalGeometry);
 
-        #endregion
+    #endregion
 
-        #region Brush
+    #region Brush
 
-        public const string PrimaryBrush = nameof(PrimaryBrush);
+    public const string PrimaryBrush = nameof(PrimaryBrush);
 
-        public const string DarkPrimaryBrush = nameof(DarkPrimaryBrush);
+    public const string DarkPrimaryBrush = nameof(DarkPrimaryBrush);
 
-        public const string SuccessBrush = nameof(SuccessBrush);
+    public const string SuccessBrush = nameof(SuccessBrush);
 
-        public const string DarkSuccessBrush = nameof(DarkSuccessBrush);
+    public const string DarkSuccessBrush = nameof(DarkSuccessBrush);
 
-        public const string InfoBrush = nameof(InfoBrush);
+    public const string InfoBrush = nameof(InfoBrush);
 
-        public const string DarkInfoBrush = nameof(DarkInfoBrush);
+    public const string DarkInfoBrush = nameof(DarkInfoBrush);
 
-        public const string DangerBrush = nameof(DangerBrush);
+    public const string DangerBrush = nameof(DangerBrush);
 
-        public const string DarkDangerBrush = nameof(DarkDangerBrush);
+    public const string DarkDangerBrush = nameof(DarkDangerBrush);
 
-        public const string WarningBrush = nameof(WarningBrush);
+    public const string WarningBrush = nameof(WarningBrush);
 
-        public const string DarkWarningBrush = nameof(DarkWarningBrush);
+    public const string DarkWarningBrush = nameof(DarkWarningBrush);
 
-        public const string AccentBrush = nameof(AccentBrush);
+    public const string AccentBrush = nameof(AccentBrush);
 
-        public const string DarkAccentBrush = nameof(DarkAccentBrush);
+    public const string DarkAccentBrush = nameof(DarkAccentBrush);
 
-        public const string PrimaryTextBrush = nameof(PrimaryTextBrush);
+    public const string PrimaryTextBrush = nameof(PrimaryTextBrush);
 
-        public const string SecondaryTextBrush = nameof(SecondaryTextBrush);
+    public const string SecondaryTextBrush = nameof(SecondaryTextBrush);
 
-        public const string ThirdlyTextBrush = nameof(ThirdlyTextBrush);
+    public const string ThirdlyTextBrush = nameof(ThirdlyTextBrush);
 
-        public const string ReverseTextBrush = nameof(ReverseTextBrush);
+    public const string ReverseTextBrush = nameof(ReverseTextBrush);
 
-        public const string TextIconBrush = nameof(TextIconBrush);
+    public const string TextIconBrush = nameof(TextIconBrush);
 
-        public const string BorderBrush = nameof(BorderBrush);
+    public const string BorderBrush = nameof(BorderBrush);
 
-        public const string SecondaryBorderBrush = nameof(SecondaryBorderBrush);
+    public const string SecondaryBorderBrush = nameof(SecondaryBorderBrush);
 
-        public const string BackgroundBrush = nameof(BackgroundBrush);
+    public const string BackgroundBrush = nameof(BackgroundBrush);
 
-        public const string RegionBrush = nameof(RegionBrush);
+    public const string RegionBrush = nameof(RegionBrush);
 
-        public const string SecondaryRegionBrush = nameof(SecondaryRegionBrush);
+    public const string SecondaryRegionBrush = nameof(SecondaryRegionBrush);
 
-        public const string ThirdlyRegionBrush = nameof(ThirdlyRegionBrush);
+    public const string ThirdlyRegionBrush = nameof(ThirdlyRegionBrush);
 
-        public const string TitleBrush = nameof(TitleBrush);
+    public const string TitleBrush = nameof(TitleBrush);
 
-        public const string DefaultBrush = nameof(DefaultBrush);
+    public const string DefaultBrush = nameof(DefaultBrush);
 
-        public const string DarkDefaultBrush = nameof(DarkDefaultBrush);
+    public const string DarkDefaultBrush = nameof(DarkDefaultBrush);
 
-        public const string DarkMaskBrush = nameof(DarkMaskBrush);
+    public const string DarkMaskBrush = nameof(DarkMaskBrush);
 
-        public const string DarkOpacityBrush = nameof(DarkOpacityBrush);
+    public const string DarkOpacityBrush = nameof(DarkOpacityBrush);
 
-        #endregion
+    #endregion
 
-        #region Converter
+    #region Converter
 
-        public const string Boolean2BooleanReConverter = nameof(Boolean2BooleanReConverter);
+    public const string Boolean2BooleanReConverter = nameof(Boolean2BooleanReConverter);
 
-        public const string Boolean2VisibilityReConverter = nameof(Boolean2VisibilityReConverter);
+    public const string Boolean2VisibilityReConverter = nameof(Boolean2VisibilityReConverter);
 
-        public const string BooleanArr2VisibilityConverter = nameof(BooleanArr2VisibilityConverter);
+    public const string BooleanArr2VisibilityConverter = nameof(BooleanArr2VisibilityConverter);
 
-        public const string Long2FileSizeConverter = nameof(Long2FileSizeConverter);
+    public const string Long2FileSizeConverter = nameof(Long2FileSizeConverter);
 
-        public const string String2VisibilityConverter = nameof(String2VisibilityConverter);
+    public const string String2VisibilityConverter = nameof(String2VisibilityConverter);
 
-        public const string String2VisibilityReConverter = nameof(String2VisibilityReConverter);
+    public const string String2VisibilityReConverter = nameof(String2VisibilityReConverter);
 
-        public const string Boolean2VisibilityConverter = nameof(Boolean2VisibilityConverter);
+    public const string Boolean2VisibilityConverter = nameof(Boolean2VisibilityConverter);
 
-        public const string TreeViewItemMarginConverter = nameof(TreeViewItemMarginConverter);
+    public const string TreeViewItemMarginConverter = nameof(TreeViewItemMarginConverter);
 
-        public const string Color2HexStringConverter = nameof(Color2HexStringConverter);
+    public const string Color2HexStringConverter = nameof(Color2HexStringConverter);
 
-        public const string Object2BooleanConverter = nameof(Object2BooleanConverter);
+    public const string Object2BooleanConverter = nameof(Object2BooleanConverter);
 
-        public const string Boolean2StringConverter = nameof(Boolean2StringConverter);
+    public const string Boolean2StringConverter = nameof(Boolean2StringConverter);
 
-        public const string Int2StringConverter = nameof(Int2StringConverter);
+    public const string Int2StringConverter = nameof(Int2StringConverter);
 
-        public const string BorderClipConverter = nameof(BorderClipConverter);
+    public const string BorderClipConverter = nameof(BorderClipConverter);
 
-        public const string BorderCircularClipConverter = nameof(BorderCircularClipConverter);
+    public const string BorderCircularClipConverter = nameof(BorderCircularClipConverter);
 
-        public const string BorderCircularConverter = nameof(BorderCircularConverter);
+    public const string BorderCircularConverter = nameof(BorderCircularConverter);
 
-        public const string Object2VisibilityConverter = nameof(Object2VisibilityConverter);
+    public const string Object2VisibilityConverter = nameof(Object2VisibilityConverter);
 
-        public const string Number2PercentageConverter = nameof(Number2PercentageConverter);
+    public const string Number2PercentageConverter = nameof(Number2PercentageConverter);
 
-        public const string RectangleCircularConverter = nameof(RectangleCircularConverter);
+    public const string RectangleCircularConverter = nameof(RectangleCircularConverter);
 
-        public const string ThicknessSplitConverter = nameof(ThicknessSplitConverter);
+    public const string ThicknessSplitConverter = nameof(ThicknessSplitConverter);
 
-        public const string CornerRadiusSplitConverter = nameof(CornerRadiusSplitConverter);
+    public const string CornerRadiusSplitConverter = nameof(CornerRadiusSplitConverter);
 
-        public const string MenuScrollingVisibilityConverter = nameof(MenuScrollingVisibilityConverter);
+    public const string MenuScrollingVisibilityConverter = nameof(MenuScrollingVisibilityConverter);
 
-        public const string Double2GridLengthConverter = nameof(Double2GridLengthConverter);
+    public const string Double2GridLengthConverter = nameof(Double2GridLengthConverter);
 
-        public const string DoubleMinConverter = nameof(DoubleMinConverter);
+    public const string DoubleMinConverter = nameof(DoubleMinConverter);
 
-        #endregion
+    #endregion
 
-        #region Effect
+    #region Effect
 
-        public const string EffectShadowColor = nameof(EffectShadowColor);
+    public const string EffectShadowColor = nameof(EffectShadowColor);
 
-        public const string EffectShadow1 = nameof(EffectShadow1);
+    public const string EffectShadow1 = nameof(EffectShadow1);
 
-        public const string EffectShadow2 = nameof(EffectShadow2);
+    public const string EffectShadow2 = nameof(EffectShadow2);
 
-        public const string EffectShadow3 = nameof(EffectShadow3);
+    public const string EffectShadow3 = nameof(EffectShadow3);
 
-        public const string EffectShadow4 = nameof(EffectShadow4);
+    public const string EffectShadow4 = nameof(EffectShadow4);
 
-        public const string EffectShadow5 = nameof(EffectShadow5);
+    public const string EffectShadow5 = nameof(EffectShadow5);
 
-        #endregion
+    #endregion
 
-        #region Color
+    #region Color
 
-        public const string PrimaryColor = nameof(PrimaryColor);
+    public const string PrimaryColor = nameof(PrimaryColor);
 
-        public const string DarkPrimaryColor = nameof(DarkPrimaryColor);
+    public const string DarkPrimaryColor = nameof(DarkPrimaryColor);
 
-        public const string DangerColor = nameof(DangerColor);
+    public const string DangerColor = nameof(DangerColor);
 
-        public const string DarkDangerColor = nameof(DarkDangerColor);
+    public const string DarkDangerColor = nameof(DarkDangerColor);
 
-        public const string WarningColor = nameof(WarningColor);
+    public const string WarningColor = nameof(WarningColor);
 
-        public const string DarkWarningColor = nameof(DarkWarningColor);
+    public const string DarkWarningColor = nameof(DarkWarningColor);
 
-        public const string InfoColor = nameof(InfoColor);
+    public const string InfoColor = nameof(InfoColor);
 
-        public const string DarkInfoColor = nameof(DarkInfoColor);
+    public const string DarkInfoColor = nameof(DarkInfoColor);
 
-        public const string SuccessColor = nameof(SuccessColor);
+    public const string SuccessColor = nameof(SuccessColor);
 
-        public const string DarkSuccessColor = nameof(DarkSuccessColor);
+    public const string DarkSuccessColor = nameof(DarkSuccessColor);
 
-        public const string PrimaryTextColor = nameof(PrimaryTextColor);
+    public const string PrimaryTextColor = nameof(PrimaryTextColor);
 
-        public const string SecondaryTextColor = nameof(SecondaryTextColor);
+    public const string SecondaryTextColor = nameof(SecondaryTextColor);
 
-        public const string ThirdlyTextColor = nameof(ThirdlyTextColor);
+    public const string ThirdlyTextColor = nameof(ThirdlyTextColor);
 
-        public const string ReverseTextColor = nameof(ReverseTextColor);
+    public const string ReverseTextColor = nameof(ReverseTextColor);
 
-        public const string TextIconColor = nameof(TextIconColor);
+    public const string TextIconColor = nameof(TextIconColor);
 
-        public const string BorderColor = nameof(BorderColor);
+    public const string BorderColor = nameof(BorderColor);
 
-        public const string SecondaryBorderColor = nameof(SecondaryBorderColor);
+    public const string SecondaryBorderColor = nameof(SecondaryBorderColor);
 
-        public const string BackgroundColor = nameof(BackgroundColor);
+    public const string BackgroundColor = nameof(BackgroundColor);
 
-        public const string RegionColor = nameof(RegionColor);
+    public const string RegionColor = nameof(RegionColor);
 
-        public const string SecondaryRegionColor = nameof(SecondaryRegionColor);
+    public const string SecondaryRegionColor = nameof(SecondaryRegionColor);
 
-        public const string ThirdlyRegionColor = nameof(ThirdlyRegionColor);
+    public const string ThirdlyRegionColor = nameof(ThirdlyRegionColor);
 
-        public const string TitleColor = nameof(TitleColor);
+    public const string TitleColor = nameof(TitleColor);
 
-        public const string SecondaryTitleColor = nameof(SecondaryTitleColor);
+    public const string SecondaryTitleColor = nameof(SecondaryTitleColor);
 
-        public const string DefaultColor = nameof(DefaultColor);
+    public const string DefaultColor = nameof(DefaultColor);
 
-        public const string DarkDefaultColor = nameof(DarkDefaultColor);
+    public const string DarkDefaultColor = nameof(DarkDefaultColor);
 
-        public const string AccentColor = nameof(AccentColor);
+    public const string AccentColor = nameof(AccentColor);
 
-        public const string DarkAccentColor = nameof(DarkAccentColor);
+    public const string DarkAccentColor = nameof(DarkAccentColor);
 
-        public const string DarkMaskColor = nameof(DarkMaskColor);
+    public const string DarkMaskColor = nameof(DarkMaskColor);
 
-        public const string DarkOpacityColor = nameof(DarkOpacityColor);
+    public const string DarkOpacityColor = nameof(DarkOpacityColor);
 
-        #endregion
+    #endregion
 
-        #region Behavior
+    #region Behavior
 
-        public const string BehaviorXY200 = nameof(BehaviorXY200);
+    public const string BehaviorXY200 = nameof(BehaviorXY200);
 
-        public const string BehaviorX200 = nameof(BehaviorX200);
+    public const string BehaviorX200 = nameof(BehaviorX200);
 
-        public const string BehaviorY200 = nameof(BehaviorY200);
+    public const string BehaviorY200 = nameof(BehaviorY200);
 
-        public const string BehaviorXY400 = nameof(BehaviorXY400);
+    public const string BehaviorXY400 = nameof(BehaviorXY400);
 
-        public const string BehaviorX400 = nameof(BehaviorX400);
+    public const string BehaviorX400 = nameof(BehaviorX400);
 
-        public const string BehaviorY400 = nameof(BehaviorY400);
+    public const string BehaviorY400 = nameof(BehaviorY400);
 
-        #endregion
+    #endregion
 
-        #endregion
+    #endregion
 
-        #region Internal
+    #region Internal
 
-        internal const string BlurGradientValue = nameof(BlurGradientValue);
+    internal const string BlurGradientValue = nameof(BlurGradientValue);
 
-        internal const string ButtonCustom = nameof(ButtonCustom);
+    internal const string ButtonCustom = nameof(ButtonCustom);
 
-        internal const string PaginationButtonStyle = nameof(PaginationButtonStyle);
+    internal const string PaginationButtonStyle = nameof(PaginationButtonStyle);
 
-        internal const string WindowWin10 = nameof(WindowWin10);
+    internal const string WindowWin10 = nameof(WindowWin10);
 
-        internal const string WindowBlur = nameof(WindowBlur);
+    internal const string WindowBlur = nameof(WindowBlur);
 
-        internal const string WindowGlow = nameof(WindowGlow);
+    internal const string WindowGlow = nameof(WindowGlow);
 
-        internal const string Window4ScreenshotStyle = nameof(Window4ScreenshotStyle);
+    internal const string Window4ScreenshotStyle = nameof(Window4ScreenshotStyle);
 
-        internal const string AddTagButtonStyle = nameof(AddTagButtonStyle);
+    internal const string AddTagButtonStyle = nameof(AddTagButtonStyle);
 
-        internal const string RadioGroupItemDefault = nameof(RadioGroupItemDefault);
+    internal const string RadioGroupItemDefault = nameof(RadioGroupItemDefault);
 
-        internal const string RadioGroupItemSingle = nameof(RadioGroupItemSingle);
+    internal const string RadioGroupItemSingle = nameof(RadioGroupItemSingle);
 
-        internal const string RadioGroupItemHorizontalFirst = nameof(RadioGroupItemHorizontalFirst);
+    internal const string RadioGroupItemHorizontalFirst = nameof(RadioGroupItemHorizontalFirst);
 
-        internal const string RadioGroupItemHorizontalLast = nameof(RadioGroupItemHorizontalLast);
+    internal const string RadioGroupItemHorizontalLast = nameof(RadioGroupItemHorizontalLast);
 
-        internal const string RadioGroupItemVerticalFirst = nameof(RadioGroupItemVerticalFirst);
+    internal const string RadioGroupItemVerticalFirst = nameof(RadioGroupItemVerticalFirst);
 
-        internal const string RadioGroupItemVerticalLast = nameof(RadioGroupItemVerticalLast);
+    internal const string RadioGroupItemVerticalLast = nameof(RadioGroupItemVerticalLast);
 
-        internal const string ButtonGroupItemDefault = nameof(ButtonGroupItemDefault);
+    internal const string ButtonGroupItemDefault = nameof(ButtonGroupItemDefault);
 
-        internal const string ButtonGroupItemSingle = nameof(ButtonGroupItemSingle);
+    internal const string ButtonGroupItemSingle = nameof(ButtonGroupItemSingle);
 
-        internal const string ButtonGroupItemHorizontalFirst = nameof(ButtonGroupItemHorizontalFirst);
+    internal const string ButtonGroupItemHorizontalFirst = nameof(ButtonGroupItemHorizontalFirst);
 
-        internal const string ButtonGroupItemHorizontalLast = nameof(ButtonGroupItemHorizontalLast);
+    internal const string ButtonGroupItemHorizontalLast = nameof(ButtonGroupItemHorizontalLast);
 
-        internal const string ButtonGroupItemVerticalFirst = nameof(ButtonGroupItemVerticalFirst);
+    internal const string ButtonGroupItemVerticalFirst = nameof(ButtonGroupItemVerticalFirst);
 
-        internal const string ButtonGroupItemVerticalLast = nameof(ButtonGroupItemVerticalLast);
+    internal const string ButtonGroupItemVerticalLast = nameof(ButtonGroupItemVerticalLast);
 
-        internal const string ToggleButtonGroupItemDefault = nameof(ToggleButtonGroupItemDefault);
+    internal const string ToggleButtonGroupItemDefault = nameof(ToggleButtonGroupItemDefault);
 
-        internal const string ToggleButtonGroupItemSingle = nameof(ToggleButtonGroupItemSingle);
+    internal const string ToggleButtonGroupItemSingle = nameof(ToggleButtonGroupItemSingle);
 
-        internal const string ToggleButtonGroupItemHorizontalFirst = nameof(ToggleButtonGroupItemHorizontalFirst);
+    internal const string ToggleButtonGroupItemHorizontalFirst = nameof(ToggleButtonGroupItemHorizontalFirst);
 
-        internal const string ToggleButtonGroupItemHorizontalLast = nameof(ToggleButtonGroupItemHorizontalLast);
+    internal const string ToggleButtonGroupItemHorizontalLast = nameof(ToggleButtonGroupItemHorizontalLast);
 
-        internal const string ToggleButtonGroupItemVerticalFirst = nameof(ToggleButtonGroupItemVerticalFirst);
+    internal const string ToggleButtonGroupItemVerticalFirst = nameof(ToggleButtonGroupItemVerticalFirst);
 
-        internal const string ToggleButtonGroupItemVerticalLast = nameof(ToggleButtonGroupItemVerticalLast);
+    internal const string ToggleButtonGroupItemVerticalLast = nameof(ToggleButtonGroupItemVerticalLast);
 
-        internal const string TabItemCapsuleDefault = nameof(TabItemCapsuleDefault);
+    internal const string TabItemCapsuleDefault = nameof(TabItemCapsuleDefault);
 
-        internal const string TabItemCapsuleSingle = nameof(TabItemCapsuleSingle);
+    internal const string TabItemCapsuleSingle = nameof(TabItemCapsuleSingle);
 
-        internal const string TabItemCapsuleHorizontalFirst = nameof(TabItemCapsuleHorizontalFirst);
+    internal const string TabItemCapsuleHorizontalFirst = nameof(TabItemCapsuleHorizontalFirst);
 
-        internal const string TabItemCapsuleHorizontalLast = nameof(TabItemCapsuleHorizontalLast);
+    internal const string TabItemCapsuleHorizontalLast = nameof(TabItemCapsuleHorizontalLast);
 
-        internal const string TabItemCapsuleVerticalFirst = nameof(TabItemCapsuleVerticalFirst);
+    internal const string TabItemCapsuleVerticalFirst = nameof(TabItemCapsuleVerticalFirst);
 
-        internal const string TabItemCapsuleVerticalLast = nameof(TabItemCapsuleVerticalLast);
+    internal const string TabItemCapsuleVerticalLast = nameof(TabItemCapsuleVerticalLast);
 
-        internal const string ComboBoxItemCapsuleDefault = nameof(ComboBoxItemCapsuleDefault);
+    internal const string ComboBoxItemCapsuleDefault = nameof(ComboBoxItemCapsuleDefault);
 
-        internal const string ComboBoxItemCapsuleSingle = nameof(ComboBoxItemCapsuleSingle);
+    internal const string ComboBoxItemCapsuleSingle = nameof(ComboBoxItemCapsuleSingle);
 
-        internal const string ComboBoxItemCapsuleHorizontalFirst = nameof(ComboBoxItemCapsuleHorizontalFirst);
+    internal const string ComboBoxItemCapsuleHorizontalFirst = nameof(ComboBoxItemCapsuleHorizontalFirst);
 
-        internal const string ComboBoxItemCapsuleHorizontalLast = nameof(ComboBoxItemCapsuleHorizontalLast);
+    internal const string ComboBoxItemCapsuleHorizontalLast = nameof(ComboBoxItemCapsuleHorizontalLast);
 
-        internal const string ComboBoxItemCapsuleVerticalFirst = nameof(ComboBoxItemCapsuleVerticalFirst);
+    internal const string ComboBoxItemCapsuleVerticalFirst = nameof(ComboBoxItemCapsuleVerticalFirst);
 
-        internal const string ComboBoxItemCapsuleVerticalLast = nameof(ComboBoxItemCapsuleVerticalLast);
+    internal const string ComboBoxItemCapsuleVerticalLast = nameof(ComboBoxItemCapsuleVerticalLast);
 
-        #endregion
-    }
-}
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
index 8c25b761..ef197c4a 100644
--- a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
+++ b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
@@ -1,51 +1,50 @@
 using System.Windows.Controls;
 
-namespace HandyControl.Data
+namespace HandyControl.Data;
+
+/// <summary>
+///     装箱后的值类型（用于提高效率）
+/// </summary>
+internal static class ValueBoxes
 {
-    /// <summary>
-    ///     装箱后的值类型（用于提高效率）
-    /// </summary>
-    internal static class ValueBoxes
-    {
-        internal static object TrueBox = true;
+    internal static object TrueBox = true;
 
-        internal static object FalseBox = false;
+    internal static object FalseBox = false;
 
-        internal static object VerticalBox = Orientation.Vertical;
+    internal static object VerticalBox = Orientation.Vertical;
 
-        internal static object HorizontalBox = Orientation.Horizontal;
+    internal static object HorizontalBox = Orientation.Horizontal;
 
-        internal static object Double0Box = .0;
+    internal static object Double0Box = .0;
 
-        internal static object Double01Box = .1;
+    internal static object Double01Box = .1;
 
-        internal static object Double1Box = 1.0;
+    internal static object Double1Box = 1.0;
 
-        internal static object Double10Box = 10.0;
+    internal static object Double10Box = 10.0;
 
-        internal static object Double20Box = 20.0;
+    internal static object Double20Box = 20.0;
 
-        internal static object Double100Box = 100.0;
+    internal static object Double100Box = 100.0;
 
-        internal static object Double200Box = 200.0;
+    internal static object Double200Box = 200.0;
 
-        internal static object Double300Box = 300.0;
+    internal static object Double300Box = 300.0;
 
-        internal static object DoubleNeg1Box = -1.0;
+    internal static object DoubleNeg1Box = -1.0;
 
-        internal static object Int0Box = 0;
+    internal static object Int0Box = 0;
 
-        internal static object Int1Box = 1;
+    internal static object Int1Box = 1;
 
-        internal static object Int2Box = 2;
+    internal static object Int2Box = 2;
 
-        internal static object Int5Box = 5;
+    internal static object Int5Box = 5;
 
-        internal static object Int99Box = 99;
+    internal static object Int99Box = 99;
 
-        internal static object BooleanBox(bool value) => value ? TrueBox : FalseBox;
+    internal static object BooleanBox(bool value) => value ? TrueBox : FalseBox;
 
-        internal static object OrientationBox(Orientation value) =>
-            value == Orientation.Horizontal ? HorizontalBox : VerticalBox;
-    }
-}
+    internal static object OrientationBox(Orientation value) =>
+        value == Orientation.Horizontal ? HorizontalBox : VerticalBox;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs
index 9708fea2..e6b32928 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs
@@ -2,356 +2,355 @@
 using System.Collections.Generic;
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class BezierCurveFlattener
 {
-    internal static class BezierCurveFlattener
+    public const double StandardFlatteningTolerance = 0.25;
+
+    private static void DoCubicForwardDifferencing(Point[] controlPoints, double leftParameter, double rightParameter, double inverseErrorTolerance, ICollection<Point> resultPolyline, ICollection<double> resultParameters)
     {
-        public const double StandardFlatteningTolerance = 0.25;
-
-        private static void DoCubicForwardDifferencing(Point[] controlPoints, double leftParameter, double rightParameter, double inverseErrorTolerance, ICollection<Point> resultPolyline, ICollection<double> resultParameters)
+        double num14;
+        var num = controlPoints[1].X - controlPoints[0].X;
+        var num2 = controlPoints[1].Y - controlPoints[0].Y;
+        var num3 = controlPoints[2].X - controlPoints[1].X;
+        var num4 = controlPoints[2].Y - controlPoints[1].Y;
+        var num5 = controlPoints[3].X - controlPoints[2].X;
+        var num6 = controlPoints[3].Y - controlPoints[2].Y;
+        var num7 = num3 - num;
+        var num8 = num4 - num2;
+        var num9 = num5 - num3;
+        var num10 = num6 - num4;
+        var num11 = num9 - num7;
+        var num12 = num10 - num8;
+        var vector = controlPoints[3].Subtract(controlPoints[0]);
+        var length = vector.Length;
+        if (!MathHelper.IsVerySmall(length))
+            num14 = Math.Max(0.0,
+                Math.Max(Math.Abs((num7 * vector.Y - num8 * vector.X) / length),
+                    Math.Abs((num9 * vector.Y - num10 * vector.X) / length)));
+        else
+            num14 = Math.Max(0.0,
+                Math.Max(GeometryHelper.Distance(controlPoints[1], controlPoints[0]),
+                    GeometryHelper.Distance(controlPoints[2], controlPoints[0])));
+        uint num15 = 0;
+        if (num14 > 0.0)
         {
-            double num14;
-            var num = controlPoints[1].X - controlPoints[0].X;
-            var num2 = controlPoints[1].Y - controlPoints[0].Y;
-            var num3 = controlPoints[2].X - controlPoints[1].X;
-            var num4 = controlPoints[2].Y - controlPoints[1].Y;
-            var num5 = controlPoints[3].X - controlPoints[2].X;
-            var num6 = controlPoints[3].Y - controlPoints[2].Y;
-            var num7 = num3 - num;
-            var num8 = num4 - num2;
-            var num9 = num5 - num3;
-            var num10 = num6 - num4;
-            var num11 = num9 - num7;
-            var num12 = num10 - num8;
-            var vector = controlPoints[3].Subtract(controlPoints[0]);
-            var length = vector.Length;
-            if (!MathHelper.IsVerySmall(length))
-                num14 = Math.Max(0.0,
-                    Math.Max(Math.Abs((num7 * vector.Y - num8 * vector.X) / length),
-                        Math.Abs((num9 * vector.Y - num10 * vector.X) / length)));
-            else
-                num14 = Math.Max(0.0,
-                    Math.Max(GeometryHelper.Distance(controlPoints[1], controlPoints[0]),
-                        GeometryHelper.Distance(controlPoints[2], controlPoints[0])));
-            uint num15 = 0;
-            if (num14 > 0.0)
-            {
-                var d = num14 * inverseErrorTolerance;
-                num15 = d < 2147483647.0 ? Log4UnsignedInt32((uint) (d + 0.5)) : Log4Double(d);
-            }
-
-            var exp = (int) -num15;
-            var num18 = exp + exp;
-            var num19 = num18 + exp;
-            var num20 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num7, num18);
-            var num21 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num8, num18);
-            var num22 = MathHelper.DoubleFromMantissaAndExponent(6.0 * num11, num19);
-            var num23 = MathHelper.DoubleFromMantissaAndExponent(6.0 * num12, num19);
-            var num24 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num, exp) + num20 +
-                        0.16666666666666666 * num22;
-            var num25 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num2, exp) + num21 +
-                        0.16666666666666666 * num23;
-            var num26 = 2.0 * num20 + num22;
-            var num27 = 2.0 * num21 + num23;
-            var x = controlPoints[0].X;
-            var y = controlPoints[0].Y;
-            var item = new Point(0.0, 0.0);
-            var num30 = 1 << (int) num15;
-            var num31 = num30 > 0 ? (rightParameter - leftParameter) / num30 : 0.0;
-            var num32 = leftParameter;
-            for (var i = 1; i < num30; i++)
-            {
-                x += num24;
-                y += num25;
-                item.X = x;
-                item.Y = y;
-                resultPolyline.Add(item);
-                num32 += num31;
-                resultParameters?.Add(num32);
-                num24 += num26;
-                num25 += num27;
-                num26 += num22;
-                num27 += num23;
-            }
+            var d = num14 * inverseErrorTolerance;
+            num15 = d < 2147483647.0 ? Log4UnsignedInt32((uint) (d + 0.5)) : Log4Double(d);
         }
 
-        private static void DoCubicMidpointSubdivision(Point[] controlPoints, uint depth, double leftParameter, double rightParameter, double inverseErrorTolerance, ICollection<Point> resultPolyline, ICollection<double> resultParameters)
+        var exp = (int) -num15;
+        var num18 = exp + exp;
+        var num19 = num18 + exp;
+        var num20 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num7, num18);
+        var num21 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num8, num18);
+        var num22 = MathHelper.DoubleFromMantissaAndExponent(6.0 * num11, num19);
+        var num23 = MathHelper.DoubleFromMantissaAndExponent(6.0 * num12, num19);
+        var num24 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num, exp) + num20 +
+                    0.16666666666666666 * num22;
+        var num25 = MathHelper.DoubleFromMantissaAndExponent(3.0 * num2, exp) + num21 +
+                    0.16666666666666666 * num23;
+        var num26 = 2.0 * num20 + num22;
+        var num27 = 2.0 * num21 + num23;
+        var x = controlPoints[0].X;
+        var y = controlPoints[0].Y;
+        var item = new Point(0.0, 0.0);
+        var num30 = 1 << (int) num15;
+        var num31 = num30 > 0 ? (rightParameter - leftParameter) / num30 : 0.0;
+        var num32 = leftParameter;
+        for (var i = 1; i < num30; i++)
         {
-            Point[] pointArray = { controlPoints[0], controlPoints[1], controlPoints[2], controlPoints[3] };
-            var pointArray2 = new Point[4];
-            pointArray2[3] = pointArray[3];
-            pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
-            pointArray[2] = GeometryHelper.Midpoint(pointArray[2], pointArray[1]);
-            pointArray[1] = GeometryHelper.Midpoint(pointArray[1], pointArray[0]);
-            pointArray2[2] = pointArray[3];
-            pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
-            pointArray[2] = GeometryHelper.Midpoint(pointArray[2], pointArray[1]);
-            pointArray2[1] = pointArray[3];
-            pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
-            pointArray2[0] = pointArray[3];
-            depth--;
-            var num = (leftParameter + rightParameter) * 0.5;
+            x += num24;
+            y += num25;
+            item.X = x;
+            item.Y = y;
+            resultPolyline.Add(item);
+            num32 += num31;
+            resultParameters?.Add(num32);
+            num24 += num26;
+            num25 += num27;
+            num26 += num22;
+            num27 += num23;
+        }
+    }
+
+    private static void DoCubicMidpointSubdivision(Point[] controlPoints, uint depth, double leftParameter, double rightParameter, double inverseErrorTolerance, ICollection<Point> resultPolyline, ICollection<double> resultParameters)
+    {
+        Point[] pointArray = { controlPoints[0], controlPoints[1], controlPoints[2], controlPoints[3] };
+        var pointArray2 = new Point[4];
+        pointArray2[3] = pointArray[3];
+        pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
+        pointArray[2] = GeometryHelper.Midpoint(pointArray[2], pointArray[1]);
+        pointArray[1] = GeometryHelper.Midpoint(pointArray[1], pointArray[0]);
+        pointArray2[2] = pointArray[3];
+        pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
+        pointArray[2] = GeometryHelper.Midpoint(pointArray[2], pointArray[1]);
+        pointArray2[1] = pointArray[3];
+        pointArray[3] = GeometryHelper.Midpoint(pointArray[3], pointArray[2]);
+        pointArray2[0] = pointArray[3];
+        depth--;
+        var num = (leftParameter + rightParameter) * 0.5;
+        if (depth > 0)
+        {
+            DoCubicMidpointSubdivision(pointArray, depth, leftParameter, num, inverseErrorTolerance,
+                resultPolyline, resultParameters);
+            resultPolyline.Add(pointArray2[0]);
+            resultParameters?.Add(num);
+            DoCubicMidpointSubdivision(pointArray2, depth, num, rightParameter, inverseErrorTolerance,
+                resultPolyline, resultParameters);
+        }
+        else
+        {
+            DoCubicForwardDifferencing(pointArray, leftParameter, num, inverseErrorTolerance,
+                resultPolyline, resultParameters);
+            resultPolyline.Add(pointArray2[0]);
+            resultParameters?.Add(num);
+            DoCubicForwardDifferencing(pointArray2, num, rightParameter, inverseErrorTolerance,
+                resultPolyline, resultParameters);
+        }
+    }
+
+    private static void EnsureErrorTolerance(ref double errorTolerance)
+    {
+        if (errorTolerance <= 0.0)
+        {
+            errorTolerance = 0.25;
+        }
+    }
+
+    public static void FlattenCubic(Point[] controlPoints, double errorTolerance, ICollection<Point> resultPolyline, bool skipFirstPoint, ICollection<double> resultParameters = null)
+    {
+        if (resultPolyline == null) throw new ArgumentNullException(nameof(resultPolyline));
+        if (controlPoints == null) throw new ArgumentNullException(nameof(controlPoints));
+        if (controlPoints.Length != 4) throw new ArgumentOutOfRangeException(nameof(controlPoints));
+        EnsureErrorTolerance(ref errorTolerance);
+        if (!skipFirstPoint)
+        {
+            resultPolyline.Add(controlPoints[0]);
+            resultParameters?.Add(0.0);
+        }
+
+        if (IsCubicChordMonotone(controlPoints, errorTolerance * errorTolerance))
+        {
+            var flattener = new AdaptiveForwardDifferencingCubicFlattener(controlPoints, errorTolerance,
+                errorTolerance, true);
+            var p = new Point();
+            var u = 0.0;
+            while (flattener.Next(ref p, ref u))
+            {
+                resultPolyline.Add(p);
+                resultParameters?.Add(u);
+            }
+        }
+        else
+        {
+            var x = controlPoints[3].X - controlPoints[2].X + controlPoints[1].X - controlPoints[0].X;
+            var y = controlPoints[3].Y - controlPoints[2].Y + controlPoints[1].Y - controlPoints[0].Y;
+            var num4 = 1.0 / errorTolerance;
+            var depth = Log8UnsignedInt32((uint) (MathHelper.Hypotenuse(x, y) * num4 + 0.5));
+            if (depth > 0) depth--;
             if (depth > 0)
-            {
-                DoCubicMidpointSubdivision(pointArray, depth, leftParameter, num, inverseErrorTolerance,
-                    resultPolyline, resultParameters);
-                resultPolyline.Add(pointArray2[0]);
-                resultParameters?.Add(num);
-                DoCubicMidpointSubdivision(pointArray2, depth, num, rightParameter, inverseErrorTolerance,
-                    resultPolyline, resultParameters);
-            }
+                DoCubicMidpointSubdivision(controlPoints, depth, 0.0, 1.0, 0.75 * num4, resultPolyline,
+                    resultParameters);
             else
-            {
-                DoCubicForwardDifferencing(pointArray, leftParameter, num, inverseErrorTolerance,
-                    resultPolyline, resultParameters);
-                resultPolyline.Add(pointArray2[0]);
-                resultParameters?.Add(num);
-                DoCubicForwardDifferencing(pointArray2, num, rightParameter, inverseErrorTolerance,
-                    resultPolyline, resultParameters);
-            }
+                DoCubicForwardDifferencing(controlPoints, 0.0, 1.0, 0.75 * num4, resultPolyline,
+                    resultParameters);
         }
 
-        private static void EnsureErrorTolerance(ref double errorTolerance)
+        resultPolyline.Add(controlPoints[3]);
+        resultParameters?.Add(1.0);
+    }
+
+    public static void FlattenQuadratic(Point[] controlPoints, double errorTolerance, ICollection<Point> resultPolyline, bool skipFirstPoint, ICollection<double> resultParameters = null)
+    {
+        if (resultPolyline == null)
         {
-            if (errorTolerance <= 0.0)
-            {
-                errorTolerance = 0.25;
-            }
+            throw new ArgumentNullException(nameof(resultPolyline));
+        }
+        if (controlPoints == null)
+        {
+            throw new ArgumentNullException(nameof(controlPoints));
+        }
+        if (controlPoints.Length != 3)
+        {
+            throw new ArgumentOutOfRangeException(nameof(controlPoints));
+        }
+        EnsureErrorTolerance(ref errorTolerance);
+        Point[] pointArray = { controlPoints[0], GeometryHelper.Lerp(controlPoints[0], controlPoints[1], 0.66666666666666663), GeometryHelper.Lerp(controlPoints[1], controlPoints[2], 0.33333333333333331), controlPoints[2] };
+        FlattenCubic(pointArray, errorTolerance, resultPolyline, skipFirstPoint, resultParameters);
+    }
+
+    private static bool IsCubicChordMonotone(Point[] controlPoints, double squaredTolerance)
+    {
+        double num = GeometryHelper.SquaredDistance(controlPoints[0], controlPoints[3]);
+        if (num <= squaredTolerance)
+        {
+            return false;
+        }
+        Vector lhs = controlPoints[3].Subtract(controlPoints[0]);
+        Vector rhs = controlPoints[1].Subtract(controlPoints[0]);
+        double num2 = GeometryHelper.Dot(lhs, rhs);
+        if ((num2 < 0.0) || (num2 > num))
+        {
+            return false;
+        }
+        Vector vector3 = controlPoints[2].Subtract(controlPoints[0]);
+        double num3 = GeometryHelper.Dot(lhs, vector3);
+        if ((num3 < 0.0) || (num3 > num))
+        {
+            return false;
+        }
+        if (num2 > num3)
+        {
+            return false;
+        }
+        return true;
+    }
+
+    private static uint Log4Double(double d)
+    {
+        uint num = 0;
+        while (d > 1.0)
+        {
+            d *= 0.25;
+            num++;
+        }
+        return num;
+    }
+
+    private static uint Log4UnsignedInt32(uint i)
+    {
+        uint num = 0;
+        while (i > 0)
+        {
+            i = i >> 2;
+            num++;
+        }
+        return num;
+    }
+
+    private static uint Log8UnsignedInt32(uint i)
+    {
+        uint num = 0;
+        while (i > 0)
+        {
+            i = i >> 3;
+            num++;
+        }
+        return num;
+    }
+
+    private class AdaptiveForwardDifferencingCubicFlattener
+    {
+        private double _aX;
+
+        private double _aY;
+
+        private double _bX;
+
+        private double _bY;
+
+        private double _cX;
+
+        private double _cY;
+
+        private readonly double _distanceTolerance;
+
+        private readonly bool _doParameters;
+
+        private double _dParameter;
+
+        private double _dX;
+
+        private double _dY;
+
+        private readonly double _flatnessTolerance;
+
+        private int _numSteps;
+
+        private double _parameter;
+
+        internal AdaptiveForwardDifferencingCubicFlattener(Point[] controlPoints,
+            double flatnessTolerance, double distanceTolerance, bool doParameters)
+        {
+            _numSteps = 1;
+            _dParameter = 1.0;
+            _flatnessTolerance = 3.0 * flatnessTolerance;
+            _distanceTolerance = distanceTolerance;
+            _doParameters = doParameters;
+            _aX = -controlPoints[0].X + 3.0 * (controlPoints[1].X - controlPoints[2].X) +
+                  controlPoints[3].X;
+            _aY = -controlPoints[0].Y + 3.0 * (controlPoints[1].Y - controlPoints[2].Y) +
+                  controlPoints[3].Y;
+            _bX = 3.0 * (controlPoints[0].X - 2.0 * controlPoints[1].X + controlPoints[2].X);
+            _bY = 3.0 * (controlPoints[0].Y - 2.0 * controlPoints[1].Y + controlPoints[2].Y);
+            _cX = 3.0 * (-controlPoints[0].X + controlPoints[1].X);
+            _cY = 3.0 * (-controlPoints[0].Y + controlPoints[1].Y);
+            _dX = controlPoints[0].X;
+            _dY = controlPoints[0].Y;
         }
 
-        public static void FlattenCubic(Point[] controlPoints, double errorTolerance, ICollection<Point> resultPolyline, bool skipFirstPoint, ICollection<double> resultParameters = null)
+        private void DoubleStepSize()
         {
-            if (resultPolyline == null) throw new ArgumentNullException(nameof(resultPolyline));
-            if (controlPoints == null) throw new ArgumentNullException(nameof(controlPoints));
-            if (controlPoints.Length != 4) throw new ArgumentOutOfRangeException(nameof(controlPoints));
-            EnsureErrorTolerance(ref errorTolerance);
-            if (!skipFirstPoint)
-            {
-                resultPolyline.Add(controlPoints[0]);
-                resultParameters?.Add(0.0);
-            }
-
-            if (IsCubicChordMonotone(controlPoints, errorTolerance * errorTolerance))
-            {
-                var flattener = new AdaptiveForwardDifferencingCubicFlattener(controlPoints, errorTolerance,
-                    errorTolerance, true);
-                var p = new Point();
-                var u = 0.0;
-                while (flattener.Next(ref p, ref u))
-                {
-                    resultPolyline.Add(p);
-                    resultParameters?.Add(u);
-                }
-            }
-            else
-            {
-                var x = controlPoints[3].X - controlPoints[2].X + controlPoints[1].X - controlPoints[0].X;
-                var y = controlPoints[3].Y - controlPoints[2].Y + controlPoints[1].Y - controlPoints[0].Y;
-                var num4 = 1.0 / errorTolerance;
-                var depth = Log8UnsignedInt32((uint) (MathHelper.Hypotenuse(x, y) * num4 + 0.5));
-                if (depth > 0) depth--;
-                if (depth > 0)
-                    DoCubicMidpointSubdivision(controlPoints, depth, 0.0, 1.0, 0.75 * num4, resultPolyline,
-                        resultParameters);
-                else
-                    DoCubicForwardDifferencing(controlPoints, 0.0, 1.0, 0.75 * num4, resultPolyline,
-                        resultParameters);
-            }
-
-            resultPolyline.Add(controlPoints[3]);
-            resultParameters?.Add(1.0);
+            _aX *= 8.0;
+            _aY *= 8.0;
+            _bX *= 4.0;
+            _bY *= 4.0;
+            _cX += _cX;
+            _cY += _cY;
+            if (_doParameters) _dParameter *= 2.0;
+            _numSteps = _numSteps >> 1;
         }
 
-        public static void FlattenQuadratic(Point[] controlPoints, double errorTolerance, ICollection<Point> resultPolyline, bool skipFirstPoint, ICollection<double> resultParameters = null)
+        private void HalveStepSize()
         {
-            if (resultPolyline == null)
-            {
-                throw new ArgumentNullException(nameof(resultPolyline));
-            }
-            if (controlPoints == null)
-            {
-                throw new ArgumentNullException(nameof(controlPoints));
-            }
-            if (controlPoints.Length != 3)
-            {
-                throw new ArgumentOutOfRangeException(nameof(controlPoints));
-            }
-            EnsureErrorTolerance(ref errorTolerance);
-            Point[] pointArray = { controlPoints[0], GeometryHelper.Lerp(controlPoints[0], controlPoints[1], 0.66666666666666663), GeometryHelper.Lerp(controlPoints[1], controlPoints[2], 0.33333333333333331), controlPoints[2] };
-            FlattenCubic(pointArray, errorTolerance, resultPolyline, skipFirstPoint, resultParameters);
+            _aX *= 0.125;
+            _aY *= 0.125;
+            _bX *= 0.25;
+            _bY *= 0.25;
+            _cX *= 0.5;
+            _cY *= 0.5;
+            if (_doParameters) _dParameter *= 0.5;
+            _numSteps = _numSteps << 1;
         }
 
-        private static bool IsCubicChordMonotone(Point[] controlPoints, double squaredTolerance)
+        private void IncrementDifferencesAndParameter()
         {
-            double num = GeometryHelper.SquaredDistance(controlPoints[0], controlPoints[3]);
-            if (num <= squaredTolerance)
-            {
-                return false;
-            }
-            Vector lhs = controlPoints[3].Subtract(controlPoints[0]);
-            Vector rhs = controlPoints[1].Subtract(controlPoints[0]);
-            double num2 = GeometryHelper.Dot(lhs, rhs);
-            if ((num2 < 0.0) || (num2 > num))
-            {
-                return false;
-            }
-            Vector vector3 = controlPoints[2].Subtract(controlPoints[0]);
-            double num3 = GeometryHelper.Dot(lhs, vector3);
-            if ((num3 < 0.0) || (num3 > num))
-            {
-                return false;
-            }
-            if (num2 > num3)
-            {
-                return false;
-            }
+            _dX = _aX + _bX + _cX + _dX;
+            _dY = _aY + _bY + _cY + _dY;
+            _cX = _aX + _aX + _aX + _bX + _bX + _cX;
+            _cY = _aY + _aY + _aY + _bY + _bY + _cY;
+            _bX = _aX + _aX + _aX + _bX;
+            _bY = _aY + _aY + _aY + _bY;
+            _numSteps--;
+            _parameter += _dParameter;
+        }
+
+        private bool MustSubdivide(double flatnessTolerance)
+        {
+            var num = -(_aY + _bY + _cY);
+            var num2 = _aX + _bX + _cX;
+            var num3 = Math.Abs(num) + Math.Abs(num2);
+            if (num3 <= _distanceTolerance) return false;
+            num3 *= flatnessTolerance;
+            if (Math.Abs(_cX * num + _cY * num2) <= num3 &&
+                Math.Abs((_bX + _cX + _cX) * num + (_bY + _cY + _cY) * num2) <= num3) return false;
             return true;
         }
 
-        private static uint Log4Double(double d)
+        // ReSharper disable once RedundantAssignment
+        internal bool Next(ref Point p, ref double u)
         {
-            uint num = 0;
-            while (d > 1.0)
-            {
-                d *= 0.25;
-                num++;
-            }
-            return num;
-        }
-
-        private static uint Log4UnsignedInt32(uint i)
-        {
-            uint num = 0;
-            while (i > 0)
-            {
-                i = i >> 2;
-                num++;
-            }
-            return num;
-        }
-
-        private static uint Log8UnsignedInt32(uint i)
-        {
-            uint num = 0;
-            while (i > 0)
-            {
-                i = i >> 3;
-                num++;
-            }
-            return num;
-        }
-
-        private class AdaptiveForwardDifferencingCubicFlattener
-        {
-            private double _aX;
-
-            private double _aY;
-
-            private double _bX;
-
-            private double _bY;
-
-            private double _cX;
-
-            private double _cY;
-
-            private readonly double _distanceTolerance;
-
-            private readonly bool _doParameters;
-
-            private double _dParameter;
-
-            private double _dX;
-
-            private double _dY;
-
-            private readonly double _flatnessTolerance;
-
-            private int _numSteps;
-
-            private double _parameter;
-
-            internal AdaptiveForwardDifferencingCubicFlattener(Point[] controlPoints,
-                double flatnessTolerance, double distanceTolerance, bool doParameters)
-            {
-                _numSteps = 1;
-                _dParameter = 1.0;
-                _flatnessTolerance = 3.0 * flatnessTolerance;
-                _distanceTolerance = distanceTolerance;
-                _doParameters = doParameters;
-                _aX = -controlPoints[0].X + 3.0 * (controlPoints[1].X - controlPoints[2].X) +
-                     controlPoints[3].X;
-                _aY = -controlPoints[0].Y + 3.0 * (controlPoints[1].Y - controlPoints[2].Y) +
-                     controlPoints[3].Y;
-                _bX = 3.0 * (controlPoints[0].X - 2.0 * controlPoints[1].X + controlPoints[2].X);
-                _bY = 3.0 * (controlPoints[0].Y - 2.0 * controlPoints[1].Y + controlPoints[2].Y);
-                _cX = 3.0 * (-controlPoints[0].X + controlPoints[1].X);
-                _cY = 3.0 * (-controlPoints[0].Y + controlPoints[1].Y);
-                _dX = controlPoints[0].X;
-                _dY = controlPoints[0].Y;
-            }
-
-            private void DoubleStepSize()
-            {
-                _aX *= 8.0;
-                _aY *= 8.0;
-                _bX *= 4.0;
-                _bY *= 4.0;
-                _cX += _cX;
-                _cY += _cY;
-                if (_doParameters) _dParameter *= 2.0;
-                _numSteps = _numSteps >> 1;
-            }
-
-            private void HalveStepSize()
-            {
-                _aX *= 0.125;
-                _aY *= 0.125;
-                _bX *= 0.25;
-                _bY *= 0.25;
-                _cX *= 0.5;
-                _cY *= 0.5;
-                if (_doParameters) _dParameter *= 0.5;
-                _numSteps = _numSteps << 1;
-            }
-
-            private void IncrementDifferencesAndParameter()
-            {
-                _dX = _aX + _bX + _cX + _dX;
-                _dY = _aY + _bY + _cY + _dY;
-                _cX = _aX + _aX + _aX + _bX + _bX + _cX;
-                _cY = _aY + _aY + _aY + _bY + _bY + _cY;
-                _bX = _aX + _aX + _aX + _bX;
-                _bY = _aY + _aY + _aY + _bY;
-                _numSteps--;
-                _parameter += _dParameter;
-            }
-
-            private bool MustSubdivide(double flatnessTolerance)
-            {
-                var num = -(_aY + _bY + _cY);
-                var num2 = _aX + _bX + _cX;
-                var num3 = Math.Abs(num) + Math.Abs(num2);
-                if (num3 <= _distanceTolerance) return false;
-                num3 *= flatnessTolerance;
-                if (Math.Abs(_cX * num + _cY * num2) <= num3 &&
-                    Math.Abs((_bX + _cX + _cX) * num + (_bY + _cY + _cY) * num2) <= num3) return false;
-                return true;
-            }
-
-            // ReSharper disable once RedundantAssignment
-            internal bool Next(ref Point p, ref double u)
-            {
-                while (MustSubdivide(_flatnessTolerance)) HalveStepSize();
-                if ((_numSteps & 1) == 0)
-                    while (_numSteps > 1 && !MustSubdivide(_flatnessTolerance * 0.25))
-                        DoubleStepSize();
-                IncrementDifferencesAndParameter();
-                p.X = _dX;
-                p.Y = _dY;
-                u = _parameter;
-                return _numSteps != 0;
-            }
+            while (MustSubdivide(_flatnessTolerance)) HalveStepSize();
+            if ((_numSteps & 1) == 0)
+                while (_numSteps > 1 && !MustSubdivide(_flatnessTolerance * 0.25))
+                    DoubleStepSize();
+            IncrementDifferencesAndParameter();
+            p.X = _dX;
+            p.Y = _dY;
+            u = _parameter;
+            return _numSteps != 0;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
index 6c5a617f..b8fd80f2 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
@@ -2,114 +2,113 @@
 using System.Collections.Generic;
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class CommonExtensions
 {
-    internal static class CommonExtensions
+    public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> newItems)
     {
-        public static void AddRange<T>(this ICollection<T> collection, IEnumerable<T> newItems)
+        if (collection == null)
         {
-            if (collection == null)
-            {
-                throw new ArgumentNullException(nameof(collection));
-            }
-
-            if (collection is List<T> list)
-            {
-                list.AddRange(newItems);
-            }
-            else
-            {
-                foreach (var local in newItems)
-                {
-                    collection.Add(local);
-                }
-            }
+            throw new ArgumentNullException(nameof(collection));
         }
 
-        public static bool SetIfDifferent(this DependencyObject dependencyObject, DependencyProperty dependencyProperty, object value)
+        if (collection is List<T> list)
         {
-            if (!Equals(dependencyObject.GetValue(dependencyProperty), value))
-            {
-                dependencyObject.SetValue(dependencyProperty, value);
-                return true;
-            }
-            return false;
+            list.AddRange(newItems);
         }
-
-        public static bool EnsureListCount<T>(this IList<T> list, int count, Func<T> factory = null)
+        else
         {
-            if (list == null)
+            foreach (var local in newItems)
             {
-                throw new ArgumentNullException(nameof(list));
+                collection.Add(local);
             }
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count));
-            }
-            if (!list.EnsureListCountAtLeast(count, factory))
-            {
-                if (list.Count <= count)
-                {
-                    return false;
-                }
+        }
+    }
 
-                if (list is List<T> list2)
-                {
-                    list2.RemoveRange(count, list.Count - count);
-                }
-                else
-                {
-                    for (var i = list.Count - 1; i >= count; i--)
-                    {
-                        list.RemoveAt(i);
-                    }
-                }
-            }
+    public static bool SetIfDifferent(this DependencyObject dependencyObject, DependencyProperty dependencyProperty, object value)
+    {
+        if (!Equals(dependencyObject.GetValue(dependencyProperty), value))
+        {
+            dependencyObject.SetValue(dependencyProperty, value);
             return true;
         }
+        return false;
+    }
 
-        public static bool EnsureListCountAtLeast<T>(this IList<T> list, int count, Func<T> factory = null)
+    public static bool EnsureListCount<T>(this IList<T> list, int count, Func<T> factory = null)
+    {
+        if (list == null)
         {
-            if (list == null)
-            {
-                throw new ArgumentNullException(nameof(list));
-            }
-            if (count < 0)
-            {
-                throw new ArgumentOutOfRangeException(nameof(count));
-            }
-            if (list.Count >= count)
+            throw new ArgumentNullException(nameof(list));
+        }
+        if (count < 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(count));
+        }
+        if (!list.EnsureListCountAtLeast(count, factory))
+        {
+            if (list.Count <= count)
             {
                 return false;
             }
 
-            if ((list is List<T> list2) && factory == null)
+            if (list is List<T> list2)
             {
-                list2.AddRange(new T[count - list.Count]);
+                list2.RemoveRange(count, list.Count - count);
             }
             else
             {
-                for (var i = list.Count; i < count; i++)
+                for (var i = list.Count - 1; i >= count; i--)
                 {
-                    list.Add(factory == null ? default : factory());
+                    list.RemoveAt(i);
                 }
             }
-            return true;
         }
+        return true;
+    }
 
-        public static bool ClearIfSet(this DependencyObject dependencyObject, DependencyProperty dependencyProperty)
+    public static bool EnsureListCountAtLeast<T>(this IList<T> list, int count, Func<T> factory = null)
+    {
+        if (list == null)
+        {
+            throw new ArgumentNullException(nameof(list));
+        }
+        if (count < 0)
+        {
+            throw new ArgumentOutOfRangeException(nameof(count));
+        }
+        if (list.Count >= count)
         {
-            if (dependencyObject.ReadLocalValue(dependencyProperty) != DependencyProperty.UnsetValue)
-            {
-                dependencyObject.ClearValue(dependencyProperty);
-                return true;
-            }
             return false;
         }
 
-        public static void RemoveLast<T>(this IList<T> list)
+        if ((list is List<T> list2) && factory == null)
         {
-            list.RemoveAt(list.Count - 1);
+            list2.AddRange(new T[count - list.Count]);
         }
+        else
+        {
+            for (var i = list.Count; i < count; i++)
+            {
+                list.Add(factory == null ? default : factory());
+            }
+        }
+        return true;
     }
-}
+
+    public static bool ClearIfSet(this DependencyObject dependencyObject, DependencyProperty dependencyProperty)
+    {
+        if (dependencyObject.ReadLocalValue(dependencyProperty) != DependencyProperty.UnsetValue)
+        {
+            dependencyObject.ClearValue(dependencyProperty);
+            return true;
+        }
+        return false;
+    }
+
+    public static void RemoveLast<T>(this IList<T> list)
+    {
+        list.RemoveAt(list.Count - 1);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs
index c63c5788..43793776 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs
@@ -5,35 +5,34 @@ using System.Globalization;
 using System.Resources;
 using System.Runtime.CompilerServices;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+[CompilerGenerated]
+[GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+[DebuggerNonUserCode]
+internal class ExceptionStringTable
 {
-    [CompilerGenerated]
-    [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [DebuggerNonUserCode]
-    internal class ExceptionStringTable
+    private static ResourceManager ResourceMan;
+
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    internal static CultureInfo Culture { get; set; }
+
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    internal static ResourceManager ResourceManager
     {
-        private static ResourceManager ResourceMan;
-
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static CultureInfo Culture { get; set; }
-
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static ResourceManager ResourceManager
+        get
         {
-            get
+            if (ReferenceEquals(ResourceMan, null))
             {
-                if (ReferenceEquals(ResourceMan, null))
-                {
-                    var manager = new ResourceManager("Microsoft.Expression.Drawing.ExceptionStringTable",
-                        typeof(ExceptionStringTable).Assembly);
-                    ResourceMan = manager;
-                }
-
-                return ResourceMan;
+                var manager = new ResourceManager("Microsoft.Expression.Drawing.ExceptionStringTable",
+                    typeof(ExceptionStringTable).Assembly);
+                ResourceMan = manager;
             }
-        }
 
-        internal static string TypeNotSupported =>
-            ResourceManager.GetString("TypeNotSupported", Culture);
+            return ResourceMan;
+        }
     }
-}
+
+    internal static string TypeNotSupported =>
+        ResourceManager.GetString("TypeNotSupported", Culture);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs
index 2fbe8fb6..864a8610 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs
@@ -4,218 +4,217 @@ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+public static class GeometryHelper
 {
-    public static class GeometryHelper
+    internal static void ApplyTransform(this IList<Point> points, GeneralTransform transform)
     {
-        internal static void ApplyTransform(this IList<Point> points, GeneralTransform transform)
-        {
-            for (var i = 0; i < points.Count; i++) points[i] = transform.Transform(points[i]);
-        }
-
-        internal static Rect Bounds(this Size size)
-        {
-            return new(0.0, 0.0, size.Width, size.Height);
-        }
-
-        internal static Point Center(this Rect rect)
-        {
-            return new(rect.X + rect.Width / 2.0, rect.Y + rect.Height / 2.0);
-        }
-
-        internal static Vector Subtract(this Point lhs, Point rhs)
-        {
-            return new(lhs.X - rhs.X, lhs.Y - rhs.Y);
-        }
-
-        internal static Thickness Subtract(this Rect lhs, Rect rhs)
-        {
-            return new(rhs.Left - lhs.Left,
-                rhs.Top - lhs.Top, lhs.Right - rhs.Right,
-                lhs.Bottom - rhs.Bottom);
-        }
-
-        internal static Point Lerp(Point pointA, Point pointB, double alpha)
-        {
-            return new(
-                MathHelper.Lerp(pointA.X, pointB.X, alpha),
-                MathHelper.Lerp(pointA.Y, pointB.Y, alpha));
-        }
-
-        internal static Vector Lerp(Vector vectorA, Vector vectorB, double alpha)
-        {
-            return new(MathHelper.Lerp(vectorA.X, vectorB.X, alpha),
-                MathHelper.Lerp(vectorA.Y, vectorB.Y, alpha));
-        }
-
-        internal static double Distance(Point lhs, Point rhs)
-        {
-            var num = lhs.X - rhs.X;
-            var num2 = lhs.Y - rhs.Y;
-            return Math.Sqrt(num * num + num2 * num2);
-        }
-
-        internal static Rect Resize(this Rect rect, double ratio)
-        {
-            return rect.Resize(ratio, ratio);
-        }
-
-        internal static Rect Resize(this Rect rect, double ratioX, double ratioY)
-        {
-            var point = rect.Center();
-            var width = rect.Width * ratioX;
-            var height = rect.Height * ratioY;
-            return new Rect(point.X - width / 2.0, point.Y - height / 2.0, width, height);
-        }
-
-        internal static Rect GetStretchBound(Rect logicalBound, Stretch stretch, Size aspectRatio)
-        {
-            if (stretch == Stretch.None) stretch = Stretch.Fill;
-            if (stretch == Stretch.Fill || !aspectRatio.HasValidArea()) return logicalBound;
-            var point = logicalBound.Center();
-            if (stretch == Stretch.Uniform)
-            {
-                if (aspectRatio.Width * logicalBound.Height < logicalBound.Width * aspectRatio.Height)
-                    logicalBound.Width = logicalBound.Height * aspectRatio.Width / aspectRatio.Height;
-                else
-                    logicalBound.Height = logicalBound.Width * aspectRatio.Height / aspectRatio.Width;
-            }
-            else if (stretch == Stretch.UniformToFill)
-            {
-                if (aspectRatio.Width * logicalBound.Height < logicalBound.Width * aspectRatio.Height)
-                    logicalBound.Height = logicalBound.Width * aspectRatio.Height / aspectRatio.Width;
-                else
-                    logicalBound.Width = logicalBound.Height * aspectRatio.Width / aspectRatio.Height;
-            }
-
-            return new Rect(point.X - logicalBound.Width / 2.0, point.Y - logicalBound.Height / 2.0,
-                logicalBound.Width, logicalBound.Height);
-        }
-
-        internal static Point GetArcPoint(double degree)
-        {
-            var a = degree * 3.1415926535897931 / 180.0;
-            return new Point(0.5 + 0.5 * Math.Sin(a), 0.5 - 0.5 * Math.Cos(a));
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        internal static Point GetArcPoint(double degree, Rect bound)
-        {
-            var arcPoint = GetArcPoint(degree);
-            return RelativeToAbsolutePoint(bound, arcPoint);
-        }
-
-        internal static Point RelativeToAbsolutePoint(Rect bound, Point relative)
-        {
-            return new(bound.X + relative.X * bound.Width, bound.Y + relative.Y * bound.Height);
-        }
-
-        internal static double SquaredDistance(Point lhs, Point rhs)
-        {
-            var num = lhs.X - rhs.X;
-            var num2 = lhs.Y - rhs.Y;
-            return num * num + num2 * num2;
-        }
-
-        internal static Point Midpoint(Point lhs, Point rhs)
-        {
-            return new((lhs.X + rhs.X) / 2.0, (lhs.Y + rhs.Y) / 2.0);
-        }
-
-        internal static bool HasValidArea(this Size size)
-        {
-            return size.Width > 0.0 && size.Height > 0.0 && !double.IsInfinity(size.Width) &&
-                   !double.IsInfinity(size.Height);
-        }
-
-        internal static Rect Inflate(Rect rect, double offset)
-        {
-            return Inflate(rect, new Thickness(offset));
-        }
-
-        internal static Rect Inflate(Rect rect, Thickness thickness)
-        {
-            var width = rect.Width + thickness.Left + thickness.Right;
-            var height = rect.Height + thickness.Top + thickness.Bottom;
-            var x = rect.X - thickness.Left;
-            if (width < 0.0)
-            {
-                x += width / 2.0;
-                width = 0.0;
-            }
-
-            var y = rect.Y - thickness.Top;
-            if (height < 0.0)
-            {
-                y += height / 2.0;
-                height = 0.0;
-            }
-
-            return new Rect(x, y, width, height);
-        }
-
-        internal static double Dot(Point lhs, Point rhs)
-        {
-            return lhs.X * rhs.X + lhs.Y * rhs.Y;
-        }
-
-        internal static double Dot(Vector lhs, Vector rhs)
-        {
-            return lhs.X * rhs.X + lhs.Y * rhs.Y;
-        }
-
-        internal static Point Plus(this Point lhs, Point rhs)
-        {
-            return new(lhs.X + rhs.X, lhs.Y + rhs.Y);
-        }
-
-        internal static Point Minus(this Point lhs, Point rhs)
-        {
-            return new(lhs.X - rhs.X, lhs.Y - rhs.Y);
-        }
-
-        internal static Vector Normal(Point lhs, Point rhs)
-        {
-            return new Vector(lhs.Y - rhs.Y, rhs.X - lhs.X).Normalized();
-        }
-
-        internal static Vector Normalized(this Vector vector)
-        {
-            var vector2 = new Vector(vector.X, vector.Y);
-            var length = vector2.Length;
-            if (MathHelper.IsVerySmall(length)) return new Vector(0.0, 1.0);
-            return vector2 / length;
-        }
-
-        internal static double Determinant(Point lhs, Point rhs)
-        {
-            return lhs.X * rhs.Y - lhs.Y * rhs.X;
-        }
-
-        internal static bool EnsureSegmentType<T>(out T result, IList<PathSegment> list, int index,
-            Func<T> factory) where T : PathSegment
-        {
-            result = list[index] as T;
-            if (result == null)
-            {
-                list[index] = result = factory();
-                return true;
-            }
-
-            return false;
-        }
-
-        internal static bool EnsureGeometryType<T>(out T result, ref Geometry value, Func<T> factory)
-            where T : Geometry
-        {
-            result = value as T;
-            if (result == null)
-            {
-                value = result = factory();
-                return true;
-            }
-
-            return false;
-        }
+        for (var i = 0; i < points.Count; i++) points[i] = transform.Transform(points[i]);
     }
-}
+
+    internal static Rect Bounds(this Size size)
+    {
+        return new(0.0, 0.0, size.Width, size.Height);
+    }
+
+    internal static Point Center(this Rect rect)
+    {
+        return new(rect.X + rect.Width / 2.0, rect.Y + rect.Height / 2.0);
+    }
+
+    internal static Vector Subtract(this Point lhs, Point rhs)
+    {
+        return new(lhs.X - rhs.X, lhs.Y - rhs.Y);
+    }
+
+    internal static Thickness Subtract(this Rect lhs, Rect rhs)
+    {
+        return new(rhs.Left - lhs.Left,
+            rhs.Top - lhs.Top, lhs.Right - rhs.Right,
+            lhs.Bottom - rhs.Bottom);
+    }
+
+    internal static Point Lerp(Point pointA, Point pointB, double alpha)
+    {
+        return new(
+            MathHelper.Lerp(pointA.X, pointB.X, alpha),
+            MathHelper.Lerp(pointA.Y, pointB.Y, alpha));
+    }
+
+    internal static Vector Lerp(Vector vectorA, Vector vectorB, double alpha)
+    {
+        return new(MathHelper.Lerp(vectorA.X, vectorB.X, alpha),
+            MathHelper.Lerp(vectorA.Y, vectorB.Y, alpha));
+    }
+
+    internal static double Distance(Point lhs, Point rhs)
+    {
+        var num = lhs.X - rhs.X;
+        var num2 = lhs.Y - rhs.Y;
+        return Math.Sqrt(num * num + num2 * num2);
+    }
+
+    internal static Rect Resize(this Rect rect, double ratio)
+    {
+        return rect.Resize(ratio, ratio);
+    }
+
+    internal static Rect Resize(this Rect rect, double ratioX, double ratioY)
+    {
+        var point = rect.Center();
+        var width = rect.Width * ratioX;
+        var height = rect.Height * ratioY;
+        return new Rect(point.X - width / 2.0, point.Y - height / 2.0, width, height);
+    }
+
+    internal static Rect GetStretchBound(Rect logicalBound, Stretch stretch, Size aspectRatio)
+    {
+        if (stretch == Stretch.None) stretch = Stretch.Fill;
+        if (stretch == Stretch.Fill || !aspectRatio.HasValidArea()) return logicalBound;
+        var point = logicalBound.Center();
+        if (stretch == Stretch.Uniform)
+        {
+            if (aspectRatio.Width * logicalBound.Height < logicalBound.Width * aspectRatio.Height)
+                logicalBound.Width = logicalBound.Height * aspectRatio.Width / aspectRatio.Height;
+            else
+                logicalBound.Height = logicalBound.Width * aspectRatio.Height / aspectRatio.Width;
+        }
+        else if (stretch == Stretch.UniformToFill)
+        {
+            if (aspectRatio.Width * logicalBound.Height < logicalBound.Width * aspectRatio.Height)
+                logicalBound.Height = logicalBound.Width * aspectRatio.Height / aspectRatio.Width;
+            else
+                logicalBound.Width = logicalBound.Height * aspectRatio.Width / aspectRatio.Height;
+        }
+
+        return new Rect(point.X - logicalBound.Width / 2.0, point.Y - logicalBound.Height / 2.0,
+            logicalBound.Width, logicalBound.Height);
+    }
+
+    internal static Point GetArcPoint(double degree)
+    {
+        var a = degree * 3.1415926535897931 / 180.0;
+        return new Point(0.5 + 0.5 * Math.Sin(a), 0.5 - 0.5 * Math.Cos(a));
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    internal static Point GetArcPoint(double degree, Rect bound)
+    {
+        var arcPoint = GetArcPoint(degree);
+        return RelativeToAbsolutePoint(bound, arcPoint);
+    }
+
+    internal static Point RelativeToAbsolutePoint(Rect bound, Point relative)
+    {
+        return new(bound.X + relative.X * bound.Width, bound.Y + relative.Y * bound.Height);
+    }
+
+    internal static double SquaredDistance(Point lhs, Point rhs)
+    {
+        var num = lhs.X - rhs.X;
+        var num2 = lhs.Y - rhs.Y;
+        return num * num + num2 * num2;
+    }
+
+    internal static Point Midpoint(Point lhs, Point rhs)
+    {
+        return new((lhs.X + rhs.X) / 2.0, (lhs.Y + rhs.Y) / 2.0);
+    }
+
+    internal static bool HasValidArea(this Size size)
+    {
+        return size.Width > 0.0 && size.Height > 0.0 && !double.IsInfinity(size.Width) &&
+               !double.IsInfinity(size.Height);
+    }
+
+    internal static Rect Inflate(Rect rect, double offset)
+    {
+        return Inflate(rect, new Thickness(offset));
+    }
+
+    internal static Rect Inflate(Rect rect, Thickness thickness)
+    {
+        var width = rect.Width + thickness.Left + thickness.Right;
+        var height = rect.Height + thickness.Top + thickness.Bottom;
+        var x = rect.X - thickness.Left;
+        if (width < 0.0)
+        {
+            x += width / 2.0;
+            width = 0.0;
+        }
+
+        var y = rect.Y - thickness.Top;
+        if (height < 0.0)
+        {
+            y += height / 2.0;
+            height = 0.0;
+        }
+
+        return new Rect(x, y, width, height);
+    }
+
+    internal static double Dot(Point lhs, Point rhs)
+    {
+        return lhs.X * rhs.X + lhs.Y * rhs.Y;
+    }
+
+    internal static double Dot(Vector lhs, Vector rhs)
+    {
+        return lhs.X * rhs.X + lhs.Y * rhs.Y;
+    }
+
+    internal static Point Plus(this Point lhs, Point rhs)
+    {
+        return new(lhs.X + rhs.X, lhs.Y + rhs.Y);
+    }
+
+    internal static Point Minus(this Point lhs, Point rhs)
+    {
+        return new(lhs.X - rhs.X, lhs.Y - rhs.Y);
+    }
+
+    internal static Vector Normal(Point lhs, Point rhs)
+    {
+        return new Vector(lhs.Y - rhs.Y, rhs.X - lhs.X).Normalized();
+    }
+
+    internal static Vector Normalized(this Vector vector)
+    {
+        var vector2 = new Vector(vector.X, vector.Y);
+        var length = vector2.Length;
+        if (MathHelper.IsVerySmall(length)) return new Vector(0.0, 1.0);
+        return vector2 / length;
+    }
+
+    internal static double Determinant(Point lhs, Point rhs)
+    {
+        return lhs.X * rhs.Y - lhs.Y * rhs.X;
+    }
+
+    internal static bool EnsureSegmentType<T>(out T result, IList<PathSegment> list, int index,
+        Func<T> factory) where T : PathSegment
+    {
+        result = list[index] as T;
+        if (result == null)
+        {
+            list[index] = result = factory();
+            return true;
+        }
+
+        return false;
+    }
+
+    internal static bool EnsureGeometryType<T>(out T result, ref Geometry value, Func<T> factory)
+        where T : Geometry
+    {
+        result = value as T;
+        if (result == null)
+        {
+            value = result = factory();
+            return true;
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs
index c73ae913..7536bee4 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs
@@ -1,50 +1,49 @@
 using System.Collections.Generic;
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal class MarchLocation
 {
-    internal class MarchLocation
+    public double After { get; private set; }
+
+    public double Before { get; private set; }
+
+    public int Index { get; private set; }
+
+    public double Ratio { get; private set; }
+
+    public MarchStopReason Reason { get; private set; }
+
+    public double Remain { get; private set; }
+
+    public static MarchLocation Create(MarchStopReason reason, int index, double before, double after,
+        double remain)
     {
-        public double After { get; private set; }
-
-        public double Before { get; private set; }
-
-        public int Index { get; private set; }
-
-        public double Ratio { get; private set; }
-
-        public MarchStopReason Reason { get; private set; }
-
-        public double Remain { get; private set; }
-
-        public static MarchLocation Create(MarchStopReason reason, int index, double before, double after,
-            double remain)
+        var num = before + after;
+        return new MarchLocation
         {
-            var num = before + after;
-            return new MarchLocation
-            {
-                Reason = reason,
-                Index = index,
-                Remain = remain,
-                Before = MathHelper.EnsureRange(before, 0.0, num),
-                After = MathHelper.EnsureRange(after, 0.0, num),
-                Ratio = MathHelper.EnsureRange(MathHelper.SafeDivide(before, num, 0.0), 0.0, 1.0)
-            };
-        }
-
-        public double GetArcLength(IList<double> accumulatedLengths)
-        {
-            return MathHelper.Lerp(accumulatedLengths[Index], accumulatedLengths[Index + 1], Ratio);
-        }
-
-        public Vector GetNormal(PolylineData polyline, double cornerRadius = 0.0)
-        {
-            return polyline.SmoothNormal(Index, Ratio, cornerRadius);
-        }
-
-        public Point GetPoint(IList<Point> points)
-        {
-            return GeometryHelper.Lerp(points[Index], points[Index + 1], Ratio);
-        }
+            Reason = reason,
+            Index = index,
+            Remain = remain,
+            Before = MathHelper.EnsureRange(before, 0.0, num),
+            After = MathHelper.EnsureRange(after, 0.0, num),
+            Ratio = MathHelper.EnsureRange(MathHelper.SafeDivide(before, num, 0.0), 0.0, 1.0)
+        };
     }
-}
+
+    public double GetArcLength(IList<double> accumulatedLengths)
+    {
+        return MathHelper.Lerp(accumulatedLengths[Index], accumulatedLengths[Index + 1], Ratio);
+    }
+
+    public Vector GetNormal(PolylineData polyline, double cornerRadius = 0.0)
+    {
+        return polyline.SmoothNormal(Index, Ratio, cornerRadius);
+    }
+
+    public Point GetPoint(IList<Point> points)
+    {
+        return GeometryHelper.Lerp(points[Index], points[Index + 1], Ratio);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs
index 2a820c68..ca67f651 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs
@@ -1,9 +1,8 @@
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal enum MarchStopReason
 {
-    internal enum MarchStopReason
-    {
-        CompleteStep,
-        CompletePolyline,
-        CornerPoint
-    }
-}
+    CompleteStep,
+    CompletePolyline,
+    CornerPoint
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs
index ea276dac..138d3ab8 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs
@@ -1,69 +1,68 @@
 using System;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class MathHelper
 {
-    internal static class MathHelper
+    internal const double DBL_EPSILON = 2.2204460492503131e-016;
+
+    public static bool AreClose(double value1, double value2) =>
+        // ReSharper disable once CompareOfFloatsByEqualityOperator
+        value1 == value2 || IsVerySmall(value1 - value2);
+
+    public static double Lerp(double x, double y, double alpha) => x * (1.0 - alpha) + y * alpha;
+
+    public static bool IsVerySmall(double value) => Math.Abs(value) < 1E-06;
+
+    public static bool IsZero(double value) => Math.Abs(value) < 10.0 * DBL_EPSILON;
+
+    public static bool IsFiniteDouble(double x) => !double.IsInfinity(x) && !double.IsNaN(x);
+
+    public static double DoubleFromMantissaAndExponent(double x, int exp) => x * Math.Pow(2.0, exp);
+
+    public static bool GreaterThan(double value1, double value2) => value1 > value2 && !AreClose(value1, value2);
+
+    public static bool GreaterThanOrClose(double value1, double value2)
     {
-        internal const double DBL_EPSILON = 2.2204460492503131e-016;
-
-        public static bool AreClose(double value1, double value2) =>
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            value1 == value2 || IsVerySmall(value1 - value2);
-
-        public static double Lerp(double x, double y, double alpha) => x * (1.0 - alpha) + y * alpha;
-
-        public static bool IsVerySmall(double value) => Math.Abs(value) < 1E-06;
-
-        public static bool IsZero(double value) => Math.Abs(value) < 10.0 * DBL_EPSILON;
-
-        public static bool IsFiniteDouble(double x) => !double.IsInfinity(x) && !double.IsNaN(x);
-
-        public static double DoubleFromMantissaAndExponent(double x, int exp) => x * Math.Pow(2.0, exp);
-
-        public static bool GreaterThan(double value1, double value2) => value1 > value2 && !AreClose(value1, value2);
-
-        public static bool GreaterThanOrClose(double value1, double value2)
+        if (value1 <= value2)
         {
-            if (value1 <= value2)
-            {
-                return AreClose(value1, value2);
-            }
-            return true;
-        }
-
-        public static double Hypotenuse(double x, double y) => Math.Sqrt(x * x + y * y);
-
-        public static bool LessThan(double value1, double value2) => value1 < value2 && !AreClose(value1, value2);
-
-        public static bool LessThanOrClose(double value1, double value2)
-        {
-            if (value1 >= value2)
-            {
-                return AreClose(value1, value2);
-            }
-            return true;
-        }
-
-        public static double EnsureRange(double value, double? min, double? max)
-        {
-            if (min.HasValue && value < min.Value)
-            {
-                return min.Value;
-            }
-            if (max.HasValue && value > max.Value)
-            {
-                return max.Value;
-            }
-            return value;
-        }
-
-        public static double SafeDivide(double lhs, double rhs, double fallback)
-        {
-            if (!IsVerySmall(rhs))
-            {
-                return lhs / rhs;
-            }
-            return fallback;
+            return AreClose(value1, value2);
         }
+        return true;
     }
-}
+
+    public static double Hypotenuse(double x, double y) => Math.Sqrt(x * x + y * y);
+
+    public static bool LessThan(double value1, double value2) => value1 < value2 && !AreClose(value1, value2);
+
+    public static bool LessThanOrClose(double value1, double value2)
+    {
+        if (value1 >= value2)
+        {
+            return AreClose(value1, value2);
+        }
+        return true;
+    }
+
+    public static double EnsureRange(double value, double? min, double? max)
+    {
+        if (min.HasValue && value < min.Value)
+        {
+            return min.Value;
+        }
+        if (max.HasValue && value > max.Value)
+        {
+            return max.Value;
+        }
+        return value;
+    }
+
+    public static double SafeDivide(double lhs, double rhs, double fallback)
+    {
+        if (!IsVerySmall(rhs))
+        {
+            return lhs / rhs;
+        }
+        return fallback;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs
index f27b79ab..0065709e 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs
@@ -4,112 +4,111 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class PathFigureHelper
 {
-    internal static class PathFigureHelper
+    public static IEnumerable<PathSegmentData> AllSegments(this PathFigure figure)
     {
-        public static IEnumerable<PathSegmentData> AllSegments(this PathFigure figure)
+        if (figure != null && figure.Segments.Count > 0)
         {
-            if (figure != null && figure.Segments.Count > 0)
+            var startPoint = figure.StartPoint;
+            // ReSharper disable once GenericEnumeratorNotDisposed
+            var enumerator = figure.Segments.GetEnumerator();
+            while (enumerator.MoveNext())
             {
-                var startPoint = figure.StartPoint;
-                // ReSharper disable once GenericEnumeratorNotDisposed
-                var enumerator = figure.Segments.GetEnumerator();
-                while (enumerator.MoveNext())
-                {
-                    var current = enumerator.Current;
-                    var lastPoint = current.GetLastPoint();
-                    yield return new PathSegmentData(startPoint, current);
-                    startPoint = lastPoint;
-                }
+                var current = enumerator.Current;
+                var lastPoint = current.GetLastPoint();
+                yield return new PathSegmentData(startPoint, current);
+                startPoint = lastPoint;
             }
         }
-
-        internal static void ApplyTransform(this PathFigure figure, GeneralTransform transform)
-        {
-            figure.StartPoint = transform.Transform(figure.StartPoint);
-            for (var i = 0; i < figure.Segments.Count; i++)
-            {
-                var segment =
-                    PathSegmentHelper.ApplyTransform(figure.Segments[i], figure.StartPoint, transform);
-                if (!Equals(figure.Segments[i], segment)) figure.Segments[i] = segment;
-            }
-        }
-
-        internal static void FlattenFigure(PathFigure figure, IList<Point> points, double tolerance,
-            bool removeRepeat)
-        {
-            if (figure == null) throw new ArgumentNullException(nameof(figure));
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            if (tolerance < 0.0) throw new ArgumentOutOfRangeException(nameof(tolerance));
-            var list = removeRepeat ? new List<Point>() : points;
-            list.Add(figure.StartPoint);
-            foreach (var data in figure.AllSegments())
-                data.PathSegment.FlattenSegment(list, data.StartPoint, tolerance);
-            if (figure.IsClosed) list.Add(figure.StartPoint);
-            if (removeRepeat && list.Count > 0)
-            {
-                points.Add(list[0]);
-                for (var i = 1; i < list.Count; i++)
-                    if (!MathHelper.IsVerySmall(GeometryHelper.SquaredDistance(points.Last(), list[i])))
-                        points.Add(list[i]);
-            }
-        }
-
-        internal static bool SyncEllipseFigure(PathFigure figure, Rect bounds, SweepDirection sweepDirection,
-            bool isFilled = true)
-        {
-            var flag = false;
-            var pointArray = new Point[2];
-            var size = new Size(bounds.Width / 2.0, bounds.Height / 2.0);
-            var point = bounds.Center();
-            if (size.Width > size.Height)
-            {
-                pointArray[0] = new Point(bounds.Left, point.Y);
-                pointArray[1] = new Point(bounds.Right, point.Y);
-            }
-            else
-            {
-                pointArray[0] = new Point(point.X, bounds.Top);
-                pointArray[1] = new Point(point.X, bounds.Bottom);
-            }
-
-            flag |= figure.SetIfDifferent(PathFigure.IsClosedProperty, true);
-            flag |= figure.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
-            flag |= figure.SetIfDifferent(PathFigure.StartPointProperty, pointArray[0]);
-            flag |= figure.Segments.EnsureListCount(2, () => new ArcSegment());
-            flag |= GeometryHelper.EnsureSegmentType(out var segment, figure.Segments, 0, () => new ArcSegment());
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty, pointArray[1]);
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
-            flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
-            flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, sweepDirection);
-            flag |= GeometryHelper.EnsureSegmentType(out segment, figure.Segments, 1, () => new ArcSegment());
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty, pointArray[0]);
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
-            flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
-            return flag | segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, sweepDirection);
-        }
-
-        internal static bool SyncPolylineFigure(PathFigure figure, IList<Point> points, bool isClosed,
-            bool isFilled = true)
-        {
-            if (figure == null) throw new ArgumentNullException(nameof(figure));
-            var flag = false;
-            if (points == null || points.Count == 0)
-            {
-                flag |= figure.ClearIfSet(PathFigure.StartPointProperty);
-                flag |= figure.Segments.EnsureListCount(0);
-            }
-            else
-            {
-                flag |= figure.SetIfDifferent(PathFigure.StartPointProperty, points[0]);
-                flag |= figure.Segments.EnsureListCount(1, () => new PolyLineSegment());
-                flag |= PathSegmentHelper.SyncPolylineSegment(figure.Segments, 0, points, 1,
-                    points.Count - 1);
-            }
-
-            flag |= figure.SetIfDifferent(PathFigure.IsClosedProperty, isClosed);
-            return flag | figure.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
-        }
     }
-}
+
+    internal static void ApplyTransform(this PathFigure figure, GeneralTransform transform)
+    {
+        figure.StartPoint = transform.Transform(figure.StartPoint);
+        for (var i = 0; i < figure.Segments.Count; i++)
+        {
+            var segment =
+                PathSegmentHelper.ApplyTransform(figure.Segments[i], figure.StartPoint, transform);
+            if (!Equals(figure.Segments[i], segment)) figure.Segments[i] = segment;
+        }
+    }
+
+    internal static void FlattenFigure(PathFigure figure, IList<Point> points, double tolerance,
+        bool removeRepeat)
+    {
+        if (figure == null) throw new ArgumentNullException(nameof(figure));
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        if (tolerance < 0.0) throw new ArgumentOutOfRangeException(nameof(tolerance));
+        var list = removeRepeat ? new List<Point>() : points;
+        list.Add(figure.StartPoint);
+        foreach (var data in figure.AllSegments())
+            data.PathSegment.FlattenSegment(list, data.StartPoint, tolerance);
+        if (figure.IsClosed) list.Add(figure.StartPoint);
+        if (removeRepeat && list.Count > 0)
+        {
+            points.Add(list[0]);
+            for (var i = 1; i < list.Count; i++)
+                if (!MathHelper.IsVerySmall(GeometryHelper.SquaredDistance(points.Last(), list[i])))
+                    points.Add(list[i]);
+        }
+    }
+
+    internal static bool SyncEllipseFigure(PathFigure figure, Rect bounds, SweepDirection sweepDirection,
+        bool isFilled = true)
+    {
+        var flag = false;
+        var pointArray = new Point[2];
+        var size = new Size(bounds.Width / 2.0, bounds.Height / 2.0);
+        var point = bounds.Center();
+        if (size.Width > size.Height)
+        {
+            pointArray[0] = new Point(bounds.Left, point.Y);
+            pointArray[1] = new Point(bounds.Right, point.Y);
+        }
+        else
+        {
+            pointArray[0] = new Point(point.X, bounds.Top);
+            pointArray[1] = new Point(point.X, bounds.Bottom);
+        }
+
+        flag |= figure.SetIfDifferent(PathFigure.IsClosedProperty, true);
+        flag |= figure.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
+        flag |= figure.SetIfDifferent(PathFigure.StartPointProperty, pointArray[0]);
+        flag |= figure.Segments.EnsureListCount(2, () => new ArcSegment());
+        flag |= GeometryHelper.EnsureSegmentType(out var segment, figure.Segments, 0, () => new ArcSegment());
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty, pointArray[1]);
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
+        flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
+        flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, sweepDirection);
+        flag |= GeometryHelper.EnsureSegmentType(out segment, figure.Segments, 1, () => new ArcSegment());
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty, pointArray[0]);
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
+        flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
+        return flag | segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, sweepDirection);
+    }
+
+    internal static bool SyncPolylineFigure(PathFigure figure, IList<Point> points, bool isClosed,
+        bool isFilled = true)
+    {
+        if (figure == null) throw new ArgumentNullException(nameof(figure));
+        var flag = false;
+        if (points == null || points.Count == 0)
+        {
+            flag |= figure.ClearIfSet(PathFigure.StartPointProperty);
+            flag |= figure.Segments.EnsureListCount(0);
+        }
+        else
+        {
+            flag |= figure.SetIfDifferent(PathFigure.StartPointProperty, points[0]);
+            flag |= figure.Segments.EnsureListCount(1, () => new PolyLineSegment());
+            flag |= PathSegmentHelper.SyncPolylineSegment(figure.Segments, 0, points, 1,
+                points.Count - 1);
+        }
+
+        flag |= figure.SetIfDifferent(PathFigure.IsClosedProperty, isClosed);
+        return flag | figure.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs
index 7d441fbd..a4393ec8 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs
@@ -1,25 +1,24 @@
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class PathGeometryHelper
 {
-    internal static class PathGeometryHelper
+    public static bool IsStroked(this PathSegment pathSegment) => pathSegment.IsStroked;
+
+    public static PathGeometry AsPathGeometry(this Geometry original)
     {
-        public static bool IsStroked(this PathSegment pathSegment) => pathSegment.IsStroked;
-
-        public static PathGeometry AsPathGeometry(this Geometry original)
+        if (original == null)
         {
-            if (original == null)
-            {
-                return null;
-            }
-
-            if (!(original is PathGeometry geometry))
-            {
-                return PathGeometry.CreateFromGeometry(original);
-            }
-            return geometry;
+            return null;
         }
 
-        internal static Geometry FixPathGeometryBoundary(Geometry geometry) => geometry;
+        if (!(original is PathGeometry geometry))
+        {
+            return PathGeometry.CreateFromGeometry(original);
+        }
+        return geometry;
     }
-}
+
+    internal static Geometry FixPathGeometryBoundary(Geometry geometry) => geometry;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs
index 48b828a2..af3a5517 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs
@@ -1,17 +1,16 @@
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal sealed class PathSegmentData
 {
-    internal sealed class PathSegmentData
+    public PathSegmentData(Point startPoint, System.Windows.Media.PathSegment pathSegment)
     {
-        public PathSegmentData(Point startPoint, System.Windows.Media.PathSegment pathSegment)
-        {
-            PathSegment = pathSegment;
-            StartPoint = startPoint;
-        }
-
-        public System.Windows.Media.PathSegment PathSegment { get; }
-
-        public Point StartPoint { get; }
+        PathSegment = pathSegment;
+        StartPoint = startPoint;
     }
-}
+
+    public System.Windows.Media.PathSegment PathSegment { get; }
+
+    public Point StartPoint { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs
index 0df2c29b..44a4a41b 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs
@@ -5,745 +5,744 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal static class PathSegmentHelper
 {
-    internal static class PathSegmentHelper
+    public static PathSegment ApplyTransform(PathSegment segment, Point start, GeneralTransform transform)
     {
-        public static PathSegment ApplyTransform(PathSegment segment, Point start, GeneralTransform transform)
+        return PathSegmentImplementation.Create(segment, start).ApplyTransform(transform);
+    }
+
+    public static PathSegment ArcToBezierSegments(ArcSegment arcSegment, Point startPoint)
+    {
+        var isStroked = arcSegment.IsStroked();
+        ArcToBezierHelper.ArcToBezier(startPoint.X, startPoint.Y, arcSegment.Size.Width,
+            arcSegment.Size.Height, arcSegment.RotationAngle, arcSegment.IsLargeArc,
+            arcSegment.SweepDirection == SweepDirection.Clockwise, arcSegment.Point.X, arcSegment.Point.Y,
+            out var pointArray, out var num);
+        return num switch
         {
-            return PathSegmentImplementation.Create(segment, start).ApplyTransform(transform);
+            -1 => null,
+            0 => CreateLineSegment(arcSegment.Point, isStroked),
+            1 => CreateBezierSegment(pointArray[0], pointArray[1], pointArray[2], isStroked),
+            _ => CreatePolyBezierSegment(pointArray, 0, num * 3, isStroked)
+        };
+    }
+
+    public static ArcSegment CreateArcSegment(Point point, Size size, bool isLargeArc, bool clockwise,
+        double rotationAngle = 0.0, bool isStroked = true)
+    {
+        var dependencyObject = new ArcSegment();
+        dependencyObject.SetIfDifferent(ArcSegment.PointProperty, point);
+        dependencyObject.SetIfDifferent(ArcSegment.SizeProperty, size);
+        dependencyObject.SetIfDifferent(ArcSegment.IsLargeArcProperty, isLargeArc);
+        dependencyObject.SetIfDifferent(ArcSegment.SweepDirectionProperty,
+            clockwise ? SweepDirection.Clockwise : SweepDirection.Counterclockwise);
+        dependencyObject.SetIfDifferent(ArcSegment.RotationAngleProperty, rotationAngle);
+        dependencyObject.SetIsStroked(isStroked);
+        return dependencyObject;
+    }
+
+    public static BezierSegment CreateBezierSegment(Point point1, Point point2, Point point3,
+        bool isStroked = true)
+    {
+        var segment = new BezierSegment
+        {
+            Point1 = point1,
+            Point2 = point2,
+            Point3 = point3
+        };
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static LineSegment CreateLineSegment(Point point, bool isStroked = true)
+    {
+        var segment = new LineSegment
+        {
+            Point = point
+        };
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static PolyBezierSegment CreatePolyBezierSegment(IList<Point> points, int start, int count,
+        bool isStroked = true)
+    {
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        count = count / 3 * 3;
+        if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
+        var segment = new PolyBezierSegment
+        {
+            Points = new PointCollection()
+        };
+        for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static PolyLineSegment CreatePolylineSegment(IList<Point> points, int start, int count,
+        bool isStroked = true)
+    {
+        if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
+        var segment = new PolyLineSegment
+        {
+            Points = new PointCollection()
+        };
+        for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static PolyQuadraticBezierSegment CreatePolyQuadraticBezierSegment(IList<Point> points,
+        int start, int count, bool isStroked = true)
+    {
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        count = count / 2 * 2;
+        if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
+        var segment = new PolyQuadraticBezierSegment
+        {
+            Points = new PointCollection()
+        };
+        for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static QuadraticBezierSegment CreateQuadraticBezierSegment(Point point1, Point point2,
+        bool isStroked = true)
+    {
+        var segment = new QuadraticBezierSegment
+        {
+            Point1 = point1,
+            Point2 = point2
+        };
+        segment.SetIsStroked(isStroked);
+        return segment;
+    }
+
+    public static void FlattenSegment(this PathSegment segment, IList<Point> points, Point start,
+        double tolerance)
+    {
+        PathSegmentImplementation.Create(segment, start).Flatten(points, tolerance);
+    }
+
+    public static Point GetLastPoint(this PathSegment segment)
+    {
+        return segment.GetPoint(-1);
+    }
+
+    public static Point GetPoint(this PathSegment segment, int index)
+    {
+        return PathSegmentImplementation.Create(segment).GetPoint(index);
+    }
+
+    public static int GetPointCount(this PathSegment segment)
+    {
+        if (segment is ArcSegment) return 1;
+        if (segment is LineSegment) return 1;
+        if (segment is QuadraticBezierSegment) return 2;
+        if (segment is BezierSegment) return 3;
+        if (segment is PolyLineSegment segment2) return segment2.Points.Count;
+        if (segment is PolyQuadraticBezierSegment segment3) return segment3.Points.Count / 2 * 2;
+        if (segment is PolyBezierSegment segment4) return segment4.Points.Count / 3 * 3;
+        return 0;
+    }
+
+    public static IEnumerable<SimpleSegment> GetSimpleSegments(this PathSegment segment, Point start)
+    {
+        return PathSegmentImplementation.Create(segment, start).GetSimpleSegments();
+    }
+
+    public static bool IsEmpty(this PathSegment segment)
+    {
+        return segment.GetPointCount() == 0;
+    }
+
+    private static void SetIsStroked(this PathSegment segment, bool isStroked)
+    {
+        if (segment.IsStroked != isStroked) segment.IsStroked = isStroked;
+    }
+
+    public static bool SyncPolyBezierSegment(PathSegmentCollection collection, int index,
+        IList<Point> points, int start, int count)
+    {
+        if (collection == null) throw new ArgumentNullException(nameof(collection));
+        if (index < 0 || index >= collection.Count) throw new ArgumentOutOfRangeException(nameof(index));
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        if (start < 0) throw new ArgumentOutOfRangeException(nameof(start));
+        if (count < 0) throw new ArgumentOutOfRangeException(nameof(count));
+        if (points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
+        var flag = false;
+        count = count / 3 * 3;
+        var segment = collection[index] as PolyBezierSegment;
+        if (segment == null)
+        {
+            collection[index] = segment = new PolyBezierSegment();
+            flag = true;
         }
 
-        public static PathSegment ArcToBezierSegments(ArcSegment arcSegment, Point startPoint)
-        {
-            var isStroked = arcSegment.IsStroked();
-            ArcToBezierHelper.ArcToBezier(startPoint.X, startPoint.Y, arcSegment.Size.Width,
-                arcSegment.Size.Height, arcSegment.RotationAngle, arcSegment.IsLargeArc,
-                arcSegment.SweepDirection == SweepDirection.Clockwise, arcSegment.Point.X, arcSegment.Point.Y,
-                out var pointArray, out var num);
-            return num switch
+        segment.Points.EnsureListCount(count);
+        for (var i = 0; i < count; i++)
+            if (segment.Points[i] != points[i + start])
             {
-                -1 => null,
-                0 => CreateLineSegment(arcSegment.Point, isStroked),
-                1 => CreateBezierSegment(pointArray[0], pointArray[1], pointArray[2], isStroked),
-                _ => CreatePolyBezierSegment(pointArray, 0, num * 3, isStroked)
-            };
-        }
-
-        public static ArcSegment CreateArcSegment(Point point, Size size, bool isLargeArc, bool clockwise,
-            double rotationAngle = 0.0, bool isStroked = true)
-        {
-            var dependencyObject = new ArcSegment();
-            dependencyObject.SetIfDifferent(ArcSegment.PointProperty, point);
-            dependencyObject.SetIfDifferent(ArcSegment.SizeProperty, size);
-            dependencyObject.SetIfDifferent(ArcSegment.IsLargeArcProperty, isLargeArc);
-            dependencyObject.SetIfDifferent(ArcSegment.SweepDirectionProperty,
-                clockwise ? SweepDirection.Clockwise : SweepDirection.Counterclockwise);
-            dependencyObject.SetIfDifferent(ArcSegment.RotationAngleProperty, rotationAngle);
-            dependencyObject.SetIsStroked(isStroked);
-            return dependencyObject;
-        }
-
-        public static BezierSegment CreateBezierSegment(Point point1, Point point2, Point point3,
-            bool isStroked = true)
-        {
-            var segment = new BezierSegment
-            {
-                Point1 = point1,
-                Point2 = point2,
-                Point3 = point3
-            };
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static LineSegment CreateLineSegment(Point point, bool isStroked = true)
-        {
-            var segment = new LineSegment
-            {
-                Point = point
-            };
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static PolyBezierSegment CreatePolyBezierSegment(IList<Point> points, int start, int count,
-            bool isStroked = true)
-        {
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            count = count / 3 * 3;
-            if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
-            var segment = new PolyBezierSegment
-            {
-                Points = new PointCollection()
-            };
-            for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static PolyLineSegment CreatePolylineSegment(IList<Point> points, int start, int count,
-            bool isStroked = true)
-        {
-            if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
-            var segment = new PolyLineSegment
-            {
-                Points = new PointCollection()
-            };
-            for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static PolyQuadraticBezierSegment CreatePolyQuadraticBezierSegment(IList<Point> points,
-            int start, int count, bool isStroked = true)
-        {
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            count = count / 2 * 2;
-            if (count < 0 || points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
-            var segment = new PolyQuadraticBezierSegment
-            {
-                Points = new PointCollection()
-            };
-            for (var i = 0; i < count; i++) segment.Points.Add(points[start + i]);
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static QuadraticBezierSegment CreateQuadraticBezierSegment(Point point1, Point point2,
-            bool isStroked = true)
-        {
-            var segment = new QuadraticBezierSegment
-            {
-                Point1 = point1,
-                Point2 = point2
-            };
-            segment.SetIsStroked(isStroked);
-            return segment;
-        }
-
-        public static void FlattenSegment(this PathSegment segment, IList<Point> points, Point start,
-            double tolerance)
-        {
-            PathSegmentImplementation.Create(segment, start).Flatten(points, tolerance);
-        }
-
-        public static Point GetLastPoint(this PathSegment segment)
-        {
-            return segment.GetPoint(-1);
-        }
-
-        public static Point GetPoint(this PathSegment segment, int index)
-        {
-            return PathSegmentImplementation.Create(segment).GetPoint(index);
-        }
-
-        public static int GetPointCount(this PathSegment segment)
-        {
-            if (segment is ArcSegment) return 1;
-            if (segment is LineSegment) return 1;
-            if (segment is QuadraticBezierSegment) return 2;
-            if (segment is BezierSegment) return 3;
-            if (segment is PolyLineSegment segment2) return segment2.Points.Count;
-            if (segment is PolyQuadraticBezierSegment segment3) return segment3.Points.Count / 2 * 2;
-            if (segment is PolyBezierSegment segment4) return segment4.Points.Count / 3 * 3;
-            return 0;
-        }
-
-        public static IEnumerable<SimpleSegment> GetSimpleSegments(this PathSegment segment, Point start)
-        {
-            return PathSegmentImplementation.Create(segment, start).GetSimpleSegments();
-        }
-
-        public static bool IsEmpty(this PathSegment segment)
-        {
-            return segment.GetPointCount() == 0;
-        }
-
-        private static void SetIsStroked(this PathSegment segment, bool isStroked)
-        {
-            if (segment.IsStroked != isStroked) segment.IsStroked = isStroked;
-        }
-
-        public static bool SyncPolyBezierSegment(PathSegmentCollection collection, int index,
-            IList<Point> points, int start, int count)
-        {
-            if (collection == null) throw new ArgumentNullException(nameof(collection));
-            if (index < 0 || index >= collection.Count) throw new ArgumentOutOfRangeException(nameof(index));
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            if (start < 0) throw new ArgumentOutOfRangeException(nameof(start));
-            if (count < 0) throw new ArgumentOutOfRangeException(nameof(count));
-            if (points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
-            var flag = false;
-            count = count / 3 * 3;
-            var segment = collection[index] as PolyBezierSegment;
-            if (segment == null)
-            {
-                collection[index] = segment = new PolyBezierSegment();
+                segment.Points[i] = points[i + start];
                 flag = true;
             }
 
-            segment.Points.EnsureListCount(count);
-            for (var i = 0; i < count; i++)
-                if (segment.Points[i] != points[i + start])
-                {
-                    segment.Points[i] = points[i + start];
-                    flag = true;
-                }
+        return flag;
+    }
 
-            return flag;
+    public static bool SyncPolylineSegment(PathSegmentCollection collection, int index,
+        IList<Point> points, int start, int count)
+    {
+        if (collection == null) throw new ArgumentNullException(nameof(collection));
+        if (index < 0 || index >= collection.Count) throw new ArgumentOutOfRangeException(nameof(index));
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        if (start < 0) throw new ArgumentOutOfRangeException(nameof(start));
+        if (count < 0) throw new ArgumentOutOfRangeException(nameof(count));
+        if (points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
+        var flag = false;
+        var segment = collection[index] as PolyLineSegment;
+        if (segment == null)
+        {
+            collection[index] = segment = new PolyLineSegment();
+            flag = true;
         }
 
-        public static bool SyncPolylineSegment(PathSegmentCollection collection, int index,
-            IList<Point> points, int start, int count)
-        {
-            if (collection == null) throw new ArgumentNullException(nameof(collection));
-            if (index < 0 || index >= collection.Count) throw new ArgumentOutOfRangeException(nameof(index));
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            if (start < 0) throw new ArgumentOutOfRangeException(nameof(start));
-            if (count < 0) throw new ArgumentOutOfRangeException(nameof(count));
-            if (points.Count < start + count) throw new ArgumentOutOfRangeException(nameof(count));
-            var flag = false;
-            var segment = collection[index] as PolyLineSegment;
-            if (segment == null)
+        flag |= segment.Points.EnsureListCount(count);
+        for (var i = 0; i < count; i++)
+            if (segment.Points[i] != points[i + start])
             {
-                collection[index] = segment = new PolyLineSegment();
+                segment.Points[i] = points[i + start];
                 flag = true;
             }
 
-            flag |= segment.Points.EnsureListCount(count);
-            for (var i = 0; i < count; i++)
-                if (segment.Points[i] != points[i + start])
-                {
-                    segment.Points[i] = points[i + start];
-                    flag = true;
-                }
+        return flag;
+    }
 
+
+    private class ArcSegmentImplementation : PathSegmentImplementation
+    {
+        private ArcSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            var segment = ArcToBezierSegments(_segment, Start);
+            if (segment != null) return PathSegmentHelper.ApplyTransform(segment, Start, transform);
+            _segment.Point = transform.Transform(_segment.Point);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(ArcSegment source)
+        {
+            if (source != null) return new ArcSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            var segment = ArcToBezierSegments(_segment, Start);
+            segment?.FlattenSegment(points, Start, tolerance);
+        }
+
+        public override Point GetPoint(int index)
+        {
+            if (index < -1 || index > 0) throw new ArgumentOutOfRangeException(nameof(index));
+            return _segment.Point;
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            var segment = ArcToBezierSegments(_segment, Start);
+            if (segment != null) return segment.GetSimpleSegments(Start);
+            return Enumerable.Empty<SimpleSegment>();
+        }
+    }
+
+
+    private static class ArcToBezierHelper
+    {
+        private static bool AcceptRadius(double rHalfChord2, double rFuzz2, ref double rRadius)
+        {
+            var flag = rRadius * rRadius > rHalfChord2 * rFuzz2;
+            if (flag && rRadius < 0.0) rRadius = -rRadius;
             return flag;
         }
 
-
-        private class ArcSegmentImplementation : PathSegmentImplementation
+        public static void ArcToBezier(double xStart, double yStart, double xRadius, double yRadius,
+            double rRotation, bool fLargeArc, bool fSweepUp, double xEnd, double yEnd, out Point[] pPt,
+            out int cPieces)
         {
-            private ArcSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
+            var num = 1E-06;
+            pPt = new Point[12];
+            var num12 = num * num;
+            var flag = false;
+            cPieces = -1;
+            var num2 = 0.5 * (xEnd - xStart);
+            var num3 = 0.5 * (yEnd - yStart);
+            var num4 = num2 * num2 + num3 * num3;
+            if (num4 >= num12)
             {
-                var segment = ArcToBezierSegments(_segment, Start);
-                if (segment != null) return PathSegmentHelper.ApplyTransform(segment, Start, transform);
-                _segment.Point = transform.Transform(_segment.Point);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(ArcSegment source)
-            {
-                if (source != null) return new ArcSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                var segment = ArcToBezierSegments(_segment, Start);
-                segment?.FlattenSegment(points, Start, tolerance);
-            }
-
-            public override Point GetPoint(int index)
-            {
-                if (index < -1 || index > 0) throw new ArgumentOutOfRangeException(nameof(index));
-                return _segment.Point;
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                var segment = ArcToBezierSegments(_segment, Start);
-                if (segment != null) return segment.GetSimpleSegments(Start);
-                return Enumerable.Empty<SimpleSegment>();
-            }
-        }
-
-
-        private static class ArcToBezierHelper
-        {
-            private static bool AcceptRadius(double rHalfChord2, double rFuzz2, ref double rRadius)
-            {
-                var flag = rRadius * rRadius > rHalfChord2 * rFuzz2;
-                if (flag && rRadius < 0.0) rRadius = -rRadius;
-                return flag;
-            }
-
-            public static void ArcToBezier(double xStart, double yStart, double xRadius, double yRadius,
-                double rRotation, bool fLargeArc, bool fSweepUp, double xEnd, double yEnd, out Point[] pPt,
-                out int cPieces)
-            {
-                var num = 1E-06;
-                pPt = new Point[12];
-                var num12 = num * num;
-                var flag = false;
-                cPieces = -1;
-                var num2 = 0.5 * (xEnd - xStart);
-                var num3 = 0.5 * (yEnd - yStart);
-                var num4 = num2 * num2 + num3 * num3;
-                if (num4 >= num12)
+                if (!AcceptRadius(num4, num12, ref xRadius) || !AcceptRadius(num4, num12, ref yRadius))
                 {
-                    if (!AcceptRadius(num4, num12, ref xRadius) || !AcceptRadius(num4, num12, ref yRadius))
-                    {
-                        cPieces = 0;
-                    }
-                    else
-                    {
-                        double num5;
-                        double num6;
-                        // ReSharper disable once InlineOutVariableDeclaration
-                        double num7;
-                        // ReSharper disable once InlineOutVariableDeclaration
-                        double num8;
-                        double num9;
-                        double num10;
-                        Point point4;
-                        if (Math.Abs(rRotation) < num)
-                        {
-                            num5 = 1.0;
-                            num6 = 0.0;
-                        }
-                        else
-                        {
-                            rRotation = -rRotation * 3.1415926535897931 / 180.0;
-                            num5 = Math.Cos(rRotation);
-                            num6 = Math.Sin(rRotation);
-                            var num15 = num2 * num5 - num3 * num6;
-                            num3 = num2 * num6 + num3 * num5;
-                            num2 = num15;
-                        }
-
-                        num2 /= xRadius;
-                        num3 /= yRadius;
-                        num4 = num2 * num2 + num3 * num3;
-                        if (num4 > 1.0)
-                        {
-                            var num16 = Math.Sqrt(num4);
-                            xRadius *= num16;
-                            yRadius *= num16;
-                            num9 = num10 = 0.0;
-                            flag = true;
-                            num2 /= num16;
-                            num3 /= num16;
-                        }
-                        else
-                        {
-                            var num17 = Math.Sqrt((1.0 - num4) / num4);
-                            if (fLargeArc != fSweepUp)
-                            {
-                                num9 = -num17 * num3;
-                                num10 = num17 * num2;
-                            }
-                            else
-                            {
-                                num9 = num17 * num3;
-                                num10 = -num17 * num2;
-                            }
-                        }
-
-                        var ptStart = new Point(-num2 - num9, -num3 - num10);
-                        var ptEnd = new Point(num2 - num9, num3 - num10);
-                        var matrix = new Matrix(num5 * xRadius, -num6 * xRadius, num6 * yRadius,
-                            num5 * yRadius, 0.5 * (xEnd + xStart), 0.5 * (yEnd + yStart));
-                        if (!flag)
-                        {
-                            matrix.OffsetX += matrix.M11 * num9 + matrix.M21 * num10;
-                            matrix.OffsetY += matrix.M12 * num9 + matrix.M22 * num10;
-                        }
-
-                        GetArcAngle(ptStart, ptEnd, fLargeArc, fSweepUp, out num7, out num8, out cPieces);
-                        var bezierDistance = GetBezierDistance(num7);
-                        if (!fSweepUp) bezierDistance = -bezierDistance;
-                        var rhs = new Point(-bezierDistance * ptStart.Y, bezierDistance * ptStart.X);
-                        var index = 0;
-                        pPt = new Point[cPieces * 3];
-                        for (var i = 1; i < cPieces; i++)
-                        {
-                            var lhs = new Point(ptStart.X * num7 - ptStart.Y * num8,
-                                ptStart.X * num8 + ptStart.Y * num7);
-                            point4 = new Point(-bezierDistance * lhs.Y, bezierDistance * lhs.X);
-                            pPt[index++] = matrix.Transform(ptStart.Plus(rhs));
-                            pPt[index++] = matrix.Transform(lhs.Minus(point4));
-                            pPt[index++] = matrix.Transform(lhs);
-                            ptStart = lhs;
-                            rhs = point4;
-                        }
-
-                        point4 = new Point(-bezierDistance * ptEnd.Y, bezierDistance * ptEnd.X);
-                        pPt[index++] = matrix.Transform(ptStart.Plus(rhs));
-                        pPt[index++] = matrix.Transform(ptEnd.Minus(point4));
-                        pPt[index] = new Point(xEnd, yEnd);
-                    }
-                }
-            }
-
-            private static void GetArcAngle(Point ptStart, Point ptEnd, bool fLargeArc, bool fSweepUp,
-                out double rCosArcAngle, out double rSinArcAngle, out int cPieces)
-            {
-                rCosArcAngle = GeometryHelper.Dot(ptStart, ptEnd);
-                rSinArcAngle = GeometryHelper.Determinant(ptStart, ptEnd);
-                if (rCosArcAngle >= 0.0)
-                {
-                    if (!fLargeArc)
-                    {
-                        cPieces = 1;
-                        return;
-                    }
-
-                    cPieces = 4;
-                }
-                else if (fLargeArc)
-                {
-                    cPieces = 3;
+                    cPieces = 0;
                 }
                 else
                 {
-                    cPieces = 2;
-                }
+                    double num5;
+                    double num6;
+                    // ReSharper disable once InlineOutVariableDeclaration
+                    double num7;
+                    // ReSharper disable once InlineOutVariableDeclaration
+                    double num8;
+                    double num9;
+                    double num10;
+                    Point point4;
+                    if (Math.Abs(rRotation) < num)
+                    {
+                        num5 = 1.0;
+                        num6 = 0.0;
+                    }
+                    else
+                    {
+                        rRotation = -rRotation * 3.1415926535897931 / 180.0;
+                        num5 = Math.Cos(rRotation);
+                        num6 = Math.Sin(rRotation);
+                        var num15 = num2 * num5 - num3 * num6;
+                        num3 = num2 * num6 + num3 * num5;
+                        num2 = num15;
+                    }
 
-                var d = Math.Atan2(rSinArcAngle, rCosArcAngle);
-                if (fSweepUp)
-                {
-                    if (d < 0.0) d += 6.2831853071795862;
-                }
-                else if (d > 0.0)
-                {
-                    d -= 6.2831853071795862;
-                }
+                    num2 /= xRadius;
+                    num3 /= yRadius;
+                    num4 = num2 * num2 + num3 * num3;
+                    if (num4 > 1.0)
+                    {
+                        var num16 = Math.Sqrt(num4);
+                        xRadius *= num16;
+                        yRadius *= num16;
+                        num9 = num10 = 0.0;
+                        flag = true;
+                        num2 /= num16;
+                        num3 /= num16;
+                    }
+                    else
+                    {
+                        var num17 = Math.Sqrt((1.0 - num4) / num4);
+                        if (fLargeArc != fSweepUp)
+                        {
+                            num9 = -num17 * num3;
+                            num10 = num17 * num2;
+                        }
+                        else
+                        {
+                            num9 = num17 * num3;
+                            num10 = -num17 * num2;
+                        }
+                    }
 
-                d /= cPieces;
-                rCosArcAngle = Math.Cos(d);
-                rSinArcAngle = Math.Sin(d);
-            }
+                    var ptStart = new Point(-num2 - num9, -num3 - num10);
+                    var ptEnd = new Point(num2 - num9, num3 - num10);
+                    var matrix = new Matrix(num5 * xRadius, -num6 * xRadius, num6 * yRadius,
+                        num5 * yRadius, 0.5 * (xEnd + xStart), 0.5 * (yEnd + yStart));
+                    if (!flag)
+                    {
+                        matrix.OffsetX += matrix.M11 * num9 + matrix.M21 * num10;
+                        matrix.OffsetY += matrix.M12 * num9 + matrix.M22 * num10;
+                    }
 
-            private static double GetBezierDistance(double rDot, double rRadius = 1.0)
-            {
-                var num = rRadius * rRadius;
-                var num5 = 0.0;
-                var d = 0.5 * (num + rDot);
-                if (d < 0.0) return num5;
-                var num3 = num - d;
-                if (num3 <= 0.0) return num5;
-                var num4 = Math.Sqrt(num3);
-                var num2 = 4.0 * (rRadius - Math.Sqrt(d)) / 3.0;
-                if (num2 <= num4 * 1E-06) return 0.0;
-                return num2 / num4;
+                    GetArcAngle(ptStart, ptEnd, fLargeArc, fSweepUp, out num7, out num8, out cPieces);
+                    var bezierDistance = GetBezierDistance(num7);
+                    if (!fSweepUp) bezierDistance = -bezierDistance;
+                    var rhs = new Point(-bezierDistance * ptStart.Y, bezierDistance * ptStart.X);
+                    var index = 0;
+                    pPt = new Point[cPieces * 3];
+                    for (var i = 1; i < cPieces; i++)
+                    {
+                        var lhs = new Point(ptStart.X * num7 - ptStart.Y * num8,
+                            ptStart.X * num8 + ptStart.Y * num7);
+                        point4 = new Point(-bezierDistance * lhs.Y, bezierDistance * lhs.X);
+                        pPt[index++] = matrix.Transform(ptStart.Plus(rhs));
+                        pPt[index++] = matrix.Transform(lhs.Minus(point4));
+                        pPt[index++] = matrix.Transform(lhs);
+                        ptStart = lhs;
+                        rhs = point4;
+                    }
+
+                    point4 = new Point(-bezierDistance * ptEnd.Y, bezierDistance * ptEnd.X);
+                    pPt[index++] = matrix.Transform(ptStart.Plus(rhs));
+                    pPt[index++] = matrix.Transform(ptEnd.Minus(point4));
+                    pPt[index] = new Point(xEnd, yEnd);
+                }
             }
         }
 
-
-        private class BezierSegmentImplementation : PathSegmentImplementation
+        private static void GetArcAngle(Point ptStart, Point ptEnd, bool fLargeArc, bool fSweepUp,
+            out double rCosArcAngle, out double rSinArcAngle, out int cPieces)
         {
-            private BezierSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
+            rCosArcAngle = GeometryHelper.Dot(ptStart, ptEnd);
+            rSinArcAngle = GeometryHelper.Determinant(ptStart, ptEnd);
+            if (rCosArcAngle >= 0.0)
             {
-                _segment.Point1 = transform.Transform(_segment.Point1);
-                _segment.Point2 = transform.Transform(_segment.Point2);
-                _segment.Point3 = transform.Transform(_segment.Point3);
-                return _segment;
+                if (!fLargeArc)
+                {
+                    cPieces = 1;
+                    return;
+                }
+
+                cPieces = 4;
+            }
+            else if (fLargeArc)
+            {
+                cPieces = 3;
+            }
+            else
+            {
+                cPieces = 2;
             }
 
-            public static PathSegmentImplementation Create(BezierSegment source)
+            var d = Math.Atan2(rSinArcAngle, rCosArcAngle);
+            if (fSweepUp)
             {
-                if (source != null) return new BezierSegmentImplementation { _segment = source };
-                return null;
+                if (d < 0.0) d += 6.2831853071795862;
+            }
+            else if (d > 0.0)
+            {
+                d -= 6.2831853071795862;
             }
 
-            public override void Flatten(IList<Point> points, double tolerance)
+            d /= cPieces;
+            rCosArcAngle = Math.Cos(d);
+            rSinArcAngle = Math.Sin(d);
+        }
+
+        private static double GetBezierDistance(double rDot, double rRadius = 1.0)
+        {
+            var num = rRadius * rRadius;
+            var num5 = 0.0;
+            var d = 0.5 * (num + rDot);
+            if (d < 0.0) return num5;
+            var num3 = num - d;
+            if (num3 <= 0.0) return num5;
+            var num4 = Math.Sqrt(num3);
+            var num2 = 4.0 * (rRadius - Math.Sqrt(d)) / 3.0;
+            if (num2 <= num4 * 1E-06) return 0.0;
+            return num2 / num4;
+        }
+    }
+
+
+    private class BezierSegmentImplementation : PathSegmentImplementation
+    {
+        private BezierSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Point1 = transform.Transform(_segment.Point1);
+            _segment.Point2 = transform.Transform(_segment.Point2);
+            _segment.Point3 = transform.Transform(_segment.Point3);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(BezierSegment source)
+        {
+            if (source != null) return new BezierSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            Point[] controlPoints = { Start, _segment.Point1, _segment.Point2, _segment.Point3 };
+            var resultPolyline = new List<Point>();
+            BezierCurveFlattener.FlattenCubic(controlPoints, tolerance, resultPolyline, true);
+            points.AddRange(resultPolyline);
+        }
+
+        public override Point GetPoint(int index)
+        {
+            if (index < -1 || index > 2) throw new ArgumentOutOfRangeException(nameof(index));
+            if (index == 0) return _segment.Point1;
+            if (index == 1) return _segment.Point2;
+            return _segment.Point3;
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            yield return SimpleSegment.Create(Start, _segment.Point1, _segment.Point2, _segment.Point3);
+        }
+    }
+
+
+    private class LineSegmentImplementation : PathSegmentImplementation
+    {
+        private LineSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Point = transform.Transform(_segment.Point);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(LineSegment source)
+        {
+            if (source != null) return new LineSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            points.Add(_segment.Point);
+        }
+
+        public override Point GetPoint(int index)
+        {
+            if (index < -1 || index > 0) throw new ArgumentOutOfRangeException(nameof(index));
+            return _segment.Point;
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            yield return SimpleSegment.Create(Start, _segment.Point);
+        }
+    }
+
+
+    private abstract class PathSegmentImplementation
+    {
+        protected Point Start { get; private set; }
+
+        public abstract PathSegment ApplyTransform(GeneralTransform transform);
+
+        public static PathSegmentImplementation Create(PathSegment segment)
+        {
+            PathSegmentImplementation implementation;
+            if ((implementation = BezierSegmentImplementation.Create(segment as BezierSegment)) == null &&
+                (implementation = LineSegmentImplementation.Create(segment as LineSegment)) == null &&
+                (implementation = ArcSegmentImplementation.Create(segment as ArcSegment)) == null &&
+                (implementation = PolyLineSegmentImplementation.Create(segment as PolyLineSegment)) ==
+                null &&
+                (implementation = PolyBezierSegmentImplementation.Create(segment as PolyBezierSegment)) ==
+                null &&
+                (implementation =
+                    QuadraticBezierSegmentImplementation.Create(segment as QuadraticBezierSegment)) ==
+                null &&
+                (implementation =
+                    PolyQuadraticBezierSegmentImplementation.Create(segment as PolyQuadraticBezierSegment)
+                ) == null)
+                throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.TypeNotSupported, new object[] { segment.GetType().FullName }));
+            return implementation;
+        }
+
+        public static PathSegmentImplementation Create(PathSegment segment, Point start)
+        {
+            var implementation = Create(segment);
+            implementation.Start = start;
+            return implementation;
+        }
+
+        public abstract void Flatten(IList<Point> points, double tolerance);
+
+        public abstract Point GetPoint(int index);
+
+        public abstract IEnumerable<SimpleSegment> GetSimpleSegments();
+    }
+
+
+    private class PolyBezierSegmentImplementation : PathSegmentImplementation
+    {
+        private PolyBezierSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Points.ApplyTransform(transform);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(PolyBezierSegment source)
+        {
+            if (source != null) return new PolyBezierSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            var start = Start;
+            var num = _segment.Points.Count / 3 * 3;
+            for (var i = 0; i < num; i += 3)
             {
-                Point[] controlPoints = { Start, _segment.Point1, _segment.Point2, _segment.Point3 };
+                Point[] controlPoints = { start, _segment.Points[i], _segment.Points[i + 1], _segment.Points[i + 2] };
                 var resultPolyline = new List<Point>();
                 BezierCurveFlattener.FlattenCubic(controlPoints, tolerance, resultPolyline, true);
                 points.AddRange(resultPolyline);
-            }
-
-            public override Point GetPoint(int index)
-            {
-                if (index < -1 || index > 2) throw new ArgumentOutOfRangeException(nameof(index));
-                if (index == 0) return _segment.Point1;
-                if (index == 1) return _segment.Point2;
-                return _segment.Point3;
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                yield return SimpleSegment.Create(Start, _segment.Point1, _segment.Point2, _segment.Point3);
+                start = _segment.Points[i + 2];
             }
         }
 
-
-        private class LineSegmentImplementation : PathSegmentImplementation
+        public override Point GetPoint(int index)
         {
-            private LineSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
-            {
-                _segment.Point = transform.Transform(_segment.Point);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(LineSegment source)
-            {
-                if (source != null) return new LineSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                points.Add(_segment.Point);
-            }
-
-            public override Point GetPoint(int index)
-            {
-                if (index < -1 || index > 0) throw new ArgumentOutOfRangeException(nameof(index));
-                return _segment.Point;
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                yield return SimpleSegment.Create(Start, _segment.Point);
-            }
+            var num = _segment.Points.Count / 3 * 3;
+            if (index < -1 || index > num - 1) throw new ArgumentOutOfRangeException(nameof(index));
+            if (index != -1) return _segment.Points[index];
+            return _segment.Points[num - 1];
         }
 
-
-        private abstract class PathSegmentImplementation
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
         {
-            protected Point Start { get; private set; }
-
-            public abstract PathSegment ApplyTransform(GeneralTransform transform);
-
-            public static PathSegmentImplementation Create(PathSegment segment)
+            var start = Start;
+            IList<Point> points = _segment.Points;
+            var iteratorVariable2 = _segment.Points.Count / 3;
+            var iteratorVariable3 = 0;
+            while (true)
             {
-                PathSegmentImplementation implementation;
-                if ((implementation = BezierSegmentImplementation.Create(segment as BezierSegment)) == null &&
-                    (implementation = LineSegmentImplementation.Create(segment as LineSegment)) == null &&
-                    (implementation = ArcSegmentImplementation.Create(segment as ArcSegment)) == null &&
-                    (implementation = PolyLineSegmentImplementation.Create(segment as PolyLineSegment)) ==
-                    null &&
-                    (implementation = PolyBezierSegmentImplementation.Create(segment as PolyBezierSegment)) ==
-                    null &&
-                    (implementation =
-                        QuadraticBezierSegmentImplementation.Create(segment as QuadraticBezierSegment)) ==
-                    null &&
-                    (implementation =
-                        PolyQuadraticBezierSegmentImplementation.Create(segment as PolyQuadraticBezierSegment)
-                    ) == null)
-                    throw new NotSupportedException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.TypeNotSupported, new object[] { segment.GetType().FullName }));
-                return implementation;
-            }
-
-            public static PathSegmentImplementation Create(PathSegment segment, Point start)
-            {
-                var implementation = Create(segment);
-                implementation.Start = start;
-                return implementation;
-            }
-
-            public abstract void Flatten(IList<Point> points, double tolerance);
-
-            public abstract Point GetPoint(int index);
-
-            public abstract IEnumerable<SimpleSegment> GetSimpleSegments();
-        }
-
-
-        private class PolyBezierSegmentImplementation : PathSegmentImplementation
-        {
-            private PolyBezierSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
-            {
-                _segment.Points.ApplyTransform(transform);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(PolyBezierSegment source)
-            {
-                if (source != null) return new PolyBezierSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                var start = Start;
-                var num = _segment.Points.Count / 3 * 3;
-                for (var i = 0; i < num; i += 3)
-                {
-                    Point[] controlPoints = { start, _segment.Points[i], _segment.Points[i + 1], _segment.Points[i + 2] };
-                    var resultPolyline = new List<Point>();
-                    BezierCurveFlattener.FlattenCubic(controlPoints, tolerance, resultPolyline, true);
-                    points.AddRange(resultPolyline);
-                    start = _segment.Points[i + 2];
-                }
-            }
-
-            public override Point GetPoint(int index)
-            {
-                var num = _segment.Points.Count / 3 * 3;
-                if (index < -1 || index > num - 1) throw new ArgumentOutOfRangeException(nameof(index));
-                if (index != -1) return _segment.Points[index];
-                return _segment.Points[num - 1];
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                var start = Start;
-                IList<Point> points = _segment.Points;
-                var iteratorVariable2 = _segment.Points.Count / 3;
-                var iteratorVariable3 = 0;
-                while (true)
-                {
-                    if (iteratorVariable3 >= iteratorVariable2) yield break;
-                    var iteratorVariable4 = iteratorVariable3 * 3;
-                    yield return SimpleSegment.Create(start, points[iteratorVariable4],
-                        points[iteratorVariable4 + 1], points[iteratorVariable4 + 2]);
-                    start = points[iteratorVariable4 + 2];
-                    iteratorVariable3++;
-                }
-            }
-        }
-
-
-        private class PolyLineSegmentImplementation : PathSegmentImplementation
-        {
-            private PolyLineSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
-            {
-                _segment.Points.ApplyTransform(transform);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(PolyLineSegment source)
-            {
-                if (source != null) return new PolyLineSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                points.AddRange(_segment.Points);
-            }
-
-            public override Point GetPoint(int index)
-            {
-                if (index < -1 || index > _segment.Points.Count - 1)
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                if (index != -1) return _segment.Points[index];
-                return _segment.Points.Last();
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                var start = Start;
-                // ReSharper disable once GenericEnumeratorNotDisposed
-                var enumerator = _segment.Points.GetEnumerator();
-                while (enumerator.MoveNext())
-                {
-                    var current = enumerator.Current;
-                    yield return SimpleSegment.Create(start, current);
-                    start = current;
-                }
-            }
-        }
-
-
-        private class PolyQuadraticBezierSegmentImplementation : PathSegmentImplementation
-        {
-            private PolyQuadraticBezierSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
-            {
-                _segment.Points.ApplyTransform(transform);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(PolyQuadraticBezierSegment source)
-            {
-                if (source != null) return new PolyQuadraticBezierSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                var start = Start;
-                var num = _segment.Points.Count / 2 * 2;
-                for (var i = 0; i < num; i += 2)
-                {
-                    Point[] controlPoints = { start, _segment.Points[i], _segment.Points[i + 1] };
-                    var resultPolyline = new List<Point>();
-                    BezierCurveFlattener.FlattenQuadratic(controlPoints, tolerance, resultPolyline, true);
-                    points.AddRange(resultPolyline);
-                    start = _segment.Points[i + 1];
-                }
-            }
-
-            public override Point GetPoint(int index)
-            {
-                var num = _segment.Points.Count / 2 * 2;
-                if (index < -1 || index > num - 1) throw new ArgumentOutOfRangeException(nameof(index));
-                if (index != -1) return _segment.Points[index];
-                return _segment.Points[num - 1];
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                var start = Start;
-                IList<Point> points = _segment.Points;
-                var iteratorVariable2 = _segment.Points.Count / 2;
-                var iteratorVariable3 = 0;
-                while (true)
-                {
-                    if (iteratorVariable3 >= iteratorVariable2) yield break;
-                    var iteratorVariable4 = iteratorVariable3 * 2;
-                    yield return SimpleSegment.Create(start, points[iteratorVariable4],
-                        points[iteratorVariable4 + 1]);
-                    start = points[iteratorVariable4 + 1];
-                    iteratorVariable3++;
-                }
-            }
-        }
-
-
-        private class QuadraticBezierSegmentImplementation : PathSegmentImplementation
-        {
-            private QuadraticBezierSegment _segment;
-
-            public override PathSegment ApplyTransform(GeneralTransform transform)
-            {
-                _segment.Point1 = transform.Transform(_segment.Point1);
-                _segment.Point2 = transform.Transform(_segment.Point2);
-                return _segment;
-            }
-
-            public static PathSegmentImplementation Create(QuadraticBezierSegment source)
-            {
-                if (source != null) return new QuadraticBezierSegmentImplementation { _segment = source };
-                return null;
-            }
-
-            public override void Flatten(IList<Point> points, double tolerance)
-            {
-                Point[] controlPoints = { Start, _segment.Point1, _segment.Point2 };
-                var resultPolyline = new List<Point>();
-                BezierCurveFlattener.FlattenQuadratic(controlPoints, tolerance, resultPolyline, true);
-                points.AddRange(resultPolyline);
-            }
-
-            public override Point GetPoint(int index)
-            {
-                if (index < -1 || index > 1) throw new ArgumentOutOfRangeException(nameof(index));
-                return index == 0 ? _segment.Point1 : _segment.Point2;
-            }
-
-            public override IEnumerable<SimpleSegment> GetSimpleSegments()
-            {
-                yield return SimpleSegment.Create(Start, _segment.Point1, _segment.Point2);
+                if (iteratorVariable3 >= iteratorVariable2) yield break;
+                var iteratorVariable4 = iteratorVariable3 * 3;
+                yield return SimpleSegment.Create(start, points[iteratorVariable4],
+                    points[iteratorVariable4 + 1], points[iteratorVariable4 + 2]);
+                start = points[iteratorVariable4 + 2];
+                iteratorVariable3++;
             }
         }
     }
-}
+
+
+    private class PolyLineSegmentImplementation : PathSegmentImplementation
+    {
+        private PolyLineSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Points.ApplyTransform(transform);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(PolyLineSegment source)
+        {
+            if (source != null) return new PolyLineSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            points.AddRange(_segment.Points);
+        }
+
+        public override Point GetPoint(int index)
+        {
+            if (index < -1 || index > _segment.Points.Count - 1)
+                throw new ArgumentOutOfRangeException(nameof(index));
+            if (index != -1) return _segment.Points[index];
+            return _segment.Points.Last();
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            var start = Start;
+            // ReSharper disable once GenericEnumeratorNotDisposed
+            var enumerator = _segment.Points.GetEnumerator();
+            while (enumerator.MoveNext())
+            {
+                var current = enumerator.Current;
+                yield return SimpleSegment.Create(start, current);
+                start = current;
+            }
+        }
+    }
+
+
+    private class PolyQuadraticBezierSegmentImplementation : PathSegmentImplementation
+    {
+        private PolyQuadraticBezierSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Points.ApplyTransform(transform);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(PolyQuadraticBezierSegment source)
+        {
+            if (source != null) return new PolyQuadraticBezierSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            var start = Start;
+            var num = _segment.Points.Count / 2 * 2;
+            for (var i = 0; i < num; i += 2)
+            {
+                Point[] controlPoints = { start, _segment.Points[i], _segment.Points[i + 1] };
+                var resultPolyline = new List<Point>();
+                BezierCurveFlattener.FlattenQuadratic(controlPoints, tolerance, resultPolyline, true);
+                points.AddRange(resultPolyline);
+                start = _segment.Points[i + 1];
+            }
+        }
+
+        public override Point GetPoint(int index)
+        {
+            var num = _segment.Points.Count / 2 * 2;
+            if (index < -1 || index > num - 1) throw new ArgumentOutOfRangeException(nameof(index));
+            if (index != -1) return _segment.Points[index];
+            return _segment.Points[num - 1];
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            var start = Start;
+            IList<Point> points = _segment.Points;
+            var iteratorVariable2 = _segment.Points.Count / 2;
+            var iteratorVariable3 = 0;
+            while (true)
+            {
+                if (iteratorVariable3 >= iteratorVariable2) yield break;
+                var iteratorVariable4 = iteratorVariable3 * 2;
+                yield return SimpleSegment.Create(start, points[iteratorVariable4],
+                    points[iteratorVariable4 + 1]);
+                start = points[iteratorVariable4 + 1];
+                iteratorVariable3++;
+            }
+        }
+    }
+
+
+    private class QuadraticBezierSegmentImplementation : PathSegmentImplementation
+    {
+        private QuadraticBezierSegment _segment;
+
+        public override PathSegment ApplyTransform(GeneralTransform transform)
+        {
+            _segment.Point1 = transform.Transform(_segment.Point1);
+            _segment.Point2 = transform.Transform(_segment.Point2);
+            return _segment;
+        }
+
+        public static PathSegmentImplementation Create(QuadraticBezierSegment source)
+        {
+            if (source != null) return new QuadraticBezierSegmentImplementation { _segment = source };
+            return null;
+        }
+
+        public override void Flatten(IList<Point> points, double tolerance)
+        {
+            Point[] controlPoints = { Start, _segment.Point1, _segment.Point2 };
+            var resultPolyline = new List<Point>();
+            BezierCurveFlattener.FlattenQuadratic(controlPoints, tolerance, resultPolyline, true);
+            points.AddRange(resultPolyline);
+        }
+
+        public override Point GetPoint(int index)
+        {
+            if (index < -1 || index > 1) throw new ArgumentOutOfRangeException(nameof(index));
+            return index == 0 ? _segment.Point1 : _segment.Point2;
+        }
+
+        public override IEnumerable<SimpleSegment> GetSimpleSegments()
+        {
+            yield return SimpleSegment.Create(Start, _segment.Point1, _segment.Point2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs
index a8b4ac28..b9d850a6 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs
@@ -3,150 +3,149 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal class PolylineData
 {
-    internal class PolylineData
+    private IList<double> _accumulates;
+
+    private IList<double> _angles;
+
+    private IList<double> _lengths;
+
+    private IList<Vector> _normals;
+
+    private double? _totalLength;
+
+    public PolylineData(IList<Point> points)
     {
-        private IList<double> _accumulates;
+        if (points == null) throw new ArgumentNullException(nameof(points));
+        if (points.Count <= 1) throw new ArgumentOutOfRangeException(nameof(points));
+        Points = points;
+    }
 
-        private IList<double> _angles;
+    public IList<double> AccumulatedLength =>
+        _accumulates ?? ComputeAccumulatedLength();
 
-        private IList<double> _lengths;
+    public IList<double> Angles =>
+        _angles ?? ComputeAngles();
 
-        private IList<Vector> _normals;
+    public int Count =>
+        Points.Count;
 
-        private double? _totalLength;
+    public bool IsClosed =>
+        Points[0] == Points.Last();
 
-        public PolylineData(IList<Point> points)
+    public IList<double> Lengths =>
+        _lengths ?? ComputeLengths();
+
+    public IList<Vector> Normals =>
+        _normals ?? ComputeNormals();
+
+    public IList<Point> Points { get; }
+
+    public double TotalLength
+    {
+        get
         {
-            if (points == null) throw new ArgumentNullException(nameof(points));
-            if (points.Count <= 1) throw new ArgumentOutOfRangeException(nameof(points));
-            Points = points;
-        }
-
-        public IList<double> AccumulatedLength =>
-            _accumulates ?? ComputeAccumulatedLength();
-
-        public IList<double> Angles =>
-            _angles ?? ComputeAngles();
-
-        public int Count =>
-            Points.Count;
-
-        public bool IsClosed =>
-            Points[0] == Points.Last();
-
-        public IList<double> Lengths =>
-            _lengths ?? ComputeLengths();
-
-        public IList<Vector> Normals =>
-            _normals ?? ComputeNormals();
-
-        public IList<Point> Points { get; }
-
-        public double TotalLength
-        {
-            get
-            {
-                var length = _totalLength;
-                return length ?? ComputeTotalLength();
-            }
-        }
-
-        private IList<double> ComputeAccumulatedLength()
-        {
-            _accumulates = new double[Count];
-            _accumulates[0] = 0.0;
-            for (var i = 1; i < Count; i++) _accumulates[i] = _accumulates[i - 1] + Lengths[i - 1];
-            _totalLength = _accumulates.Last();
-            return _accumulates;
-        }
-
-        private IList<double> ComputeAngles()
-        {
-            _angles = new double[Count];
-            for (var i = 1; i < Count - 1; i++) _angles[i] = -GeometryHelper.Dot(Normals[i - 1], Normals[i]);
-            if (IsClosed)
-            {
-                var num2 = -GeometryHelper.Dot(Normals[0], Normals[Count - 2]);
-                _angles[0] = _angles[Count - 1] = num2;
-            }
-            else
-            {
-                _angles[0] = _angles[Count - 1] = 1.0;
-            }
-
-            return _angles;
-        }
-
-        private IList<double> ComputeLengths()
-        {
-            _lengths = new double[Count];
-            for (var i = 0; i < Count; i++) _lengths[i] = Difference(i).Length;
-            return _lengths;
-        }
-
-        private IList<Vector> ComputeNormals()
-        {
-            _normals = new Vector[Points.Count];
-            for (var i = 0; i < Count - 1; i++) _normals[i] = GeometryHelper.Normal(Points[i], Points[i + 1]);
-            _normals[Count - 1] = _normals[Count - 2];
-            return _normals;
-        }
-
-        private double ComputeTotalLength()
-        {
-            ComputeAccumulatedLength();
-            // ReSharper disable once PossibleInvalidOperationException
-            return _totalLength.Value;
-        }
-
-        public Vector Difference(int index)
-        {
-            var num = (index + 1) % Count;
-            return Points[num].Subtract(Points[index]);
-        }
-
-        public Vector SmoothNormal(int index, double fraction, double cornerRadius)
-        {
-            if (cornerRadius > 0.0)
-            {
-                var num = Lengths[index];
-                if (MathHelper.IsVerySmall(num))
-                {
-                    var num2 = index - 1;
-                    if (num2 < 0 && IsClosed) num2 = Count - 1;
-                    var num3 = index + 1;
-                    if (IsClosed && num3 >= Count - 1) num3 = 0;
-                    if (num2 >= 0 && num3 < Count)
-                        return GeometryHelper.Lerp(Normals[num3], Normals[num2], 0.5).Normalized();
-                    return Normals[index];
-                }
-
-                var num4 = Math.Min(cornerRadius / num, 0.5);
-                if (fraction <= num4)
-                {
-                    var num5 = index - 1;
-                    if (IsClosed && num5 == -1) num5 = Count - 1;
-                    if (num5 >= 0)
-                    {
-                        var alpha = (num4 - fraction) / (2.0 * num4);
-                        return GeometryHelper.Lerp(Normals[index], Normals[num5], alpha).Normalized();
-                    }
-                }
-                else if (fraction >= 1.0 - num4)
-                {
-                    var num7 = index + 1;
-                    if (IsClosed && num7 >= Count - 1) num7 = 0;
-                    if (num7 < Count)
-                    {
-                        var num8 = (fraction + num4 - 1.0) / (2.0 * num4);
-                        return GeometryHelper.Lerp(Normals[index], Normals[num7], num8).Normalized();
-                    }
-                }
-            }
-
-            return Normals[index];
+            var length = _totalLength;
+            return length ?? ComputeTotalLength();
         }
     }
-}
+
+    private IList<double> ComputeAccumulatedLength()
+    {
+        _accumulates = new double[Count];
+        _accumulates[0] = 0.0;
+        for (var i = 1; i < Count; i++) _accumulates[i] = _accumulates[i - 1] + Lengths[i - 1];
+        _totalLength = _accumulates.Last();
+        return _accumulates;
+    }
+
+    private IList<double> ComputeAngles()
+    {
+        _angles = new double[Count];
+        for (var i = 1; i < Count - 1; i++) _angles[i] = -GeometryHelper.Dot(Normals[i - 1], Normals[i]);
+        if (IsClosed)
+        {
+            var num2 = -GeometryHelper.Dot(Normals[0], Normals[Count - 2]);
+            _angles[0] = _angles[Count - 1] = num2;
+        }
+        else
+        {
+            _angles[0] = _angles[Count - 1] = 1.0;
+        }
+
+        return _angles;
+    }
+
+    private IList<double> ComputeLengths()
+    {
+        _lengths = new double[Count];
+        for (var i = 0; i < Count; i++) _lengths[i] = Difference(i).Length;
+        return _lengths;
+    }
+
+    private IList<Vector> ComputeNormals()
+    {
+        _normals = new Vector[Points.Count];
+        for (var i = 0; i < Count - 1; i++) _normals[i] = GeometryHelper.Normal(Points[i], Points[i + 1]);
+        _normals[Count - 1] = _normals[Count - 2];
+        return _normals;
+    }
+
+    private double ComputeTotalLength()
+    {
+        ComputeAccumulatedLength();
+        // ReSharper disable once PossibleInvalidOperationException
+        return _totalLength.Value;
+    }
+
+    public Vector Difference(int index)
+    {
+        var num = (index + 1) % Count;
+        return Points[num].Subtract(Points[index]);
+    }
+
+    public Vector SmoothNormal(int index, double fraction, double cornerRadius)
+    {
+        if (cornerRadius > 0.0)
+        {
+            var num = Lengths[index];
+            if (MathHelper.IsVerySmall(num))
+            {
+                var num2 = index - 1;
+                if (num2 < 0 && IsClosed) num2 = Count - 1;
+                var num3 = index + 1;
+                if (IsClosed && num3 >= Count - 1) num3 = 0;
+                if (num2 >= 0 && num3 < Count)
+                    return GeometryHelper.Lerp(Normals[num3], Normals[num2], 0.5).Normalized();
+                return Normals[index];
+            }
+
+            var num4 = Math.Min(cornerRadius / num, 0.5);
+            if (fraction <= num4)
+            {
+                var num5 = index - 1;
+                if (IsClosed && num5 == -1) num5 = Count - 1;
+                if (num5 >= 0)
+                {
+                    var alpha = (num4 - fraction) / (2.0 * num4);
+                    return GeometryHelper.Lerp(Normals[index], Normals[num5], alpha).Normalized();
+                }
+            }
+            else if (fraction >= 1.0 - num4)
+            {
+                var num7 = index + 1;
+                if (IsClosed && num7 >= Count - 1) num7 = 0;
+                if (num7 < Count)
+                {
+                    var num8 = (fraction + num4 - 1.0) / (2.0 * num4);
+                    return GeometryHelper.Lerp(Normals[index], Normals[num7], num8).Normalized();
+                }
+            }
+        }
+
+        return Normals[index];
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs
index 10d9853a..85cea863 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs
@@ -2,115 +2,114 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace HandyControl.Expression.Drawing
-{
-    internal static class PolylineHelper
-    {
-        public static IEnumerable<PolylineData> GetWrappedPolylines(IList<PolylineData> lines,
-            ref double startArcLength)
-        {
-            var count = 0;
-            for (var i = 0; i < lines.Count; i++)
-            {
-                count = i;
-                startArcLength -= lines[i].TotalLength;
-                if (MathHelper.LessThanOrClose(startArcLength, 0.0)) break;
-            }
+namespace HandyControl.Expression.Drawing;
 
-            if (!MathHelper.LessThanOrClose(startArcLength, 0.0))
-                throw new ArgumentOutOfRangeException(nameof(startArcLength));
-            startArcLength += lines[count].TotalLength;
-            return lines.Skip(count).Concat(lines.Take(count + 1));
+internal static class PolylineHelper
+{
+    public static IEnumerable<PolylineData> GetWrappedPolylines(IList<PolylineData> lines,
+        ref double startArcLength)
+    {
+        var count = 0;
+        for (var i = 0; i < lines.Count; i++)
+        {
+            count = i;
+            startArcLength -= lines[i].TotalLength;
+            if (MathHelper.LessThanOrClose(startArcLength, 0.0)) break;
         }
 
-        public static void PathMarch(PolylineData polyline, double startArcLength, double cornerThreshold,
-            Func<MarchLocation, double> stopCallback)
+        if (!MathHelper.LessThanOrClose(startArcLength, 0.0))
+            throw new ArgumentOutOfRangeException(nameof(startArcLength));
+        startArcLength += lines[count].TotalLength;
+        return lines.Skip(count).Concat(lines.Take(count + 1));
+    }
+
+    public static void PathMarch(PolylineData polyline, double startArcLength, double cornerThreshold,
+        Func<MarchLocation, double> stopCallback)
+    {
+        if (polyline == null) throw new ArgumentNullException(nameof(polyline));
+        var count = polyline.Count;
+        if (count <= 1) throw new ArgumentOutOfRangeException(nameof(polyline));
+        var flag = false;
+        var x = startArcLength;
+        var before = 0.0;
+        var index = 0;
+        var num5 = Math.Cos(cornerThreshold * 3.1415926535897931 / 180.0);
+        while (true)
         {
-            if (polyline == null) throw new ArgumentNullException(nameof(polyline));
-            var count = polyline.Count;
-            if (count <= 1) throw new ArgumentOutOfRangeException(nameof(polyline));
-            var flag = false;
-            var x = startArcLength;
-            var before = 0.0;
-            var index = 0;
-            var num5 = Math.Cos(cornerThreshold * 3.1415926535897931 / 180.0);
-            while (true)
+            var num6 = polyline.Lengths[index];
+            if (!MathHelper.IsFiniteDouble(x)) return;
+            if (MathHelper.IsVerySmall(x))
             {
-                var num6 = polyline.Lengths[index];
-                if (!MathHelper.IsFiniteDouble(x)) return;
-                if (MathHelper.IsVerySmall(x))
+                x = stopCallback(MarchLocation.Create(MarchStopReason.CompleteStep, index, before,
+                    num6 - before, x));
+                flag = true;
+            }
+            else if (MathHelper.GreaterThan(x, 0.0))
+            {
+                if (MathHelper.LessThanOrClose(x + before, num6))
                 {
+                    before += x;
                     x = stopCallback(MarchLocation.Create(MarchStopReason.CompleteStep, index, before,
+                        num6 - before, 0.0));
+                    flag = true;
+                }
+                else if (index < count - 2)
+                {
+                    index++;
+                    var num7 = num6 - before;
+                    x -= num7;
+                    before = 0.0;
+                    // ReSharper disable once CompareOfFloatsByEqualityOperator
+                    if (flag && num5 != 1.0 && polyline.Angles[index] > num5)
+                    {
+                        num6 = polyline.Lengths[index];
+                        x = stopCallback(MarchLocation.Create(MarchStopReason.CornerPoint, index, before,
+                            num6 - before, x));
+                    }
+                }
+                else
+                {
+                    var num8 = num6 - before;
+                    x -= num8;
+                    num6 = polyline.Lengths[index];
+                    before = polyline.Lengths[index];
+                    x = stopCallback(MarchLocation.Create(MarchStopReason.CompletePolyline, index, before,
                         num6 - before, x));
                     flag = true;
                 }
-                else if (MathHelper.GreaterThan(x, 0.0))
+            }
+            else if (MathHelper.LessThan(x, 0.0))
+            {
+                if (MathHelper.GreaterThanOrClose(x + before, 0.0))
                 {
-                    if (MathHelper.LessThanOrClose(x + before, num6))
+                    before += x;
+                    x = stopCallback(MarchLocation.Create(MarchStopReason.CompleteStep, index, before,
+                        num6 - before, 0.0));
+                    flag = true;
+                }
+                else if (index > 0)
+                {
+                    index--;
+                    x += before;
+                    before = polyline.Lengths[index];
+                    // ReSharper disable once CompareOfFloatsByEqualityOperator
+                    if (flag && num5 != 1.0 && polyline.Angles[index + 1] > num5)
                     {
-                        before += x;
-                        x = stopCallback(MarchLocation.Create(MarchStopReason.CompleteStep, index, before,
-                            num6 - before, 0.0));
-                        flag = true;
-                    }
-                    else if (index < count - 2)
-                    {
-                        index++;
-                        var num7 = num6 - before;
-                        x -= num7;
-                        before = 0.0;
-                        // ReSharper disable once CompareOfFloatsByEqualityOperator
-                        if (flag && num5 != 1.0 && polyline.Angles[index] > num5)
-                        {
-                            num6 = polyline.Lengths[index];
-                            x = stopCallback(MarchLocation.Create(MarchStopReason.CornerPoint, index, before,
-                                num6 - before, x));
-                        }
-                    }
-                    else
-                    {
-                        var num8 = num6 - before;
-                        x -= num8;
                         num6 = polyline.Lengths[index];
-                        before = polyline.Lengths[index];
-                        x = stopCallback(MarchLocation.Create(MarchStopReason.CompletePolyline, index, before,
+                        x = stopCallback(MarchLocation.Create(MarchStopReason.CornerPoint, index, before,
                             num6 - before, x));
-                        flag = true;
                     }
                 }
-                else if (MathHelper.LessThan(x, 0.0))
+                else
                 {
-                    if (MathHelper.GreaterThanOrClose(x + before, 0.0))
-                    {
-                        before += x;
-                        x = stopCallback(MarchLocation.Create(MarchStopReason.CompleteStep, index, before,
-                            num6 - before, 0.0));
-                        flag = true;
-                    }
-                    else if (index > 0)
-                    {
-                        index--;
-                        x += before;
-                        before = polyline.Lengths[index];
-                        // ReSharper disable once CompareOfFloatsByEqualityOperator
-                        if (flag && num5 != 1.0 && polyline.Angles[index + 1] > num5)
-                        {
-                            num6 = polyline.Lengths[index];
-                            x = stopCallback(MarchLocation.Create(MarchStopReason.CornerPoint, index, before,
-                                num6 - before, x));
-                        }
-                    }
-                    else
-                    {
-                        x += before;
-                        num6 = polyline.Lengths[index];
-                        before = 0.0;
-                        x = stopCallback(MarchLocation.Create(MarchStopReason.CompletePolyline, index, before,
-                            num6 - before, x));
-                        flag = true;
-                    }
+                    x += before;
+                    num6 = polyline.Lengths[index];
+                    before = 0.0;
+                    x = stopCallback(MarchLocation.Create(MarchStopReason.CompletePolyline, index, before,
+                        num6 - before, x));
+                    flag = true;
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs
index da517c71..a96f08b3 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs
@@ -1,45 +1,44 @@
 using System;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal class RandomEngine
 {
-    internal class RandomEngine
+    private double? _anotherSample;
+
+    private Random _random;
+
+    public RandomEngine(long seed) => Initialize(seed);
+
+    private double Gaussian()
     {
-        private double? _anotherSample;
-
-        private Random _random;
-
-        public RandomEngine(long seed) => Initialize(seed);
-
-        private double Gaussian()
+        double num;
+        double num2;
+        double num3;
+        if (_anotherSample.HasValue)
         {
-            double num;
-            double num2;
-            double num3;
-            if (_anotherSample.HasValue)
-            {
-                var num4 = _anotherSample.Value;
-                _anotherSample = null;
-                return num4;
-            }
-
-            do
-            {
-                num2 = 2.0 * Uniform() - 1.0;
-                num3 = 2.0 * Uniform() - 1.0;
-                num = num2 * num2 + num3 * num3;
-            } while (num >= 1.0);
-
-            var num5 = Math.Sqrt(-2.0 * Math.Log(num) / num);
-            _anotherSample = num2 * num5;
-            return num3 * num5;
+            var num4 = _anotherSample.Value;
+            _anotherSample = null;
+            return num4;
         }
 
-        private void Initialize(long seed) => _random = new Random((int) seed);
+        do
+        {
+            num2 = 2.0 * Uniform() - 1.0;
+            num3 = 2.0 * Uniform() - 1.0;
+            num = num2 * num2 + num3 * num3;
+        } while (num >= 1.0);
 
-        public double NextGaussian(double mean, double variance) => Gaussian() * variance + mean;
-
-        public double NextUniform(double min, double max) => Uniform() * (max - min) + min;
-
-        private double Uniform() => _random.NextDouble();
+        var num5 = Math.Sqrt(-2.0 * Math.Log(num) / num);
+        _anotherSample = num2 * num5;
+        return num3 * num5;
     }
-}
+
+    private void Initialize(long seed) => _random = new Random((int) seed);
+
+    public double NextGaussian(double mean, double variance) => Gaussian() * variance + mean;
+
+    public double NextUniform(double min, double max) => Uniform() * (max - min) + min;
+
+    private double Uniform() => _random.NextDouble();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs b/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs
index 5b82f8ea..41cc759a 100644
--- a/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs
@@ -1,76 +1,75 @@
 using System.Collections.Generic;
 using System.Windows;
 
-namespace HandyControl.Expression.Drawing
+namespace HandyControl.Expression.Drawing;
+
+internal class SimpleSegment
 {
-    internal class SimpleSegment
+    public enum SegmentType
     {
-        public enum SegmentType
+        Line,
+
+        CubicBeizer
+    }
+
+
+    private SimpleSegment()
+    {
+    }
+
+    public Point[] Points { get; private set; }
+
+    public SegmentType Type { get; private set; }
+
+    public static SimpleSegment Create(Point point0, Point point1)
+    {
+        var segment = new SimpleSegment
         {
-            Line,
+            Type = SegmentType.Line,
+            Points = new[] { point0, point1 }
+        };
+        return segment;
+    }
 
-            CubicBeizer
-        }
-
-
-        private SimpleSegment()
+    public static SimpleSegment Create(Point point0, Point point1, Point point2)
+    {
+        var point = GeometryHelper.Lerp(point0, point1, 0.66666666666666663);
+        var point3 = GeometryHelper.Lerp(point1, point2, 0.33333333333333331);
+        var segment = new SimpleSegment
         {
-        }
+            Type = SegmentType.CubicBeizer,
+            Points = new[] { point0, point, point3, point2 }
+        };
+        return segment;
+    }
 
-        public Point[] Points { get; private set; }
-
-        public SegmentType Type { get; private set; }
-
-        public static SimpleSegment Create(Point point0, Point point1)
+    public static SimpleSegment Create(Point point0, Point point1, Point point2, Point point3)
+    {
+        var segment = new SimpleSegment
         {
-            var segment = new SimpleSegment
-            {
-                Type = SegmentType.Line,
-                Points = new[] { point0, point1 }
-            };
-            return segment;
-        }
+            Type = SegmentType.CubicBeizer,
+            Points = new[] { point0, point1, point2, point3 }
+        };
+        return segment;
+    }
 
-        public static SimpleSegment Create(Point point0, Point point1, Point point2)
+    public void Flatten(IList<Point> resultPolyline, double tolerance, IList<double> resultParameters)
+    {
+        switch (Type)
         {
-            var point = GeometryHelper.Lerp(point0, point1, 0.66666666666666663);
-            var point3 = GeometryHelper.Lerp(point1, point2, 0.33333333333333331);
-            var segment = new SimpleSegment
-            {
-                Type = SegmentType.CubicBeizer,
-                Points = new[] { point0, point, point3, point2 }
-            };
-            return segment;
-        }
+            case SegmentType.Line:
+                resultPolyline.Add(Points[1]);
+                if (resultParameters == null) break;
+                resultParameters.Add(1.0);
+                return;
 
-        public static SimpleSegment Create(Point point0, Point point1, Point point2, Point point3)
-        {
-            var segment = new SimpleSegment
-            {
-                Type = SegmentType.CubicBeizer,
-                Points = new[] { point0, point1, point2, point3 }
-            };
-            return segment;
-        }
+            case SegmentType.CubicBeizer:
+                BezierCurveFlattener.FlattenCubic(Points, tolerance, resultPolyline, true,
+                    resultParameters);
+                break;
 
-        public void Flatten(IList<Point> resultPolyline, double tolerance, IList<double> resultParameters)
-        {
-            switch (Type)
-            {
-                case SegmentType.Line:
-                    resultPolyline.Add(Points[1]);
-                    if (resultParameters == null) break;
-                    resultParameters.Add(1.0);
-                    return;
-
-                case SegmentType.CubicBeizer:
-                    BezierCurveFlattener.FlattenCubic(Points, tolerance, resultPolyline, true,
-                        resultParameters);
-                    break;
-
-                default:
-                    return;
-            }
+            default:
+                return;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs b/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs
index 3923b658..4dbdbe07 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs
@@ -6,465 +6,464 @@ using System.Windows;
 using System.Windows.Media;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+internal class ArcGeometrySource : GeometrySource<IArcGeometrySourceParameters>
 {
-    internal class ArcGeometrySource : GeometrySource<IArcGeometrySourceParameters>
+    private double _absoluteThickness;
+
+    private double _relativeThickness;
+
+    private static bool AreCloseEnough(double angleA, double angleB)
     {
-        private double _absoluteThickness;
-
-        private double _relativeThickness;
-
-        private static bool AreCloseEnough(double angleA, double angleB)
-        {
-            return Math.Abs(angleA - angleB) < 0.001;
-        }
-
-        internal static double[] ComputeAngleRanges(double radiusX, double radiusY, double intersect,
-            double start, double end)
-        {
-            var values = new List<double>
-            {
-                start,
-                end,
-                intersect,
-                180.0 - intersect,
-                180.0 + intersect,
-                360.0 - intersect,
-                360.0 + intersect,
-                540.0 - intersect,
-                540.0 + intersect,
-                720.0 - intersect
-            };
-            values.Sort();
-            var index = values.IndexOf(start);
-            var num2 = values.IndexOf(end);
-            if (num2 == index)
-            {
-                num2++;
-            }
-            else if (start < end)
-            {
-                IncreaseDuplicatedIndex(values, ref index);
-                DecreaseDuplicatedIndex(values, ref num2);
-            }
-            else if (start > end)
-            {
-                DecreaseDuplicatedIndex(values, ref index);
-                IncreaseDuplicatedIndex(values, ref num2);
-            }
-
-            var list = new List<double>();
-            if (index < num2)
-                for (var i = index; i <= num2; i++)
-                    list.Add(values[i]);
-            else
-                for (var j = index; j >= num2; j--)
-                    list.Add(values[j]);
-            var num5 = EnsureFirstQuadrant((list[0] + list[1]) / 2.0);
-            if (radiusX < radiusY && num5 < intersect || radiusX > radiusY && num5 > intersect)
-                list.RemoveAt(0);
-            if (list.Count % 2 == 1) list.RemoveLast();
-            if (list.Count == 0)
-            {
-                var num6 = Math.Min(index, num2) - 1;
-                if (num6 < 0) num6 = Math.Max(index, num2) + 1;
-                list.Add(values[num6]);
-                list.Add(values[num6]);
-            }
-
-            return list.ToArray();
-        }
-
-        protected override Rect ComputeLogicalBounds(Rect layoutBounds, IGeometrySourceParameters parameters)
-        {
-            return GeometryHelper.GetStretchBound(base.ComputeLogicalBounds(layoutBounds, parameters),
-                parameters.Stretch, new Size(1.0, 1.0));
-        }
-
-        private static IList<Point> ComputeOneInnerCurve(double start, double end, Rect bounds, double offset)
-        {
-            var num = bounds.Width / 2.0;
-            var num2 = bounds.Height / 2.0;
-            var point = bounds.Center();
-            start = start * 3.1415926535897931 / 180.0;
-            end = end * 3.1415926535897931 / 180.0;
-            var num3 = 0.17453292519943295;
-            var num4 = (int) Math.Ceiling(Math.Abs(end - start) / num3);
-            num4 = Math.Max(2, num4);
-            var list = new List<Point>(num4);
-            var list2 = new List<Vector>(num4);
-            var lhs = new Point();
-            var item = new Point();
-            var vector = new Vector();
-            var vector2 = new Vector();
-            var vector3 = new Vector();
-            var vector4 = new Vector();
-            for (var i = 0; i < num4; i++)
-            {
-                var a = MathHelper.Lerp(start, end, i / (double) (num4 - 1));
-                var num10 = Math.Sin(a);
-                var num11 = Math.Cos(a);
-                lhs.X = point.X + num * num10;
-                lhs.Y = point.Y - num2 * num11;
-                vector.X = num * num11;
-                vector.Y = num2 * num10;
-                vector2.X = -num2 * num10;
-                vector2.Y = num * num11;
-                var d = num2 * num2 * num10 * num10 + num * num * num11 * num11;
-                var num6 = Math.Sqrt(d);
-                var num7 = 2.0 * num10 * num11 * (num2 * num2 - num * num);
-                vector3.X = -num2 * num11;
-                vector3.Y = -num * num10;
-                item.X = lhs.X + offset * vector2.X / num6;
-                item.Y = lhs.Y + offset * vector2.Y / num6;
-                vector4.X = vector.X + offset / num6 * (vector3.X - 0.5 * vector2.X / d * num7);
-                vector4.Y = vector.Y + offset / num6 * (vector3.Y - 0.5 * vector2.Y / d * num7);
-                list.Add(item);
-                list2.Add(-vector4.Normalized());
-            }
-
-            var list3 = new List<Point>(num4 * 3 + 1)
-            {
-                list[0]
-            };
-            for (var j = 1; j < num4; j++)
-            {
-                lhs = list[j - 1];
-                item = list[j];
-                var num13 = GeometryHelper.Distance(lhs, item) / 3.0;
-                list3.Add(lhs + list2[j - 1] * num13);
-                list3.Add(item - list2[j] * num13);
-                list3.Add(item);
-            }
-
-            return list3;
-        }
-
-        private static void DecreaseDuplicatedIndex(IList<double> values, ref int index)
-        {
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            while (index > 0 && values[index] == values[index - 1]) index--;
-        }
-
-        internal static double EnsureFirstQuadrant(double angle)
-        {
-            angle = Math.Abs(angle % 180.0);
-            if (angle <= 90.0) return angle;
-            return 180.0 - angle;
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static Size GetArcSize(Rect bound)
-        {
-            return new(bound.Width / 2.0, bound.Height / 2.0);
-        }
-
-        private static void IncreaseDuplicatedIndex(IList<double> values, ref int index)
-        {
-            // ReSharper disable once CompareOfFloatsByEqualityOperator
-            while (index < values.Count - 1 && values[index] == values[index + 1]) index++;
-        }
-
-        internal static double InnerCurveSelfIntersect(double radiusX, double radiusY, double thickness)
-        {
-            var angleA = 0.0;
-            var angleB = 1.5707963267948966;
-            var flag = radiusX <= radiusY;
-            var vector = new Vector();
-            while (!AreCloseEnough(angleA, angleB))
-            {
-                var d = (angleA + angleB) / 2.0;
-                var num4 = Math.Cos(d);
-                var num5 = Math.Sin(d);
-                vector.X = radiusY * num5;
-                vector.Y = radiusX * num4;
-                vector.Normalize();
-                if (flag)
-                {
-                    var num6 = radiusX * num5 - vector.X * thickness;
-                    if (num6 > 0.0)
-                        angleB = d;
-                    else if (num6 < 0.0) angleA = d;
-                }
-                else
-                {
-                    var num7 = radiusY * num4 - vector.Y * thickness;
-                    if (num7 < 0.0)
-                        angleB = d;
-                    else if (num7 > 0.0) angleA = d;
-                }
-            }
-
-            var num8 = (angleA + angleB) / 2.0;
-            if (AreCloseEnough(num8, 0.0)) return 0.0;
-            if (!AreCloseEnough(num8, 1.5707963267948966)) return num8 * 180.0 / 3.1415926535897931;
-            return 90.0;
-        }
-
-        private static double NormalizeAngle(double degree)
-        {
-            if (degree < 0.0 || degree > 360.0)
-            {
-                degree = degree % 360.0;
-                if (degree < 0.0) degree += 360.0;
-            }
-
-            return degree;
-        }
-
-        private void NormalizeThickness(IArcGeometrySourceParameters parameters)
-        {
-            var num = LogicalBounds.Width / 2.0;
-            var num2 = LogicalBounds.Height / 2.0;
-            var rhs = Math.Min(num, num2);
-            var arcThickness = parameters.ArcThickness;
-            if (parameters.ArcThicknessUnit == UnitType.Pixel)
-                arcThickness = MathHelper.SafeDivide(arcThickness, rhs, 0.0);
-            _relativeThickness = MathHelper.EnsureRange(arcThickness, 0.0, 1.0);
-            _absoluteThickness = rhs * _relativeThickness;
-        }
-
-        private bool SyncPieceWiseInnerCurves(PathFigure figure, int index, ref Point firstPoint,
-            params double[] angles)
-        {
-            var flag = false;
-            var length = angles.Length;
-            var logicalBounds = LogicalBounds;
-            var absoluteThickness = _absoluteThickness;
-            flag |= figure.Segments.EnsureListCount(index + length / 2, () => new PolyBezierSegment());
-            for (var i = 0; i < length / 2; i++)
-            {
-                var points = ComputeOneInnerCurve(angles[i * 2], angles[i * 2 + 1], logicalBounds,
-                    absoluteThickness);
-                if (i == 0) firstPoint = points[0];
-                flag |= PathSegmentHelper.SyncPolyBezierSegment(figure.Segments, index + i, points, 1,
-                    points.Count - 1);
-            }
-
-            return flag;
-        }
-
-        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
-        [SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator")]
-        protected override bool UpdateCachedGeometry(IArcGeometrySourceParameters parameters)
-        {
-            var flag = false;
-            NormalizeThickness(parameters);
-            var relativeMode = parameters.ArcThicknessUnit == UnitType.Percent;
-            var flag3 = MathHelper.AreClose(parameters.StartAngle, parameters.EndAngle);
-            var angle = NormalizeAngle(parameters.StartAngle);
-            var end = NormalizeAngle(parameters.EndAngle);
-            if (end < angle) end += 360.0;
-            var isFilled = _relativeThickness == 1.0;
-            var flag5 = _relativeThickness == 0.0;
-            if (flag3) return flag | UpdateZeroAngleGeometry(relativeMode, angle);
-            if (MathHelper.IsVerySmall((end - angle) % 360.0))
-            {
-                if (flag5 || isFilled) return flag | UpdateEllipseGeometry(isFilled);
-                return flag | UpdateFullRingGeometry(relativeMode);
-            }
-
-            if (isFilled) return flag | UpdatePieGeometry(angle, end);
-            if (flag5) return flag | UpdateOpenArcGeometry(angle, end);
-            return flag | UpdateRingArcGeometry(relativeMode, angle, end);
-        }
-
-        private bool UpdateEllipseGeometry(bool isFilled)
-        {
-            var flag = false;
-            var y = MathHelper.Lerp(LogicalBounds.Top, LogicalBounds.Bottom, 0.5);
-            var point = new Point(LogicalBounds.Left, y);
-            var point2 = new Point(LogicalBounds.Right, y);
-            flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
-                () => new PathGeometry());
-            flag |= geometry.Figures.EnsureListCount(1, () => new PathFigure());
-            var dependencyObject = geometry.Figures[0];
-            flag |= dependencyObject.SetIfDifferent(PathFigure.IsClosedProperty, true);
-            flag |= dependencyObject.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
-            flag |= dependencyObject.Segments.EnsureListCount(2, () => new ArcSegment());
-            flag |= dependencyObject.SetIfDifferent(PathFigure.StartPointProperty, point);
-            flag |= GeometryHelper.EnsureSegmentType(out var segment, dependencyObject.Segments, 0,
-                () => new ArcSegment());
-            flag |= GeometryHelper.EnsureSegmentType(out var segment2, dependencyObject.Segments, 1,
-                () => new ArcSegment());
-            var size = new Size(LogicalBounds.Width / 2.0, LogicalBounds.Height / 2.0);
-            flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
-            flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty, point2);
-            flag |= segment2.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
-            flag |= segment2.SetIfDifferent(ArcSegment.SizeProperty, size);
-            flag |= segment2.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
-            return flag | segment2.SetIfDifferent(ArcSegment.PointProperty, point);
-        }
-
-        private bool UpdateFullRingGeometry(bool relativeMode)
-        {
-            var flag = false;
-            flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
-                () => new PathGeometry());
-            flag |= geometry.SetIfDifferent(PathGeometry.FillRuleProperty, FillRule.EvenOdd);
-            flag |= geometry.Figures.EnsureListCount(2, () => new PathFigure());
-            flag |= PathFigureHelper.SyncEllipseFigure(geometry.Figures[0], LogicalBounds,
-                SweepDirection.Clockwise);
-            var logicalBounds = LogicalBounds;
-            var num = logicalBounds.Width / 2.0;
-            var num2 = logicalBounds.Height / 2.0;
-            if (relativeMode || MathHelper.AreClose(num, num2))
-            {
-                var bounds = LogicalBounds.Resize(1.0 - _relativeThickness);
-                return flag | PathFigureHelper.SyncEllipseFigure(geometry.Figures[1], bounds,
-                           SweepDirection.Counterclockwise);
-            }
-
-            flag |= geometry.Figures[1].SetIfDifferent(PathFigure.IsClosedProperty, true);
-            flag |= geometry.Figures[1].SetIfDifferent(PathFigure.IsFilledProperty, true);
-            var firstPoint = new Point();
-            var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
-            var angles = ComputeAngleRanges(num, num2, intersect, 360.0, 0.0);
-            flag |= SyncPieceWiseInnerCurves(geometry.Figures[1], 0, ref firstPoint, angles);
-            return flag | geometry.Figures[1].SetIfDifferent(PathFigure.StartPointProperty, firstPoint);
-        }
-
-        private bool UpdateOpenArcGeometry(double start, double end)
-        {
-            PathFigure figure;
-            ArcSegment segment;
-            var flag = false;
-            var cachedGeometry = CachedGeometry as PathGeometry;
-            if (cachedGeometry == null || cachedGeometry.Figures.Count != 1 ||
-                (figure = cachedGeometry.Figures[0]).Segments.Count != 1 ||
-                (segment = figure.Segments[0] as ArcSegment) == null)
-            {
-                figure = new PathFigure();
-                CachedGeometry = new PathGeometry
-                {
-                    Figures = { figure }
-                };
-                figure.Segments.Add(segment = new ArcSegment());
-                figure.IsClosed = false;
-                segment.SweepDirection = SweepDirection.Clockwise;
-                flag = true;
-            }
-
-            flag |= figure.SetIfDifferent(PathFigure.StartPointProperty,
-                GeometryHelper.GetArcPoint(start, LogicalBounds));
-            flag |= figure.SetIfDifferent(PathFigure.IsFilledProperty, false);
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
-                GeometryHelper.GetArcPoint(end, LogicalBounds));
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(LogicalBounds));
-            return flag | segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
-        }
-
-        private bool UpdatePieGeometry(double start, double end)
-        {
-            PathFigure figure;
-            ArcSegment segment;
-            LineSegment segment2;
-            var flag = false;
-            var cachedGeometry = CachedGeometry as PathGeometry;
-            if (cachedGeometry == null || cachedGeometry.Figures.Count != 1 ||
-                (figure = cachedGeometry.Figures[0]).Segments.Count != 2 ||
-                (segment = figure.Segments[0] as ArcSegment) == null ||
-                (segment2 = figure.Segments[1] as LineSegment) == null)
-            {
-                figure = new PathFigure();
-                CachedGeometry = new PathGeometry
-                {
-                    Figures = { figure }
-                };
-                figure.Segments.Add(segment = new ArcSegment());
-                figure.Segments.Add(segment2 = new LineSegment());
-                figure.IsClosed = true;
-                segment.SweepDirection = SweepDirection.Clockwise;
-                flag = true;
-            }
-
-            flag |= figure.SetIfDifferent(PathFigure.StartPointProperty,
-                GeometryHelper.GetArcPoint(start, LogicalBounds));
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
-                GeometryHelper.GetArcPoint(end, LogicalBounds));
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(LogicalBounds));
-            flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
-            return flag | segment2.SetIfDifferent(LineSegment.PointProperty, LogicalBounds.Center());
-        }
-
-        private bool UpdateRingArcGeometry(bool relativeMode, double start, double end)
-        {
-            var flag = false;
-            flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
-                () => new PathGeometry());
-            flag |= geometry.SetIfDifferent(PathGeometry.FillRuleProperty, FillRule.Nonzero);
-            flag |= geometry.Figures.EnsureListCount(1, () => new PathFigure());
-            var dependencyObject = geometry.Figures[0];
-            flag |= dependencyObject.SetIfDifferent(PathFigure.IsClosedProperty, true);
-            flag |= dependencyObject.SetIfDifferent(PathFigure.IsFilledProperty, true);
-            flag |= dependencyObject.SetIfDifferent(PathFigure.StartPointProperty,
-                GeometryHelper.GetArcPoint(start, LogicalBounds));
-            flag |= dependencyObject.Segments.EnsureListCountAtLeast(3, () => new ArcSegment());
-            flag |= GeometryHelper.EnsureSegmentType(out var segment, dependencyObject.Segments, 0,
-                () => new ArcSegment());
-            flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
-                GeometryHelper.GetArcPoint(end, LogicalBounds));
-            flag |= segment.SetIfDifferent(ArcSegment.SizeProperty,
-                new Size(LogicalBounds.Width / 2.0, LogicalBounds.Height / 2.0));
-            flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
-            flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
-            flag |= GeometryHelper.EnsureSegmentType(out var segment2, dependencyObject.Segments, 1,
-                () => new LineSegment());
-            var logicalBounds = LogicalBounds;
-            var num = logicalBounds.Width / 2.0;
-            var num2 = logicalBounds.Height / 2.0;
-            if (relativeMode || MathHelper.AreClose(num, num2))
-            {
-                var bound = LogicalBounds.Resize(1.0 - _relativeThickness);
-                flag |= segment2.SetIfDifferent(LineSegment.PointProperty,
-                    GeometryHelper.GetArcPoint(end, bound));
-                flag |= dependencyObject.Segments.EnsureListCount(3, () => new ArcSegment());
-                flag |= GeometryHelper.EnsureSegmentType(out var segment3, dependencyObject.Segments, 2,
-                    () => new ArcSegment());
-                flag |= segment3.SetIfDifferent(ArcSegment.PointProperty,
-                    GeometryHelper.GetArcPoint(start, bound));
-                flag |= segment3.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(bound));
-                flag |= segment3.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
-                return flag | segment3.SetIfDifferent(ArcSegment.SweepDirectionProperty,
-                           SweepDirection.Counterclockwise);
-            }
-
-            var firstPoint = new Point();
-            var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
-            var angles = ComputeAngleRanges(num, num2, intersect, end, start);
-            flag |= SyncPieceWiseInnerCurves(dependencyObject, 2, ref firstPoint, angles);
-            return flag | segment2.SetIfDifferent(LineSegment.PointProperty, firstPoint);
-        }
-
-        private bool UpdateZeroAngleGeometry(bool relativeMode, double angle)
-        {
-            Point point2;
-            var flag = false;
-            var arcPoint = GeometryHelper.GetArcPoint(angle, LogicalBounds);
-            var logicalBounds = LogicalBounds;
-            var num = logicalBounds.Width / 2.0;
-            var num2 = logicalBounds.Height / 2.0;
-            if (relativeMode || MathHelper.AreClose(num, num2))
-            {
-                var bound = LogicalBounds.Resize(1.0 - _relativeThickness);
-                point2 = GeometryHelper.GetArcPoint(angle, bound);
-            }
-            else
-            {
-                var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
-                var numArray = ComputeAngleRanges(num, num2, intersect, angle, angle);
-                var a = numArray[0] * 3.1415926535897931 / 180.0;
-                var vector = new Vector(num2 * Math.Sin(a), -num * Math.Cos(a));
-                point2 = GeometryHelper.GetArcPoint(numArray[0], LogicalBounds) -
-                         vector.Normalized() * _absoluteThickness;
-            }
-
-            flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
-                () => new LineGeometry());
-            flag |= geometry.SetIfDifferent(LineGeometry.StartPointProperty, arcPoint);
-            return flag | geometry.SetIfDifferent(LineGeometry.EndPointProperty, point2);
-        }
+        return Math.Abs(angleA - angleB) < 0.001;
     }
-}
+
+    internal static double[] ComputeAngleRanges(double radiusX, double radiusY, double intersect,
+        double start, double end)
+    {
+        var values = new List<double>
+        {
+            start,
+            end,
+            intersect,
+            180.0 - intersect,
+            180.0 + intersect,
+            360.0 - intersect,
+            360.0 + intersect,
+            540.0 - intersect,
+            540.0 + intersect,
+            720.0 - intersect
+        };
+        values.Sort();
+        var index = values.IndexOf(start);
+        var num2 = values.IndexOf(end);
+        if (num2 == index)
+        {
+            num2++;
+        }
+        else if (start < end)
+        {
+            IncreaseDuplicatedIndex(values, ref index);
+            DecreaseDuplicatedIndex(values, ref num2);
+        }
+        else if (start > end)
+        {
+            DecreaseDuplicatedIndex(values, ref index);
+            IncreaseDuplicatedIndex(values, ref num2);
+        }
+
+        var list = new List<double>();
+        if (index < num2)
+            for (var i = index; i <= num2; i++)
+                list.Add(values[i]);
+        else
+            for (var j = index; j >= num2; j--)
+                list.Add(values[j]);
+        var num5 = EnsureFirstQuadrant((list[0] + list[1]) / 2.0);
+        if (radiusX < radiusY && num5 < intersect || radiusX > radiusY && num5 > intersect)
+            list.RemoveAt(0);
+        if (list.Count % 2 == 1) list.RemoveLast();
+        if (list.Count == 0)
+        {
+            var num6 = Math.Min(index, num2) - 1;
+            if (num6 < 0) num6 = Math.Max(index, num2) + 1;
+            list.Add(values[num6]);
+            list.Add(values[num6]);
+        }
+
+        return list.ToArray();
+    }
+
+    protected override Rect ComputeLogicalBounds(Rect layoutBounds, IGeometrySourceParameters parameters)
+    {
+        return GeometryHelper.GetStretchBound(base.ComputeLogicalBounds(layoutBounds, parameters),
+            parameters.Stretch, new Size(1.0, 1.0));
+    }
+
+    private static IList<Point> ComputeOneInnerCurve(double start, double end, Rect bounds, double offset)
+    {
+        var num = bounds.Width / 2.0;
+        var num2 = bounds.Height / 2.0;
+        var point = bounds.Center();
+        start = start * 3.1415926535897931 / 180.0;
+        end = end * 3.1415926535897931 / 180.0;
+        var num3 = 0.17453292519943295;
+        var num4 = (int) Math.Ceiling(Math.Abs(end - start) / num3);
+        num4 = Math.Max(2, num4);
+        var list = new List<Point>(num4);
+        var list2 = new List<Vector>(num4);
+        var lhs = new Point();
+        var item = new Point();
+        var vector = new Vector();
+        var vector2 = new Vector();
+        var vector3 = new Vector();
+        var vector4 = new Vector();
+        for (var i = 0; i < num4; i++)
+        {
+            var a = MathHelper.Lerp(start, end, i / (double) (num4 - 1));
+            var num10 = Math.Sin(a);
+            var num11 = Math.Cos(a);
+            lhs.X = point.X + num * num10;
+            lhs.Y = point.Y - num2 * num11;
+            vector.X = num * num11;
+            vector.Y = num2 * num10;
+            vector2.X = -num2 * num10;
+            vector2.Y = num * num11;
+            var d = num2 * num2 * num10 * num10 + num * num * num11 * num11;
+            var num6 = Math.Sqrt(d);
+            var num7 = 2.0 * num10 * num11 * (num2 * num2 - num * num);
+            vector3.X = -num2 * num11;
+            vector3.Y = -num * num10;
+            item.X = lhs.X + offset * vector2.X / num6;
+            item.Y = lhs.Y + offset * vector2.Y / num6;
+            vector4.X = vector.X + offset / num6 * (vector3.X - 0.5 * vector2.X / d * num7);
+            vector4.Y = vector.Y + offset / num6 * (vector3.Y - 0.5 * vector2.Y / d * num7);
+            list.Add(item);
+            list2.Add(-vector4.Normalized());
+        }
+
+        var list3 = new List<Point>(num4 * 3 + 1)
+        {
+            list[0]
+        };
+        for (var j = 1; j < num4; j++)
+        {
+            lhs = list[j - 1];
+            item = list[j];
+            var num13 = GeometryHelper.Distance(lhs, item) / 3.0;
+            list3.Add(lhs + list2[j - 1] * num13);
+            list3.Add(item - list2[j] * num13);
+            list3.Add(item);
+        }
+
+        return list3;
+    }
+
+    private static void DecreaseDuplicatedIndex(IList<double> values, ref int index)
+    {
+        // ReSharper disable once CompareOfFloatsByEqualityOperator
+        while (index > 0 && values[index] == values[index - 1]) index--;
+    }
+
+    internal static double EnsureFirstQuadrant(double angle)
+    {
+        angle = Math.Abs(angle % 180.0);
+        if (angle <= 90.0) return angle;
+        return 180.0 - angle;
+    }
+
+    [MethodImpl(MethodImplOptions.NoInlining)]
+    private static Size GetArcSize(Rect bound)
+    {
+        return new(bound.Width / 2.0, bound.Height / 2.0);
+    }
+
+    private static void IncreaseDuplicatedIndex(IList<double> values, ref int index)
+    {
+        // ReSharper disable once CompareOfFloatsByEqualityOperator
+        while (index < values.Count - 1 && values[index] == values[index + 1]) index++;
+    }
+
+    internal static double InnerCurveSelfIntersect(double radiusX, double radiusY, double thickness)
+    {
+        var angleA = 0.0;
+        var angleB = 1.5707963267948966;
+        var flag = radiusX <= radiusY;
+        var vector = new Vector();
+        while (!AreCloseEnough(angleA, angleB))
+        {
+            var d = (angleA + angleB) / 2.0;
+            var num4 = Math.Cos(d);
+            var num5 = Math.Sin(d);
+            vector.X = radiusY * num5;
+            vector.Y = radiusX * num4;
+            vector.Normalize();
+            if (flag)
+            {
+                var num6 = radiusX * num5 - vector.X * thickness;
+                if (num6 > 0.0)
+                    angleB = d;
+                else if (num6 < 0.0) angleA = d;
+            }
+            else
+            {
+                var num7 = radiusY * num4 - vector.Y * thickness;
+                if (num7 < 0.0)
+                    angleB = d;
+                else if (num7 > 0.0) angleA = d;
+            }
+        }
+
+        var num8 = (angleA + angleB) / 2.0;
+        if (AreCloseEnough(num8, 0.0)) return 0.0;
+        if (!AreCloseEnough(num8, 1.5707963267948966)) return num8 * 180.0 / 3.1415926535897931;
+        return 90.0;
+    }
+
+    private static double NormalizeAngle(double degree)
+    {
+        if (degree < 0.0 || degree > 360.0)
+        {
+            degree = degree % 360.0;
+            if (degree < 0.0) degree += 360.0;
+        }
+
+        return degree;
+    }
+
+    private void NormalizeThickness(IArcGeometrySourceParameters parameters)
+    {
+        var num = LogicalBounds.Width / 2.0;
+        var num2 = LogicalBounds.Height / 2.0;
+        var rhs = Math.Min(num, num2);
+        var arcThickness = parameters.ArcThickness;
+        if (parameters.ArcThicknessUnit == UnitType.Pixel)
+            arcThickness = MathHelper.SafeDivide(arcThickness, rhs, 0.0);
+        _relativeThickness = MathHelper.EnsureRange(arcThickness, 0.0, 1.0);
+        _absoluteThickness = rhs * _relativeThickness;
+    }
+
+    private bool SyncPieceWiseInnerCurves(PathFigure figure, int index, ref Point firstPoint,
+        params double[] angles)
+    {
+        var flag = false;
+        var length = angles.Length;
+        var logicalBounds = LogicalBounds;
+        var absoluteThickness = _absoluteThickness;
+        flag |= figure.Segments.EnsureListCount(index + length / 2, () => new PolyBezierSegment());
+        for (var i = 0; i < length / 2; i++)
+        {
+            var points = ComputeOneInnerCurve(angles[i * 2], angles[i * 2 + 1], logicalBounds,
+                absoluteThickness);
+            if (i == 0) firstPoint = points[0];
+            flag |= PathSegmentHelper.SyncPolyBezierSegment(figure.Segments, index + i, points, 1,
+                points.Count - 1);
+        }
+
+        return flag;
+    }
+
+    [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
+    [SuppressMessage("ReSharper", "CompareOfFloatsByEqualityOperator")]
+    protected override bool UpdateCachedGeometry(IArcGeometrySourceParameters parameters)
+    {
+        var flag = false;
+        NormalizeThickness(parameters);
+        var relativeMode = parameters.ArcThicknessUnit == UnitType.Percent;
+        var flag3 = MathHelper.AreClose(parameters.StartAngle, parameters.EndAngle);
+        var angle = NormalizeAngle(parameters.StartAngle);
+        var end = NormalizeAngle(parameters.EndAngle);
+        if (end < angle) end += 360.0;
+        var isFilled = _relativeThickness == 1.0;
+        var flag5 = _relativeThickness == 0.0;
+        if (flag3) return flag | UpdateZeroAngleGeometry(relativeMode, angle);
+        if (MathHelper.IsVerySmall((end - angle) % 360.0))
+        {
+            if (flag5 || isFilled) return flag | UpdateEllipseGeometry(isFilled);
+            return flag | UpdateFullRingGeometry(relativeMode);
+        }
+
+        if (isFilled) return flag | UpdatePieGeometry(angle, end);
+        if (flag5) return flag | UpdateOpenArcGeometry(angle, end);
+        return flag | UpdateRingArcGeometry(relativeMode, angle, end);
+    }
+
+    private bool UpdateEllipseGeometry(bool isFilled)
+    {
+        var flag = false;
+        var y = MathHelper.Lerp(LogicalBounds.Top, LogicalBounds.Bottom, 0.5);
+        var point = new Point(LogicalBounds.Left, y);
+        var point2 = new Point(LogicalBounds.Right, y);
+        flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
+            () => new PathGeometry());
+        flag |= geometry.Figures.EnsureListCount(1, () => new PathFigure());
+        var dependencyObject = geometry.Figures[0];
+        flag |= dependencyObject.SetIfDifferent(PathFigure.IsClosedProperty, true);
+        flag |= dependencyObject.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
+        flag |= dependencyObject.Segments.EnsureListCount(2, () => new ArcSegment());
+        flag |= dependencyObject.SetIfDifferent(PathFigure.StartPointProperty, point);
+        flag |= GeometryHelper.EnsureSegmentType(out var segment, dependencyObject.Segments, 0,
+            () => new ArcSegment());
+        flag |= GeometryHelper.EnsureSegmentType(out var segment2, dependencyObject.Segments, 1,
+            () => new ArcSegment());
+        var size = new Size(LogicalBounds.Width / 2.0, LogicalBounds.Height / 2.0);
+        flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, size);
+        flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty, point2);
+        flag |= segment2.SetIfDifferent(ArcSegment.IsLargeArcProperty, false);
+        flag |= segment2.SetIfDifferent(ArcSegment.SizeProperty, size);
+        flag |= segment2.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
+        return flag | segment2.SetIfDifferent(ArcSegment.PointProperty, point);
+    }
+
+    private bool UpdateFullRingGeometry(bool relativeMode)
+    {
+        var flag = false;
+        flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
+            () => new PathGeometry());
+        flag |= geometry.SetIfDifferent(PathGeometry.FillRuleProperty, FillRule.EvenOdd);
+        flag |= geometry.Figures.EnsureListCount(2, () => new PathFigure());
+        flag |= PathFigureHelper.SyncEllipseFigure(geometry.Figures[0], LogicalBounds,
+            SweepDirection.Clockwise);
+        var logicalBounds = LogicalBounds;
+        var num = logicalBounds.Width / 2.0;
+        var num2 = logicalBounds.Height / 2.0;
+        if (relativeMode || MathHelper.AreClose(num, num2))
+        {
+            var bounds = LogicalBounds.Resize(1.0 - _relativeThickness);
+            return flag | PathFigureHelper.SyncEllipseFigure(geometry.Figures[1], bounds,
+                SweepDirection.Counterclockwise);
+        }
+
+        flag |= geometry.Figures[1].SetIfDifferent(PathFigure.IsClosedProperty, true);
+        flag |= geometry.Figures[1].SetIfDifferent(PathFigure.IsFilledProperty, true);
+        var firstPoint = new Point();
+        var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
+        var angles = ComputeAngleRanges(num, num2, intersect, 360.0, 0.0);
+        flag |= SyncPieceWiseInnerCurves(geometry.Figures[1], 0, ref firstPoint, angles);
+        return flag | geometry.Figures[1].SetIfDifferent(PathFigure.StartPointProperty, firstPoint);
+    }
+
+    private bool UpdateOpenArcGeometry(double start, double end)
+    {
+        PathFigure figure;
+        ArcSegment segment;
+        var flag = false;
+        var cachedGeometry = CachedGeometry as PathGeometry;
+        if (cachedGeometry == null || cachedGeometry.Figures.Count != 1 ||
+            (figure = cachedGeometry.Figures[0]).Segments.Count != 1 ||
+            (segment = figure.Segments[0] as ArcSegment) == null)
+        {
+            figure = new PathFigure();
+            CachedGeometry = new PathGeometry
+            {
+                Figures = { figure }
+            };
+            figure.Segments.Add(segment = new ArcSegment());
+            figure.IsClosed = false;
+            segment.SweepDirection = SweepDirection.Clockwise;
+            flag = true;
+        }
+
+        flag |= figure.SetIfDifferent(PathFigure.StartPointProperty,
+            GeometryHelper.GetArcPoint(start, LogicalBounds));
+        flag |= figure.SetIfDifferent(PathFigure.IsFilledProperty, false);
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
+            GeometryHelper.GetArcPoint(end, LogicalBounds));
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(LogicalBounds));
+        return flag | segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
+    }
+
+    private bool UpdatePieGeometry(double start, double end)
+    {
+        PathFigure figure;
+        ArcSegment segment;
+        LineSegment segment2;
+        var flag = false;
+        var cachedGeometry = CachedGeometry as PathGeometry;
+        if (cachedGeometry == null || cachedGeometry.Figures.Count != 1 ||
+            (figure = cachedGeometry.Figures[0]).Segments.Count != 2 ||
+            (segment = figure.Segments[0] as ArcSegment) == null ||
+            (segment2 = figure.Segments[1] as LineSegment) == null)
+        {
+            figure = new PathFigure();
+            CachedGeometry = new PathGeometry
+            {
+                Figures = { figure }
+            };
+            figure.Segments.Add(segment = new ArcSegment());
+            figure.Segments.Add(segment2 = new LineSegment());
+            figure.IsClosed = true;
+            segment.SweepDirection = SweepDirection.Clockwise;
+            flag = true;
+        }
+
+        flag |= figure.SetIfDifferent(PathFigure.StartPointProperty,
+            GeometryHelper.GetArcPoint(start, LogicalBounds));
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
+            GeometryHelper.GetArcPoint(end, LogicalBounds));
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(LogicalBounds));
+        flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
+        return flag | segment2.SetIfDifferent(LineSegment.PointProperty, LogicalBounds.Center());
+    }
+
+    private bool UpdateRingArcGeometry(bool relativeMode, double start, double end)
+    {
+        var flag = false;
+        flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
+            () => new PathGeometry());
+        flag |= geometry.SetIfDifferent(PathGeometry.FillRuleProperty, FillRule.Nonzero);
+        flag |= geometry.Figures.EnsureListCount(1, () => new PathFigure());
+        var dependencyObject = geometry.Figures[0];
+        flag |= dependencyObject.SetIfDifferent(PathFigure.IsClosedProperty, true);
+        flag |= dependencyObject.SetIfDifferent(PathFigure.IsFilledProperty, true);
+        flag |= dependencyObject.SetIfDifferent(PathFigure.StartPointProperty,
+            GeometryHelper.GetArcPoint(start, LogicalBounds));
+        flag |= dependencyObject.Segments.EnsureListCountAtLeast(3, () => new ArcSegment());
+        flag |= GeometryHelper.EnsureSegmentType(out var segment, dependencyObject.Segments, 0,
+            () => new ArcSegment());
+        flag |= segment.SetIfDifferent(ArcSegment.PointProperty,
+            GeometryHelper.GetArcPoint(end, LogicalBounds));
+        flag |= segment.SetIfDifferent(ArcSegment.SizeProperty,
+            new Size(LogicalBounds.Width / 2.0, LogicalBounds.Height / 2.0));
+        flag |= segment.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
+        flag |= segment.SetIfDifferent(ArcSegment.SweepDirectionProperty, SweepDirection.Clockwise);
+        flag |= GeometryHelper.EnsureSegmentType(out var segment2, dependencyObject.Segments, 1,
+            () => new LineSegment());
+        var logicalBounds = LogicalBounds;
+        var num = logicalBounds.Width / 2.0;
+        var num2 = logicalBounds.Height / 2.0;
+        if (relativeMode || MathHelper.AreClose(num, num2))
+        {
+            var bound = LogicalBounds.Resize(1.0 - _relativeThickness);
+            flag |= segment2.SetIfDifferent(LineSegment.PointProperty,
+                GeometryHelper.GetArcPoint(end, bound));
+            flag |= dependencyObject.Segments.EnsureListCount(3, () => new ArcSegment());
+            flag |= GeometryHelper.EnsureSegmentType(out var segment3, dependencyObject.Segments, 2,
+                () => new ArcSegment());
+            flag |= segment3.SetIfDifferent(ArcSegment.PointProperty,
+                GeometryHelper.GetArcPoint(start, bound));
+            flag |= segment3.SetIfDifferent(ArcSegment.SizeProperty, GetArcSize(bound));
+            flag |= segment3.SetIfDifferent(ArcSegment.IsLargeArcProperty, end - start > 180.0);
+            return flag | segment3.SetIfDifferent(ArcSegment.SweepDirectionProperty,
+                SweepDirection.Counterclockwise);
+        }
+
+        var firstPoint = new Point();
+        var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
+        var angles = ComputeAngleRanges(num, num2, intersect, end, start);
+        flag |= SyncPieceWiseInnerCurves(dependencyObject, 2, ref firstPoint, angles);
+        return flag | segment2.SetIfDifferent(LineSegment.PointProperty, firstPoint);
+    }
+
+    private bool UpdateZeroAngleGeometry(bool relativeMode, double angle)
+    {
+        Point point2;
+        var flag = false;
+        var arcPoint = GeometryHelper.GetArcPoint(angle, LogicalBounds);
+        var logicalBounds = LogicalBounds;
+        var num = logicalBounds.Width / 2.0;
+        var num2 = logicalBounds.Height / 2.0;
+        if (relativeMode || MathHelper.AreClose(num, num2))
+        {
+            var bound = LogicalBounds.Resize(1.0 - _relativeThickness);
+            point2 = GeometryHelper.GetArcPoint(angle, bound);
+        }
+        else
+        {
+            var intersect = InnerCurveSelfIntersect(num, num2, _absoluteThickness);
+            var numArray = ComputeAngleRanges(num, num2, intersect, angle, angle);
+            var a = numArray[0] * 3.1415926535897931 / 180.0;
+            var vector = new Vector(num2 * Math.Sin(a), -num * Math.Cos(a));
+            point2 = GeometryHelper.GetArcPoint(numArray[0], LogicalBounds) -
+                     vector.Normalized() * _absoluteThickness;
+        }
+
+        flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
+            () => new LineGeometry());
+        flag |= geometry.SetIfDifferent(LineGeometry.StartPointProperty, arcPoint);
+        return flag | geometry.SetIfDifferent(LineGeometry.EndPointProperty, point2);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs
index deb73eb9..a87c68c0 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace HandyControl.Expression.Media
-{
-    internal class DrawingPropertyChangedEventArgs : EventArgs
-    {
-        public bool IsAnimated { get; set; }
+namespace HandyControl.Expression.Media;
 
-        public DrawingPropertyMetadata Metadata { get; set; }
-    }
-}
+internal class DrawingPropertyChangedEventArgs : EventArgs
+{
+    public bool IsAnimated { get; set; }
+
+    public DrawingPropertyMetadata Metadata { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs
index 2c5e4284..6c090281 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs
@@ -1,77 +1,76 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+internal class DrawingPropertyMetadata : FrameworkPropertyMetadata
 {
-    internal class DrawingPropertyMetadata : FrameworkPropertyMetadata
-    {
 #pragma warning disable 414
-        private DrawingPropertyMetadataOptions options;
+    private DrawingPropertyMetadataOptions options;
 #pragma warning restore 414
 
-        private PropertyChangedCallback propertyChangedCallback;
+    private PropertyChangedCallback propertyChangedCallback;
 
-        public static event EventHandler<DrawingPropertyChangedEventArgs> DrawingPropertyChanged;
+    public static event EventHandler<DrawingPropertyChangedEventArgs> DrawingPropertyChanged;
 
-        static DrawingPropertyMetadata()
+    static DrawingPropertyMetadata()
+    {
+        DrawingPropertyChanged += delegate (object sender, DrawingPropertyChangedEventArgs args)
         {
-            DrawingPropertyChanged += delegate (object sender, DrawingPropertyChangedEventArgs args)
+            if ((sender is IShape shape) && args.Metadata.AffectsRender)
             {
-                if ((sender is IShape shape) && args.Metadata.AffectsRender)
+                InvalidateGeometryReasons reasons = InvalidateGeometryReasons.PropertyChanged;
+                if (args.IsAnimated)
                 {
-                    InvalidateGeometryReasons reasons = InvalidateGeometryReasons.PropertyChanged;
-                    if (args.IsAnimated)
-                    {
-                        reasons |= InvalidateGeometryReasons.IsAnimated;
-                    }
-                    shape.InvalidateGeometry(reasons);
+                    reasons |= InvalidateGeometryReasons.IsAnimated;
                 }
-            };
-        }
-
-        public DrawingPropertyMetadata(object defaultValue) : this(defaultValue, DrawingPropertyMetadataOptions.None, null)
-        {
-        }
-
-        public DrawingPropertyMetadata(PropertyChangedCallback propertyChangedCallback) : this(DependencyProperty.UnsetValue, DrawingPropertyMetadataOptions.None, propertyChangedCallback)
-        {
-        }
-
-        private DrawingPropertyMetadata(DrawingPropertyMetadataOptions options, object defaultValue) : base(defaultValue, (FrameworkPropertyMetadataOptions) options)
-        {
-        }
-
-        public DrawingPropertyMetadata(object defaultValue, DrawingPropertyMetadataOptions options) : this(defaultValue, options, null)
-        {
-        }
-
-        public DrawingPropertyMetadata(object defaultValue, DrawingPropertyMetadataOptions options, PropertyChangedCallback propertyChangedCallback) : base(defaultValue, (FrameworkPropertyMetadataOptions) options, AttachCallback(defaultValue, options, propertyChangedCallback))
-        {
-        }
-
-        private static PropertyChangedCallback AttachCallback(object defaultValue, DrawingPropertyMetadataOptions options, PropertyChangedCallback propertyChangedCallback)
-        {
-            DrawingPropertyMetadata metadata = new DrawingPropertyMetadata(options, defaultValue)
-            {
-                options = options,
-                propertyChangedCallback = propertyChangedCallback
-            };
-            return metadata.InternalCallback;
-        }
-
-        private void InternalCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (DrawingPropertyChanged != null)
-            {
-                DrawingPropertyChangedEventArgs args = new DrawingPropertyChangedEventArgs
-                {
-                    Metadata = this,
-                    IsAnimated = DependencyPropertyHelper.GetValueSource(sender, e.Property).IsAnimated
-                };
-                DrawingPropertyChanged(sender, args);
+                shape.InvalidateGeometry(reasons);
             }
-
-            propertyChangedCallback?.Invoke(sender, e);
-        }
+        };
     }
-}
+
+    public DrawingPropertyMetadata(object defaultValue) : this(defaultValue, DrawingPropertyMetadataOptions.None, null)
+    {
+    }
+
+    public DrawingPropertyMetadata(PropertyChangedCallback propertyChangedCallback) : this(DependencyProperty.UnsetValue, DrawingPropertyMetadataOptions.None, propertyChangedCallback)
+    {
+    }
+
+    private DrawingPropertyMetadata(DrawingPropertyMetadataOptions options, object defaultValue) : base(defaultValue, (FrameworkPropertyMetadataOptions) options)
+    {
+    }
+
+    public DrawingPropertyMetadata(object defaultValue, DrawingPropertyMetadataOptions options) : this(defaultValue, options, null)
+    {
+    }
+
+    public DrawingPropertyMetadata(object defaultValue, DrawingPropertyMetadataOptions options, PropertyChangedCallback propertyChangedCallback) : base(defaultValue, (FrameworkPropertyMetadataOptions) options, AttachCallback(defaultValue, options, propertyChangedCallback))
+    {
+    }
+
+    private static PropertyChangedCallback AttachCallback(object defaultValue, DrawingPropertyMetadataOptions options, PropertyChangedCallback propertyChangedCallback)
+    {
+        DrawingPropertyMetadata metadata = new DrawingPropertyMetadata(options, defaultValue)
+        {
+            options = options,
+            propertyChangedCallback = propertyChangedCallback
+        };
+        return metadata.InternalCallback;
+    }
+
+    private void InternalCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+    {
+        if (DrawingPropertyChanged != null)
+        {
+            DrawingPropertyChangedEventArgs args = new DrawingPropertyChangedEventArgs
+            {
+                Metadata = this,
+                IsAnimated = DependencyPropertyHelper.GetValueSource(sender, e.Property).IsAnimated
+            };
+            DrawingPropertyChanged(sender, args);
+        }
+
+        propertyChangedCallback?.Invoke(sender, e);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs
index 3eb487d9..bb6bd8e0 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+[Flags]
+internal enum DrawingPropertyMetadataOptions
 {
-    [Flags]
-    internal enum DrawingPropertyMetadataOptions
-    {
-        AffectsMeasure = 1,
-        AffectsRender = 0x10,
-        None = 0
-    }
-}
+    AffectsMeasure = 1,
+    AffectsRender = 0x10,
+    None = 0
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs
index cf26c163..1ef6ea24 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs
@@ -4,169 +4,168 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Threading;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+[TypeConverter(typeof(GeometryEffectConverter))]
+public abstract class GeometryEffect : Freezable
 {
-    [TypeConverter(typeof(GeometryEffectConverter))]
-    public abstract class GeometryEffect : Freezable
+    // ReSharper disable once InconsistentNaming
+    private static GeometryEffect defaultGeometryEffect;
+
+    public static readonly DependencyProperty GeometryEffectProperty =
+        DependencyProperty.RegisterAttached("GeometryEffect", typeof(GeometryEffect),
+            typeof(GeometryEffect),
+            new DrawingPropertyMetadata(DefaultGeometryEffect,
+                DrawingPropertyMetadataOptions.AffectsRender, OnGeometryEffectChanged));
+
+    protected Geometry CachedGeometry;
+
+    private bool _effectInvalidated;
+
+    static GeometryEffect()
     {
-        // ReSharper disable once InconsistentNaming
-        private static GeometryEffect defaultGeometryEffect;
-
-        public static readonly DependencyProperty GeometryEffectProperty =
-            DependencyProperty.RegisterAttached("GeometryEffect", typeof(GeometryEffect),
-                typeof(GeometryEffect),
-                new DrawingPropertyMetadata(DefaultGeometryEffect,
-                    DrawingPropertyMetadataOptions.AffectsRender, OnGeometryEffectChanged));
-
-        protected Geometry CachedGeometry;
-
-        private bool _effectInvalidated;
-
-        static GeometryEffect()
-        {
-            DrawingPropertyMetadata.DrawingPropertyChanged +=
-                delegate (object sender, DrawingPropertyChangedEventArgs args)
-                {
-                    if (sender is GeometryEffect effect && args.Metadata.AffectsRender)
-                        effect.InvalidateGeometry(InvalidateGeometryReasons.PropertyChanged);
-                };
-        }
-
-        public static GeometryEffect DefaultGeometryEffect =>
-            defaultGeometryEffect ?? (defaultGeometryEffect = new NoGeometryEffect());
-
-        public Geometry OutputGeometry =>
-            CachedGeometry;
-
-        protected internal DependencyObject Parent { get; private set; }
-
-        protected internal virtual void Attach(DependencyObject obj)
-        {
-            if (Parent != null) Detach();
-            _effectInvalidated = true;
-            CachedGeometry = null;
-            if (InvalidateParent(obj)) Parent = obj;
-        }
-
-        public new GeometryEffect CloneCurrentValue()
-        {
-            return (GeometryEffect) base.CloneCurrentValue();
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return (Freezable) Activator.CreateInstance(GetType());
-        }
-
-        protected abstract GeometryEffect DeepCopy();
-
-        protected internal virtual void Detach()
-        {
-            _effectInvalidated = true;
-            CachedGeometry = null;
-            if (Parent != null)
+        DrawingPropertyMetadata.DrawingPropertyChanged +=
+            delegate (object sender, DrawingPropertyChangedEventArgs args)
             {
-                InvalidateParent(Parent);
-                Parent = null;
-            }
-        }
+                if (sender is GeometryEffect effect && args.Metadata.AffectsRender)
+                    effect.InvalidateGeometry(InvalidateGeometryReasons.PropertyChanged);
+            };
+    }
 
-        public abstract bool Equals(GeometryEffect geometryEffect);
+    public static GeometryEffect DefaultGeometryEffect =>
+        defaultGeometryEffect ?? (defaultGeometryEffect = new NoGeometryEffect());
 
-        public static GeometryEffect GetGeometryEffect(DependencyObject obj)
+    public Geometry OutputGeometry =>
+        CachedGeometry;
+
+    protected internal DependencyObject Parent { get; private set; }
+
+    protected internal virtual void Attach(DependencyObject obj)
+    {
+        if (Parent != null) Detach();
+        _effectInvalidated = true;
+        CachedGeometry = null;
+        if (InvalidateParent(obj)) Parent = obj;
+    }
+
+    public new GeometryEffect CloneCurrentValue()
+    {
+        return (GeometryEffect) base.CloneCurrentValue();
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return (Freezable) Activator.CreateInstance(GetType());
+    }
+
+    protected abstract GeometryEffect DeepCopy();
+
+    protected internal virtual void Detach()
+    {
+        _effectInvalidated = true;
+        CachedGeometry = null;
+        if (Parent != null)
         {
-            return (GeometryEffect) obj.GetValue(GeometryEffectProperty);
+            InvalidateParent(Parent);
+            Parent = null;
         }
+    }
 
-        public bool InvalidateGeometry(InvalidateGeometryReasons reasons)
+    public abstract bool Equals(GeometryEffect geometryEffect);
+
+    public static GeometryEffect GetGeometryEffect(DependencyObject obj)
+    {
+        return (GeometryEffect) obj.GetValue(GeometryEffectProperty);
+    }
+
+    public bool InvalidateGeometry(InvalidateGeometryReasons reasons)
+    {
+        if (_effectInvalidated) return false;
+        _effectInvalidated = true;
+        if (reasons != InvalidateGeometryReasons.ParentInvalidated) InvalidateParent(Parent);
+        return true;
+    }
+
+    private static bool InvalidateParent(DependencyObject parent)
+    {
+        if (parent is IShape shape)
         {
-            if (_effectInvalidated) return false;
-            _effectInvalidated = true;
-            if (reasons != InvalidateGeometryReasons.ParentInvalidated) InvalidateParent(Parent);
+            shape.InvalidateGeometry(InvalidateGeometryReasons.ChildInvalidated);
             return true;
         }
 
-        private static bool InvalidateParent(DependencyObject parent)
+        if (parent is GeometryEffect effect)
         {
-            if (parent is IShape shape)
-            {
-                shape.InvalidateGeometry(InvalidateGeometryReasons.ChildInvalidated);
-                return true;
-            }
-
-            if (parent is GeometryEffect effect)
-            {
-                effect.InvalidateGeometry(InvalidateGeometryReasons.ChildInvalidated);
-                return true;
-            }
-
-            return false;
+            effect.InvalidateGeometry(InvalidateGeometryReasons.ChildInvalidated);
+            return true;
         }
 
-        private static void OnGeometryEffectChanged(DependencyObject obj,
-            DependencyPropertyChangedEventArgs e)
+        return false;
+    }
+
+    private static void OnGeometryEffectChanged(DependencyObject obj,
+        DependencyPropertyChangedEventArgs e)
+    {
+        var oldValue = e.OldValue as GeometryEffect;
+        var newValue = e.NewValue as GeometryEffect;
+        if (!Equals(oldValue, newValue))
         {
-            var oldValue = e.OldValue as GeometryEffect;
-            var newValue = e.NewValue as GeometryEffect;
-            if (!Equals(oldValue, newValue))
+            if (oldValue != null && obj.Equals(oldValue.Parent)) oldValue.Detach();
+            if (newValue != null)
             {
-                if (oldValue != null && obj.Equals(oldValue.Parent)) oldValue.Detach();
-                if (newValue != null)
+                if (newValue.Parent != null)
                 {
-                    if (newValue.Parent != null)
+                    obj.Dispatcher.BeginInvoke(new Action(() =>
                     {
-                        obj.Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            var effect = newValue.CloneCurrentValue();
-                            obj.SetValue(GeometryEffectProperty, effect);
-                        }), DispatcherPriority.Send, null);
-                    }
-                    else
-                    {
-                        newValue.Attach(obj);
-                    }
+                        var effect = newValue.CloneCurrentValue();
+                        obj.SetValue(GeometryEffectProperty, effect);
+                    }), DispatcherPriority.Send, null);
+                }
+                else
+                {
+                    newValue.Attach(obj);
                 }
             }
         }
+    }
 
-        public bool ProcessGeometry(Geometry input)
+    public bool ProcessGeometry(Geometry input)
+    {
+        var flag = false;
+        if (_effectInvalidated)
         {
-            var flag = false;
-            if (_effectInvalidated)
-            {
-                flag |= UpdateCachedGeometry(input);
-                _effectInvalidated = false;
-            }
-
-            return flag;
+            flag |= UpdateCachedGeometry(input);
+            _effectInvalidated = false;
         }
 
-        public static void SetGeometryEffect(DependencyObject obj, GeometryEffect value)
+        return flag;
+    }
+
+    public static void SetGeometryEffect(DependencyObject obj, GeometryEffect value)
+    {
+        obj.SetValue(GeometryEffectProperty, value);
+    }
+
+    protected abstract bool UpdateCachedGeometry(Geometry input);
+
+
+    private class NoGeometryEffect : GeometryEffect
+    {
+        protected override GeometryEffect DeepCopy()
         {
-            obj.SetValue(GeometryEffectProperty, value);
+            return new NoGeometryEffect();
         }
 
-        protected abstract bool UpdateCachedGeometry(Geometry input);
-
-
-        private class NoGeometryEffect : GeometryEffect
+        public override bool Equals(GeometryEffect geometryEffect)
         {
-            protected override GeometryEffect DeepCopy()
-            {
-                return new NoGeometryEffect();
-            }
+            if (geometryEffect != null) return geometryEffect is NoGeometryEffect;
+            return true;
+        }
 
-            public override bool Equals(GeometryEffect geometryEffect)
-            {
-                if (geometryEffect != null) return geometryEffect is NoGeometryEffect;
-                return true;
-            }
-
-            protected override bool UpdateCachedGeometry(Geometry input)
-            {
-                CachedGeometry = input;
-                return false;
-            }
+        protected override bool UpdateCachedGeometry(Geometry input)
+        {
+            CachedGeometry = input;
+            return false;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs
index 389831d2..6d75e516 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs
@@ -3,57 +3,56 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public sealed class GeometryEffectConverter : TypeConverter
 {
-    public sealed class GeometryEffectConverter : TypeConverter
+    private static readonly Dictionary<string, GeometryEffect> RegisteredEffects;
+
+    static GeometryEffectConverter()
     {
-        private static readonly Dictionary<string, GeometryEffect> RegisteredEffects;
-
-        static GeometryEffectConverter()
+        var dictionary = new Dictionary<string, GeometryEffect>
         {
-            var dictionary = new Dictionary<string, GeometryEffect>
             {
-                {
-                    "None",
-                    GeometryEffect.DefaultGeometryEffect
-                },
-                {
-                    "Sketch",
-                    new SketchGeometryEffect()
-                }
-            };
-            RegisteredEffects = dictionary;
-        }
-
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
-        {
-            return typeof(string).IsAssignableFrom(sourceType);
-        }
-
-        public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
-        {
-            return typeof(string).IsAssignableFrom(destinationType);
-        }
-
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
-        {
-            if (value is string key && RegisteredEffects.TryGetValue(key, out var effect))
-                return effect.CloneCurrentValue();
-            return null;
-        }
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value,
-            Type destinationType)
-        {
-            if (typeof(string).IsAssignableFrom(destinationType))
+                "None",
+                GeometryEffect.DefaultGeometryEffect
+            },
             {
-                if (value is string) return value;
-                foreach (var pair in RegisteredEffects)
-                    if (pair.Value?.Equals(value as GeometryEffect) ?? value == null)
-                        return pair.Key;
+                "Sketch",
+                new SketchGeometryEffect()
             }
-
-            return null;
-        }
+        };
+        RegisteredEffects = dictionary;
     }
-}
+
+    public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+    {
+        return typeof(string).IsAssignableFrom(sourceType);
+    }
+
+    public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+    {
+        return typeof(string).IsAssignableFrom(destinationType);
+    }
+
+    public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+    {
+        if (value is string key && RegisteredEffects.TryGetValue(key, out var effect))
+            return effect.CloneCurrentValue();
+        return null;
+    }
+
+    public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value,
+        Type destinationType)
+    {
+        if (typeof(string).IsAssignableFrom(destinationType))
+        {
+            if (value is string) return value;
+            foreach (var pair in RegisteredEffects)
+                if (pair.Value?.Equals(value as GeometryEffect) ?? value == null)
+                    return pair.Key;
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs b/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs
index dfdbd33c..b424e658 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs
@@ -2,87 +2,86 @@
 using System.Windows.Media;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public abstract class GeometrySource<TParameters> : IGeometrySource
+    where TParameters : IGeometrySourceParameters
 {
-    public abstract class GeometrySource<TParameters> : IGeometrySource
-        where TParameters : IGeometrySourceParameters
+    private bool _geometryInvalidated;
+
+    protected Geometry CachedGeometry;
+
+    public bool InvalidateGeometry(InvalidateGeometryReasons reasons)
     {
-        private bool _geometryInvalidated;
-
-        protected Geometry CachedGeometry;
-
-        public bool InvalidateGeometry(InvalidateGeometryReasons reasons)
+        if ((reasons & InvalidateGeometryReasons.TemplateChanged) != 0) CachedGeometry = null;
+        if (!_geometryInvalidated)
         {
-            if ((reasons & InvalidateGeometryReasons.TemplateChanged) != 0) CachedGeometry = null;
-            if (!_geometryInvalidated)
-            {
-                _geometryInvalidated = true;
-                return true;
-            }
-
-            return false;
+            _geometryInvalidated = true;
+            return true;
         }
 
-        public bool UpdateGeometry(IGeometrySourceParameters parameters, Rect layoutBounds)
-        {
-            var force = false;
-            if (parameters is TParameters parameters1)
-            {
-                var rect = ComputeLogicalBounds(layoutBounds, parameters1);
-                force |= LayoutBounds != layoutBounds || LogicalBounds != rect;
-                if (_geometryInvalidated || force)
-                {
-                    LayoutBounds = layoutBounds;
-                    LogicalBounds = rect;
-                    force |= UpdateCachedGeometry(parameters1);
-                    force |= ApplyGeometryEffect(parameters1, force);
-                }
-            }
+        return false;
+    }
 
-            _geometryInvalidated = false;
-            return force;
+    public bool UpdateGeometry(IGeometrySourceParameters parameters, Rect layoutBounds)
+    {
+        var force = false;
+        if (parameters is TParameters parameters1)
+        {
+            var rect = ComputeLogicalBounds(layoutBounds, parameters1);
+            force |= LayoutBounds != layoutBounds || LogicalBounds != rect;
+            if (_geometryInvalidated || force)
+            {
+                LayoutBounds = layoutBounds;
+                LogicalBounds = rect;
+                force |= UpdateCachedGeometry(parameters1);
+                force |= ApplyGeometryEffect(parameters1, force);
+            }
         }
 
-        public Geometry Geometry { get; private set; }
+        _geometryInvalidated = false;
+        return force;
+    }
 
-        public Rect LayoutBounds { get; private set; }
+    public Geometry Geometry { get; private set; }
 
-        public Rect LogicalBounds { get; private set; }
+    public Rect LayoutBounds { get; private set; }
 
-        private bool ApplyGeometryEffect(IGeometrySourceParameters parameters, bool force)
+    public Rect LogicalBounds { get; private set; }
+
+    private bool ApplyGeometryEffect(IGeometrySourceParameters parameters, bool force)
+    {
+        var flag = false;
+        var cachedGeometry = CachedGeometry;
+        var geometryEffect = parameters.GetGeometryEffect();
+        if (geometryEffect != null)
         {
-            var flag = false;
-            var cachedGeometry = CachedGeometry;
-            var geometryEffect = parameters.GetGeometryEffect();
-            if (geometryEffect != null)
-            {
-                if (force)
-                {
-                    flag = true;
-                    geometryEffect.InvalidateGeometry(InvalidateGeometryReasons.ParentInvalidated);
-                }
-
-                if (geometryEffect.ProcessGeometry(CachedGeometry))
-                {
-                    flag = true;
-                    cachedGeometry = geometryEffect.OutputGeometry;
-                }
-            }
-
-            if (!Equals(Geometry, cachedGeometry))
+            if (force)
             {
                 flag = true;
-                Geometry = cachedGeometry;
+                geometryEffect.InvalidateGeometry(InvalidateGeometryReasons.ParentInvalidated);
             }
 
-            return flag;
+            if (geometryEffect.ProcessGeometry(CachedGeometry))
+            {
+                flag = true;
+                cachedGeometry = geometryEffect.OutputGeometry;
+            }
         }
 
-        protected virtual Rect ComputeLogicalBounds(Rect layoutBounds, IGeometrySourceParameters parameters)
+        if (!Equals(Geometry, cachedGeometry))
         {
-            return GeometryHelper.Inflate(layoutBounds, -parameters.GetHalfStrokeThickness());
+            flag = true;
+            Geometry = cachedGeometry;
         }
 
-        protected abstract bool UpdateCachedGeometry(TParameters parameters);
+        return flag;
     }
-}
+
+    protected virtual Rect ComputeLogicalBounds(Rect layoutBounds, IGeometrySourceParameters parameters)
+    {
+        return GeometryHelper.Inflate(layoutBounds, -parameters.GetHalfStrokeThickness());
+    }
+
+    protected abstract bool UpdateCachedGeometry(TParameters parameters);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs b/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs
index 05f02924..c6149b07 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs
@@ -1,13 +1,12 @@
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public interface IArcGeometrySourceParameters : IGeometrySourceParameters
 {
-    public interface IArcGeometrySourceParameters : IGeometrySourceParameters
-    {
-        double ArcThickness { get; }
+    double ArcThickness { get; }
 
-        UnitType ArcThicknessUnit { get; }
+    UnitType ArcThicknessUnit { get; }
 
-        double EndAngle { get; }
+    double EndAngle { get; }
 
-        double StartAngle { get; }
-    }
-}
+    double StartAngle { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs
index 0b34166c..bea37506 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs
@@ -1,17 +1,16 @@
 using System.Windows;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public interface IGeometrySource
 {
-    public interface IGeometrySource
-    {
-        bool InvalidateGeometry(InvalidateGeometryReasons reasons);
+    bool InvalidateGeometry(InvalidateGeometryReasons reasons);
 
-        bool UpdateGeometry(IGeometrySourceParameters parameters, Rect layoutBounds);
+    bool UpdateGeometry(IGeometrySourceParameters parameters, Rect layoutBounds);
 
-        System.Windows.Media.Geometry Geometry { get; }
+    System.Windows.Media.Geometry Geometry { get; }
 
-        Rect LayoutBounds { get; }
+    Rect LayoutBounds { get; }
 
-        Rect LogicalBounds { get; }
-    }
-}
+    Rect LogicalBounds { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs
index 2273384c..42775a30 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs
@@ -1,31 +1,30 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+internal static class GeometrySourceExtensions
 {
-    internal static class GeometrySourceExtensions
+    public static GeometryEffect GetGeometryEffect(this IGeometrySourceParameters parameters)
     {
-        public static GeometryEffect GetGeometryEffect(this IGeometrySourceParameters parameters)
+        if (parameters is DependencyObject obj2)
         {
-            if (parameters is DependencyObject obj2)
-            {
-                var geometryEffect = GeometryEffect.GetGeometryEffect(obj2);
-                if (geometryEffect != null && obj2.Equals(geometryEffect.Parent)) return geometryEffect;
-            }
-
-            return null;
+            var geometryEffect = GeometryEffect.GetGeometryEffect(obj2);
+            if (geometryEffect != null && obj2.Equals(geometryEffect.Parent)) return geometryEffect;
         }
 
-        public static double GetHalfStrokeThickness(this IGeometrySourceParameters parameter)
-        {
-            if (parameter.Stroke != null)
-            {
-                var strokeThickness = parameter.StrokeThickness;
-                if (!double.IsNaN(strokeThickness) && !double.IsInfinity(strokeThickness))
-                    return Math.Abs(strokeThickness) / 2.0;
-            }
-
-            return 0.0;
-        }
+        return null;
     }
-}
+
+    public static double GetHalfStrokeThickness(this IGeometrySourceParameters parameter)
+    {
+        if (parameter.Stroke != null)
+        {
+            var strokeThickness = parameter.StrokeThickness;
+            if (!double.IsNaN(strokeThickness) && !double.IsInfinity(strokeThickness))
+                return Math.Abs(strokeThickness) / 2.0;
+        }
+
+        return 0.0;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs
index 969b43c1..4785a63f 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs
@@ -1,13 +1,12 @@
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public interface IGeometrySourceParameters
 {
-    public interface IGeometrySourceParameters
-    {
-        Stretch Stretch { get; }
+    Stretch Stretch { get; }
 
-        Brush Stroke { get; }
+    Brush Stroke { get; }
 
-        double StrokeThickness { get; }
-    }
-}
+    double StrokeThickness { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs b/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs
index 696197f1..c8ba927d 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs
@@ -2,24 +2,23 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public interface IShape
 {
-    public interface IShape
-    {
-        event EventHandler RenderedGeometryChanged;
+    event EventHandler RenderedGeometryChanged;
 
-        void InvalidateGeometry(InvalidateGeometryReasons reasons);
+    void InvalidateGeometry(InvalidateGeometryReasons reasons);
 
-        Brush Fill { get; set; }
+    Brush Fill { get; set; }
 
-        Thickness GeometryMargin { get; }
+    Thickness GeometryMargin { get; }
 
-        Geometry RenderedGeometry { get; }
+    Geometry RenderedGeometry { get; }
 
-        Stretch Stretch { get; set; }
+    Stretch Stretch { get; set; }
 
-        Brush Stroke { get; set; }
+    Brush Stroke { get; set; }
 
-        double StrokeThickness { get; set; }
-    }
-}
+    double StrokeThickness { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs b/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs
index 57a26573..7fa88117 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+[Flags]
+public enum InvalidateGeometryReasons
 {
-    [Flags]
-    public enum InvalidateGeometryReasons
-    {
-        ChildInvalidated = 4,
-        IsAnimated = 2,
-        ParentInvalidated = 8,
-        PropertyChanged = 1,
-        TemplateChanged = 0x10
-    }
-}
+    ChildInvalidated = 4,
+    IsAnimated = 2,
+    ParentInvalidated = 8,
+    PropertyChanged = 1,
+    TemplateChanged = 0x10
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs b/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs
index 62923d29..4b49b396 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs
@@ -6,130 +6,129 @@ using System.Windows;
 using System.Windows.Media;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public sealed class SketchGeometryEffect : GeometryEffect
 {
-    public sealed class SketchGeometryEffect : GeometryEffect
+    private readonly long _randomSeed = DateTime.Now.Ticks;
+
+    protected override GeometryEffect DeepCopy()
     {
-        private readonly long _randomSeed = DateTime.Now.Ticks;
+        return new SketchGeometryEffect();
+    }
 
-        protected override GeometryEffect DeepCopy()
+    private static void DisturbPoints(RandomEngine random, double scale, IList<Point> points,
+        IList<Vector> normals)
+    {
+        var count = points.Count;
+        for (var i = 1; i < count; i++)
         {
-            return new SketchGeometryEffect();
-        }
-
-        private static void DisturbPoints(RandomEngine random, double scale, IList<Point> points,
-            IList<Vector> normals)
-        {
-            var count = points.Count;
-            for (var i = 1; i < count; i++)
-            {
-                var num3 = random.NextGaussian(0.0, 1.0 * scale);
-                var num4 = random.NextUniform(-0.5, 0.5) * scale;
-                var point = points[i];
-                var vector = normals[i];
-                var vector2 = normals[i];
-                var point2 = points[i];
-                var vector3 = normals[i];
-                var vector4 = normals[i];
-                points[i] = new Point(point.X + vector.X * num4 - vector2.Y * num3,
-                    point2.Y + vector3.X * num3 + vector4.Y * num4);
-            }
-        }
-
-        public override bool Equals(GeometryEffect geometryEffect)
-        {
-            return geometryEffect is SketchGeometryEffect;
-        }
-
-        private IEnumerable<SimpleSegment> GetEffectiveSegments(PathFigure pathFigure)
-        {
-            var startPoint = pathFigure.StartPoint;
-            foreach (var iteratorVariable1 in pathFigure.AllSegments())
-                foreach (var iteratorVariable2 in iteratorVariable1.PathSegment.GetSimpleSegments(
-                    iteratorVariable1.StartPoint))
-                {
-                    yield return iteratorVariable2;
-                    startPoint = iteratorVariable2.Points.Last();
-                }
-
-            if (pathFigure.IsClosed) yield return SimpleSegment.Create(startPoint, pathFigure.StartPoint);
-        }
-
-        [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
-        protected override bool UpdateCachedGeometry(Geometry input)
-        {
-            var flag = false;
-            var inputPath = input.AsPathGeometry();
-            if (inputPath != null) return flag | UpdateSketchGeometry(inputPath);
-            CachedGeometry = input;
-            return flag;
-        }
-
-        private bool UpdateSketchGeometry(PathGeometry inputPath)
-        {
-            var flag = false;
-            flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
-                () => new PathGeometry());
-            flag |= geometry.Figures.EnsureListCount(inputPath.Figures.Count, () => new PathFigure());
-            var random = new RandomEngine(_randomSeed);
-            for (var i = 0; i < inputPath.Figures.Count; i++)
-            {
-                var pathFigure = inputPath.Figures[i];
-                var isClosed = pathFigure.IsClosed;
-                var isFilled = pathFigure.IsFilled;
-                if (pathFigure.Segments.Count == 0)
-                {
-                    flag |= geometry.Figures[i]
-                        .SetIfDifferent(PathFigure.StartPointProperty, pathFigure.StartPoint);
-                    flag |= geometry.Figures[i].Segments.EnsureListCount(0);
-                }
-                else
-                {
-                    var list = new List<Point>(pathFigure.Segments.Count * 3);
-                    foreach (var segment in GetEffectiveSegments(pathFigure))
-                    {
-                        var resultPolyline = new List<Point>
-                        {
-                            segment.Points[0]
-                        };
-                        segment.Flatten(resultPolyline, 0.0, null);
-                        var polyline = new PolylineData(resultPolyline);
-                        if (resultPolyline.Count > 1 && polyline.TotalLength > 4.0)
-                        {
-                            var a = polyline.TotalLength / 8.0;
-                            var sampleCount = (int) Math.Max(2.0, Math.Ceiling(a));
-                            var interval = polyline.TotalLength / sampleCount;
-                            var scale = interval / 8.0;
-                            var samplePoints = new List<Point>(sampleCount);
-                            var sampleNormals = new List<Vector>(sampleCount);
-                            var sampleIndex = 0;
-                            PolylineHelper.PathMarch(polyline, 0.0, 0.0, delegate (MarchLocation location)
-                            {
-                                if (location.Reason == MarchStopReason.CompletePolyline) return double.NaN;
-                                if (location.Reason != MarchStopReason.CompleteStep) return location.Remain;
-                                if (sampleIndex++ == sampleCount) return double.NaN;
-                                samplePoints.Add(location.GetPoint(polyline.Points));
-                                sampleNormals.Add(location.GetNormal(polyline));
-                                return interval;
-                            });
-                            DisturbPoints(random, scale, samplePoints, sampleNormals);
-                            list.AddRange(samplePoints);
-                        }
-                        else
-                        {
-                            list.AddRange(resultPolyline);
-                            list.RemoveLast();
-                        }
-                    }
-
-                    if (!isClosed) list.Add(pathFigure.Segments.Last().GetLastPoint());
-                    flag |= PathFigureHelper.SyncPolylineFigure(geometry.Figures[i], list, isClosed,
-                        isFilled);
-                }
-            }
-
-            if (flag) CachedGeometry = PathGeometryHelper.FixPathGeometryBoundary(CachedGeometry);
-            return flag;
+            var num3 = random.NextGaussian(0.0, 1.0 * scale);
+            var num4 = random.NextUniform(-0.5, 0.5) * scale;
+            var point = points[i];
+            var vector = normals[i];
+            var vector2 = normals[i];
+            var point2 = points[i];
+            var vector3 = normals[i];
+            var vector4 = normals[i];
+            points[i] = new Point(point.X + vector.X * num4 - vector2.Y * num3,
+                point2.Y + vector3.X * num3 + vector4.Y * num4);
         }
     }
-}
+
+    public override bool Equals(GeometryEffect geometryEffect)
+    {
+        return geometryEffect is SketchGeometryEffect;
+    }
+
+    private IEnumerable<SimpleSegment> GetEffectiveSegments(PathFigure pathFigure)
+    {
+        var startPoint = pathFigure.StartPoint;
+        foreach (var iteratorVariable1 in pathFigure.AllSegments())
+        foreach (var iteratorVariable2 in iteratorVariable1.PathSegment.GetSimpleSegments(
+                     iteratorVariable1.StartPoint))
+        {
+            yield return iteratorVariable2;
+            startPoint = iteratorVariable2.Points.Last();
+        }
+
+        if (pathFigure.IsClosed) yield return SimpleSegment.Create(startPoint, pathFigure.StartPoint);
+    }
+
+    [SuppressMessage("ReSharper", "ConditionIsAlwaysTrueOrFalse")]
+    protected override bool UpdateCachedGeometry(Geometry input)
+    {
+        var flag = false;
+        var inputPath = input.AsPathGeometry();
+        if (inputPath != null) return flag | UpdateSketchGeometry(inputPath);
+        CachedGeometry = input;
+        return flag;
+    }
+
+    private bool UpdateSketchGeometry(PathGeometry inputPath)
+    {
+        var flag = false;
+        flag |= GeometryHelper.EnsureGeometryType(out var geometry, ref CachedGeometry,
+            () => new PathGeometry());
+        flag |= geometry.Figures.EnsureListCount(inputPath.Figures.Count, () => new PathFigure());
+        var random = new RandomEngine(_randomSeed);
+        for (var i = 0; i < inputPath.Figures.Count; i++)
+        {
+            var pathFigure = inputPath.Figures[i];
+            var isClosed = pathFigure.IsClosed;
+            var isFilled = pathFigure.IsFilled;
+            if (pathFigure.Segments.Count == 0)
+            {
+                flag |= geometry.Figures[i]
+                    .SetIfDifferent(PathFigure.StartPointProperty, pathFigure.StartPoint);
+                flag |= geometry.Figures[i].Segments.EnsureListCount(0);
+            }
+            else
+            {
+                var list = new List<Point>(pathFigure.Segments.Count * 3);
+                foreach (var segment in GetEffectiveSegments(pathFigure))
+                {
+                    var resultPolyline = new List<Point>
+                    {
+                        segment.Points[0]
+                    };
+                    segment.Flatten(resultPolyline, 0.0, null);
+                    var polyline = new PolylineData(resultPolyline);
+                    if (resultPolyline.Count > 1 && polyline.TotalLength > 4.0)
+                    {
+                        var a = polyline.TotalLength / 8.0;
+                        var sampleCount = (int) Math.Max(2.0, Math.Ceiling(a));
+                        var interval = polyline.TotalLength / sampleCount;
+                        var scale = interval / 8.0;
+                        var samplePoints = new List<Point>(sampleCount);
+                        var sampleNormals = new List<Vector>(sampleCount);
+                        var sampleIndex = 0;
+                        PolylineHelper.PathMarch(polyline, 0.0, 0.0, delegate (MarchLocation location)
+                        {
+                            if (location.Reason == MarchStopReason.CompletePolyline) return double.NaN;
+                            if (location.Reason != MarchStopReason.CompleteStep) return location.Remain;
+                            if (sampleIndex++ == sampleCount) return double.NaN;
+                            samplePoints.Add(location.GetPoint(polyline.Points));
+                            sampleNormals.Add(location.GetNormal(polyline));
+                            return interval;
+                        });
+                        DisturbPoints(random, scale, samplePoints, sampleNormals);
+                        list.AddRange(samplePoints);
+                    }
+                    else
+                    {
+                        list.AddRange(resultPolyline);
+                        list.RemoveLast();
+                    }
+                }
+
+                if (!isClosed) list.Add(pathFigure.Segments.Last().GetLastPoint());
+                flag |= PathFigureHelper.SyncPolylineFigure(geometry.Figures[i], list, isClosed,
+                    isFilled);
+            }
+        }
+
+        if (flag) CachedGeometry = PathGeometryHelper.FixPathGeometryBoundary(CachedGeometry);
+        return flag;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs b/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs
index 6c18b8d2..d397e3db 100644
--- a/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Expression.Media
+namespace HandyControl.Expression.Media;
+
+public enum UnitType
 {
-    public enum UnitType
-    {
-        Pixel,
-        Percent
-    }
-}
+    Pixel,
+    Percent
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs b/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs
index da3d3bb4..a4f07f4d 100644
--- a/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs
@@ -2,59 +2,58 @@
 using System.Windows.Media;
 using HandyControl.Expression.Media;
 
-namespace HandyControl.Expression.Shapes
+namespace HandyControl.Expression.Shapes;
+
+public sealed class Arc : PrimitiveShape, IArcGeometrySourceParameters
 {
-    public sealed class Arc : PrimitiveShape, IArcGeometrySourceParameters
+    public static readonly DependencyProperty ArcThicknessProperty =
+        DependencyProperty.Register("ArcThickness", typeof(double), typeof(Arc),
+            new DrawingPropertyMetadata(0.0, DrawingPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty ArcThicknessUnitProperty =
+        DependencyProperty.Register("ArcThicknessUnit", typeof(UnitType), typeof(Arc),
+            new DrawingPropertyMetadata(UnitType.Pixel, DrawingPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty EndAngleProperty = DependencyProperty.Register("EndAngle",
+        typeof(double), typeof(Arc),
+        new DrawingPropertyMetadata(90.0, DrawingPropertyMetadataOptions.AffectsRender));
+
+    public static readonly DependencyProperty StartAngleProperty =
+        DependencyProperty.Register("StartAngle", typeof(double), typeof(Arc),
+            new DrawingPropertyMetadata(0.0, DrawingPropertyMetadataOptions.AffectsRender));
+
+    public double ArcThickness
     {
-        public static readonly DependencyProperty ArcThicknessProperty =
-            DependencyProperty.Register("ArcThickness", typeof(double), typeof(Arc),
-                new DrawingPropertyMetadata(0.0, DrawingPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty ArcThicknessUnitProperty =
-            DependencyProperty.Register("ArcThicknessUnit", typeof(UnitType), typeof(Arc),
-                new DrawingPropertyMetadata(UnitType.Pixel, DrawingPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty EndAngleProperty = DependencyProperty.Register("EndAngle",
-            typeof(double), typeof(Arc),
-            new DrawingPropertyMetadata(90.0, DrawingPropertyMetadataOptions.AffectsRender));
-
-        public static readonly DependencyProperty StartAngleProperty =
-            DependencyProperty.Register("StartAngle", typeof(double), typeof(Arc),
-                new DrawingPropertyMetadata(0.0, DrawingPropertyMetadataOptions.AffectsRender));
-
-        public double ArcThickness
-        {
-            get => (double) GetValue(ArcThicknessProperty);
-            set => SetValue(ArcThicknessProperty, value);
-        }
-
-        public UnitType ArcThicknessUnit
-        {
-            get => (UnitType) GetValue(ArcThicknessUnitProperty);
-            set => SetValue(ArcThicknessUnitProperty, value);
-        }
-
-        public double EndAngle
-        {
-            get => (double) GetValue(EndAngleProperty);
-            set => SetValue(EndAngleProperty, value);
-        }
-
-        Stretch IGeometrySourceParameters.Stretch => Stretch;
-
-        Brush IGeometrySourceParameters.Stroke => Stroke;
-
-        double IGeometrySourceParameters.StrokeThickness => StrokeThickness;
-
-        public double StartAngle
-        {
-            get => (double) GetValue(StartAngleProperty);
-            set => SetValue(StartAngleProperty, value);
-        }
-
-        protected override IGeometrySource CreateGeometrySource()
-        {
-            return new ArcGeometrySource();
-        }
+        get => (double) GetValue(ArcThicknessProperty);
+        set => SetValue(ArcThicknessProperty, value);
     }
-}
+
+    public UnitType ArcThicknessUnit
+    {
+        get => (UnitType) GetValue(ArcThicknessUnitProperty);
+        set => SetValue(ArcThicknessUnitProperty, value);
+    }
+
+    public double EndAngle
+    {
+        get => (double) GetValue(EndAngleProperty);
+        set => SetValue(EndAngleProperty, value);
+    }
+
+    Stretch IGeometrySourceParameters.Stretch => Stretch;
+
+    Brush IGeometrySourceParameters.Stroke => Stroke;
+
+    double IGeometrySourceParameters.StrokeThickness => StrokeThickness;
+
+    public double StartAngle
+    {
+        get => (double) GetValue(StartAngleProperty);
+        set => SetValue(StartAngleProperty, value);
+    }
+
+    protected override IGeometrySource CreateGeometrySource()
+    {
+        return new ArcGeometrySource();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs b/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
index 943c7f2b..7dc6647b 100644
--- a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
+++ b/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
@@ -6,75 +6,74 @@ using HandyControl.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Expression.Media;
 
-namespace HandyControl.Expression.Shapes
+namespace HandyControl.Expression.Shapes;
+
+public abstract class PrimitiveShape : Shape, IGeometrySourceParameters, IShape
 {
-    public abstract class PrimitiveShape : Shape, IGeometrySourceParameters, IShape
+    private IGeometrySource _geometrySource;
+
+    static PrimitiveShape()
     {
-        private IGeometrySource _geometrySource;
-
-        static PrimitiveShape()
-        {
-            StretchProperty.OverrideMetadata(typeof(PrimitiveShape),
-                new DrawingPropertyMetadata(Stretch.Fill, DrawingPropertyMetadataOptions.AffectsRender));
-            StrokeThicknessProperty.OverrideMetadata(typeof(PrimitiveShape),
-                new DrawingPropertyMetadata(ValueBoxes.Double1Box, DrawingPropertyMetadataOptions.AffectsRender));
-        }
-
-        protected sealed override Geometry DefiningGeometry =>
-            GeometrySource.Geometry ?? Geometry.Empty;
-
-        private IGeometrySource GeometrySource => _geometrySource ?? (_geometrySource = CreateGeometrySource());
-
-        Stretch IGeometrySourceParameters.Stretch => Stretch;
-
-        Brush IGeometrySourceParameters.Stroke => Stroke;
-
-        double IGeometrySourceParameters.StrokeThickness => StrokeThickness;
-
-        public event EventHandler RenderedGeometryChanged;
-
-        public void InvalidateGeometry(InvalidateGeometryReasons reasons)
-        {
-            if (GeometrySource.InvalidateGeometry(reasons)) InvalidateArrange();
-        }
-
-        public Thickness GeometryMargin => GeometrySource.LogicalBounds.Subtract(RenderedGeometry.Bounds);
-
-        Brush IShape.Fill
-        {
-            get => Fill;
-            set => Fill = value;
-        }
-
-        Stretch IShape.Stretch
-        {
-            get => Stretch;
-            set => Stretch = value;
-        }
-
-        Brush IShape.Stroke
-        {
-            get => Stroke;
-            set => Stroke = value;
-        }
-
-        double IShape.StrokeThickness
-        {
-            get => StrokeThickness;
-            set => StrokeThickness = value;
-        }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            if (GeometrySource.UpdateGeometry(this, finalSize.Bounds())) RealizeGeometry();
-            base.ArrangeOverride(finalSize);
-            return finalSize;
-        }
-
-        protected abstract IGeometrySource CreateGeometrySource();
-
-        protected override Size MeasureOverride(Size availableSize) => new(base.StrokeThickness, base.StrokeThickness);
-
-        private void RealizeGeometry() => RenderedGeometryChanged?.Invoke(this, EventArgs.Empty);
+        StretchProperty.OverrideMetadata(typeof(PrimitiveShape),
+            new DrawingPropertyMetadata(Stretch.Fill, DrawingPropertyMetadataOptions.AffectsRender));
+        StrokeThicknessProperty.OverrideMetadata(typeof(PrimitiveShape),
+            new DrawingPropertyMetadata(ValueBoxes.Double1Box, DrawingPropertyMetadataOptions.AffectsRender));
     }
-}
+
+    protected sealed override Geometry DefiningGeometry =>
+        GeometrySource.Geometry ?? Geometry.Empty;
+
+    private IGeometrySource GeometrySource => _geometrySource ?? (_geometrySource = CreateGeometrySource());
+
+    Stretch IGeometrySourceParameters.Stretch => Stretch;
+
+    Brush IGeometrySourceParameters.Stroke => Stroke;
+
+    double IGeometrySourceParameters.StrokeThickness => StrokeThickness;
+
+    public event EventHandler RenderedGeometryChanged;
+
+    public void InvalidateGeometry(InvalidateGeometryReasons reasons)
+    {
+        if (GeometrySource.InvalidateGeometry(reasons)) InvalidateArrange();
+    }
+
+    public Thickness GeometryMargin => GeometrySource.LogicalBounds.Subtract(RenderedGeometry.Bounds);
+
+    Brush IShape.Fill
+    {
+        get => Fill;
+        set => Fill = value;
+    }
+
+    Stretch IShape.Stretch
+    {
+        get => Stretch;
+        set => Stretch = value;
+    }
+
+    Brush IShape.Stroke
+    {
+        get => Stroke;
+        set => Stroke = value;
+    }
+
+    double IShape.StrokeThickness
+    {
+        get => StrokeThickness;
+        set => StrokeThickness = value;
+    }
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        if (GeometrySource.UpdateGeometry(this, finalSize.Bounds())) RealizeGeometry();
+        base.ArrangeOverride(finalSize);
+        return finalSize;
+    }
+
+    protected abstract IGeometrySource CreateGeometrySource();
+
+    protected override Size MeasureOverride(Size availableSize) => new(base.StrokeThickness, base.StrokeThickness);
+
+    private void RealizeGeometry() => RenderedGeometryChanged?.Invoke(this, EventArgs.Empty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs b/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs
index e7afac8b..39ccffe0 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs
@@ -2,45 +2,44 @@
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class AdornerContainer : Adorner
 {
-    public class AdornerContainer : Adorner
+    private UIElement _child;
+
+    public AdornerContainer(UIElement adornedElement) : base(adornedElement)
     {
-        private UIElement _child;
+    }
 
-        public AdornerContainer(UIElement adornedElement) : base(adornedElement)
+    public UIElement Child
+    {
+        get => _child;
+        set
         {
-        }
-
-        public UIElement Child
-        {
-            get => _child;
-            set
+            if (value == null)
             {
-                if (value == null)
-                {
-                    RemoveVisualChild(_child);
-                    // ReSharper disable once ExpressionIsAlwaysNull
-                    _child = value;
-                    return;
-                }
-                AddVisualChild(value);
+                RemoveVisualChild(_child);
+                // ReSharper disable once ExpressionIsAlwaysNull
                 _child = value;
+                return;
             }
-        }
-
-        protected override int VisualChildrenCount => _child != null ? 1 : 0;
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            _child?.Arrange(new Rect(finalSize));
-            return finalSize;
-        }
-
-        protected override Visual GetVisualChild(int index)
-        {
-            if (index == 0 && _child != null) return _child;
-            return base.GetVisualChild(index);
+            AddVisualChild(value);
+            _child = value;
         }
     }
-}
+
+    protected override int VisualChildrenCount => _child != null ? 1 : 0;
+
+    protected override Size ArrangeOverride(Size finalSize)
+    {
+        _child?.Arrange(new Rect(finalSize));
+        return finalSize;
+    }
+
+    protected override Visual GetVisualChild(int index)
+    {
+        if (index == 0 && _child != null) return _child;
+        return base.GetVisualChild(index);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs b/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs
index 8af0c189..2566b7d8 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs
@@ -5,164 +5,163 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class AttachableCollection<T> : FreezableCollection<T>, IAttachedObject
+    where T : DependencyObject, IAttachedObject
 {
-    public abstract class AttachableCollection<T> : FreezableCollection<T>, IAttachedObject
-        where T : DependencyObject, IAttachedObject
+    private DependencyObject _associatedObject;
+    private Collection<T> _snapshot;
+
+    internal AttachableCollection()
     {
-        private DependencyObject _associatedObject;
-        private Collection<T> _snapshot;
+        INotifyCollectionChanged changed = this;
+        changed.CollectionChanged += OnCollectionChanged;
+        _snapshot = new Collection<T>();
+    }
 
-        internal AttachableCollection()
+    public DependencyObject AssociatedObject
+    {
+        get
         {
-            INotifyCollectionChanged changed = this;
-            changed.CollectionChanged += OnCollectionChanged;
-            _snapshot = new Collection<T>();
+            ReadPreamble();
+            return _associatedObject;
         }
+    }
 
-        public DependencyObject AssociatedObject
+    DependencyObject IAttachedObject.AssociatedObject => AssociatedObject;
+
+    public void Attach(DependencyObject dependencyObject)
+    {
+        if (Equals(dependencyObject, AssociatedObject))
+            return;
+        if (AssociatedObject != null)
+            throw new InvalidOperationException();
+        if (Interaction.ShouldRunInDesignMode || !(bool) GetValue(DesignerProperties.IsInDesignModeProperty))
         {
-            get
-            {
-                ReadPreamble();
-                return _associatedObject;
-            }
-        }
-
-        DependencyObject IAttachedObject.AssociatedObject => AssociatedObject;
-
-        public void Attach(DependencyObject dependencyObject)
-        {
-            if (Equals(dependencyObject, AssociatedObject))
-                return;
-            if (AssociatedObject != null)
-                throw new InvalidOperationException();
-            if (Interaction.ShouldRunInDesignMode || !(bool) GetValue(DesignerProperties.IsInDesignModeProperty))
-            {
-                WritePreamble();
-                _associatedObject = dependencyObject;
-                WritePostscript();
-            }
-            OnAttached();
-        }
-
-        public void Detach()
-        {
-            OnDetaching();
             WritePreamble();
-            _associatedObject = null;
+            _associatedObject = dependencyObject;
             WritePostscript();
         }
+        OnAttached();
+    }
 
-        protected abstract void OnAttached();
+    public void Detach()
+    {
+        OnDetaching();
+        WritePreamble();
+        _associatedObject = null;
+        WritePostscript();
+    }
 
-        protected abstract void OnDetaching();
+    protected abstract void OnAttached();
 
-        internal abstract void ItemAdded(T item);
+    protected abstract void OnDetaching();
 
-        internal abstract void ItemRemoved(T item);
+    internal abstract void ItemAdded(T item);
 
-        private void VerifyAdd(T item)
+    internal abstract void ItemRemoved(T item);
+
+    private void VerifyAdd(T item)
+    {
+        if (item == null) throw new ArgumentNullException(nameof(item));
+        if (_snapshot.Contains(item))
+            throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
+                ExceptionStringTable.DuplicateItemInCollectionExceptionMessage, new object[]
+                {
+                    typeof(T).Name,
+                    GetType().Name
+                }));
+    }
+
+    private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        switch (e.Action)
         {
-            if (item == null) throw new ArgumentNullException(nameof(item));
-            if (_snapshot.Contains(item))
-                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
-                    ExceptionStringTable.DuplicateItemInCollectionExceptionMessage, new object[]
+            case NotifyCollectionChangedAction.Add:
+                var enumerator1 = e.NewItems.GetEnumerator();
+                try
+                {
+                    while (enumerator1.MoveNext())
                     {
-                        typeof(T).Name,
-                        GetType().Name
-                    }));
-        }
-
-        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    var enumerator1 = e.NewItems.GetEnumerator();
-                    try
-                    {
-                        while (enumerator1.MoveNext())
+                        var current = (T) enumerator1.Current;
+                        try
                         {
-                            var current = (T) enumerator1.Current;
-                            try
-                            {
-                                VerifyAdd(current);
-                                ItemAdded(current);
-                            }
-                            finally
-                            {
-                                _snapshot.Insert(IndexOf(current), current);
-                            }
-                        }
-                        break;
-                    }
-                    finally
-                    {
-                        if (enumerator1 is IDisposable disposable)
-                            disposable.Dispose();
-                    }
-                case NotifyCollectionChangedAction.Remove:
-                    var enumerator2 = e.OldItems.GetEnumerator();
-                    try
-                    {
-                        while (enumerator2.MoveNext())
-                        {
-                            var current = (T) enumerator2.Current;
-                            ItemRemoved(current);
-                            _snapshot.Remove(current);
-                        }
-                        break;
-                    }
-                    finally
-                    {
-                        if (enumerator2 is IDisposable disposable)
-                            disposable.Dispose();
-                    }
-                case NotifyCollectionChangedAction.Replace:
-                    foreach (T oldItem in e.OldItems)
-                    {
-                        ItemRemoved(oldItem);
-                        _snapshot.Remove(oldItem);
-                    }
-                    var enumerator3 = e.NewItems.GetEnumerator();
-                    try
-                    {
-                        while (enumerator3.MoveNext())
-                        {
-                            var current = (T) enumerator3.Current;
-                            try
-                            {
-                                VerifyAdd(current);
-                                ItemAdded(current);
-                            }
-                            finally
-                            {
-                                _snapshot.Insert(IndexOf(current), current);
-                            }
-                        }
-                        break;
-                    }
-                    finally
-                    {
-                        if (enumerator3 is IDisposable disposable)
-                            disposable.Dispose();
-                    }
-                case NotifyCollectionChangedAction.Reset:
-                    foreach (var obj in _snapshot)
-                        ItemRemoved(obj);
-                    _snapshot = new Collection<T>();
-                    using (var enumerator4 = GetEnumerator())
-                    {
-                        while (enumerator4.MoveNext())
-                        {
-                            var current = enumerator4.Current;
                             VerifyAdd(current);
                             ItemAdded(current);
                         }
-                        break;
+                        finally
+                        {
+                            _snapshot.Insert(IndexOf(current), current);
+                        }
                     }
-            }
+                    break;
+                }
+                finally
+                {
+                    if (enumerator1 is IDisposable disposable)
+                        disposable.Dispose();
+                }
+            case NotifyCollectionChangedAction.Remove:
+                var enumerator2 = e.OldItems.GetEnumerator();
+                try
+                {
+                    while (enumerator2.MoveNext())
+                    {
+                        var current = (T) enumerator2.Current;
+                        ItemRemoved(current);
+                        _snapshot.Remove(current);
+                    }
+                    break;
+                }
+                finally
+                {
+                    if (enumerator2 is IDisposable disposable)
+                        disposable.Dispose();
+                }
+            case NotifyCollectionChangedAction.Replace:
+                foreach (T oldItem in e.OldItems)
+                {
+                    ItemRemoved(oldItem);
+                    _snapshot.Remove(oldItem);
+                }
+                var enumerator3 = e.NewItems.GetEnumerator();
+                try
+                {
+                    while (enumerator3.MoveNext())
+                    {
+                        var current = (T) enumerator3.Current;
+                        try
+                        {
+                            VerifyAdd(current);
+                            ItemAdded(current);
+                        }
+                        finally
+                        {
+                            _snapshot.Insert(IndexOf(current), current);
+                        }
+                    }
+                    break;
+                }
+                finally
+                {
+                    if (enumerator3 is IDisposable disposable)
+                        disposable.Dispose();
+                }
+            case NotifyCollectionChangedAction.Reset:
+                foreach (var obj in _snapshot)
+                    ItemRemoved(obj);
+                _snapshot = new Collection<T>();
+                using (var enumerator4 = GetEnumerator())
+                {
+                    while (enumerator4.MoveNext())
+                    {
+                        var current = enumerator4.Current;
+                        VerifyAdd(current);
+                        ItemAdded(current);
+                    }
+                    break;
+                }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs
index 549dcc5b..fc343e35 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs
@@ -3,85 +3,84 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Media.Animation;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class Behavior : Animatable, IAttachedObject
 {
-    public abstract class Behavior : Animatable, IAttachedObject
+    private DependencyObject _associatedObject;
+    private readonly Type _associatedType;
+
+    internal Behavior(Type associatedType)
     {
-        private DependencyObject _associatedObject;
-        private readonly Type _associatedType;
+        _associatedType = associatedType;
+    }
 
-        internal Behavior(Type associatedType)
-        {
-            _associatedType = associatedType;
-        }
-
-        protected DependencyObject AssociatedObject
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedObject;
-            }
-        }
-
-        protected Type AssociatedType
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedType;
-            }
-        }
-
-        public void Attach(DependencyObject dependencyObject)
-        {
-            if (!Equals(dependencyObject, AssociatedObject))
-            {
-                if (AssociatedObject != null)
-                    throw new InvalidOperationException(ExceptionStringTable
-                        .CannotHostBehaviorMultipleTimesExceptionMessage);
-                if (dependencyObject != null && !AssociatedType.IsInstanceOfType(dependencyObject))
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
-                        new object[] { GetType().Name, dependencyObject.GetType().Name, AssociatedType.Name }));
-                WritePreamble();
-                _associatedObject = dependencyObject;
-                WritePostscript();
-                OnAssociatedObjectChanged();
-                OnAttached();
-            }
-        }
-
-        public void Detach()
-        {
-            OnDetaching();
-            WritePreamble();
-            _associatedObject = null;
-            WritePostscript();
-            OnAssociatedObjectChanged();
-        }
-
-        DependencyObject IAttachedObject.AssociatedObject =>
-            AssociatedObject;
-
-        internal event EventHandler AssociatedObjectChanged;
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return (Freezable) Activator.CreateInstance(GetType());
-        }
-
-        private void OnAssociatedObjectChanged()
-        {
-            AssociatedObjectChanged?.Invoke(this, new EventArgs());
-        }
-
-        protected virtual void OnAttached()
-        {
-        }
-
-        protected virtual void OnDetaching()
+    protected DependencyObject AssociatedObject
+    {
+        get
         {
+            ReadPreamble();
+            return _associatedObject;
         }
     }
-}
+
+    protected Type AssociatedType
+    {
+        get
+        {
+            ReadPreamble();
+            return _associatedType;
+        }
+    }
+
+    public void Attach(DependencyObject dependencyObject)
+    {
+        if (!Equals(dependencyObject, AssociatedObject))
+        {
+            if (AssociatedObject != null)
+                throw new InvalidOperationException(ExceptionStringTable
+                    .CannotHostBehaviorMultipleTimesExceptionMessage);
+            if (dependencyObject != null && !AssociatedType.IsInstanceOfType(dependencyObject))
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
+                    new object[] { GetType().Name, dependencyObject.GetType().Name, AssociatedType.Name }));
+            WritePreamble();
+            _associatedObject = dependencyObject;
+            WritePostscript();
+            OnAssociatedObjectChanged();
+            OnAttached();
+        }
+    }
+
+    public void Detach()
+    {
+        OnDetaching();
+        WritePreamble();
+        _associatedObject = null;
+        WritePostscript();
+        OnAssociatedObjectChanged();
+    }
+
+    DependencyObject IAttachedObject.AssociatedObject =>
+        AssociatedObject;
+
+    internal event EventHandler AssociatedObjectChanged;
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return (Freezable) Activator.CreateInstance(GetType());
+    }
+
+    private void OnAssociatedObjectChanged()
+    {
+        AssociatedObjectChanged?.Invoke(this, new EventArgs());
+    }
+
+    protected virtual void OnAttached()
+    {
+    }
+
+    protected virtual void OnDetaching()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs
index 357cc834..9f016540 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs
@@ -1,42 +1,41 @@
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public sealed class BehaviorCollection : AttachableCollection<Behavior>
 {
-    public sealed class BehaviorCollection : AttachableCollection<Behavior>
+    internal BehaviorCollection()
     {
-        internal BehaviorCollection()
-        {
-        }
-
-        protected override void OnAttached()
-        {
-            foreach (var behavior in this)
-                behavior.Attach(AssociatedObject);
-        }
-
-        protected override void OnDetaching()
-        {
-            foreach (var behavior in this)
-                behavior.Detach();
-        }
-
-        internal override void ItemAdded(Behavior item)
-        {
-            if (item == null || AssociatedObject == null)
-                return;
-            item.Attach(AssociatedObject);
-        }
-
-        internal override void ItemRemoved(Behavior item)
-        {
-            if (((IAttachedObject) item)?.AssociatedObject == null)
-                return;
-            item.Detach();
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new BehaviorCollection();
-        }
     }
-}
+
+    protected override void OnAttached()
+    {
+        foreach (var behavior in this)
+            behavior.Attach(AssociatedObject);
+    }
+
+    protected override void OnDetaching()
+    {
+        foreach (var behavior in this)
+            behavior.Detach();
+    }
+
+    internal override void ItemAdded(Behavior item)
+    {
+        if (item == null || AssociatedObject == null)
+            return;
+        item.Attach(AssociatedObject);
+    }
+
+    internal override void ItemRemoved(Behavior item)
+    {
+        if (((IAttachedObject) item)?.AssociatedObject == null)
+            return;
+        item.Detach();
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return new BehaviorCollection();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs
index c187ee43..647cd9b8 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs
@@ -1,13 +1,12 @@
 using System.Windows;
 
-namespace HandyControl.Interactivity
-{
-    public abstract class Behavior<T> : Behavior where T : DependencyObject
-    {
-        protected Behavior() : base(typeof(T))
-        {
-        }
+namespace HandyControl.Interactivity;
 
-        protected new T AssociatedObject => (T) base.AssociatedObject;
+public abstract class Behavior<T> : Behavior where T : DependencyObject
+{
+    protected Behavior() : base(typeof(T))
+    {
     }
-}
+
+    protected new T AssociatedObject => (T) base.AssociatedObject;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs
index 513ad914..7433c05e 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs
@@ -9,441 +9,440 @@ using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public sealed class FluidMoveBehavior : FluidMoveBehaviorBase
 {
-    public sealed class FluidMoveBehavior : FluidMoveBehaviorBase
+    private static readonly DependencyProperty CacheDuringOverlayProperty =
+        DependencyProperty.RegisterAttached("CacheDuringOverlay", typeof(object),
+            typeof(FluidMoveBehavior), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty DurationProperty = DependencyProperty.Register("Duration",
+        typeof(Duration), typeof(FluidMoveBehavior),
+        new PropertyMetadata(new Duration(TimeSpan.FromSeconds(1.0))));
+
+    public static readonly DependencyProperty EaseXProperty = DependencyProperty.Register("EaseX",
+        typeof(IEasingFunction), typeof(FluidMoveBehavior), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty EaseYProperty = DependencyProperty.Register("EaseY",
+        typeof(IEasingFunction), typeof(FluidMoveBehavior), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty FloatAboveProperty =
+        DependencyProperty.Register("FloatAbove", typeof(bool), typeof(FluidMoveBehavior),
+            new PropertyMetadata(ValueBoxes.TrueBox));
+
+    private static readonly DependencyProperty HasTransformWrapperProperty =
+        DependencyProperty.RegisterAttached("HasTransformWrapper", typeof(bool),
+            typeof(FluidMoveBehavior), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private static readonly DependencyProperty InitialIdentityTagProperty =
+        DependencyProperty.RegisterAttached("InitialIdentityTag", typeof(object),
+            typeof(FluidMoveBehavior), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty InitialTagPathProperty =
+        DependencyProperty.Register("InitialTagPath", typeof(string), typeof(FluidMoveBehavior),
+            new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty InitialTagProperty =
+        DependencyProperty.Register("InitialTag", typeof(TagType), typeof(FluidMoveBehavior),
+            new PropertyMetadata(TagType.Element));
+
+    private static readonly DependencyProperty OverlayProperty =
+        DependencyProperty.RegisterAttached("Overlay", typeof(object), typeof(FluidMoveBehavior),
+            new PropertyMetadata(null));
+
+    private static readonly Dictionary<object, Storyboard> TransitionStoryboardDictionary =
+        new();
+
+    public Duration Duration
     {
-        private static readonly DependencyProperty CacheDuringOverlayProperty =
-            DependencyProperty.RegisterAttached("CacheDuringOverlay", typeof(object),
-                typeof(FluidMoveBehavior), new PropertyMetadata(null));
+        get =>
+            (Duration) GetValue(DurationProperty);
+        set => SetValue(DurationProperty, value);
+    }
 
-        public static readonly DependencyProperty DurationProperty = DependencyProperty.Register("Duration",
-            typeof(Duration), typeof(FluidMoveBehavior),
-            new PropertyMetadata(new Duration(TimeSpan.FromSeconds(1.0))));
+    public IEasingFunction EaseX
+    {
+        get =>
+            (IEasingFunction) GetValue(EaseXProperty);
+        set => SetValue(EaseXProperty, value);
+    }
 
-        public static readonly DependencyProperty EaseXProperty = DependencyProperty.Register("EaseX",
-            typeof(IEasingFunction), typeof(FluidMoveBehavior), new PropertyMetadata(null));
+    public IEasingFunction EaseY
+    {
+        get =>
+            (IEasingFunction) GetValue(EaseYProperty);
+        set => SetValue(EaseYProperty, value);
+    }
 
-        public static readonly DependencyProperty EaseYProperty = DependencyProperty.Register("EaseY",
-            typeof(IEasingFunction), typeof(FluidMoveBehavior), new PropertyMetadata(null));
+    public bool FloatAbove
+    {
+        get =>
+            (bool) GetValue(FloatAboveProperty);
+        set => SetValue(FloatAboveProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty FloatAboveProperty =
-            DependencyProperty.Register("FloatAbove", typeof(bool), typeof(FluidMoveBehavior),
-                new PropertyMetadata(ValueBoxes.TrueBox));
+    public TagType InitialTag
+    {
+        get =>
+            (TagType) GetValue(InitialTagProperty);
+        set => SetValue(InitialTagProperty, value);
+    }
 
-        private static readonly DependencyProperty HasTransformWrapperProperty =
-            DependencyProperty.RegisterAttached("HasTransformWrapper", typeof(bool),
-                typeof(FluidMoveBehavior), new PropertyMetadata(ValueBoxes.FalseBox));
+    public string InitialTagPath
+    {
+        get =>
+            (string) GetValue(InitialTagPathProperty);
+        set => SetValue(InitialTagPathProperty, value);
+    }
 
-        private static readonly DependencyProperty InitialIdentityTagProperty =
-            DependencyProperty.RegisterAttached("InitialIdentityTag", typeof(object),
-                typeof(FluidMoveBehavior), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty InitialTagPathProperty =
-            DependencyProperty.Register("InitialTagPath", typeof(string), typeof(FluidMoveBehavior),
-                new PropertyMetadata(string.Empty));
-
-        public static readonly DependencyProperty InitialTagProperty =
-            DependencyProperty.Register("InitialTag", typeof(TagType), typeof(FluidMoveBehavior),
-                new PropertyMetadata(TagType.Element));
-
-        private static readonly DependencyProperty OverlayProperty =
-            DependencyProperty.RegisterAttached("Overlay", typeof(object), typeof(FluidMoveBehavior),
-                new PropertyMetadata(null));
-
-        private static readonly Dictionary<object, Storyboard> TransitionStoryboardDictionary =
-            new();
-
-        public Duration Duration
+    protected override bool ShouldSkipInitialLayout
+    {
+        get
         {
-            get =>
-                (Duration) GetValue(DurationProperty);
-            set => SetValue(DurationProperty, value);
-        }
-
-        public IEasingFunction EaseX
-        {
-            get =>
-                (IEasingFunction) GetValue(EaseXProperty);
-            set => SetValue(EaseXProperty, value);
-        }
-
-        public IEasingFunction EaseY
-        {
-            get =>
-                (IEasingFunction) GetValue(EaseYProperty);
-            set => SetValue(EaseYProperty, value);
-        }
-
-        public bool FloatAbove
-        {
-            get =>
-                (bool) GetValue(FloatAboveProperty);
-            set => SetValue(FloatAboveProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public TagType InitialTag
-        {
-            get =>
-                (TagType) GetValue(InitialTagProperty);
-            set => SetValue(InitialTagProperty, value);
-        }
-
-        public string InitialTagPath
-        {
-            get =>
-                (string) GetValue(InitialTagPathProperty);
-            set => SetValue(InitialTagPathProperty, value);
-        }
-
-        protected override bool ShouldSkipInitialLayout
-        {
-            get
-            {
-                if (!base.ShouldSkipInitialLayout) return InitialTag == TagType.DataContext;
-                return true;
-            }
-        }
-
-        private static void AddTransform(FrameworkElement child, Transform transform)
-        {
-            if (!(child.RenderTransform is TransformGroup renderTransform))
-            {
-                renderTransform = new TransformGroup
-                {
-                    Children = { child.RenderTransform }
-                };
-                child.RenderTransform = renderTransform;
-                SetHasTransformWrapper(child, true);
-            }
-
-            renderTransform.Children.Add(transform);
-        }
-
-        private Storyboard CreateTransitionStoryboard(FrameworkElement child, bool usingBeforeLoaded,
-            ref Rect layoutRect, ref Rect currentRect)
-        {
-            var duration = Duration;
-            var storyboard = new Storyboard
-            {
-                Duration = duration
-            };
-            var num = !usingBeforeLoaded || Math.Abs(layoutRect.Width) < 0.001
-                ? 1.0
-                : currentRect.Width / layoutRect.Width;
-            var num2 = !usingBeforeLoaded || Math.Abs(layoutRect.Height) < 0.001
-                ? 1.0
-                : currentRect.Height / layoutRect.Height;
-            var num3 = currentRect.Left - layoutRect.Left;
-            var num4 = currentRect.Top - layoutRect.Top;
-            var group = new TransformGroup();
-            var transform = new ScaleTransform
-            {
-                ScaleX = num,
-                ScaleY = num2
-            };
-            group.Children.Add(transform);
-            var transform2 = new TranslateTransform
-            {
-                X = num3,
-                Y = num4
-            };
-            group.Children.Add(transform2);
-            AddTransform(child, group);
-            var str = "(FrameworkElement.RenderTransform).";
-            if (child.RenderTransform is TransformGroup renderTransform && GetHasTransformWrapper(child))
-            {
-                object obj2 = str;
-                str = string.Concat(obj2, "(TransformGroup.Children)[", renderTransform.Children.Count - 1,
-                    "].");
-            }
-
-            if (usingBeforeLoaded)
-            {
-                if (Math.Abs(num - 1.0) > 0.001)
-                {
-                    var element = new DoubleAnimation
-                    {
-                        Duration = duration,
-                        From = num,
-                        To = 1.0
-                    };
-                    Storyboard.SetTarget(element, child);
-                    Storyboard.SetTargetProperty(element,
-                        new PropertyPath(str + "(TransformGroup.Children)[0].(ScaleTransform.ScaleX)"));
-                    element.EasingFunction = EaseX;
-                    storyboard.Children.Add(element);
-                }
-
-                if (Math.Abs(num2 - 1.0) > 0.001)
-                {
-                    var animation3 = new DoubleAnimation
-                    {
-                        Duration = duration,
-                        From = num2,
-                        To = 1.0
-                    };
-                    Storyboard.SetTarget(animation3, child);
-                    Storyboard.SetTargetProperty(animation3,
-                        new PropertyPath(str + "(TransformGroup.Children)[0].(ScaleTransform.ScaleY)"));
-                    animation3.EasingFunction = EaseY;
-                    storyboard.Children.Add(animation3);
-                }
-            }
-
-            if (Math.Abs(num3) > 0.001)
-            {
-                var animation5 = new DoubleAnimation
-                {
-                    Duration = duration,
-                    From = num3,
-                    To = 0.0
-                };
-                Storyboard.SetTarget(animation5, child);
-                Storyboard.SetTargetProperty(animation5,
-                    new PropertyPath(str + "(TransformGroup.Children)[1].(TranslateTransform.X)"));
-                animation5.EasingFunction = EaseX;
-                storyboard.Children.Add(animation5);
-            }
-
-            if (Math.Abs(num4) > 0.001)
-            {
-                var animation7 = new DoubleAnimation
-                {
-                    Duration = duration,
-                    From = num4,
-                    To = 0.0
-                };
-                Storyboard.SetTarget(animation7, child);
-                Storyboard.SetTargetProperty(animation7,
-                    new PropertyPath(str + "(TransformGroup.Children)[1].(TranslateTransform.Y)"));
-                animation7.EasingFunction = EaseY;
-                storyboard.Children.Add(animation7);
-            }
-
-            return storyboard;
-        }
-
-        protected override void EnsureTags(FrameworkElement child)
-        {
-            base.EnsureTags(child);
-            if (InitialTag == TagType.DataContext &&
-                !(child.ReadLocalValue(InitialIdentityTagProperty) is BindingExpression))
-                child.SetBinding(InitialIdentityTagProperty, new Binding(InitialTagPath));
-        }
-
-        private static bool GetHasTransformWrapper(DependencyObject obj)
-        {
-            return (bool) obj.GetValue(HasTransformWrapperProperty);
-        }
-
-        private static object GetInitialIdentityTag(DependencyObject obj)
-        {
-            return obj.GetValue(InitialIdentityTagProperty);
-        }
-
-        private static object GetOverlay(DependencyObject obj)
-        {
-            return obj.GetValue(OverlayProperty);
-        }
-
-        private static Transform GetTransform(FrameworkElement child)
-        {
-            if (child.RenderTransform is TransformGroup renderTransform && renderTransform.Children.Count > 0)
-                return renderTransform.Children[renderTransform.Children.Count - 1];
-            return new TranslateTransform();
-        }
-
-        private static bool IsClose(double a, double b)
-        {
-            return Math.Abs(a - b) < 1E-07;
-        }
-
-        private static bool IsEmptyRect(Rect rect)
-        {
-            if (!rect.IsEmpty && !double.IsNaN(rect.Left)) return double.IsNaN(rect.Top);
+            if (!base.ShouldSkipInitialLayout) return InitialTag == TagType.DataContext;
             return true;
         }
+    }
 
-        private static void RemoveTransform(FrameworkElement child)
+    private static void AddTransform(FrameworkElement child, Transform transform)
+    {
+        if (!(child.RenderTransform is TransformGroup renderTransform))
         {
-            if (child.RenderTransform is TransformGroup renderTransform)
+            renderTransform = new TransformGroup
             {
-                if (GetHasTransformWrapper(child))
-                {
-                    child.RenderTransform = renderTransform.Children[0];
-                    SetHasTransformWrapper(child, false);
-                }
-                else
-                {
-                    renderTransform.Children.RemoveAt(renderTransform.Children.Count - 1);
-                }
-            }
+                Children = { child.RenderTransform }
+            };
+            child.RenderTransform = renderTransform;
+            SetHasTransformWrapper(child, true);
         }
 
-        private static void SetHasTransformWrapper(DependencyObject obj, bool value)
+        renderTransform.Children.Add(transform);
+    }
+
+    private Storyboard CreateTransitionStoryboard(FrameworkElement child, bool usingBeforeLoaded,
+        ref Rect layoutRect, ref Rect currentRect)
+    {
+        var duration = Duration;
+        var storyboard = new Storyboard
         {
-            obj.SetValue(HasTransformWrapperProperty, ValueBoxes.BooleanBox(value));
+            Duration = duration
+        };
+        var num = !usingBeforeLoaded || Math.Abs(layoutRect.Width) < 0.001
+            ? 1.0
+            : currentRect.Width / layoutRect.Width;
+        var num2 = !usingBeforeLoaded || Math.Abs(layoutRect.Height) < 0.001
+            ? 1.0
+            : currentRect.Height / layoutRect.Height;
+        var num3 = currentRect.Left - layoutRect.Left;
+        var num4 = currentRect.Top - layoutRect.Top;
+        var group = new TransformGroup();
+        var transform = new ScaleTransform
+        {
+            ScaleX = num,
+            ScaleY = num2
+        };
+        group.Children.Add(transform);
+        var transform2 = new TranslateTransform
+        {
+            X = num3,
+            Y = num4
+        };
+        group.Children.Add(transform2);
+        AddTransform(child, group);
+        var str = "(FrameworkElement.RenderTransform).";
+        if (child.RenderTransform is TransformGroup renderTransform && GetHasTransformWrapper(child))
+        {
+            object obj2 = str;
+            str = string.Concat(obj2, "(TransformGroup.Children)[", renderTransform.Children.Count - 1,
+                "].");
         }
 
-        private static void SetOverlay(DependencyObject obj, object value)
+        if (usingBeforeLoaded)
         {
-            obj.SetValue(OverlayProperty, value);
-        }
-
-        private static void TransferLocalValue(FrameworkElement element, DependencyProperty source,
-            DependencyProperty dest)
-        {
-            var obj2 = element.ReadLocalValue(source);
-            if (obj2 is BindingExpressionBase base2)
-                element.SetBinding(dest, base2.ParentBindingBase);
-            else if (obj2 == DependencyProperty.UnsetValue)
-                element.ClearValue(dest);
-            else
-                element.SetValue(dest, element.GetAnimationBaseValue(source));
-            element.ClearValue(source);
-        }
-
-        internal override void UpdateLayoutTransitionCore(FrameworkElement child, FrameworkElement root,
-            object tag, TagData newTagData)
-        {
-            Rect empty;
-            var flag = false;
-            var usingBeforeLoaded = false;
-            var initialIdentityTag = GetInitialIdentityTag(child);
-            var flag3 = TagDictionary.TryGetValue(tag, out var data);
-            if (flag3 && data.InitialTag != initialIdentityTag)
+            if (Math.Abs(num - 1.0) > 0.001)
             {
-                flag3 = false;
-                TagDictionary.Remove(tag);
-            }
-
-            if (!flag3)
-            {
-                if (initialIdentityTag != null && TagDictionary.TryGetValue(initialIdentityTag, out var data2))
+                var element = new DoubleAnimation
                 {
-                    empty = TranslateRect(data2.AppRect, root, newTagData.Parent);
-                    flag = true;
-                    usingBeforeLoaded = true;
-                }
-                else
-                {
-                    empty = Rect.Empty;
-                }
-
-                data = new TagData
-                {
-                    ParentRect = Rect.Empty,
-                    AppRect = Rect.Empty,
-                    Parent = newTagData.Parent,
-                    Child = child,
-                    Timestamp = DateTime.Now,
-                    InitialTag = initialIdentityTag
+                    Duration = duration,
+                    From = num,
+                    To = 1.0
                 };
-                TagDictionary.Add(tag, data);
+                Storyboard.SetTarget(element, child);
+                Storyboard.SetTargetProperty(element,
+                    new PropertyPath(str + "(TransformGroup.Children)[0].(ScaleTransform.ScaleX)"));
+                element.EasingFunction = EaseX;
+                storyboard.Children.Add(element);
             }
-            else if (!Equals(data.Parent, VisualTreeHelper.GetParent(child)))
+
+            if (Math.Abs(num2 - 1.0) > 0.001)
             {
-                empty = TranslateRect(data.AppRect, root, newTagData.Parent);
-                flag = true;
+                var animation3 = new DoubleAnimation
+                {
+                    Duration = duration,
+                    From = num2,
+                    To = 1.0
+                };
+                Storyboard.SetTarget(animation3, child);
+                Storyboard.SetTargetProperty(animation3,
+                    new PropertyPath(str + "(TransformGroup.Children)[0].(ScaleTransform.ScaleY)"));
+                animation3.EasingFunction = EaseY;
+                storyboard.Children.Add(animation3);
+            }
+        }
+
+        if (Math.Abs(num3) > 0.001)
+        {
+            var animation5 = new DoubleAnimation
+            {
+                Duration = duration,
+                From = num3,
+                To = 0.0
+            };
+            Storyboard.SetTarget(animation5, child);
+            Storyboard.SetTargetProperty(animation5,
+                new PropertyPath(str + "(TransformGroup.Children)[1].(TranslateTransform.X)"));
+            animation5.EasingFunction = EaseX;
+            storyboard.Children.Add(animation5);
+        }
+
+        if (Math.Abs(num4) > 0.001)
+        {
+            var animation7 = new DoubleAnimation
+            {
+                Duration = duration,
+                From = num4,
+                To = 0.0
+            };
+            Storyboard.SetTarget(animation7, child);
+            Storyboard.SetTargetProperty(animation7,
+                new PropertyPath(str + "(TransformGroup.Children)[1].(TranslateTransform.Y)"));
+            animation7.EasingFunction = EaseY;
+            storyboard.Children.Add(animation7);
+        }
+
+        return storyboard;
+    }
+
+    protected override void EnsureTags(FrameworkElement child)
+    {
+        base.EnsureTags(child);
+        if (InitialTag == TagType.DataContext &&
+            !(child.ReadLocalValue(InitialIdentityTagProperty) is BindingExpression))
+            child.SetBinding(InitialIdentityTagProperty, new Binding(InitialTagPath));
+    }
+
+    private static bool GetHasTransformWrapper(DependencyObject obj)
+    {
+        return (bool) obj.GetValue(HasTransformWrapperProperty);
+    }
+
+    private static object GetInitialIdentityTag(DependencyObject obj)
+    {
+        return obj.GetValue(InitialIdentityTagProperty);
+    }
+
+    private static object GetOverlay(DependencyObject obj)
+    {
+        return obj.GetValue(OverlayProperty);
+    }
+
+    private static Transform GetTransform(FrameworkElement child)
+    {
+        if (child.RenderTransform is TransformGroup renderTransform && renderTransform.Children.Count > 0)
+            return renderTransform.Children[renderTransform.Children.Count - 1];
+        return new TranslateTransform();
+    }
+
+    private static bool IsClose(double a, double b)
+    {
+        return Math.Abs(a - b) < 1E-07;
+    }
+
+    private static bool IsEmptyRect(Rect rect)
+    {
+        if (!rect.IsEmpty && !double.IsNaN(rect.Left)) return double.IsNaN(rect.Top);
+        return true;
+    }
+
+    private static void RemoveTransform(FrameworkElement child)
+    {
+        if (child.RenderTransform is TransformGroup renderTransform)
+        {
+            if (GetHasTransformWrapper(child))
+            {
+                child.RenderTransform = renderTransform.Children[0];
+                SetHasTransformWrapper(child, false);
             }
             else
             {
-                empty = data.ParentRect;
+                renderTransform.Children.RemoveAt(renderTransform.Children.Count - 1);
             }
-
-            var originalChild = child;
-            if (!IsEmptyRect(empty) && !IsEmptyRect(newTagData.ParentRect) &&
-                (!IsClose(empty.Left, newTagData.ParentRect.Left) ||
-                 !IsClose(empty.Top, newTagData.ParentRect.Top)) || !Equals(child, data.Child) &&
-                TransitionStoryboardDictionary.ContainsKey(tag))
-            {
-                var rect = empty;
-                var flag4 = false;
-                if (TransitionStoryboardDictionary.TryGetValue(tag, out var storyboard))
-                {
-                    var obj3 = GetOverlay(data.Child);
-                    var adorner = (AdornerContainer) obj3;
-                    flag4 = obj3 != null;
-                    var element = data.Child;
-                    if (obj3 != null)
-                    {
-                        if (adorner.Child is Canvas canvas) element = canvas.Children[0] as FrameworkElement;
-                    }
-
-                    if (!usingBeforeLoaded) rect = GetTransform(element).TransformBounds(rect);
-                    TransitionStoryboardDictionary.Remove(tag);
-                    storyboard.Stop();
-                    RemoveTransform(element);
-                    if (obj3 != null)
-                    {
-                        AdornerLayer.GetAdornerLayer(root).Remove(adorner);
-                        TransferLocalValue(data.Child, CacheDuringOverlayProperty,
-                            UIElement.RenderTransformProperty);
-                        SetOverlay(data.Child, null);
-                    }
-                }
-
-                object overlay = null;
-                if (flag4 || flag && FloatAbove)
-                {
-                    var canvas2 = new Canvas
-                    {
-                        Width = newTagData.ParentRect.Width,
-                        Height = newTagData.ParentRect.Height,
-                        IsHitTestVisible = false
-                    };
-                    var rectangle = new Rectangle
-                    {
-                        Width = newTagData.ParentRect.Width,
-                        Height = newTagData.ParentRect.Height,
-                        IsHitTestVisible = false,
-                        Fill = new VisualBrush(child)
-                    };
-                    canvas2.Children.Add(rectangle);
-                    var container2 = new AdornerContainer(child)
-                    {
-                        Child = canvas2
-                    };
-                    overlay = container2;
-                    SetOverlay(originalChild, overlay);
-                    AdornerLayer.GetAdornerLayer(root).Add(container2);
-                    TransferLocalValue(child, UIElement.RenderTransformProperty, CacheDuringOverlayProperty);
-                    child.RenderTransform = new TranslateTransform(-10000.0, -10000.0);
-                    canvas2.RenderTransform = new TranslateTransform(10000.0, 10000.0);
-                    child = rectangle;
-                }
-
-                var parentRect = newTagData.ParentRect;
-                var transitionStoryboard =
-                    CreateTransitionStoryboard(child, usingBeforeLoaded, ref parentRect, ref rect);
-                TransitionStoryboardDictionary.Add(tag, transitionStoryboard);
-                transitionStoryboard.Completed += delegate
-                {
-                    if (TransitionStoryboardDictionary.TryGetValue(tag, out var storyboard1) &&
-                        Equals(storyboard1, transitionStoryboard))
-                    {
-                        TransitionStoryboardDictionary.Remove(tag);
-                        transitionStoryboard.Stop();
-                        RemoveTransform(child);
-                        child.InvalidateMeasure();
-                        if (overlay != null)
-                        {
-                            AdornerLayer.GetAdornerLayer(root).Remove((AdornerContainer) overlay);
-                            TransferLocalValue(originalChild, CacheDuringOverlayProperty,
-                                UIElement.RenderTransformProperty);
-                            SetOverlay(originalChild, null);
-                        }
-                    }
-                };
-                transitionStoryboard.Begin();
-            }
-
-            data.ParentRect = newTagData.ParentRect;
-            data.AppRect = newTagData.AppRect;
-            data.Parent = newTagData.Parent;
-            data.Child = newTagData.Child;
-            data.Timestamp = newTagData.Timestamp;
         }
     }
-}
+
+    private static void SetHasTransformWrapper(DependencyObject obj, bool value)
+    {
+        obj.SetValue(HasTransformWrapperProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private static void SetOverlay(DependencyObject obj, object value)
+    {
+        obj.SetValue(OverlayProperty, value);
+    }
+
+    private static void TransferLocalValue(FrameworkElement element, DependencyProperty source,
+        DependencyProperty dest)
+    {
+        var obj2 = element.ReadLocalValue(source);
+        if (obj2 is BindingExpressionBase base2)
+            element.SetBinding(dest, base2.ParentBindingBase);
+        else if (obj2 == DependencyProperty.UnsetValue)
+            element.ClearValue(dest);
+        else
+            element.SetValue(dest, element.GetAnimationBaseValue(source));
+        element.ClearValue(source);
+    }
+
+    internal override void UpdateLayoutTransitionCore(FrameworkElement child, FrameworkElement root,
+        object tag, TagData newTagData)
+    {
+        Rect empty;
+        var flag = false;
+        var usingBeforeLoaded = false;
+        var initialIdentityTag = GetInitialIdentityTag(child);
+        var flag3 = TagDictionary.TryGetValue(tag, out var data);
+        if (flag3 && data.InitialTag != initialIdentityTag)
+        {
+            flag3 = false;
+            TagDictionary.Remove(tag);
+        }
+
+        if (!flag3)
+        {
+            if (initialIdentityTag != null && TagDictionary.TryGetValue(initialIdentityTag, out var data2))
+            {
+                empty = TranslateRect(data2.AppRect, root, newTagData.Parent);
+                flag = true;
+                usingBeforeLoaded = true;
+            }
+            else
+            {
+                empty = Rect.Empty;
+            }
+
+            data = new TagData
+            {
+                ParentRect = Rect.Empty,
+                AppRect = Rect.Empty,
+                Parent = newTagData.Parent,
+                Child = child,
+                Timestamp = DateTime.Now,
+                InitialTag = initialIdentityTag
+            };
+            TagDictionary.Add(tag, data);
+        }
+        else if (!Equals(data.Parent, VisualTreeHelper.GetParent(child)))
+        {
+            empty = TranslateRect(data.AppRect, root, newTagData.Parent);
+            flag = true;
+        }
+        else
+        {
+            empty = data.ParentRect;
+        }
+
+        var originalChild = child;
+        if (!IsEmptyRect(empty) && !IsEmptyRect(newTagData.ParentRect) &&
+            (!IsClose(empty.Left, newTagData.ParentRect.Left) ||
+             !IsClose(empty.Top, newTagData.ParentRect.Top)) || !Equals(child, data.Child) &&
+            TransitionStoryboardDictionary.ContainsKey(tag))
+        {
+            var rect = empty;
+            var flag4 = false;
+            if (TransitionStoryboardDictionary.TryGetValue(tag, out var storyboard))
+            {
+                var obj3 = GetOverlay(data.Child);
+                var adorner = (AdornerContainer) obj3;
+                flag4 = obj3 != null;
+                var element = data.Child;
+                if (obj3 != null)
+                {
+                    if (adorner.Child is Canvas canvas) element = canvas.Children[0] as FrameworkElement;
+                }
+
+                if (!usingBeforeLoaded) rect = GetTransform(element).TransformBounds(rect);
+                TransitionStoryboardDictionary.Remove(tag);
+                storyboard.Stop();
+                RemoveTransform(element);
+                if (obj3 != null)
+                {
+                    AdornerLayer.GetAdornerLayer(root).Remove(adorner);
+                    TransferLocalValue(data.Child, CacheDuringOverlayProperty,
+                        UIElement.RenderTransformProperty);
+                    SetOverlay(data.Child, null);
+                }
+            }
+
+            object overlay = null;
+            if (flag4 || flag && FloatAbove)
+            {
+                var canvas2 = new Canvas
+                {
+                    Width = newTagData.ParentRect.Width,
+                    Height = newTagData.ParentRect.Height,
+                    IsHitTestVisible = false
+                };
+                var rectangle = new Rectangle
+                {
+                    Width = newTagData.ParentRect.Width,
+                    Height = newTagData.ParentRect.Height,
+                    IsHitTestVisible = false,
+                    Fill = new VisualBrush(child)
+                };
+                canvas2.Children.Add(rectangle);
+                var container2 = new AdornerContainer(child)
+                {
+                    Child = canvas2
+                };
+                overlay = container2;
+                SetOverlay(originalChild, overlay);
+                AdornerLayer.GetAdornerLayer(root).Add(container2);
+                TransferLocalValue(child, UIElement.RenderTransformProperty, CacheDuringOverlayProperty);
+                child.RenderTransform = new TranslateTransform(-10000.0, -10000.0);
+                canvas2.RenderTransform = new TranslateTransform(10000.0, 10000.0);
+                child = rectangle;
+            }
+
+            var parentRect = newTagData.ParentRect;
+            var transitionStoryboard =
+                CreateTransitionStoryboard(child, usingBeforeLoaded, ref parentRect, ref rect);
+            TransitionStoryboardDictionary.Add(tag, transitionStoryboard);
+            transitionStoryboard.Completed += delegate
+            {
+                if (TransitionStoryboardDictionary.TryGetValue(tag, out var storyboard1) &&
+                    Equals(storyboard1, transitionStoryboard))
+                {
+                    TransitionStoryboardDictionary.Remove(tag);
+                    transitionStoryboard.Stop();
+                    RemoveTransform(child);
+                    child.InvalidateMeasure();
+                    if (overlay != null)
+                    {
+                        AdornerLayer.GetAdornerLayer(root).Remove((AdornerContainer) overlay);
+                        TransferLocalValue(originalChild, CacheDuringOverlayProperty,
+                            UIElement.RenderTransformProperty);
+                        SetOverlay(originalChild, null);
+                    }
+                }
+            };
+            transitionStoryboard.Begin();
+        }
+
+        data.ParentRect = newTagData.ParentRect;
+        data.AppRect = newTagData.AppRect;
+        data.Parent = newTagData.Parent;
+        data.Child = newTagData.Child;
+        data.Timestamp = newTagData.Timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs
index 1471ba01..95778904 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs
@@ -7,190 +7,189 @@ using System.Windows.Documents;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class FluidMoveBehaviorBase : Behavior<FrameworkElement>
 {
-    public abstract class FluidMoveBehaviorBase : Behavior<FrameworkElement>
+    public static readonly DependencyProperty AppliesToProperty = DependencyProperty.Register("AppliesTo",
+        typeof(FluidMoveScope), typeof(FluidMoveBehaviorBase), new PropertyMetadata(FluidMoveScope.Self));
+
+    protected static readonly DependencyProperty IdentityTagProperty =
+        DependencyProperty.RegisterAttached("IdentityTag", typeof(object), typeof(FluidMoveBehaviorBase),
+            new PropertyMetadata(null));
+
+    public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register("IsActive",
+        typeof(bool), typeof(FluidMoveBehaviorBase), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    private static DateTime LastPurgeTick = DateTime.MinValue;
+
+    private static readonly TimeSpan MinTickDelta = TimeSpan.FromSeconds(0.5);
+
+    private static DateTime NextToLastPurgeTick = DateTime.MinValue;
+
+    internal static Dictionary<object, TagData> TagDictionary = new();
+
+    public static readonly DependencyProperty TagPathProperty = DependencyProperty.Register("TagPath",
+        typeof(string), typeof(FluidMoveBehaviorBase), new PropertyMetadata(string.Empty));
+
+    public static readonly DependencyProperty TagProperty = DependencyProperty.Register("Tag",
+        typeof(TagType), typeof(FluidMoveBehaviorBase), new PropertyMetadata(TagType.Element));
+
+    public FluidMoveScope AppliesTo
     {
-        public static readonly DependencyProperty AppliesToProperty = DependencyProperty.Register("AppliesTo",
-            typeof(FluidMoveScope), typeof(FluidMoveBehaviorBase), new PropertyMetadata(FluidMoveScope.Self));
+        get =>
+            (FluidMoveScope) GetValue(AppliesToProperty);
+        set => SetValue(AppliesToProperty, value);
+    }
 
-        protected static readonly DependencyProperty IdentityTagProperty =
-            DependencyProperty.RegisterAttached("IdentityTag", typeof(object), typeof(FluidMoveBehaviorBase),
-                new PropertyMetadata(null));
+    public bool IsActive
+    {
+        get =>
+            (bool) GetValue(IsActiveProperty);
+        set => SetValue(IsActiveProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register("IsActive",
-            typeof(bool), typeof(FluidMoveBehaviorBase), new PropertyMetadata(ValueBoxes.TrueBox));
+    protected virtual bool ShouldSkipInitialLayout =>
+        Tag == TagType.DataContext;
 
-        private static DateTime LastPurgeTick = DateTime.MinValue;
+    public TagType Tag
+    {
+        get =>
+            (TagType) GetValue(TagProperty);
+        set => SetValue(TagProperty, value);
+    }
 
-        private static readonly TimeSpan MinTickDelta = TimeSpan.FromSeconds(0.5);
+    public string TagPath
+    {
+        get =>
+            (string) GetValue(TagPathProperty);
+        set => SetValue(TagPathProperty, value);
+    }
 
-        private static DateTime NextToLastPurgeTick = DateTime.MinValue;
-
-        internal static Dictionary<object, TagData> TagDictionary = new();
-
-        public static readonly DependencyProperty TagPathProperty = DependencyProperty.Register("TagPath",
-            typeof(string), typeof(FluidMoveBehaviorBase), new PropertyMetadata(string.Empty));
-
-        public static readonly DependencyProperty TagProperty = DependencyProperty.Register("Tag",
-            typeof(TagType), typeof(FluidMoveBehaviorBase), new PropertyMetadata(TagType.Element));
-
-        public FluidMoveScope AppliesTo
+    private void AssociatedObject_LayoutUpdated(object sender, EventArgs e)
+    {
+        if (IsActive)
         {
-            get =>
-                (FluidMoveScope) GetValue(AppliesToProperty);
-            set => SetValue(AppliesToProperty, value);
-        }
-
-        public bool IsActive
-        {
-            get =>
-                (bool) GetValue(IsActiveProperty);
-            set => SetValue(IsActiveProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected virtual bool ShouldSkipInitialLayout =>
-            Tag == TagType.DataContext;
-
-        public TagType Tag
-        {
-            get =>
-                (TagType) GetValue(TagProperty);
-            set => SetValue(TagProperty, value);
-        }
-
-        public string TagPath
-        {
-            get =>
-                (string) GetValue(TagPathProperty);
-            set => SetValue(TagPathProperty, value);
-        }
-
-        private void AssociatedObject_LayoutUpdated(object sender, EventArgs e)
-        {
-            if (IsActive)
+            if (DateTime.Now - LastPurgeTick >= MinTickDelta)
             {
-                if (DateTime.Now - LastPurgeTick >= MinTickDelta)
-                {
-                    List<object> list = null;
-                    foreach (var pair in TagDictionary)
-                        if (pair.Value.Timestamp < NextToLastPurgeTick)
-                        {
-                            if (list == null) list = new List<object>();
-                            list.Add(pair.Key);
-                        }
+                List<object> list = null;
+                foreach (var pair in TagDictionary)
+                    if (pair.Value.Timestamp < NextToLastPurgeTick)
+                    {
+                        if (list == null) list = new List<object>();
+                        list.Add(pair.Key);
+                    }
 
-                    if (list != null)
-                        foreach (var obj2 in list)
-                            TagDictionary.Remove(obj2);
-                    NextToLastPurgeTick = LastPurgeTick;
-                    LastPurgeTick = DateTime.Now;
-                }
-
-                if (AppliesTo == FluidMoveScope.Self)
-                {
-                    UpdateLayoutTransition(AssociatedObject);
-                }
-                else
-                {
-                    if (AssociatedObject is Panel associatedObject)
-                        foreach (FrameworkElement element in associatedObject.Children)
-                            UpdateLayoutTransition(element);
-                }
+                if (list != null)
+                    foreach (var obj2 in list)
+                        TagDictionary.Remove(obj2);
+                NextToLastPurgeTick = LastPurgeTick;
+                LastPurgeTick = DateTime.Now;
             }
-        }
 
-        protected virtual void EnsureTags(FrameworkElement child)
-        {
-            if (Tag == TagType.DataContext &&
-                !(child.ReadLocalValue(IdentityTagProperty) is BindingExpression))
-                child.SetBinding(IdentityTagProperty, new Binding(TagPath));
-        }
-
-        protected static object GetIdentityTag(DependencyObject obj)
-        {
-            return obj.GetValue(IdentityTagProperty);
-        }
-
-        private static FrameworkElement GetVisualRoot(FrameworkElement child)
-        {
-            while (true)
+            if (AppliesTo == FluidMoveScope.Self)
             {
-                if (!(VisualTreeHelper.GetParent(child) is FrameworkElement parent)) return child;
-                if (AdornerLayer.GetAdornerLayer(parent) == null) return child;
-                child = parent;
+                UpdateLayoutTransition(AssociatedObject);
             }
-        }
-
-        protected override void OnAttached()
-        {
-            base.OnAttached();
-            AssociatedObject.LayoutUpdated += AssociatedObject_LayoutUpdated;
-        }
-
-        protected override void OnDetaching()
-        {
-            base.OnDetaching();
-            AssociatedObject.LayoutUpdated -= AssociatedObject_LayoutUpdated;
-        }
-
-        protected static void SetIdentityTag(DependencyObject obj, object value)
-        {
-            obj.SetValue(IdentityTagProperty, value);
-        }
-
-        internal static Rect TranslateRect(Rect rect, FrameworkElement from, FrameworkElement to)
-        {
-            if (from == null || to == null) return rect;
-            var point = new Point(rect.Left, rect.Top);
-            point = from.TransformToVisual(to).Transform(point);
-            return new Rect(point.X, point.Y, rect.Width, rect.Height);
-        }
-
-        private void UpdateLayoutTransition(FrameworkElement child)
-        {
-            if (child.Visibility != Visibility.Collapsed && child.IsLoaded || !ShouldSkipInitialLayout)
+            else
             {
-                var visualRoot = GetVisualRoot(child);
-                var newTagData = new TagData
-                {
-                    Parent = VisualTreeHelper.GetParent(child) as FrameworkElement,
-                    ParentRect = ExtendedVisualStateManager.GetLayoutRect(child),
-                    Child = child,
-                    Timestamp = DateTime.Now
-                };
-                try
-                {
-                    newTagData.AppRect = TranslateRect(newTagData.ParentRect, newTagData.Parent, visualRoot);
-                }
-                catch (ArgumentException)
-                {
-                    if (ShouldSkipInitialLayout) return;
-                }
-
-                EnsureTags(child);
-                var identityTag = GetIdentityTag(child) ?? child;
-                UpdateLayoutTransitionCore(child, visualRoot, identityTag, newTagData);
+                if (AssociatedObject is Panel associatedObject)
+                    foreach (FrameworkElement element in associatedObject.Children)
+                        UpdateLayoutTransition(element);
             }
         }
-
-        internal abstract void UpdateLayoutTransitionCore(FrameworkElement child, FrameworkElement root,
-            object tag, TagData newTagData);
-
-
-        internal class TagData
-        {
-            public Rect AppRect { get; set; }
-
-            public FrameworkElement Child { get; set; }
-
-            public object InitialTag { get; set; }
-
-            public FrameworkElement Parent { get; set; }
-
-            public Rect ParentRect { get; set; }
-
-            public DateTime Timestamp { get; set; }
-        }
     }
-}
+
+    protected virtual void EnsureTags(FrameworkElement child)
+    {
+        if (Tag == TagType.DataContext &&
+            !(child.ReadLocalValue(IdentityTagProperty) is BindingExpression))
+            child.SetBinding(IdentityTagProperty, new Binding(TagPath));
+    }
+
+    protected static object GetIdentityTag(DependencyObject obj)
+    {
+        return obj.GetValue(IdentityTagProperty);
+    }
+
+    private static FrameworkElement GetVisualRoot(FrameworkElement child)
+    {
+        while (true)
+        {
+            if (!(VisualTreeHelper.GetParent(child) is FrameworkElement parent)) return child;
+            if (AdornerLayer.GetAdornerLayer(parent) == null) return child;
+            child = parent;
+        }
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        AssociatedObject.LayoutUpdated += AssociatedObject_LayoutUpdated;
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        AssociatedObject.LayoutUpdated -= AssociatedObject_LayoutUpdated;
+    }
+
+    protected static void SetIdentityTag(DependencyObject obj, object value)
+    {
+        obj.SetValue(IdentityTagProperty, value);
+    }
+
+    internal static Rect TranslateRect(Rect rect, FrameworkElement from, FrameworkElement to)
+    {
+        if (from == null || to == null) return rect;
+        var point = new Point(rect.Left, rect.Top);
+        point = from.TransformToVisual(to).Transform(point);
+        return new Rect(point.X, point.Y, rect.Width, rect.Height);
+    }
+
+    private void UpdateLayoutTransition(FrameworkElement child)
+    {
+        if (child.Visibility != Visibility.Collapsed && child.IsLoaded || !ShouldSkipInitialLayout)
+        {
+            var visualRoot = GetVisualRoot(child);
+            var newTagData = new TagData
+            {
+                Parent = VisualTreeHelper.GetParent(child) as FrameworkElement,
+                ParentRect = ExtendedVisualStateManager.GetLayoutRect(child),
+                Child = child,
+                Timestamp = DateTime.Now
+            };
+            try
+            {
+                newTagData.AppRect = TranslateRect(newTagData.ParentRect, newTagData.Parent, visualRoot);
+            }
+            catch (ArgumentException)
+            {
+                if (ShouldSkipInitialLayout) return;
+            }
+
+            EnsureTags(child);
+            var identityTag = GetIdentityTag(child) ?? child;
+            UpdateLayoutTransitionCore(child, visualRoot, identityTag, newTagData);
+        }
+    }
+
+    internal abstract void UpdateLayoutTransitionCore(FrameworkElement child, FrameworkElement root,
+        object tag, TagData newTagData);
+
+
+    internal class TagData
+    {
+        public Rect AppRect { get; set; }
+
+        public FrameworkElement Child { get; set; }
+
+        public object InitialTag { get; set; }
+
+        public FrameworkElement Parent { get; set; }
+
+        public Rect ParentRect { get; set; }
+
+        public DateTime Timestamp { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs
index e4661ca2..216e38f8 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs
@@ -3,350 +3,349 @@ using System.Windows.Input;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class MouseDragElementBehavior : Behavior<FrameworkElement>
 {
-    public class MouseDragElementBehavior : Behavior<FrameworkElement>
+    public static readonly DependencyProperty ConstrainToParentBoundsProperty =
+        DependencyProperty.Register("ConstrainToParentBounds", typeof(bool), typeof(MouseDragElementBehavior),
+            new PropertyMetadata(ValueBoxes.FalseBox, OnConstrainToParentBoundsChanged));
+
+    public static readonly DependencyProperty XProperty = DependencyProperty.Register("X", typeof(double),
+        typeof(MouseDragElementBehavior), new PropertyMetadata(double.PositiveInfinity, OnXChanged));
+
+    public static readonly DependencyProperty YProperty = DependencyProperty.Register("Y", typeof(double),
+        typeof(MouseDragElementBehavior), new PropertyMetadata(double.PositiveInfinity, OnYChanged));
+
+    // Fields
+    private Transform _cachedRenderTransform;
+
+    private Point _relativePosition;
+    private bool _settingPosition;
+
+    // Properties
+
+    public bool ConstrainToParentBounds
     {
-        public static readonly DependencyProperty ConstrainToParentBoundsProperty =
-            DependencyProperty.Register("ConstrainToParentBounds", typeof(bool), typeof(MouseDragElementBehavior),
-                new PropertyMetadata(ValueBoxes.FalseBox, OnConstrainToParentBoundsChanged));
+        get => (bool) GetValue(ConstrainToParentBoundsProperty);
+        set => SetValue(ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        public static readonly DependencyProperty XProperty = DependencyProperty.Register("X", typeof(double),
-            typeof(MouseDragElementBehavior), new PropertyMetadata(double.PositiveInfinity, OnXChanged));
-
-        public static readonly DependencyProperty YProperty = DependencyProperty.Register("Y", typeof(double),
-            typeof(MouseDragElementBehavior), new PropertyMetadata(double.PositiveInfinity, OnYChanged));
-
-        // Fields
-        private Transform _cachedRenderTransform;
-
-        private Point _relativePosition;
-        private bool _settingPosition;
-
-        // Properties
-
-        public bool ConstrainToParentBounds
+    private Rect ElementBounds
+    {
+        get
         {
-            get => (bool) GetValue(ConstrainToParentBoundsProperty);
-            set => SetValue(ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value));
+            var layoutRect = ExtendedVisualStateManager.GetLayoutRect(AssociatedObject);
+            return new Rect(new Point(0.0, 0.0), new Size(layoutRect.Width, layoutRect.Height));
         }
+    }
 
-        private Rect ElementBounds
+    private FrameworkElement ParentElement =>
+        AssociatedObject.Parent as FrameworkElement;
+
+    private Transform RenderTransform
+    {
+        get
         {
-            get
+            if (_cachedRenderTransform == null ||
+                !ReferenceEquals(_cachedRenderTransform, AssociatedObject.RenderTransform))
             {
-                var layoutRect = ExtendedVisualStateManager.GetLayoutRect(AssociatedObject);
-                return new Rect(new Point(0.0, 0.0), new Size(layoutRect.Width, layoutRect.Height));
+                var transform = CloneTransform(AssociatedObject.RenderTransform);
+                RenderTransform = transform;
             }
+            return _cachedRenderTransform;
         }
-
-        private FrameworkElement ParentElement =>
-            AssociatedObject.Parent as FrameworkElement;
-
-        private Transform RenderTransform
+        set
         {
-            get
+            if (!Equals(_cachedRenderTransform, value))
             {
-                if (_cachedRenderTransform == null ||
-                    !ReferenceEquals(_cachedRenderTransform, AssociatedObject.RenderTransform))
-                {
-                    var transform = CloneTransform(AssociatedObject.RenderTransform);
-                    RenderTransform = transform;
-                }
-                return _cachedRenderTransform;
-            }
-            set
-            {
-                if (!Equals(_cachedRenderTransform, value))
-                {
-                    _cachedRenderTransform = value;
-                    AssociatedObject.RenderTransform = value;
-                }
-            }
-        }
-
-        private UIElement RootElement
-        {
-            get
-            {
-                DependencyObject associatedObject = AssociatedObject;
-                for (var obj3 = associatedObject; obj3 != null; obj3 = VisualTreeHelper.GetParent(associatedObject))
-                    associatedObject = obj3;
-                return associatedObject as UIElement;
-            }
-        }
-
-        public double X
-        {
-            get =>
-                (double) GetValue(XProperty);
-            set => SetValue(XProperty, value);
-        }
-
-        public double Y
-        {
-            get =>
-                (double) GetValue(YProperty);
-            set => SetValue(YProperty, value);
-        }
-
-        // Events
-        public event MouseEventHandler DragBegun;
-
-        public event MouseEventHandler DragFinished;
-
-        public event MouseEventHandler Dragging;
-
-        // Methods
-        private void ApplyTranslation(double x, double y)
-        {
-            if (ParentElement != null)
-            {
-                var point = TransformAsVector(RootElement.TransformToVisual(ParentElement), x, y);
-                x = point.X;
-                y = point.Y;
-                if (ConstrainToParentBounds)
-                {
-                    var parentElement = ParentElement;
-                    var rect = new Rect(0.0, 0.0, parentElement.ActualWidth, parentElement.ActualHeight);
-                    var transform2 = AssociatedObject.TransformToVisual(parentElement);
-                    var elementBounds = ElementBounds;
-                    var rect3 = transform2.TransformBounds(elementBounds);
-                    rect3.X += x;
-                    rect3.Y += y;
-                    if (!RectContainsRect(rect, rect3))
-                    {
-                        if (rect3.X < rect.Left)
-                        {
-                            var num = rect3.X - rect.Left;
-                            x -= num;
-                        }
-                        else if (rect3.Right > rect.Right)
-                        {
-                            var num2 = rect3.Right - rect.Right;
-                            x -= num2;
-                        }
-                        if (rect3.Y < rect.Top)
-                        {
-                            var num3 = rect3.Y - rect.Top;
-                            y -= num3;
-                        }
-                        else if (rect3.Bottom > rect.Bottom)
-                        {
-                            var num4 = rect3.Bottom - rect.Bottom;
-                            y -= num4;
-                        }
-                    }
-                }
-                ApplyTranslationTransform(x, y);
-            }
-        }
-
-        internal void ApplyTranslationTransform(double x, double y)
-        {
-            var renderTransform = RenderTransform;
-            var transform2 = renderTransform as TranslateTransform;
-            if (transform2 == null)
-            {
-                var group = renderTransform as TransformGroup;
-                var transform3 = renderTransform as MatrixTransform;
-                if (group != null)
-                {
-                    if (group.Children.Count > 0)
-                        transform2 = group.Children[group.Children.Count - 1] as TranslateTransform;
-                    if (transform2 == null)
-                    {
-                        transform2 = new TranslateTransform();
-                        group.Children.Add(transform2);
-                    }
-                }
-                else
-                {
-                    if (transform3 != null)
-                    {
-                        var matrix = transform3.Matrix;
-                        matrix.OffsetX += x;
-                        matrix.OffsetY += y;
-                        var transform4 = new MatrixTransform
-                        {
-                            Matrix = matrix
-                        };
-                        RenderTransform = transform4;
-                        return;
-                    }
-                    var group2 = new TransformGroup();
-                    transform2 = new TranslateTransform();
-                    if (renderTransform != null)
-                        group2.Children.Add(renderTransform);
-                    group2.Children.Add(transform2);
-                    RenderTransform = group2;
-                }
-            }
-            transform2.X += x;
-            transform2.Y += y;
-        }
-
-        internal static Transform CloneTransform(Transform transform)
-        {
-            if (transform == null)
-                return null;
-            if (transform is ScaleTransform transform2)
-                return new ScaleTransform
-                {
-                    CenterX = transform2.CenterX,
-                    CenterY = transform2.CenterY,
-                    ScaleX = transform2.ScaleX,
-                    ScaleY = transform2.ScaleY
-                };
-            if (transform is RotateTransform transform3)
-                return new RotateTransform
-                {
-                    Angle = transform3.Angle,
-                    CenterX = transform3.CenterX,
-                    CenterY = transform3.CenterY
-                };
-            if (transform is SkewTransform transform4)
-                return new SkewTransform
-                {
-                    AngleX = transform4.AngleX,
-                    AngleY = transform4.AngleY,
-                    CenterX = transform4.CenterX,
-                    CenterY = transform4.CenterY
-                };
-            if (transform is TranslateTransform transform5)
-                return new TranslateTransform
-                {
-                    X = transform5.X,
-                    Y = transform5.Y
-                };
-            if (transform is MatrixTransform transform6)
-                return new MatrixTransform { Matrix = transform6.Matrix };
-            if (!(transform is TransformGroup group))
-                return null;
-            var group2 = new TransformGroup();
-            foreach (var transform12 in group.Children)
-                group2.Children.Add(CloneTransform(transform12));
-            return group2;
-        }
-
-        internal void EndDrag()
-        {
-            AssociatedObject.MouseMove -= OnMouseMove;
-            AssociatedObject.LostMouseCapture -= OnLostMouseCapture;
-            AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonUpEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonUp));
-        }
-
-        private static Point GetTransformOffset(GeneralTransform transform)
-        {
-            return transform.Transform(new Point(0.0, 0.0));
-        }
-
-        internal void HandleDrag(Point newPositionInElementCoordinates)
-        {
-            var x = newPositionInElementCoordinates.X - _relativePosition.X;
-            var y = newPositionInElementCoordinates.Y - _relativePosition.Y;
-            var point = TransformAsVector(AssociatedObject.TransformToVisual(RootElement), x, y);
-            _settingPosition = true;
-            ApplyTranslation(point.X, point.Y);
-            UpdatePosition();
-            _settingPosition = false;
-        }
-
-        protected override void OnAttached()
-        {
-            AssociatedObject.AddHandler(UIElement.MouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonDown), false);
-        }
-
-        private static void OnConstrainToParentBoundsChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var behavior = (MouseDragElementBehavior) sender;
-            behavior.UpdatePosition(new Point(behavior.X, behavior.Y));
-        }
-
-        protected override void OnDetaching()
-        {
-            AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonDown));
-        }
-
-        private void OnLostMouseCapture(object sender, MouseEventArgs e)
-        {
-            EndDrag();
-            DragFinished?.Invoke(this, e);
-        }
-
-        private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            StartDrag(e.GetPosition(AssociatedObject));
-            DragBegun?.Invoke(this, e);
-        }
-
-        private void OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            AssociatedObject.ReleaseMouseCapture();
-        }
-
-        private void OnMouseMove(object sender, MouseEventArgs e)
-        {
-            HandleDrag(e.GetPosition(AssociatedObject));
-            Dragging?.Invoke(this, e);
-        }
-
-        private static void OnXChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var behavior = (MouseDragElementBehavior) sender;
-            behavior.UpdatePosition(new Point((double) args.NewValue, behavior.Y));
-        }
-
-        private static void OnYChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var behavior = (MouseDragElementBehavior) sender;
-            behavior.UpdatePosition(new Point(behavior.X, (double) args.NewValue));
-        }
-
-        private static bool RectContainsRect(Rect rect1, Rect rect2)
-        {
-            if (rect1.IsEmpty || rect2.IsEmpty)
-                return false;
-            return rect1.X <= rect2.X && rect1.Y <= rect2.Y && rect1.X + rect1.Width >= rect2.X + rect2.Width &&
-                   rect1.Y + rect1.Height >= rect2.Y + rect2.Height;
-        }
-
-        internal void StartDrag(Point positionInElementCoordinates)
-        {
-            _relativePosition = positionInElementCoordinates;
-            AssociatedObject.CaptureMouse();
-            AssociatedObject.MouseMove += OnMouseMove;
-            AssociatedObject.LostMouseCapture += OnLostMouseCapture;
-            AssociatedObject.AddHandler(UIElement.MouseLeftButtonUpEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonUp), false);
-        }
-
-        private static Point TransformAsVector(GeneralTransform transform, double x, double y)
-        {
-            var point = transform.Transform(new Point(0.0, 0.0));
-            var point2 = transform.Transform(new Point(x, y));
-            return new Point(point2.X - point.X, point2.Y - point.Y);
-        }
-
-        private void UpdatePosition()
-        {
-            var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
-            X = transformOffset.X;
-            Y = transformOffset.Y;
-        }
-
-        private void UpdatePosition(Point point)
-        {
-            if (!_settingPosition && AssociatedObject != null)
-            {
-                var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
-                var x = double.IsNaN(point.X) ? 0.0 : point.X - transformOffset.X;
-                var y = double.IsNaN(point.Y) ? 0.0 : point.Y - transformOffset.Y;
-                ApplyTranslation(x, y);
+                _cachedRenderTransform = value;
+                AssociatedObject.RenderTransform = value;
             }
         }
     }
-}
+
+    private UIElement RootElement
+    {
+        get
+        {
+            DependencyObject associatedObject = AssociatedObject;
+            for (var obj3 = associatedObject; obj3 != null; obj3 = VisualTreeHelper.GetParent(associatedObject))
+                associatedObject = obj3;
+            return associatedObject as UIElement;
+        }
+    }
+
+    public double X
+    {
+        get =>
+            (double) GetValue(XProperty);
+        set => SetValue(XProperty, value);
+    }
+
+    public double Y
+    {
+        get =>
+            (double) GetValue(YProperty);
+        set => SetValue(YProperty, value);
+    }
+
+    // Events
+    public event MouseEventHandler DragBegun;
+
+    public event MouseEventHandler DragFinished;
+
+    public event MouseEventHandler Dragging;
+
+    // Methods
+    private void ApplyTranslation(double x, double y)
+    {
+        if (ParentElement != null)
+        {
+            var point = TransformAsVector(RootElement.TransformToVisual(ParentElement), x, y);
+            x = point.X;
+            y = point.Y;
+            if (ConstrainToParentBounds)
+            {
+                var parentElement = ParentElement;
+                var rect = new Rect(0.0, 0.0, parentElement.ActualWidth, parentElement.ActualHeight);
+                var transform2 = AssociatedObject.TransformToVisual(parentElement);
+                var elementBounds = ElementBounds;
+                var rect3 = transform2.TransformBounds(elementBounds);
+                rect3.X += x;
+                rect3.Y += y;
+                if (!RectContainsRect(rect, rect3))
+                {
+                    if (rect3.X < rect.Left)
+                    {
+                        var num = rect3.X - rect.Left;
+                        x -= num;
+                    }
+                    else if (rect3.Right > rect.Right)
+                    {
+                        var num2 = rect3.Right - rect.Right;
+                        x -= num2;
+                    }
+                    if (rect3.Y < rect.Top)
+                    {
+                        var num3 = rect3.Y - rect.Top;
+                        y -= num3;
+                    }
+                    else if (rect3.Bottom > rect.Bottom)
+                    {
+                        var num4 = rect3.Bottom - rect.Bottom;
+                        y -= num4;
+                    }
+                }
+            }
+            ApplyTranslationTransform(x, y);
+        }
+    }
+
+    internal void ApplyTranslationTransform(double x, double y)
+    {
+        var renderTransform = RenderTransform;
+        var transform2 = renderTransform as TranslateTransform;
+        if (transform2 == null)
+        {
+            var group = renderTransform as TransformGroup;
+            var transform3 = renderTransform as MatrixTransform;
+            if (group != null)
+            {
+                if (group.Children.Count > 0)
+                    transform2 = group.Children[group.Children.Count - 1] as TranslateTransform;
+                if (transform2 == null)
+                {
+                    transform2 = new TranslateTransform();
+                    group.Children.Add(transform2);
+                }
+            }
+            else
+            {
+                if (transform3 != null)
+                {
+                    var matrix = transform3.Matrix;
+                    matrix.OffsetX += x;
+                    matrix.OffsetY += y;
+                    var transform4 = new MatrixTransform
+                    {
+                        Matrix = matrix
+                    };
+                    RenderTransform = transform4;
+                    return;
+                }
+                var group2 = new TransformGroup();
+                transform2 = new TranslateTransform();
+                if (renderTransform != null)
+                    group2.Children.Add(renderTransform);
+                group2.Children.Add(transform2);
+                RenderTransform = group2;
+            }
+        }
+        transform2.X += x;
+        transform2.Y += y;
+    }
+
+    internal static Transform CloneTransform(Transform transform)
+    {
+        if (transform == null)
+            return null;
+        if (transform is ScaleTransform transform2)
+            return new ScaleTransform
+            {
+                CenterX = transform2.CenterX,
+                CenterY = transform2.CenterY,
+                ScaleX = transform2.ScaleX,
+                ScaleY = transform2.ScaleY
+            };
+        if (transform is RotateTransform transform3)
+            return new RotateTransform
+            {
+                Angle = transform3.Angle,
+                CenterX = transform3.CenterX,
+                CenterY = transform3.CenterY
+            };
+        if (transform is SkewTransform transform4)
+            return new SkewTransform
+            {
+                AngleX = transform4.AngleX,
+                AngleY = transform4.AngleY,
+                CenterX = transform4.CenterX,
+                CenterY = transform4.CenterY
+            };
+        if (transform is TranslateTransform transform5)
+            return new TranslateTransform
+            {
+                X = transform5.X,
+                Y = transform5.Y
+            };
+        if (transform is MatrixTransform transform6)
+            return new MatrixTransform { Matrix = transform6.Matrix };
+        if (!(transform is TransformGroup group))
+            return null;
+        var group2 = new TransformGroup();
+        foreach (var transform12 in group.Children)
+            group2.Children.Add(CloneTransform(transform12));
+        return group2;
+    }
+
+    internal void EndDrag()
+    {
+        AssociatedObject.MouseMove -= OnMouseMove;
+        AssociatedObject.LostMouseCapture -= OnLostMouseCapture;
+        AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonUpEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonUp));
+    }
+
+    private static Point GetTransformOffset(GeneralTransform transform)
+    {
+        return transform.Transform(new Point(0.0, 0.0));
+    }
+
+    internal void HandleDrag(Point newPositionInElementCoordinates)
+    {
+        var x = newPositionInElementCoordinates.X - _relativePosition.X;
+        var y = newPositionInElementCoordinates.Y - _relativePosition.Y;
+        var point = TransformAsVector(AssociatedObject.TransformToVisual(RootElement), x, y);
+        _settingPosition = true;
+        ApplyTranslation(point.X, point.Y);
+        UpdatePosition();
+        _settingPosition = false;
+    }
+
+    protected override void OnAttached()
+    {
+        AssociatedObject.AddHandler(UIElement.MouseLeftButtonDownEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonDown), false);
+    }
+
+    private static void OnConstrainToParentBoundsChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var behavior = (MouseDragElementBehavior) sender;
+        behavior.UpdatePosition(new Point(behavior.X, behavior.Y));
+    }
+
+    protected override void OnDetaching()
+    {
+        AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonDownEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonDown));
+    }
+
+    private void OnLostMouseCapture(object sender, MouseEventArgs e)
+    {
+        EndDrag();
+        DragFinished?.Invoke(this, e);
+    }
+
+    private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        StartDrag(e.GetPosition(AssociatedObject));
+        DragBegun?.Invoke(this, e);
+    }
+
+    private void OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        AssociatedObject.ReleaseMouseCapture();
+    }
+
+    private void OnMouseMove(object sender, MouseEventArgs e)
+    {
+        HandleDrag(e.GetPosition(AssociatedObject));
+        Dragging?.Invoke(this, e);
+    }
+
+    private static void OnXChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var behavior = (MouseDragElementBehavior) sender;
+        behavior.UpdatePosition(new Point((double) args.NewValue, behavior.Y));
+    }
+
+    private static void OnYChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var behavior = (MouseDragElementBehavior) sender;
+        behavior.UpdatePosition(new Point(behavior.X, (double) args.NewValue));
+    }
+
+    private static bool RectContainsRect(Rect rect1, Rect rect2)
+    {
+        if (rect1.IsEmpty || rect2.IsEmpty)
+            return false;
+        return rect1.X <= rect2.X && rect1.Y <= rect2.Y && rect1.X + rect1.Width >= rect2.X + rect2.Width &&
+               rect1.Y + rect1.Height >= rect2.Y + rect2.Height;
+    }
+
+    internal void StartDrag(Point positionInElementCoordinates)
+    {
+        _relativePosition = positionInElementCoordinates;
+        AssociatedObject.CaptureMouse();
+        AssociatedObject.MouseMove += OnMouseMove;
+        AssociatedObject.LostMouseCapture += OnLostMouseCapture;
+        AssociatedObject.AddHandler(UIElement.MouseLeftButtonUpEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonUp), false);
+    }
+
+    private static Point TransformAsVector(GeneralTransform transform, double x, double y)
+    {
+        var point = transform.Transform(new Point(0.0, 0.0));
+        var point2 = transform.Transform(new Point(x, y));
+        return new Point(point2.X - point.X, point2.Y - point.Y);
+    }
+
+    private void UpdatePosition()
+    {
+        var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
+        X = transformOffset.X;
+        Y = transformOffset.Y;
+    }
+
+    private void UpdatePosition(Point point)
+    {
+        if (!_settingPosition && AssociatedObject != null)
+        {
+            var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
+            var x = double.IsNaN(point.X) ? 0.0 : point.X - transformOffset.X;
+            var y = double.IsNaN(point.Y) ? 0.0 : point.Y - transformOffset.Y;
+            ApplyTranslation(x, y);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs
index fe3d38b7..1b3287c0 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs
@@ -4,366 +4,364 @@ using System.Windows.Media;
 using HandyControl.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+/// <summary>
+///     鼠标拖动行为，该类是反编译微软的System.Windows.Interactivity程序集得到的，并对其做了些扩展
+/// </summary>
+internal class MouseDragElementBehaviorEx : Behavior<FrameworkElement>
 {
+    public static readonly DependencyProperty XProperty = DependencyProperty.Register(nameof(X), typeof(double),
+        typeof(MouseDragElementBehaviorEx), new PropertyMetadata(double.NaN, OnXChanged));
+
+    public static readonly DependencyProperty YProperty = DependencyProperty.Register(nameof(Y), typeof(double),
+        typeof(MouseDragElementBehaviorEx), new PropertyMetadata(double.NaN, OnYChanged));
+
+    public static readonly DependencyProperty ConstrainToParentBoundsProperty =
+        DependencyProperty.Register(nameof(ConstrainToParentBounds), typeof(bool),
+            typeof(MouseDragElementBehaviorEx), new PropertyMetadata(ValueBoxes.FalseBox, OnConstrainToParentBoundsChanged));
+
+    private Transform _cachedRenderTransform;
+    private Point _relativePosition;
+    private bool _settingPosition;
+
     /// <summary>
-    ///     鼠标拖动行为，该类是反编译微软的System.Windows.Interactivity程序集得到的，并对其做了些扩展
+    ///     是否固定住Y轴
     /// </summary>
-    internal class MouseDragElementBehaviorEx : Behavior<FrameworkElement>
+    public bool LockY { get; set; }
+
+    /// <summary>
+    ///     是否固定住X轴
+    /// </summary>
+    public bool LockX { get; set; }
+
+    public double X
     {
-        public static readonly DependencyProperty XProperty = DependencyProperty.Register(nameof(X), typeof(double),
-            typeof(MouseDragElementBehaviorEx), new PropertyMetadata(double.NaN, OnXChanged));
+        get => (double) GetValue(MouseDragElementBehavior.XProperty);
+        set => SetValue(MouseDragElementBehavior.XProperty, value);
+    }
 
-        public static readonly DependencyProperty YProperty = DependencyProperty.Register(nameof(Y), typeof(double),
-            typeof(MouseDragElementBehaviorEx), new PropertyMetadata(double.NaN, OnYChanged));
+    public double Y
+    {
+        get => (double) GetValue(MouseDragElementBehavior.YProperty);
+        set => SetValue(MouseDragElementBehavior.YProperty, value);
+    }
 
-        public static readonly DependencyProperty ConstrainToParentBoundsProperty =
-            DependencyProperty.Register(nameof(ConstrainToParentBounds), typeof(bool),
-                typeof(MouseDragElementBehaviorEx), new PropertyMetadata(ValueBoxes.FalseBox, OnConstrainToParentBoundsChanged));
+    public bool ConstrainToParentBounds
+    {
+        get => (bool) GetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty);
+        set => SetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value));
+    }
 
-        private Transform _cachedRenderTransform;
-        private Point _relativePosition;
-        private bool _settingPosition;
-
-        /// <summary>
-        ///     是否固定住Y轴
-        /// </summary>
-        public bool LockY { get; set; }
-
-        /// <summary>
-        ///     是否固定住X轴
-        /// </summary>
-        public bool LockX { get; set; }
-
-        public double X
+    private Rect ElementBounds
+    {
+        get
         {
-            get => (double) GetValue(MouseDragElementBehavior.XProperty);
-            set => SetValue(MouseDragElementBehavior.XProperty, value);
-        }
-
-        public double Y
-        {
-            get => (double) GetValue(MouseDragElementBehavior.YProperty);
-            set => SetValue(MouseDragElementBehavior.YProperty, value);
-        }
-
-        public bool ConstrainToParentBounds
-        {
-            get => (bool) GetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty);
-            set => SetValue(MouseDragElementBehavior.ConstrainToParentBoundsProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private Rect ElementBounds
-        {
-            get
-            {
-                var layoutRect = ArithmeticHelper.GetLayoutRect(AssociatedObject);
-                return new Rect(new Point(0.0, 0.0), new Size(layoutRect.Width, layoutRect.Height));
-            }
-        }
-
-        private FrameworkElement ParentElement => AssociatedObject.Parent as FrameworkElement;
-
-        private UIElement RootElement
-        {
-            get
-            {
-                DependencyObject reference = AssociatedObject;
-                for (var dependencyObject = reference;
-                    dependencyObject != null;
-                    dependencyObject = VisualTreeHelper.GetParent(reference))
-                    reference = dependencyObject;
-                return reference as UIElement;
-            }
-        }
-
-        private Transform RenderTransform
-        {
-            get
-            {
-                if (_cachedRenderTransform == null ||
-                    !ReferenceEquals(_cachedRenderTransform, AssociatedObject.RenderTransform))
-                    RenderTransform = CloneTransform(AssociatedObject.RenderTransform);
-                return _cachedRenderTransform;
-            }
-            set
-            {
-                if (Equals(_cachedRenderTransform, value))
-                    return;
-                _cachedRenderTransform = value;
-                AssociatedObject.RenderTransform = value;
-            }
-        }
-
-        public event MouseEventHandler DragBegun;
-
-        public event MouseEventHandler Dragging;
-
-        public event MouseEventHandler DragFinished;
-
-        private static void OnXChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
-            dragElementBehavior.UpdatePosition(new Point((double) args.NewValue, dragElementBehavior.Y));
-        }
-
-        private static void OnYChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
-            dragElementBehavior.UpdatePosition(new Point(dragElementBehavior.X, (double) args.NewValue));
-        }
-
-        private static void OnConstrainToParentBoundsChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
-            dragElementBehavior.UpdatePosition(new Point(dragElementBehavior.X, dragElementBehavior.Y));
-        }
-
-        private void UpdatePosition(Point point)
-        {
-            if (_settingPosition || AssociatedObject == null)
-                return;
-            var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
-            ApplyTranslation(double.IsNaN(point.X) ? 0.0 : point.X - transformOffset.X,
-                double.IsNaN(point.Y) ? 0.0 : point.Y - transformOffset.Y);
-        }
-
-        private void ApplyTranslation(double x, double y)
-        {
-            if (ParentElement == null)
-                return;
-            var point = TransformAsVector(RootElement.TransformToVisual(ParentElement), x, y);
-            x = point.X;
-            y = point.Y;
-            if (ConstrainToParentBounds)
-            {
-                var parentElement = ParentElement;
-                var rect1 = new Rect(0.0, 0.0, parentElement.ActualWidth, parentElement.ActualHeight);
-                var rect2 = AssociatedObject.TransformToVisual(parentElement).TransformBounds(ElementBounds);
-                rect2.X += x;
-                rect2.Y += y;
-                if (!RectContainsRect(rect1, rect2))
-                {
-                    if (rect2.X < rect1.Left)
-                    {
-                        var num = rect2.X - rect1.Left;
-                        x -= num;
-                    }
-                    else if (rect2.Right > rect1.Right)
-                    {
-                        var num = rect2.Right - rect1.Right;
-                        x -= num;
-                    }
-                    if (rect2.Y < rect1.Top)
-                    {
-                        var num = rect2.Y - rect1.Top;
-                        y -= num;
-                    }
-                    else if (rect2.Bottom > rect1.Bottom)
-                    {
-                        var num = rect2.Bottom - rect1.Bottom;
-                        y -= num;
-                    }
-                }
-            }
-            ApplyTranslationTransform(x, y);
-        }
-
-        internal void ApplyTranslationTransform(double x, double y)
-        {
-            var renderTransform = RenderTransform;
-            var translateTransform = renderTransform as TranslateTransform;
-            if (translateTransform == null)
-            {
-                var matrixTransform = renderTransform as MatrixTransform;
-                if (renderTransform is TransformGroup transformGroup1)
-                {
-                    if (transformGroup1.Children.Count > 0)
-                        translateTransform =
-                            transformGroup1.Children[transformGroup1.Children.Count - 1] as TranslateTransform;
-                    if (translateTransform == null)
-                    {
-                        translateTransform = new TranslateTransform();
-                        transformGroup1.Children.Add(translateTransform);
-                    }
-                }
-                else
-                {
-                    if (matrixTransform != null)
-                    {
-                        var matrix = matrixTransform.Matrix;
-                        //在该处对微软的类进行了修改
-                        if (!LockX)
-                        {
-                            matrix.OffsetX += x;
-                        }
-                        if (!LockY)
-                        {
-                            matrix.OffsetY += y;
-                        }
-                        //修改结束
-                        RenderTransform = new MatrixTransform
-                        {
-                            Matrix = matrix
-                        };
-                        return;
-                    }
-                    var transformGroup2 = new TransformGroup();
-                    translateTransform = new TranslateTransform();
-                    if (renderTransform != null)
-                        transformGroup2.Children.Add(renderTransform);
-                    transformGroup2.Children.Add(translateTransform);
-                    RenderTransform = transformGroup2;
-                }
-            }
-            //在该处对微软的类进行了修改
-            if (!LockX)
-            {
-                translateTransform.X += x;
-            }
-            if (!LockY)
-            {
-                translateTransform.Y += y;
-            }
-            //修改结束
-        }
-
-        internal static Transform CloneTransform(Transform transform)
-        {
-            if (transform == null)
-                return null;
-            if (transform is ScaleTransform scaleTransform)
-                return new ScaleTransform
-                {
-                    CenterX = scaleTransform.CenterX,
-                    CenterY = scaleTransform.CenterY,
-                    ScaleX = scaleTransform.ScaleX,
-                    ScaleY = scaleTransform.ScaleY
-                };
-            if (transform is RotateTransform rotateTransform)
-                return new RotateTransform
-                {
-                    Angle = rotateTransform.Angle,
-                    CenterX = rotateTransform.CenterX,
-                    CenterY = rotateTransform.CenterY
-                };
-            if (transform is SkewTransform skewTransform)
-                return new SkewTransform
-                {
-                    AngleX = skewTransform.AngleX,
-                    AngleY = skewTransform.AngleY,
-                    CenterX = skewTransform.CenterX,
-                    CenterY = skewTransform.CenterY
-                };
-            if (transform is TranslateTransform translateTransform)
-                return new TranslateTransform
-                {
-                    X = translateTransform.X,
-                    Y = translateTransform.Y
-                };
-            if (transform is MatrixTransform matrixTransform)
-                return new MatrixTransform
-                {
-                    Matrix = matrixTransform.Matrix
-                };
-            if (!(transform is TransformGroup transformGroup1))
-                return null;
-            var transformGroup2 = new TransformGroup();
-            foreach (var child in transformGroup1.Children)
-                transformGroup2.Children.Add(CloneTransform(child));
-            return transformGroup2;
-        }
-
-        private void UpdatePosition()
-        {
-            var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
-            X = transformOffset.X;
-            Y = transformOffset.Y;
-        }
-
-        internal void StartDrag(Point positionInElementCoordinates)
-        {
-            _relativePosition = positionInElementCoordinates;
-            AssociatedObject.CaptureMouse();
-            AssociatedObject.MouseMove += OnMouseMove;
-            AssociatedObject.LostMouseCapture += OnLostMouseCapture;
-            AssociatedObject.AddHandler(UIElement.MouseLeftButtonUpEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonUp), false);
-        }
-
-        internal void HandleDrag(Point newPositionInElementCoordinates)
-        {
-            var point = TransformAsVector(AssociatedObject.TransformToVisual(RootElement),
-                newPositionInElementCoordinates.X - _relativePosition.X,
-                newPositionInElementCoordinates.Y - _relativePosition.Y);
-            _settingPosition = true;
-            ApplyTranslation(point.X, point.Y);
-            UpdatePosition();
-            _settingPosition = false;
-        }
-
-        internal void EndDrag()
-        {
-            AssociatedObject.MouseMove -= OnMouseMove;
-            AssociatedObject.LostMouseCapture -= OnLostMouseCapture;
-            AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonUpEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonUp));
-        }
-
-        private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            StartDrag(e.GetPosition(AssociatedObject));
-            DragBegun?.Invoke(this, e);
-        }
-
-        private void OnLostMouseCapture(object sender, MouseEventArgs e)
-        {
-            EndDrag();
-            DragFinished?.Invoke(this, e);
-        }
-
-        private void OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            AssociatedObject.ReleaseMouseCapture();
-        }
-
-        private void OnMouseMove(object sender, MouseEventArgs e)
-        {
-            HandleDrag(e.GetPosition(AssociatedObject));
-            Dragging?.Invoke(this, e);
-        }
-
-        private static bool RectContainsRect(Rect rect1, Rect rect2)
-        {
-            if (rect1.IsEmpty || rect2.IsEmpty || rect1.X > rect2.X || rect1.Y > rect2.Y ||
-                rect1.X + rect1.Width < rect2.X + rect2.Width)
-                return false;
-            return rect1.Y + rect1.Height >= rect2.Y + rect2.Height;
-        }
-
-        private static Point TransformAsVector(GeneralTransform transform, double x, double y)
-        {
-            var point1 = transform.Transform(new Point(0.0, 0.0));
-            var point2 = transform.Transform(new Point(x, y));
-            return new Point(point2.X - point1.X, point2.Y - point1.Y);
-        }
-
-        private static Point GetTransformOffset(GeneralTransform transform)
-        {
-            return transform.Transform(new Point(0.0, 0.0));
-        }
-
-        protected override void OnAttached()
-        {
-            AssociatedObject.AddHandler(UIElement.MouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonDown), false);
-        }
-
-        protected override void OnDetaching()
-        {
-            AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonDownEvent,
-                new MouseButtonEventHandler(OnMouseLeftButtonDown));
+            var layoutRect = ArithmeticHelper.GetLayoutRect(AssociatedObject);
+            return new Rect(new Point(0.0, 0.0), new Size(layoutRect.Width, layoutRect.Height));
         }
     }
 
-}
+    private FrameworkElement ParentElement => AssociatedObject.Parent as FrameworkElement;
+
+    private UIElement RootElement
+    {
+        get
+        {
+            DependencyObject reference = AssociatedObject;
+            for (var dependencyObject = reference;
+                 dependencyObject != null;
+                 dependencyObject = VisualTreeHelper.GetParent(reference))
+                reference = dependencyObject;
+            return reference as UIElement;
+        }
+    }
+
+    private Transform RenderTransform
+    {
+        get
+        {
+            if (_cachedRenderTransform == null ||
+                !ReferenceEquals(_cachedRenderTransform, AssociatedObject.RenderTransform))
+                RenderTransform = CloneTransform(AssociatedObject.RenderTransform);
+            return _cachedRenderTransform;
+        }
+        set
+        {
+            if (Equals(_cachedRenderTransform, value))
+                return;
+            _cachedRenderTransform = value;
+            AssociatedObject.RenderTransform = value;
+        }
+    }
+
+    public event MouseEventHandler DragBegun;
+
+    public event MouseEventHandler Dragging;
+
+    public event MouseEventHandler DragFinished;
+
+    private static void OnXChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
+        dragElementBehavior.UpdatePosition(new Point((double) args.NewValue, dragElementBehavior.Y));
+    }
+
+    private static void OnYChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
+        dragElementBehavior.UpdatePosition(new Point(dragElementBehavior.X, (double) args.NewValue));
+    }
+
+    private static void OnConstrainToParentBoundsChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        var dragElementBehavior = (MouseDragElementBehaviorEx) sender;
+        dragElementBehavior.UpdatePosition(new Point(dragElementBehavior.X, dragElementBehavior.Y));
+    }
+
+    private void UpdatePosition(Point point)
+    {
+        if (_settingPosition || AssociatedObject == null)
+            return;
+        var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
+        ApplyTranslation(double.IsNaN(point.X) ? 0.0 : point.X - transformOffset.X,
+            double.IsNaN(point.Y) ? 0.0 : point.Y - transformOffset.Y);
+    }
+
+    private void ApplyTranslation(double x, double y)
+    {
+        if (ParentElement == null)
+            return;
+        var point = TransformAsVector(RootElement.TransformToVisual(ParentElement), x, y);
+        x = point.X;
+        y = point.Y;
+        if (ConstrainToParentBounds)
+        {
+            var parentElement = ParentElement;
+            var rect1 = new Rect(0.0, 0.0, parentElement.ActualWidth, parentElement.ActualHeight);
+            var rect2 = AssociatedObject.TransformToVisual(parentElement).TransformBounds(ElementBounds);
+            rect2.X += x;
+            rect2.Y += y;
+            if (!RectContainsRect(rect1, rect2))
+            {
+                if (rect2.X < rect1.Left)
+                {
+                    var num = rect2.X - rect1.Left;
+                    x -= num;
+                }
+                else if (rect2.Right > rect1.Right)
+                {
+                    var num = rect2.Right - rect1.Right;
+                    x -= num;
+                }
+                if (rect2.Y < rect1.Top)
+                {
+                    var num = rect2.Y - rect1.Top;
+                    y -= num;
+                }
+                else if (rect2.Bottom > rect1.Bottom)
+                {
+                    var num = rect2.Bottom - rect1.Bottom;
+                    y -= num;
+                }
+            }
+        }
+        ApplyTranslationTransform(x, y);
+    }
+
+    internal void ApplyTranslationTransform(double x, double y)
+    {
+        var renderTransform = RenderTransform;
+        var translateTransform = renderTransform as TranslateTransform;
+        if (translateTransform == null)
+        {
+            var matrixTransform = renderTransform as MatrixTransform;
+            if (renderTransform is TransformGroup transformGroup1)
+            {
+                if (transformGroup1.Children.Count > 0)
+                    translateTransform =
+                        transformGroup1.Children[transformGroup1.Children.Count - 1] as TranslateTransform;
+                if (translateTransform == null)
+                {
+                    translateTransform = new TranslateTransform();
+                    transformGroup1.Children.Add(translateTransform);
+                }
+            }
+            else
+            {
+                if (matrixTransform != null)
+                {
+                    var matrix = matrixTransform.Matrix;
+                    //在该处对微软的类进行了修改
+                    if (!LockX)
+                    {
+                        matrix.OffsetX += x;
+                    }
+                    if (!LockY)
+                    {
+                        matrix.OffsetY += y;
+                    }
+                    //修改结束
+                    RenderTransform = new MatrixTransform
+                    {
+                        Matrix = matrix
+                    };
+                    return;
+                }
+                var transformGroup2 = new TransformGroup();
+                translateTransform = new TranslateTransform();
+                if (renderTransform != null)
+                    transformGroup2.Children.Add(renderTransform);
+                transformGroup2.Children.Add(translateTransform);
+                RenderTransform = transformGroup2;
+            }
+        }
+        //在该处对微软的类进行了修改
+        if (!LockX)
+        {
+            translateTransform.X += x;
+        }
+        if (!LockY)
+        {
+            translateTransform.Y += y;
+        }
+        //修改结束
+    }
+
+    internal static Transform CloneTransform(Transform transform)
+    {
+        if (transform == null)
+            return null;
+        if (transform is ScaleTransform scaleTransform)
+            return new ScaleTransform
+            {
+                CenterX = scaleTransform.CenterX,
+                CenterY = scaleTransform.CenterY,
+                ScaleX = scaleTransform.ScaleX,
+                ScaleY = scaleTransform.ScaleY
+            };
+        if (transform is RotateTransform rotateTransform)
+            return new RotateTransform
+            {
+                Angle = rotateTransform.Angle,
+                CenterX = rotateTransform.CenterX,
+                CenterY = rotateTransform.CenterY
+            };
+        if (transform is SkewTransform skewTransform)
+            return new SkewTransform
+            {
+                AngleX = skewTransform.AngleX,
+                AngleY = skewTransform.AngleY,
+                CenterX = skewTransform.CenterX,
+                CenterY = skewTransform.CenterY
+            };
+        if (transform is TranslateTransform translateTransform)
+            return new TranslateTransform
+            {
+                X = translateTransform.X,
+                Y = translateTransform.Y
+            };
+        if (transform is MatrixTransform matrixTransform)
+            return new MatrixTransform
+            {
+                Matrix = matrixTransform.Matrix
+            };
+        if (!(transform is TransformGroup transformGroup1))
+            return null;
+        var transformGroup2 = new TransformGroup();
+        foreach (var child in transformGroup1.Children)
+            transformGroup2.Children.Add(CloneTransform(child));
+        return transformGroup2;
+    }
+
+    private void UpdatePosition()
+    {
+        var transformOffset = GetTransformOffset(AssociatedObject.TransformToVisual(RootElement));
+        X = transformOffset.X;
+        Y = transformOffset.Y;
+    }
+
+    internal void StartDrag(Point positionInElementCoordinates)
+    {
+        _relativePosition = positionInElementCoordinates;
+        AssociatedObject.CaptureMouse();
+        AssociatedObject.MouseMove += OnMouseMove;
+        AssociatedObject.LostMouseCapture += OnLostMouseCapture;
+        AssociatedObject.AddHandler(UIElement.MouseLeftButtonUpEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonUp), false);
+    }
+
+    internal void HandleDrag(Point newPositionInElementCoordinates)
+    {
+        var point = TransformAsVector(AssociatedObject.TransformToVisual(RootElement),
+            newPositionInElementCoordinates.X - _relativePosition.X,
+            newPositionInElementCoordinates.Y - _relativePosition.Y);
+        _settingPosition = true;
+        ApplyTranslation(point.X, point.Y);
+        UpdatePosition();
+        _settingPosition = false;
+    }
+
+    internal void EndDrag()
+    {
+        AssociatedObject.MouseMove -= OnMouseMove;
+        AssociatedObject.LostMouseCapture -= OnLostMouseCapture;
+        AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonUpEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonUp));
+    }
+
+    private void OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        StartDrag(e.GetPosition(AssociatedObject));
+        DragBegun?.Invoke(this, e);
+    }
+
+    private void OnLostMouseCapture(object sender, MouseEventArgs e)
+    {
+        EndDrag();
+        DragFinished?.Invoke(this, e);
+    }
+
+    private void OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+    {
+        AssociatedObject.ReleaseMouseCapture();
+    }
+
+    private void OnMouseMove(object sender, MouseEventArgs e)
+    {
+        HandleDrag(e.GetPosition(AssociatedObject));
+        Dragging?.Invoke(this, e);
+    }
+
+    private static bool RectContainsRect(Rect rect1, Rect rect2)
+    {
+        if (rect1.IsEmpty || rect2.IsEmpty || rect1.X > rect2.X || rect1.Y > rect2.Y ||
+            rect1.X + rect1.Width < rect2.X + rect2.Width)
+            return false;
+        return rect1.Y + rect1.Height >= rect2.Y + rect2.Height;
+    }
+
+    private static Point TransformAsVector(GeneralTransform transform, double x, double y)
+    {
+        var point1 = transform.Transform(new Point(0.0, 0.0));
+        var point2 = transform.Transform(new Point(x, y));
+        return new Point(point2.X - point1.X, point2.Y - point1.Y);
+    }
+
+    private static Point GetTransformOffset(GeneralTransform transform)
+    {
+        return transform.Transform(new Point(0.0, 0.0));
+    }
+
+    protected override void OnAttached()
+    {
+        AssociatedObject.AddHandler(UIElement.MouseLeftButtonDownEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonDown), false);
+    }
+
+    protected override void OnDetaching()
+    {
+        AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonDownEvent,
+            new MouseButtonEventHandler(OnMouseLeftButtonDown));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
index 746e5cf2..b01d4403 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
@@ -2,23 +2,22 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace HandyControl.Interactivity
-{
-    public class CloseWindowCommand : ICommand
-    {
-        public bool CanExecute(object parameter) => true;
+namespace HandyControl.Interactivity;
 
-        public void Execute(object parameter)
+public class CloseWindowCommand : ICommand
+{
+    public bool CanExecute(object parameter) => true;
+
+    public void Execute(object parameter)
+    {
+        if (parameter is DependencyObject dependencyObject)
         {
-            if (parameter is DependencyObject dependencyObject)
+            if (Window.GetWindow(dependencyObject) is { } window)
             {
-                if (Window.GetWindow(dependencyObject) is { } window)
-                {
-                    window.Close();
-                }
+                window.Close();
             }
         }
-
-        public event EventHandler CanExecuteChanged;
     }
-}
+
+    public event EventHandler CanExecuteChanged;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
index a949d26e..1c18fb4d 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
@@ -1,185 +1,184 @@
 using System.Windows.Input;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+/// <summary>
+///     控件库使用的所有命令（为了统一，不使用wpf自带的命令）
+/// </summary>
+public static class ControlCommands
 {
     /// <summary>
-    ///     控件库使用的所有命令（为了统一，不使用wpf自带的命令）
+    ///     搜索
     /// </summary>
-    public static class ControlCommands
-    {
-        /// <summary>
-        ///     搜索
-        /// </summary>
-        public static RoutedCommand Search { get; } = new(nameof(Search), typeof(ControlCommands));
+    public static RoutedCommand Search { get; } = new(nameof(Search), typeof(ControlCommands));
 
-        /// <summary>
-        ///     清除
-        /// </summary>
-        public static RoutedCommand Clear { get; } = new(nameof(Clear), typeof(ControlCommands));
+    /// <summary>
+    ///     清除
+    /// </summary>
+    public static RoutedCommand Clear { get; } = new(nameof(Clear), typeof(ControlCommands));
 
-        /// <summary>
-        ///     切换
-        /// </summary>
-        public static RoutedCommand Switch { get; } = new(nameof(Switch), typeof(ControlCommands));
+    /// <summary>
+    ///     切换
+    /// </summary>
+    public static RoutedCommand Switch { get; } = new(nameof(Switch), typeof(ControlCommands));
 
-        /// <summary>
-        ///     右转
-        /// </summary>
-        public static RoutedCommand RotateRight { get; } = new(nameof(RotateRight), typeof(ControlCommands));
+    /// <summary>
+    ///     右转
+    /// </summary>
+    public static RoutedCommand RotateRight { get; } = new(nameof(RotateRight), typeof(ControlCommands));
 
-        /// <summary>
-        ///     左转
-        /// </summary>
-        public static RoutedCommand RotateLeft { get; } = new(nameof(RotateLeft), typeof(ControlCommands));
+    /// <summary>
+    ///     左转
+    /// </summary>
+    public static RoutedCommand RotateLeft { get; } = new(nameof(RotateLeft), typeof(ControlCommands));
 
-        /// <summary>
-        ///     小
-        /// </summary>
-        public static RoutedCommand Reduce { get; } = new(nameof(Reduce), typeof(ControlCommands));
+    /// <summary>
+    ///     小
+    /// </summary>
+    public static RoutedCommand Reduce { get; } = new(nameof(Reduce), typeof(ControlCommands));
 
-        /// <summary>
-        ///     大
-        /// </summary>
-        public static RoutedCommand Enlarge { get; } = new(nameof(Enlarge), typeof(ControlCommands));
+    /// <summary>
+    ///     大
+    /// </summary>
+    public static RoutedCommand Enlarge { get; } = new(nameof(Enlarge), typeof(ControlCommands));
 
-        /// <summary>
-        ///     还原
-        /// </summary>
-        public static RoutedCommand Restore { get; } = new(nameof(Restore), typeof(ControlCommands));
+    /// <summary>
+    ///     还原
+    /// </summary>
+    public static RoutedCommand Restore { get; } = new(nameof(Restore), typeof(ControlCommands));
 
-        /// <summary>
-        ///     打开
-        /// </summary>
-        public static RoutedCommand Open { get; } = new(nameof(Open), typeof(ControlCommands));
+    /// <summary>
+    ///     打开
+    /// </summary>
+    public static RoutedCommand Open { get; } = new(nameof(Open), typeof(ControlCommands));
 
-        /// <summary>
-        ///     保存
-        /// </summary>
-        public static RoutedCommand Save { get; } = new(nameof(Save), typeof(ControlCommands));
+    /// <summary>
+    ///     保存
+    /// </summary>
+    public static RoutedCommand Save { get; } = new(nameof(Save), typeof(ControlCommands));
 
-        /// <summary>
-        ///     选中
-        /// </summary>
-        public static RoutedCommand Selected { get; } = new(nameof(Selected), typeof(ControlCommands));
+    /// <summary>
+    ///     选中
+    /// </summary>
+    public static RoutedCommand Selected { get; } = new(nameof(Selected), typeof(ControlCommands));
 
-        /// <summary>
-        ///     关闭
-        /// </summary>
-        public static RoutedCommand Close { get; } = new(nameof(Close), typeof(ControlCommands));
+    /// <summary>
+    ///     关闭
+    /// </summary>
+    public static RoutedCommand Close { get; } = new(nameof(Close), typeof(ControlCommands));
 
-        /// <summary>
-        ///     取消
-        /// </summary>
-        public static RoutedCommand Cancel { get; } = new(nameof(Cancel), typeof(ControlCommands));
+    /// <summary>
+    ///     取消
+    /// </summary>
+    public static RoutedCommand Cancel { get; } = new(nameof(Cancel), typeof(ControlCommands));
 
-        /// <summary>
-        ///     确定
-        /// </summary>
-        public static RoutedCommand Confirm { get; } = new(nameof(Confirm), typeof(ControlCommands));
+    /// <summary>
+    ///     确定
+    /// </summary>
+    public static RoutedCommand Confirm { get; } = new(nameof(Confirm), typeof(ControlCommands));
 
-        /// <summary>
-        ///     是
-        /// </summary>
-        public static RoutedCommand Yes { get; } = new(nameof(Yes), typeof(ControlCommands));
+    /// <summary>
+    ///     是
+    /// </summary>
+    public static RoutedCommand Yes { get; } = new(nameof(Yes), typeof(ControlCommands));
 
-        /// <summary>
-        ///     否
-        /// </summary>
-        public static RoutedCommand No { get; } = new(nameof(No), typeof(ControlCommands));
+    /// <summary>
+    ///     否
+    /// </summary>
+    public static RoutedCommand No { get; } = new(nameof(No), typeof(ControlCommands));
 
-        /// <summary>
-        ///     关闭所有
-        /// </summary>
-        public static RoutedCommand CloseAll { get; } = new(nameof(CloseAll), typeof(ControlCommands));
+    /// <summary>
+    ///     关闭所有
+    /// </summary>
+    public static RoutedCommand CloseAll { get; } = new(nameof(CloseAll), typeof(ControlCommands));
 
-        /// <summary>
-        ///     关闭其他
-        /// </summary>
-        public static RoutedCommand CloseOther { get; } = new(nameof(CloseOther), typeof(ControlCommands));
+    /// <summary>
+    ///     关闭其他
+    /// </summary>
+    public static RoutedCommand CloseOther { get; } = new(nameof(CloseOther), typeof(ControlCommands));
 
-        /// <summary>
-        ///     上一个
-        /// </summary>
-        public static RoutedCommand Prev { get; } = new(nameof(Prev), typeof(ControlCommands));
+    /// <summary>
+    ///     上一个
+    /// </summary>
+    public static RoutedCommand Prev { get; } = new(nameof(Prev), typeof(ControlCommands));
 
-        /// <summary>
-        ///     下一个
-        /// </summary>
-        public static RoutedCommand Next { get; } = new(nameof(Next), typeof(ControlCommands));
+    /// <summary>
+    ///     下一个
+    /// </summary>
+    public static RoutedCommand Next { get; } = new(nameof(Next), typeof(ControlCommands));
 
-        /// <summary>
-        ///     跳转
-        /// </summary>
-        public static RoutedCommand Jump { get; } = new(nameof(Jump), typeof(ControlCommands));
+    /// <summary>
+    ///     跳转
+    /// </summary>
+    public static RoutedCommand Jump { get; } = new(nameof(Jump), typeof(ControlCommands));
 
-        /// <summary>
-        ///     上午
-        /// </summary>
-        public static RoutedCommand Am { get; } = new(nameof(Am), typeof(ControlCommands));
+    /// <summary>
+    ///     上午
+    /// </summary>
+    public static RoutedCommand Am { get; } = new(nameof(Am), typeof(ControlCommands));
 
-        /// <summary>
-        ///     下午
-        /// </summary>
-        public static RoutedCommand Pm { get; } = new(nameof(Pm), typeof(ControlCommands));
+    /// <summary>
+    ///     下午
+    /// </summary>
+    public static RoutedCommand Pm { get; } = new(nameof(Pm), typeof(ControlCommands));
 
-        /// <summary>
-        ///     确认
-        /// </summary>
-        public static RoutedCommand Sure { get; } = new(nameof(Sure), typeof(ControlCommands));
+    /// <summary>
+    ///     确认
+    /// </summary>
+    public static RoutedCommand Sure { get; } = new(nameof(Sure), typeof(ControlCommands));
 
-        /// <summary>
-        ///     小时改变
-        /// </summary>
-        public static RoutedCommand HourChange { get; } = new(nameof(HourChange), typeof(ControlCommands));
+    /// <summary>
+    ///     小时改变
+    /// </summary>
+    public static RoutedCommand HourChange { get; } = new(nameof(HourChange), typeof(ControlCommands));
 
-        /// <summary>
-        ///     分钟改变
-        /// </summary>
-        public static RoutedCommand MinuteChange { get; } = new(nameof(MinuteChange), typeof(ControlCommands));
+    /// <summary>
+    ///     分钟改变
+    /// </summary>
+    public static RoutedCommand MinuteChange { get; } = new(nameof(MinuteChange), typeof(ControlCommands));
 
-        /// <summary>
-        ///     秒改变
-        /// </summary>
-        public static RoutedCommand SecondChange { get; } = new(nameof(SecondChange), typeof(ControlCommands));
+    /// <summary>
+    ///     秒改变
+    /// </summary>
+    public static RoutedCommand SecondChange { get; } = new(nameof(SecondChange), typeof(ControlCommands));
 
-        /// <summary>
-        ///     鼠标移动
-        /// </summary>
-        public static RoutedCommand MouseMove { get; } = new(nameof(MouseMove), typeof(ControlCommands));
+    /// <summary>
+    ///     鼠标移动
+    /// </summary>
+    public static RoutedCommand MouseMove { get; } = new(nameof(MouseMove), typeof(ControlCommands));
 
-        /// <summary>
-        ///     打开链接
-        /// </summary>
-        public static OpenLinkCommand OpenLink { get; } = new();
+    /// <summary>
+    ///     打开链接
+    /// </summary>
+    public static OpenLinkCommand OpenLink { get; } = new();
 
-        /// <summary>
-        ///     关闭程序
-        /// </summary>
-        public static ShutdownAppCommand ShutdownApp { get; } = new();
+    /// <summary>
+    ///     关闭程序
+    /// </summary>
+    public static ShutdownAppCommand ShutdownApp { get; } = new();
 
-        /// <summary>
-        ///     前置主窗口
-        /// </summary>
-        public static PushMainWindow2TopCommand PushMainWindow2Top { get; } = new();
+    /// <summary>
+    ///     前置主窗口
+    /// </summary>
+    public static PushMainWindow2TopCommand PushMainWindow2Top { get; } = new();
 
-        /// <summary>
-        ///     关闭窗口
-        /// </summary>
-        public static CloseWindowCommand CloseWindow { get; } = new();
+    /// <summary>
+    ///     关闭窗口
+    /// </summary>
+    public static CloseWindowCommand CloseWindow { get; } = new();
 
-        /// <summary>
-        ///     开始截图
-        /// </summary>
-        public static StartScreenshotCommand StartScreenshot { get; } = new();
+    /// <summary>
+    ///     开始截图
+    /// </summary>
+    public static StartScreenshotCommand StartScreenshot { get; } = new();
 
-        /// <summary>
-        ///     按照类别排序
-        /// </summary>
-        public static RoutedCommand SortByCategory { get; } = new(nameof(SortByCategory), typeof(ControlCommands));
+    /// <summary>
+    ///     按照类别排序
+    /// </summary>
+    public static RoutedCommand SortByCategory { get; } = new(nameof(SortByCategory), typeof(ControlCommands));
 
-        /// <summary>
-        ///     按照名称排序
-        /// </summary>
-        public static RoutedCommand SortByName { get; } = new(nameof(SortByName), typeof(ControlCommands));
-    }
-}
+    /// <summary>
+    ///     按照名称排序
+    /// </summary>
+    public static RoutedCommand SortByName { get; } = new(nameof(SortByName), typeof(ControlCommands));
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
index d21175a4..7d666516 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
@@ -2,32 +2,31 @@
 using System.Diagnostics;
 using System.Windows.Input;
 
-namespace HandyControl.Interactivity
-{
-    public class OpenLinkCommand : ICommand
-    {
-        public bool CanExecute(object parameter) => true;
+namespace HandyControl.Interactivity;
 
-        public void Execute(object parameter)
+public class OpenLinkCommand : ICommand
+{
+    public bool CanExecute(object parameter) => true;
+
+    public void Execute(object parameter)
+    {
+        if (parameter is string link)
         {
-            if (parameter is string link)
+            link = link.Replace("&", "^&");
+            try
             {
-                link = link.Replace("&", "^&");
-                try
+                Process.Start(new ProcessStartInfo("cmd", $"/c start {link}")
                 {
-                    Process.Start(new ProcessStartInfo("cmd", $"/c start {link}")
-                    {
-                        UseShellExecute = false,
-                        CreateNoWindow = true
-                    });
-                }
-                catch
-                {
-                    // ignored
-                }
+                    UseShellExecute = false,
+                    CreateNoWindow = true
+                });
+            }
+            catch
+            {
+                // ignored
             }
         }
-
-        public event EventHandler CanExecuteChanged;
     }
-}
+
+    public event EventHandler CanExecuteChanged;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
index 654da612..9c1a95c9 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
@@ -3,21 +3,20 @@ using System.Windows;
 using System.Windows.Input;
 using HandyControl.Tools;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class PushMainWindow2TopCommand : ICommand
 {
-    public class PushMainWindow2TopCommand : ICommand
+    public bool CanExecute(object parameter) => true;
+
+    public void Execute(object parameter)
     {
-        public bool CanExecute(object parameter) => true;
-
-        public void Execute(object parameter)
+        if (Application.Current.MainWindow != null && Application.Current.MainWindow.Visibility != Visibility.Visible)
         {
-            if (Application.Current.MainWindow != null && Application.Current.MainWindow.Visibility != Visibility.Visible)
-            {
-                Application.Current.MainWindow.Show();
-                WindowHelper.SetWindowToForeground(Application.Current.MainWindow);
-            }
+            Application.Current.MainWindow.Show();
+            WindowHelper.SetWindowToForeground(Application.Current.MainWindow);
         }
-
-        public event EventHandler CanExecuteChanged;
     }
-}
+
+    public event EventHandler CanExecuteChanged;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
index dd7920ca..ce34a41c 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
@@ -2,14 +2,13 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class ShutdownAppCommand : ICommand
 {
-    public class ShutdownAppCommand : ICommand
-    {
-        public bool CanExecute(object parameter) => true;
+    public bool CanExecute(object parameter) => true;
 
-        public void Execute(object parameter) => Application.Current.Shutdown();
+    public void Execute(object parameter) => Application.Current.Shutdown();
 
-        public event EventHandler CanExecuteChanged;
-    }
-}
+    public event EventHandler CanExecuteChanged;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
index cefef4f4..fdd7b379 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
@@ -2,14 +2,13 @@
 using System.Windows.Input;
 using HandyControl.Controls;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class StartScreenshotCommand : ICommand
 {
-    public class StartScreenshotCommand : ICommand
-    {
-        public bool CanExecute(object parameter) => true;
+    public bool CanExecute(object parameter) => true;
 
-        public void Execute(object parameter) => new Screenshot().Start();
+    public void Execute(object parameter) => new Screenshot().Start();
 
-        public event EventHandler CanExecuteChanged;
-    }
-}
+    public event EventHandler CanExecuteChanged;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs b/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs
index 9e58a826..651a5fa0 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs
@@ -2,48 +2,47 @@
 using System.Collections;
 using System.Globalization;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Class, AllowMultiple = true)]
+public sealed class DefaultTriggerAttribute : Attribute
 {
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class, AllowMultiple = true)]
-    public sealed class DefaultTriggerAttribute : Attribute
+    private readonly object[] _parameters;
+
+    public DefaultTriggerAttribute(Type targetType, Type triggerType, object parameter) : this(targetType,
+        triggerType, new[] { parameter })
     {
-        private readonly object[] _parameters;
-
-        public DefaultTriggerAttribute(Type targetType, Type triggerType, object parameter) : this(targetType,
-            triggerType, new[] { parameter })
-        {
-        }
-
-        public DefaultTriggerAttribute(Type targetType, Type triggerType, params object[] parameters)
-        {
-            if (!typeof(TriggerBase).IsAssignableFrom(triggerType))
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
-                    ExceptionStringTable.DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage,
-                    new object[] { triggerType.Name }));
-            TargetType = targetType;
-            TriggerType = triggerType;
-            _parameters = parameters;
-        }
-
-        public IEnumerable Parameters =>
-            _parameters;
-
-        public Type TargetType { get; }
-
-        public Type TriggerType { get; }
-
-        public TriggerBase Instantiate()
-        {
-            object obj2 = null;
-            try
-            {
-                obj2 = Activator.CreateInstance(TriggerType, _parameters);
-            }
-            catch
-            {
-                // ignored
-            }
-            return (TriggerBase) obj2;
-        }
     }
-}
+
+    public DefaultTriggerAttribute(Type targetType, Type triggerType, params object[] parameters)
+    {
+        if (!typeof(TriggerBase).IsAssignableFrom(triggerType))
+            throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
+                ExceptionStringTable.DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage,
+                new object[] { triggerType.Name }));
+        TargetType = targetType;
+        TriggerType = triggerType;
+        _parameters = parameters;
+    }
+
+    public IEnumerable Parameters =>
+        _parameters;
+
+    public Type TargetType { get; }
+
+    public Type TriggerType { get; }
+
+    public TriggerBase Instantiate()
+    {
+        object obj2 = null;
+        try
+        {
+            obj2 = Activator.CreateInstance(TriggerType, _parameters);
+        }
+        catch
+        {
+            // ignored
+        }
+        return (TriggerBase) obj2;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
index 819b9923..2c565100 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
@@ -27,169 +27,168 @@ using System.Windows;
 using System.Windows.Input;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class EventToCommand : TriggerAction<DependencyObject>
 {
-    public class EventToCommand : TriggerAction<DependencyObject>
+    public const string EventArgsConverterParameterPropertyName = "EventArgsConverterParameter";
+
+    public const string AlwaysInvokeCommandPropertyName = "AlwaysInvokeCommand";
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
+        nameof(CommandParameter), typeof(object), typeof(EventToCommand), new PropertyMetadata(null,
+            (s, e) =>
+            {
+                var eventToCommand = s as EventToCommand;
+                if (eventToCommand?.AssociatedObject == null)
+                    return;
+                eventToCommand.EnableDisableElement();
+            }));
+
+    public static readonly DependencyProperty CommandProperty =
+        DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(EventToCommand),
+            new PropertyMetadata(null, (s, e) => OnCommandChanged(s as EventToCommand, e)));
+
+    public static readonly DependencyProperty MustToggleIsEnabledProperty = DependencyProperty.Register(
+        nameof(MustToggleIsEnabled), typeof(bool), typeof(EventToCommand), new PropertyMetadata(ValueBoxes.FalseBox,
+            (s, e) =>
+            {
+                var eventToCommand = s as EventToCommand;
+                if (eventToCommand?.AssociatedObject == null)
+                    return;
+                eventToCommand.EnableDisableElement();
+            }));
+
+    public static readonly DependencyProperty EventArgsConverterParameterProperty =
+        DependencyProperty.Register(nameof(EventArgsConverterParameter), typeof(object),
+            typeof(EventToCommand), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty AlwaysInvokeCommandProperty =
+        DependencyProperty.Register(nameof(AlwaysInvokeCommand), typeof(bool), typeof(EventToCommand),
+            new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private object _commandParameterValue;
+
+    private bool? _mustToggleValue;
+
+    public ICommand Command
     {
-        public const string EventArgsConverterParameterPropertyName = "EventArgsConverterParameter";
+        get => (ICommand) GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
 
-        public const string AlwaysInvokeCommandPropertyName = "AlwaysInvokeCommand";
+    public object CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
 
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register(
-            nameof(CommandParameter), typeof(object), typeof(EventToCommand), new PropertyMetadata(null,
-                (s, e) =>
-                {
-                    var eventToCommand = s as EventToCommand;
-                    if (eventToCommand?.AssociatedObject == null)
-                        return;
-                    eventToCommand.EnableDisableElement();
-                }));
-
-        public static readonly DependencyProperty CommandProperty =
-            DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(EventToCommand),
-                new PropertyMetadata(null, (s, e) => OnCommandChanged(s as EventToCommand, e)));
-
-        public static readonly DependencyProperty MustToggleIsEnabledProperty = DependencyProperty.Register(
-            nameof(MustToggleIsEnabled), typeof(bool), typeof(EventToCommand), new PropertyMetadata(ValueBoxes.FalseBox,
-                (s, e) =>
-                {
-                    var eventToCommand = s as EventToCommand;
-                    if (eventToCommand?.AssociatedObject == null)
-                        return;
-                    eventToCommand.EnableDisableElement();
-                }));
-
-        public static readonly DependencyProperty EventArgsConverterParameterProperty =
-            DependencyProperty.Register(nameof(EventArgsConverterParameter), typeof(object),
-                typeof(EventToCommand), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty AlwaysInvokeCommandProperty =
-            DependencyProperty.Register(nameof(AlwaysInvokeCommand), typeof(bool), typeof(EventToCommand),
-                new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private object _commandParameterValue;
-
-        private bool? _mustToggleValue;
-
-        public ICommand Command
+    public object CommandParameterValue
+    {
+        get => _commandParameterValue ?? CommandParameter;
+        set
         {
-            get => (ICommand) GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        public object CommandParameter
-        {
-            get => GetValue(CommandParameterProperty);
-            set => SetValue(CommandParameterProperty, value);
-        }
-
-        public object CommandParameterValue
-        {
-            get => _commandParameterValue ?? CommandParameter;
-            set
-            {
-                _commandParameterValue = value;
-                EnableDisableElement();
-            }
-        }
-
-        public bool MustToggleIsEnabled
-        {
-            get => (bool) GetValue(MustToggleIsEnabledProperty);
-            set => SetValue(MustToggleIsEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        public bool MustToggleIsEnabledValue
-        {
-            get
-            {
-                if (_mustToggleValue.HasValue)
-                    return _mustToggleValue.Value;
-                return MustToggleIsEnabled;
-            }
-            set
-            {
-                _mustToggleValue = value;
-                EnableDisableElement();
-            }
-        }
-
-        public bool PassEventArgsToCommand { get; set; }
-
-        public IEventArgsConverter EventArgsConverter { get; set; }
-
-        public object EventArgsConverterParameter
-        {
-            get => GetValue(EventArgsConverterParameterProperty);
-            set => SetValue(EventArgsConverterParameterProperty, value);
-        }
-
-        public bool AlwaysInvokeCommand
-        {
-            get => (bool) GetValue(AlwaysInvokeCommandProperty);
-            set => SetValue(AlwaysInvokeCommandProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        protected override void OnAttached()
-        {
-            base.OnAttached();
+            _commandParameterValue = value;
             EnableDisableElement();
         }
-
-        private FrameworkElement GetAssociatedObject() => AssociatedObject as FrameworkElement;
-
-        private ICommand GetCommand() => Command;
-
-        public void Invoke() => Invoke(null);
-
-        protected override void Invoke(object parameter)
-        {
-            if (AssociatedElementIsDisabled() && !AlwaysInvokeCommand)
-                return;
-            var command = GetCommand();
-            var parameter1 = CommandParameterValue;
-            if (parameter1 == null && PassEventArgsToCommand)
-                parameter1 = EventArgsConverter == null
-                    ? parameter
-                    : EventArgsConverter.Convert(parameter, EventArgsConverterParameter);
-            if (command == null || !command.CanExecute(parameter1))
-                return;
-            command.Execute(parameter1);
-        }
-
-        private static void OnCommandChanged(EventToCommand element, DependencyPropertyChangedEventArgs e)
-        {
-            if (element == null)
-                return;
-            if (e.OldValue != null)
-                ((ICommand) e.OldValue).CanExecuteChanged -= element.OnCommandCanExecuteChanged;
-            var newValue = (ICommand) e.NewValue;
-            if (newValue != null)
-                newValue.CanExecuteChanged += element.OnCommandCanExecuteChanged;
-            element.EnableDisableElement();
-        }
-
-        private bool AssociatedElementIsDisabled()
-        {
-            var associatedObject = GetAssociatedObject();
-            if (AssociatedObject == null)
-                return true;
-            if (associatedObject != null)
-                return !associatedObject.IsEnabled;
-            return false;
-        }
-
-        private void EnableDisableElement()
-        {
-            var associatedObject = GetAssociatedObject();
-            if (associatedObject == null)
-                return;
-            var command = GetCommand();
-            if (!MustToggleIsEnabledValue || command == null)
-                return;
-            associatedObject.IsEnabled = command.CanExecute(CommandParameterValue);
-        }
-
-        private void OnCommandCanExecuteChanged(object sender, EventArgs e) => EnableDisableElement();
     }
-}
+
+    public bool MustToggleIsEnabled
+    {
+        get => (bool) GetValue(MustToggleIsEnabledProperty);
+        set => SetValue(MustToggleIsEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public bool MustToggleIsEnabledValue
+    {
+        get
+        {
+            if (_mustToggleValue.HasValue)
+                return _mustToggleValue.Value;
+            return MustToggleIsEnabled;
+        }
+        set
+        {
+            _mustToggleValue = value;
+            EnableDisableElement();
+        }
+    }
+
+    public bool PassEventArgsToCommand { get; set; }
+
+    public IEventArgsConverter EventArgsConverter { get; set; }
+
+    public object EventArgsConverterParameter
+    {
+        get => GetValue(EventArgsConverterParameterProperty);
+        set => SetValue(EventArgsConverterParameterProperty, value);
+    }
+
+    public bool AlwaysInvokeCommand
+    {
+        get => (bool) GetValue(AlwaysInvokeCommandProperty);
+        set => SetValue(AlwaysInvokeCommandProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        EnableDisableElement();
+    }
+
+    private FrameworkElement GetAssociatedObject() => AssociatedObject as FrameworkElement;
+
+    private ICommand GetCommand() => Command;
+
+    public void Invoke() => Invoke(null);
+
+    protected override void Invoke(object parameter)
+    {
+        if (AssociatedElementIsDisabled() && !AlwaysInvokeCommand)
+            return;
+        var command = GetCommand();
+        var parameter1 = CommandParameterValue;
+        if (parameter1 == null && PassEventArgsToCommand)
+            parameter1 = EventArgsConverter == null
+                ? parameter
+                : EventArgsConverter.Convert(parameter, EventArgsConverterParameter);
+        if (command == null || !command.CanExecute(parameter1))
+            return;
+        command.Execute(parameter1);
+    }
+
+    private static void OnCommandChanged(EventToCommand element, DependencyPropertyChangedEventArgs e)
+    {
+        if (element == null)
+            return;
+        if (e.OldValue != null)
+            ((ICommand) e.OldValue).CanExecuteChanged -= element.OnCommandCanExecuteChanged;
+        var newValue = (ICommand) e.NewValue;
+        if (newValue != null)
+            newValue.CanExecuteChanged += element.OnCommandCanExecuteChanged;
+        element.EnableDisableElement();
+    }
+
+    private bool AssociatedElementIsDisabled()
+    {
+        var associatedObject = GetAssociatedObject();
+        if (AssociatedObject == null)
+            return true;
+        if (associatedObject != null)
+            return !associatedObject.IsEnabled;
+        return false;
+    }
+
+    private void EnableDisableElement()
+    {
+        var associatedObject = GetAssociatedObject();
+        if (associatedObject == null)
+            return;
+        var command = GetCommand();
+        if (!MustToggleIsEnabledValue || command == null)
+            return;
+        associatedObject.IsEnabled = command.CanExecute(CommandParameterValue);
+    }
+
+    private void OnCommandCanExecuteChanged(object sender, EventArgs e) => EnableDisableElement();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs
index a6ded793..ca988a05 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs
@@ -1,29 +1,28 @@
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class EventTrigger : EventTriggerBase<object>
 {
-    public class EventTrigger : EventTriggerBase<object>
+    public static readonly DependencyProperty EventNameProperty = DependencyProperty.Register("EventName", typeof(string), typeof(EventTrigger), new FrameworkPropertyMetadata("Loaded", OnEventNameChanged));
+
+    public EventTrigger()
     {
-        public static readonly DependencyProperty EventNameProperty = DependencyProperty.Register("EventName", typeof(string), typeof(EventTrigger), new FrameworkPropertyMetadata("Loaded", OnEventNameChanged));
-
-        public EventTrigger()
-        {
-        }
-
-        public EventTrigger(string eventName) => EventName = eventName;
-
-        protected override string GetEventName() => EventName;
-
-        private static void OnEventNameChanged(object sender, DependencyPropertyChangedEventArgs args)
-        {
-            ((EventTrigger) sender).OnEventNameChanged((string) args.OldValue, (string) args.NewValue);
-        }
-
-        public string EventName
-        {
-            get => (string) GetValue(EventNameProperty);
-
-            set => SetValue(EventNameProperty, value);
-        }
     }
-}
+
+    public EventTrigger(string eventName) => EventName = eventName;
+
+    protected override string GetEventName() => EventName;
+
+    private static void OnEventNameChanged(object sender, DependencyPropertyChangedEventArgs args)
+    {
+        ((EventTrigger) sender).OnEventNameChanged((string) args.OldValue, (string) args.NewValue);
+    }
+
+    public string EventName
+    {
+        get => (string) GetValue(EventNameProperty);
+
+        set => SetValue(EventNameProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs
index dcff858a..baf366d8 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs
@@ -4,310 +4,309 @@ using System.Globalization;
 using System.Reflection;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class EventTriggerBase : TriggerBase
 {
-    public abstract class EventTriggerBase : TriggerBase
+    public static readonly DependencyProperty SourceNameProperty = DependencyProperty.Register("SourceName",
+        typeof(string), typeof(EventTriggerBase), new PropertyMetadata(OnSourceNameChanged));
+
+    public static readonly DependencyProperty SourceObjectProperty = DependencyProperty.Register("SourceObject",
+        typeof(object), typeof(EventTriggerBase), new PropertyMetadata(OnSourceObjectChanged));
+
+    private MethodInfo _eventHandlerMethodInfo;
+
+    internal EventTriggerBase(Type sourceTypeConstraint) : base(typeof(DependencyObject))
     {
-        public static readonly DependencyProperty SourceNameProperty = DependencyProperty.Register("SourceName",
-            typeof(string), typeof(EventTriggerBase), new PropertyMetadata(OnSourceNameChanged));
+        SourceTypeConstraint = sourceTypeConstraint;
+        SourceNameResolver = new NameResolver();
+        RegisterSourceChanged();
+    }
 
-        public static readonly DependencyProperty SourceObjectProperty = DependencyProperty.Register("SourceObject",
-            typeof(object), typeof(EventTriggerBase), new PropertyMetadata(OnSourceObjectChanged));
-
-        private MethodInfo _eventHandlerMethodInfo;
-
-        internal EventTriggerBase(Type sourceTypeConstraint) : base(typeof(DependencyObject))
+    protected sealed override Type AssociatedObjectTypeConstraint
+    {
+        get
         {
-            SourceTypeConstraint = sourceTypeConstraint;
-            SourceNameResolver = new NameResolver();
-            RegisterSourceChanged();
+            if (TypeDescriptor.GetAttributes(GetType())[typeof(TypeConstraintAttribute)] is TypeConstraintAttribute attribute)
+                return attribute.Constraint;
+            return typeof(DependencyObject);
         }
+    }
 
-        protected sealed override Type AssociatedObjectTypeConstraint
+    private bool IsLoadedRegistered { get; set; }
+
+    private bool IsSourceChangedRegistered { get; set; }
+
+    private bool IsSourceNameSet
+    {
+        get
         {
-            get
+            if (string.IsNullOrEmpty(SourceName))
+                return ReadLocalValue(SourceNameProperty) != DependencyProperty.UnsetValue;
+            return true;
+        }
+    }
+
+    public object Source
+    {
+        get
+        {
+            object associatedObject = AssociatedObject;
+            if (SourceObject != null)
+                return SourceObject;
+            if (IsSourceNameSet)
             {
-                if (TypeDescriptor.GetAttributes(GetType())[typeof(TypeConstraintAttribute)] is TypeConstraintAttribute attribute)
-                    return attribute.Constraint;
-                return typeof(DependencyObject);
+                associatedObject = SourceNameResolver.Object;
+                if (associatedObject != null && !SourceTypeConstraint.IsInstanceOfType(associatedObject))
+                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
+                        ExceptionStringTable.RetargetedTypeConstraintViolatedExceptionMessage, GetType().Name,
+                        associatedObject.GetType(), SourceTypeConstraint, "Source"));
             }
+            return associatedObject;
         }
+    }
 
-        private bool IsLoadedRegistered { get; set; }
+    public string SourceName
+    {
+        get =>
+            (string) GetValue(SourceNameProperty);
+        set => SetValue(SourceNameProperty, value);
+    }
 
-        private bool IsSourceChangedRegistered { get; set; }
+    private NameResolver SourceNameResolver { get; }
 
-        private bool IsSourceNameSet
+    public object SourceObject
+    {
+        get =>
+            GetValue(SourceObjectProperty);
+        set => SetValue(SourceObjectProperty, value);
+    }
+
+    protected Type SourceTypeConstraint { get; }
+
+    protected abstract string GetEventName();
+
+    private static bool IsValidEvent(EventInfo eventInfo)
+    {
+        var eventHandlerType = eventInfo.EventHandlerType;
+        if (!typeof(Delegate).IsAssignableFrom(eventInfo.EventHandlerType))
+            return false;
+        var parameters = eventHandlerType.GetMethod("Invoke")?.GetParameters();
+        return parameters != null && parameters.Length == 2 && typeof(object).IsAssignableFrom(parameters[0].ParameterType) && typeof(EventArgs).IsAssignableFrom(parameters[1].ParameterType);
+    }
+
+    protected override void OnAttached()
+    {
+        base.OnAttached();
+        var associatedObject = AssociatedObject;
+        var behavior = associatedObject as Behavior;
+        var element = associatedObject as FrameworkElement;
+        RegisterSourceChanged();
+        if (behavior != null)
         {
-            get
-            {
-                if (string.IsNullOrEmpty(SourceName))
-                    return ReadLocalValue(SourceNameProperty) != DependencyProperty.UnsetValue;
-                return true;
-            }
+            behavior.AssociatedObjectChanged += OnBehaviorHostChanged;
         }
-
-        public object Source
+        else if (SourceObject != null || element == null)
         {
-            get
-            {
-                object associatedObject = AssociatedObject;
-                if (SourceObject != null)
-                    return SourceObject;
-                if (IsSourceNameSet)
-                {
-                    associatedObject = SourceNameResolver.Object;
-                    if (associatedObject != null && !SourceTypeConstraint.IsInstanceOfType(associatedObject))
-                        throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
-                            ExceptionStringTable.RetargetedTypeConstraintViolatedExceptionMessage, GetType().Name,
-                            associatedObject.GetType(), SourceTypeConstraint, "Source"));
-                }
-                return associatedObject;
-            }
-        }
-
-        public string SourceName
-        {
-            get =>
-                (string) GetValue(SourceNameProperty);
-            set => SetValue(SourceNameProperty, value);
-        }
-
-        private NameResolver SourceNameResolver { get; }
-
-        public object SourceObject
-        {
-            get =>
-                GetValue(SourceObjectProperty);
-            set => SetValue(SourceObjectProperty, value);
-        }
-
-        protected Type SourceTypeConstraint { get; }
-
-        protected abstract string GetEventName();
-
-        private static bool IsValidEvent(EventInfo eventInfo)
-        {
-            var eventHandlerType = eventInfo.EventHandlerType;
-            if (!typeof(Delegate).IsAssignableFrom(eventInfo.EventHandlerType))
-                return false;
-            var parameters = eventHandlerType.GetMethod("Invoke")?.GetParameters();
-            return parameters != null && parameters.Length == 2 && typeof(object).IsAssignableFrom(parameters[0].ParameterType) && typeof(EventArgs).IsAssignableFrom(parameters[1].ParameterType);
-        }
-
-        protected override void OnAttached()
-        {
-            base.OnAttached();
-            var associatedObject = AssociatedObject;
-            var behavior = associatedObject as Behavior;
-            var element = associatedObject as FrameworkElement;
-            RegisterSourceChanged();
-            if (behavior != null)
-            {
-                behavior.AssociatedObjectChanged += OnBehaviorHostChanged;
-            }
-            else if (SourceObject != null || element == null)
-            {
-                try
-                {
-                    OnSourceChanged(null, Source);
-                }
-                catch (InvalidOperationException)
-                {
-                }
-            }
-            else
-            {
-                SourceNameResolver.NameScopeReferenceElement = element;
-            }
-            if (string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) == 0 && element != null &&
-                !Interaction.IsElementLoaded(element))
-                RegisterLoaded(element);
-        }
-
-        private void OnBehaviorHostChanged(object sender, EventArgs e)
-        {
-            SourceNameResolver.NameScopeReferenceElement =
-                ((IAttachedObject) sender).AssociatedObject as FrameworkElement;
-        }
-
-        protected override void OnDetaching()
-        {
-            base.OnDetaching();
-            var associatedObject = AssociatedObject as Behavior;
-            var associatedElement = AssociatedObject as FrameworkElement;
             try
             {
-                OnSourceChanged(Source, null);
+                OnSourceChanged(null, Source);
             }
             catch (InvalidOperationException)
             {
             }
-            UnregisterSourceChanged();
-            if (associatedObject != null)
-                associatedObject.AssociatedObjectChanged -= OnBehaviorHostChanged;
-            SourceNameResolver.NameScopeReferenceElement = null;
-            if (string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) == 0 && associatedElement != null)
-                UnregisterLoaded(associatedElement);
         }
-
-        protected virtual void OnEvent(EventArgs eventArgs)
+        else
         {
-            InvokeActions(eventArgs);
+            SourceNameResolver.NameScopeReferenceElement = element;
         }
+        if (string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) == 0 && element != null &&
+            !Interaction.IsElementLoaded(element))
+            RegisterLoaded(element);
+    }
 
-        private void OnEventImpl(object sender, EventArgs eventArgs)
+    private void OnBehaviorHostChanged(object sender, EventArgs e)
+    {
+        SourceNameResolver.NameScopeReferenceElement =
+            ((IAttachedObject) sender).AssociatedObject as FrameworkElement;
+    }
+
+    protected override void OnDetaching()
+    {
+        base.OnDetaching();
+        var associatedObject = AssociatedObject as Behavior;
+        var associatedElement = AssociatedObject as FrameworkElement;
+        try
         {
-            OnEvent(eventArgs);
+            OnSourceChanged(Source, null);
         }
-
-        internal void OnEventNameChanged(string oldEventName, string newEventName)
+        catch (InvalidOperationException)
         {
-            if (AssociatedObject != null)
-            {
-                var source = Source as FrameworkElement;
-                if (source != null && string.Compare(oldEventName, "Loaded", StringComparison.Ordinal) == 0)
-                    UnregisterLoaded(source);
-                else if (!string.IsNullOrEmpty(oldEventName))
-                    UnregisterEvent(Source, oldEventName);
-                if (source != null && string.Compare(newEventName, "Loaded", StringComparison.Ordinal) == 0)
-                    RegisterLoaded(source);
-                else if (!string.IsNullOrEmpty(newEventName))
-                    RegisterEvent(Source, newEventName);
-            }
         }
+        UnregisterSourceChanged();
+        if (associatedObject != null)
+            associatedObject.AssociatedObjectChanged -= OnBehaviorHostChanged;
+        SourceNameResolver.NameScopeReferenceElement = null;
+        if (string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) == 0 && associatedElement != null)
+            UnregisterLoaded(associatedElement);
+    }
 
-        private void OnSourceChanged(object oldSource, object newSource)
-        {
-            if (AssociatedObject != null)
-                OnSourceChangedImpl(oldSource, newSource);
-        }
+    protected virtual void OnEvent(EventArgs eventArgs)
+    {
+        InvokeActions(eventArgs);
+    }
 
-        internal virtual void OnSourceChangedImpl(object oldSource, object newSource)
-        {
-            if (!string.IsNullOrEmpty(GetEventName()) &&
-                string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) != 0)
-            {
-                if (oldSource != null && SourceTypeConstraint.IsInstanceOfType(oldSource))
-                    UnregisterEvent(oldSource, GetEventName());
-                if (newSource != null && SourceTypeConstraint.IsInstanceOfType(newSource))
-                    RegisterEvent(newSource, GetEventName());
-            }
-        }
+    private void OnEventImpl(object sender, EventArgs eventArgs)
+    {
+        OnEvent(eventArgs);
+    }
 
-        private static void OnSourceNameChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    internal void OnEventNameChanged(string oldEventName, string newEventName)
+    {
+        if (AssociatedObject != null)
         {
-            var base2 = (EventTriggerBase) obj;
-            base2.SourceNameResolver.Name = (string) args.NewValue;
-        }
-
-        private void OnSourceNameResolverElementChanged(object sender, NameResolvedEventArgs e)
-        {
-            if (SourceObject == null)
-                OnSourceChanged(e.OldObject, e.NewObject);
-        }
-
-        private static void OnSourceObjectChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
-            var base2 = (EventTriggerBase) obj;
-            object newSource = base2.SourceNameResolver.Object;
-            if (args.NewValue == null)
-            {
-                base2.OnSourceChanged(args.OldValue, newSource);
-            }
-            else
-            {
-                if (args.OldValue == null && newSource != null)
-                    base2.UnregisterEvent(newSource, base2.GetEventName());
-                base2.OnSourceChanged(args.OldValue, args.NewValue);
-            }
-        }
-
-        private void RegisterEvent(object obj, string eventName)
-        {
-            var eventInfo = obj.GetType().GetEvent(eventName);
-            if (eventInfo == null)
-            {
-                if (SourceObject != null)
-                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.EventTriggerCannotFindEventNameExceptionMessage,
-                        new object[] { eventName, obj.GetType().Name }));
-            }
-            else if (!IsValidEvent(eventInfo))
-            {
-                if (SourceObject != null)
-                    throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.EventTriggerBaseInvalidEventExceptionMessage,
-                        new object[] { eventName, obj.GetType().Name }));
-            }
-            else
-            {
-                _eventHandlerMethodInfo =
-                    typeof(EventTriggerBase).GetMethod("OnEventImpl", BindingFlags.NonPublic | BindingFlags.Instance);
-                eventInfo.AddEventHandler(obj,
-                    Delegate.CreateDelegate(eventInfo.EventHandlerType, this, _eventHandlerMethodInfo ?? throw new InvalidOperationException()));
-            }
-        }
-
-        private void RegisterLoaded(FrameworkElement associatedElement)
-        {
-            if (!IsLoadedRegistered && associatedElement != null)
-            {
-                associatedElement.Loaded += OnEventImpl;
-                IsLoadedRegistered = true;
-            }
-        }
-
-        private void RegisterSourceChanged()
-        {
-            if (!IsSourceChangedRegistered)
-            {
-                SourceNameResolver.ResolvedElementChanged += OnSourceNameResolverElementChanged;
-                IsSourceChangedRegistered = true;
-            }
-        }
-
-        private void UnregisterEvent(object obj, string eventName)
-        {
-            if (string.Compare(eventName, "Loaded", StringComparison.Ordinal) == 0)
-            {
-                if (obj is FrameworkElement associatedElement)
-                    UnregisterLoaded(associatedElement);
-            }
-            else
-            {
-                UnregisterEventImpl(obj, eventName);
-            }
-        }
-
-        private void UnregisterEventImpl(object obj, string eventName)
-        {
-            var type = obj.GetType();
-            if (_eventHandlerMethodInfo != null)
-            {
-                var info = type.GetEvent(eventName);
-                info.RemoveEventHandler(obj,
-                    Delegate.CreateDelegate(info.EventHandlerType, this, _eventHandlerMethodInfo));
-                _eventHandlerMethodInfo = null;
-            }
-        }
-
-        private void UnregisterLoaded(FrameworkElement associatedElement)
-        {
-            if (IsLoadedRegistered && associatedElement != null)
-            {
-                associatedElement.Loaded -= OnEventImpl;
-                IsLoadedRegistered = false;
-            }
-        }
-
-        private void UnregisterSourceChanged()
-        {
-            if (IsSourceChangedRegistered)
-            {
-                SourceNameResolver.ResolvedElementChanged -= OnSourceNameResolverElementChanged;
-                IsSourceChangedRegistered = false;
-            }
+            var source = Source as FrameworkElement;
+            if (source != null && string.Compare(oldEventName, "Loaded", StringComparison.Ordinal) == 0)
+                UnregisterLoaded(source);
+            else if (!string.IsNullOrEmpty(oldEventName))
+                UnregisterEvent(Source, oldEventName);
+            if (source != null && string.Compare(newEventName, "Loaded", StringComparison.Ordinal) == 0)
+                RegisterLoaded(source);
+            else if (!string.IsNullOrEmpty(newEventName))
+                RegisterEvent(Source, newEventName);
         }
     }
-}
+
+    private void OnSourceChanged(object oldSource, object newSource)
+    {
+        if (AssociatedObject != null)
+            OnSourceChangedImpl(oldSource, newSource);
+    }
+
+    internal virtual void OnSourceChangedImpl(object oldSource, object newSource)
+    {
+        if (!string.IsNullOrEmpty(GetEventName()) &&
+            string.Compare(GetEventName(), "Loaded", StringComparison.Ordinal) != 0)
+        {
+            if (oldSource != null && SourceTypeConstraint.IsInstanceOfType(oldSource))
+                UnregisterEvent(oldSource, GetEventName());
+            if (newSource != null && SourceTypeConstraint.IsInstanceOfType(newSource))
+                RegisterEvent(newSource, GetEventName());
+        }
+    }
+
+    private static void OnSourceNameChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        var base2 = (EventTriggerBase) obj;
+        base2.SourceNameResolver.Name = (string) args.NewValue;
+    }
+
+    private void OnSourceNameResolverElementChanged(object sender, NameResolvedEventArgs e)
+    {
+        if (SourceObject == null)
+            OnSourceChanged(e.OldObject, e.NewObject);
+    }
+
+    private static void OnSourceObjectChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        var base2 = (EventTriggerBase) obj;
+        object newSource = base2.SourceNameResolver.Object;
+        if (args.NewValue == null)
+        {
+            base2.OnSourceChanged(args.OldValue, newSource);
+        }
+        else
+        {
+            if (args.OldValue == null && newSource != null)
+                base2.UnregisterEvent(newSource, base2.GetEventName());
+            base2.OnSourceChanged(args.OldValue, args.NewValue);
+        }
+    }
+
+    private void RegisterEvent(object obj, string eventName)
+    {
+        var eventInfo = obj.GetType().GetEvent(eventName);
+        if (eventInfo == null)
+        {
+            if (SourceObject != null)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.EventTriggerCannotFindEventNameExceptionMessage,
+                    new object[] { eventName, obj.GetType().Name }));
+        }
+        else if (!IsValidEvent(eventInfo))
+        {
+            if (SourceObject != null)
+                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.EventTriggerBaseInvalidEventExceptionMessage,
+                    new object[] { eventName, obj.GetType().Name }));
+        }
+        else
+        {
+            _eventHandlerMethodInfo =
+                typeof(EventTriggerBase).GetMethod("OnEventImpl", BindingFlags.NonPublic | BindingFlags.Instance);
+            eventInfo.AddEventHandler(obj,
+                Delegate.CreateDelegate(eventInfo.EventHandlerType, this, _eventHandlerMethodInfo ?? throw new InvalidOperationException()));
+        }
+    }
+
+    private void RegisterLoaded(FrameworkElement associatedElement)
+    {
+        if (!IsLoadedRegistered && associatedElement != null)
+        {
+            associatedElement.Loaded += OnEventImpl;
+            IsLoadedRegistered = true;
+        }
+    }
+
+    private void RegisterSourceChanged()
+    {
+        if (!IsSourceChangedRegistered)
+        {
+            SourceNameResolver.ResolvedElementChanged += OnSourceNameResolverElementChanged;
+            IsSourceChangedRegistered = true;
+        }
+    }
+
+    private void UnregisterEvent(object obj, string eventName)
+    {
+        if (string.Compare(eventName, "Loaded", StringComparison.Ordinal) == 0)
+        {
+            if (obj is FrameworkElement associatedElement)
+                UnregisterLoaded(associatedElement);
+        }
+        else
+        {
+            UnregisterEventImpl(obj, eventName);
+        }
+    }
+
+    private void UnregisterEventImpl(object obj, string eventName)
+    {
+        var type = obj.GetType();
+        if (_eventHandlerMethodInfo != null)
+        {
+            var info = type.GetEvent(eventName);
+            info.RemoveEventHandler(obj,
+                Delegate.CreateDelegate(info.EventHandlerType, this, _eventHandlerMethodInfo));
+            _eventHandlerMethodInfo = null;
+        }
+    }
+
+    private void UnregisterLoaded(FrameworkElement associatedElement)
+    {
+        if (IsLoadedRegistered && associatedElement != null)
+        {
+            associatedElement.Loaded -= OnEventImpl;
+            IsLoadedRegistered = false;
+        }
+    }
+
+    private void UnregisterSourceChanged()
+    {
+        if (IsSourceChangedRegistered)
+        {
+            SourceNameResolver.ResolvedElementChanged -= OnSourceNameResolverElementChanged;
+            IsSourceChangedRegistered = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs
index a92e8ed2..7d3544c8 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs
@@ -1,21 +1,20 @@
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class EventTriggerBase<T> : EventTriggerBase where T : class
 {
-    public abstract class EventTriggerBase<T> : EventTriggerBase where T : class
+    protected EventTriggerBase() : base(typeof(T))
     {
-        protected EventTriggerBase() : base(typeof(T))
-        {
-        }
-
-        protected virtual void OnSourceChanged(T oldSource, T newSource)
-        {
-        }
-
-        internal sealed override void OnSourceChangedImpl(object oldSource, object newSource)
-        {
-            base.OnSourceChangedImpl(oldSource, newSource);
-            OnSourceChanged(oldSource as T, newSource as T);
-        }
-
-        public new T Source => (T) base.Source;
     }
-}
+
+    protected virtual void OnSourceChanged(T oldSource, T newSource)
+    {
+    }
+
+    internal sealed override void OnSourceChangedImpl(object oldSource, object newSource)
+    {
+        base.OnSourceChangedImpl(oldSource, newSource);
+        OnSourceChanged(oldSource as T, newSource as T);
+    }
+
+    public new T Source => (T) base.Source;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs b/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs
index a0d0b79c..a844a240 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs
@@ -2,57 +2,56 @@
 using System.Globalization;
 using System.Resources;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+internal class ExceptionStringTable
 {
-    internal class ExceptionStringTable
-    {
-        private static ResourceManager ResourceMan;
+    private static ResourceManager ResourceMan;
 
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static ResourceManager ResourceManager => ResourceMan ??= new ResourceManager(nameof(ExceptionStringTable),
-            typeof(ExceptionStringTable).Assembly);
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    internal static ResourceManager ResourceManager => ResourceMan ??= new ResourceManager(nameof(ExceptionStringTable),
+        typeof(ExceptionStringTable).Assembly);
 
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        internal static CultureInfo Culture { get; set; }
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    internal static CultureInfo Culture { get; set; }
 
-        internal static string CannotHostBehaviorCollectionMultipleTimesExceptionMessage =>
-            ResourceManager.GetString(nameof(CannotHostBehaviorCollectionMultipleTimesExceptionMessage), Culture);
+    internal static string CannotHostBehaviorCollectionMultipleTimesExceptionMessage =>
+        ResourceManager.GetString(nameof(CannotHostBehaviorCollectionMultipleTimesExceptionMessage), Culture);
 
-        internal static string CannotHostBehaviorMultipleTimesExceptionMessage =>
-            ResourceManager.GetString(nameof(CannotHostBehaviorMultipleTimesExceptionMessage), Culture);
+    internal static string CannotHostBehaviorMultipleTimesExceptionMessage =>
+        ResourceManager.GetString(nameof(CannotHostBehaviorMultipleTimesExceptionMessage), Culture);
 
-        internal static string CannotHostTriggerActionMultipleTimesExceptionMessage =>
-            ResourceManager.GetString(nameof(CannotHostTriggerActionMultipleTimesExceptionMessage), Culture);
+    internal static string CannotHostTriggerActionMultipleTimesExceptionMessage =>
+        ResourceManager.GetString(nameof(CannotHostTriggerActionMultipleTimesExceptionMessage), Culture);
 
-        internal static string CannotHostTriggerCollectionMultipleTimesExceptionMessage =>
-            ResourceManager.GetString(nameof(CannotHostTriggerCollectionMultipleTimesExceptionMessage), Culture);
+    internal static string CannotHostTriggerCollectionMultipleTimesExceptionMessage =>
+        ResourceManager.GetString(nameof(CannotHostTriggerCollectionMultipleTimesExceptionMessage), Culture);
 
-        internal static string CannotHostTriggerMultipleTimesExceptionMessage =>
-            ResourceManager.GetString(nameof(CannotHostTriggerMultipleTimesExceptionMessage), Culture);
+    internal static string CannotHostTriggerMultipleTimesExceptionMessage =>
+        ResourceManager.GetString(nameof(CannotHostTriggerMultipleTimesExceptionMessage), Culture);
 
-        internal static string CommandDoesNotExistOnBehaviorWarningMessage =>
-            ResourceManager.GetString(nameof(CommandDoesNotExistOnBehaviorWarningMessage), Culture);
+    internal static string CommandDoesNotExistOnBehaviorWarningMessage =>
+        ResourceManager.GetString(nameof(CommandDoesNotExistOnBehaviorWarningMessage), Culture);
 
-        internal static string DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage =>
-            ResourceManager.GetString(nameof(DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage),
-                Culture);
+    internal static string DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage =>
+        ResourceManager.GetString(nameof(DefaultTriggerAttributeInvalidTriggerTypeSpecifiedExceptionMessage),
+            Culture);
 
-        internal static string DuplicateItemInCollectionExceptionMessage =>
-            ResourceManager.GetString(nameof(DuplicateItemInCollectionExceptionMessage), Culture);
+    internal static string DuplicateItemInCollectionExceptionMessage =>
+        ResourceManager.GetString(nameof(DuplicateItemInCollectionExceptionMessage), Culture);
 
-        internal static string EventTriggerBaseInvalidEventExceptionMessage =>
-            ResourceManager.GetString(nameof(EventTriggerBaseInvalidEventExceptionMessage), Culture);
+    internal static string EventTriggerBaseInvalidEventExceptionMessage =>
+        ResourceManager.GetString(nameof(EventTriggerBaseInvalidEventExceptionMessage), Culture);
 
-        internal static string EventTriggerCannotFindEventNameExceptionMessage =>
-            ResourceManager.GetString(nameof(EventTriggerCannotFindEventNameExceptionMessage), Culture);
+    internal static string EventTriggerCannotFindEventNameExceptionMessage =>
+        ResourceManager.GetString(nameof(EventTriggerCannotFindEventNameExceptionMessage), Culture);
 
-        internal static string RetargetedTypeConstraintViolatedExceptionMessage =>
-            ResourceManager.GetString(nameof(RetargetedTypeConstraintViolatedExceptionMessage), Culture);
+    internal static string RetargetedTypeConstraintViolatedExceptionMessage =>
+        ResourceManager.GetString(nameof(RetargetedTypeConstraintViolatedExceptionMessage), Culture);
 
-        internal static string TypeConstraintViolatedExceptionMessage =>
-            ResourceManager.GetString(nameof(TypeConstraintViolatedExceptionMessage), Culture);
+    internal static string TypeConstraintViolatedExceptionMessage =>
+        ResourceManager.GetString(nameof(TypeConstraintViolatedExceptionMessage), Culture);
 
-        internal static string UnableToResolveTargetNameWarningMessage =>
-            ResourceManager.GetString(nameof(UnableToResolveTargetNameWarningMessage), Culture);
-    }
-}
+    internal static string UnableToResolveTargetNameWarningMessage =>
+        ResourceManager.GetString(nameof(UnableToResolveTargetNameWarningMessage), Culture);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs b/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs
index b4e1bf0d..011475ae 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs
@@ -10,1115 +10,1114 @@ using System.Windows.Media.Effects;
 using System.Windows.Media.Imaging;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class ExtendedVisualStateManager : VisualStateManager
 {
-    public class ExtendedVisualStateManager : VisualStateManager
+    // Fields
+    internal static readonly DependencyProperty CachedBackgroundProperty =
+        DependencyProperty.RegisterAttached("CachedBackground", typeof(object), typeof(ExtendedVisualStateManager),
+            new PropertyMetadata(null));
+
+    internal static readonly DependencyProperty CachedEffectProperty =
+        DependencyProperty.RegisterAttached("CachedEffect", typeof(Effect), typeof(ExtendedVisualStateManager),
+            new PropertyMetadata(null));
+
+    private static readonly List<DependencyProperty> ChildAffectingLayoutProperties;
+
+    internal static readonly DependencyProperty CurrentStateProperty =
+        DependencyProperty.RegisterAttached("CurrentState", typeof(VisualState), typeof(ExtendedVisualStateManager),
+            new PropertyMetadata(null));
+
+    internal static readonly DependencyProperty DidCacheBackgroundProperty =
+        DependencyProperty.RegisterAttached("DidCacheBackground", typeof(bool), typeof(ExtendedVisualStateManager),
+            new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private static readonly List<DependencyProperty> LayoutProperties;
+
+    internal static readonly DependencyProperty LayoutStoryboardProperty =
+        DependencyProperty.RegisterAttached("LayoutStoryboard", typeof(Storyboard),
+            typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
+
+    private static Storyboard LayoutTransitionStoryboard;
+    private static List<FrameworkElement> MovingElements;
+
+    internal static readonly DependencyProperty OriginalLayoutValuesProperty =
+        DependencyProperty.RegisterAttached("OriginalLayoutValues", typeof(List<OriginalLayoutValueRecord>),
+            typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty RuntimeVisibilityPropertyProperty =
+        DependencyProperty.RegisterAttached("RuntimeVisibilityProperty", typeof(DependencyProperty),
+            typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty TransitionEffectProperty =
+        DependencyProperty.RegisterAttached("TransitionEffect", typeof(TransitionEffect),
+            typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
+
+    internal static readonly DependencyProperty TransitionEffectStoryboardProperty =
+        DependencyProperty.RegisterAttached("TransitionEffectStoryboard", typeof(Storyboard),
+            typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty UseFluidLayoutProperty =
+        DependencyProperty.RegisterAttached("UseFluidLayout", typeof(bool), typeof(ExtendedVisualStateManager),
+            new PropertyMetadata(ValueBoxes.FalseBox));
+
+    private bool _changingState;
+
+    // Methods
+    static ExtendedVisualStateManager()
     {
-        // Fields
-        internal static readonly DependencyProperty CachedBackgroundProperty =
-            DependencyProperty.RegisterAttached("CachedBackground", typeof(object), typeof(ExtendedVisualStateManager),
-                new PropertyMetadata(null));
-
-        internal static readonly DependencyProperty CachedEffectProperty =
-            DependencyProperty.RegisterAttached("CachedEffect", typeof(Effect), typeof(ExtendedVisualStateManager),
-                new PropertyMetadata(null));
-
-        private static readonly List<DependencyProperty> ChildAffectingLayoutProperties;
-
-        internal static readonly DependencyProperty CurrentStateProperty =
-            DependencyProperty.RegisterAttached("CurrentState", typeof(VisualState), typeof(ExtendedVisualStateManager),
-                new PropertyMetadata(null));
-
-        internal static readonly DependencyProperty DidCacheBackgroundProperty =
-            DependencyProperty.RegisterAttached("DidCacheBackground", typeof(bool), typeof(ExtendedVisualStateManager),
-                new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private static readonly List<DependencyProperty> LayoutProperties;
-
-        internal static readonly DependencyProperty LayoutStoryboardProperty =
-            DependencyProperty.RegisterAttached("LayoutStoryboard", typeof(Storyboard),
-                typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
-
-        private static Storyboard LayoutTransitionStoryboard;
-        private static List<FrameworkElement> MovingElements;
-
-        internal static readonly DependencyProperty OriginalLayoutValuesProperty =
-            DependencyProperty.RegisterAttached("OriginalLayoutValues", typeof(List<OriginalLayoutValueRecord>),
-                typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty RuntimeVisibilityPropertyProperty =
-            DependencyProperty.RegisterAttached("RuntimeVisibilityProperty", typeof(DependencyProperty),
-                typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty TransitionEffectProperty =
-            DependencyProperty.RegisterAttached("TransitionEffect", typeof(TransitionEffect),
-                typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
-
-        internal static readonly DependencyProperty TransitionEffectStoryboardProperty =
-            DependencyProperty.RegisterAttached("TransitionEffectStoryboard", typeof(Storyboard),
-                typeof(ExtendedVisualStateManager), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty UseFluidLayoutProperty =
-            DependencyProperty.RegisterAttached("UseFluidLayout", typeof(bool), typeof(ExtendedVisualStateManager),
-                new PropertyMetadata(ValueBoxes.FalseBox));
-
-        private bool _changingState;
-
-        // Methods
-        static ExtendedVisualStateManager()
+        var list = new List<DependencyProperty>
         {
-            var list = new List<DependencyProperty>
-            {
-                Grid.ColumnProperty,
-                Grid.ColumnSpanProperty,
-                Grid.RowProperty,
-                Grid.RowSpanProperty,
-                Canvas.LeftProperty,
-                Canvas.TopProperty,
-                FrameworkElement.WidthProperty,
-                FrameworkElement.HeightProperty,
-                FrameworkElement.MinWidthProperty,
-                FrameworkElement.MinHeightProperty,
-                FrameworkElement.MaxWidthProperty,
-                FrameworkElement.MaxHeightProperty,
-                FrameworkElement.MarginProperty,
-                FrameworkElement.HorizontalAlignmentProperty,
-                FrameworkElement.VerticalAlignmentProperty,
-                UIElement.VisibilityProperty,
-                StackPanel.OrientationProperty
-            };
-            LayoutProperties = list;
-            var list2 = new List<DependencyProperty>
-            {
-                StackPanel.OrientationProperty
-            };
-            ChildAffectingLayoutProperties = list2;
+            Grid.ColumnProperty,
+            Grid.ColumnSpanProperty,
+            Grid.RowProperty,
+            Grid.RowSpanProperty,
+            Canvas.LeftProperty,
+            Canvas.TopProperty,
+            FrameworkElement.WidthProperty,
+            FrameworkElement.HeightProperty,
+            FrameworkElement.MinWidthProperty,
+            FrameworkElement.MinHeightProperty,
+            FrameworkElement.MaxWidthProperty,
+            FrameworkElement.MaxHeightProperty,
+            FrameworkElement.MarginProperty,
+            FrameworkElement.HorizontalAlignmentProperty,
+            FrameworkElement.VerticalAlignmentProperty,
+            UIElement.VisibilityProperty,
+            StackPanel.OrientationProperty
+        };
+        LayoutProperties = list;
+        var list2 = new List<DependencyProperty>
+        {
+            StackPanel.OrientationProperty
+        };
+        ChildAffectingLayoutProperties = list2;
+    }
+
+    // Properties
+    public static bool IsRunningFluidLayoutTransition =>
+        LayoutTransitionStoryboard != null;
+
+    private static void AnimateTransitionEffect(FrameworkElement stateGroupsRoot, VisualTransition transition)
+    {
+        var element = new DoubleAnimation
+        {
+            Duration = transition.GeneratedDuration,
+            EasingFunction = transition.GeneratedEasingFunction,
+            From = 0.0,
+            To = 1.0
+        };
+        var sb = new Storyboard
+        {
+            Duration = transition.GeneratedDuration,
+            Children = { element }
+        };
+        Storyboard.SetTarget(element, stateGroupsRoot);
+        Storyboard.SetTargetProperty(element,
+            new PropertyPath("(0).(1)", UIElement.EffectProperty, TransitionEffect.ProgressProperty));
+        if (stateGroupsRoot is Panel panel && panel.Background == null)
+        {
+            SetDidCacheBackground(panel, true);
+            TransferLocalValue(panel, Panel.BackgroundProperty, CachedBackgroundProperty);
+            panel.Background = Brushes.Transparent;
         }
-
-        // Properties
-        public static bool IsRunningFluidLayoutTransition =>
-            LayoutTransitionStoryboard != null;
-
-        private static void AnimateTransitionEffect(FrameworkElement stateGroupsRoot, VisualTransition transition)
+        sb.Completed += delegate
         {
-            var element = new DoubleAnimation
-            {
-                Duration = transition.GeneratedDuration,
-                EasingFunction = transition.GeneratedEasingFunction,
-                From = 0.0,
-                To = 1.0
-            };
-            var sb = new Storyboard
-            {
-                Duration = transition.GeneratedDuration,
-                Children = { element }
-            };
-            Storyboard.SetTarget(element, stateGroupsRoot);
-            Storyboard.SetTargetProperty(element,
-                new PropertyPath("(0).(1)", UIElement.EffectProperty, TransitionEffect.ProgressProperty));
-            if (stateGroupsRoot is Panel panel && panel.Background == null)
-            {
-                SetDidCacheBackground(panel, true);
-                TransferLocalValue(panel, Panel.BackgroundProperty, CachedBackgroundProperty);
-                panel.Background = Brushes.Transparent;
-            }
-            sb.Completed += delegate
-            {
-                if (Equals(GetTransitionEffectStoryboard(stateGroupsRoot), sb))
-                    FinishTransitionEffectAnimation(stateGroupsRoot);
-            };
-            SetTransitionEffectStoryboard(stateGroupsRoot, sb);
-            sb.Begin();
-        }
+            if (Equals(GetTransitionEffectStoryboard(stateGroupsRoot), sb))
+                FinishTransitionEffectAnimation(stateGroupsRoot);
+        };
+        SetTransitionEffectStoryboard(stateGroupsRoot, sb);
+        sb.Begin();
+    }
 
-        private static object CacheLocalValueHelper(DependencyObject dependencyObject, DependencyProperty property)
-        {
-            return dependencyObject.ReadLocalValue(property);
-        }
+    private static object CacheLocalValueHelper(DependencyObject dependencyObject, DependencyProperty property)
+    {
+        return dependencyObject.ReadLocalValue(property);
+    }
 
-        private static void control_LayoutUpdated(object sender, EventArgs e)
-        {
-            if (LayoutTransitionStoryboard != null)
-                foreach (var element in MovingElements)
-                {
-                    if (element.Parent is WrapperCanvas parent)
-                    {
-                        var layoutRect = GetLayoutRect(parent);
-                        var newRect = parent.NewRect;
-                        var renderTransform = parent.RenderTransform as TranslateTransform;
-                        var num = renderTransform?.X ?? 0.0;
-                        var num2 = renderTransform?.Y ?? 0.0;
-                        var num3 = newRect.Left - layoutRect.Left;
-                        var num4 = newRect.Top - layoutRect.Top;
-                        if (Math.Abs(num - num3) > 0.001 || Math.Abs(num2 - num4) > 0.001)
-                        {
-                            if (renderTransform == null)
-                            {
-                                renderTransform = new TranslateTransform();
-                                parent.RenderTransform = renderTransform;
-                            }
-                            renderTransform.X = num3;
-                            renderTransform.Y = num4;
-                        }
-                    }
-                }
-        }
-
-        private static void CopyLayoutProperties(FrameworkElement source, FrameworkElement target, bool restoring)
-        {
-            var canvas = restoring ? (WrapperCanvas) source : (WrapperCanvas) target;
-            if (canvas.LocalValueCache == null)
-                canvas.LocalValueCache = new Dictionary<DependencyProperty, object>();
-            foreach (var property in LayoutProperties)
-                if (!ChildAffectingLayoutProperties.Contains(property))
-                    if (restoring)
-                    {
-                        ReplaceCachedLocalValueHelper(target, property, canvas.LocalValueCache[property]);
-                    }
-                    else
-                    {
-                        var obj2 = target.GetValue(property);
-                        var obj3 = CacheLocalValueHelper(source, property);
-                        canvas.LocalValueCache[property] = obj3;
-                        if (IsVisibilityProperty(property))
-                            canvas.DestinationVisibilityCache = (Visibility) source.GetValue(property);
-                        else
-                            target.SetValue(property, source.GetValue(property));
-                        source.SetValue(property, obj2);
-                    }
-        }
-
-        private static Storyboard CreateLayoutTransitionStoryboard(VisualTransition transition,
-            List<FrameworkElement> movingElements, Dictionary<FrameworkElement, double> oldOpacities)
-        {
-            var duration = transition?.GeneratedDuration ?? new Duration(TimeSpan.Zero);
-            var generatedEasingFunction = transition?.GeneratedEasingFunction;
-            var storyboard = new Storyboard
-            {
-                Duration = duration
-            };
-            foreach (var element in movingElements)
+    private static void control_LayoutUpdated(object sender, EventArgs e)
+    {
+        if (LayoutTransitionStoryboard != null)
+            foreach (var element in MovingElements)
             {
                 if (element.Parent is WrapperCanvas parent)
                 {
-                    var animation = new DoubleAnimation
+                    var layoutRect = GetLayoutRect(parent);
+                    var newRect = parent.NewRect;
+                    var renderTransform = parent.RenderTransform as TranslateTransform;
+                    var num = renderTransform?.X ?? 0.0;
+                    var num2 = renderTransform?.Y ?? 0.0;
+                    var num3 = newRect.Left - layoutRect.Left;
+                    var num4 = newRect.Top - layoutRect.Top;
+                    if (Math.Abs(num - num3) > 0.001 || Math.Abs(num2 - num4) > 0.001)
                     {
-                        From = 1.0,
-                        To = 0.0,
+                        if (renderTransform == null)
+                        {
+                            renderTransform = new TranslateTransform();
+                            parent.RenderTransform = renderTransform;
+                        }
+                        renderTransform.X = num3;
+                        renderTransform.Y = num4;
+                    }
+                }
+            }
+    }
+
+    private static void CopyLayoutProperties(FrameworkElement source, FrameworkElement target, bool restoring)
+    {
+        var canvas = restoring ? (WrapperCanvas) source : (WrapperCanvas) target;
+        if (canvas.LocalValueCache == null)
+            canvas.LocalValueCache = new Dictionary<DependencyProperty, object>();
+        foreach (var property in LayoutProperties)
+            if (!ChildAffectingLayoutProperties.Contains(property))
+                if (restoring)
+                {
+                    ReplaceCachedLocalValueHelper(target, property, canvas.LocalValueCache[property]);
+                }
+                else
+                {
+                    var obj2 = target.GetValue(property);
+                    var obj3 = CacheLocalValueHelper(source, property);
+                    canvas.LocalValueCache[property] = obj3;
+                    if (IsVisibilityProperty(property))
+                        canvas.DestinationVisibilityCache = (Visibility) source.GetValue(property);
+                    else
+                        target.SetValue(property, source.GetValue(property));
+                    source.SetValue(property, obj2);
+                }
+    }
+
+    private static Storyboard CreateLayoutTransitionStoryboard(VisualTransition transition,
+        List<FrameworkElement> movingElements, Dictionary<FrameworkElement, double> oldOpacities)
+    {
+        var duration = transition?.GeneratedDuration ?? new Duration(TimeSpan.Zero);
+        var generatedEasingFunction = transition?.GeneratedEasingFunction;
+        var storyboard = new Storyboard
+        {
+            Duration = duration
+        };
+        foreach (var element in movingElements)
+        {
+            if (element.Parent is WrapperCanvas parent)
+            {
+                var animation = new DoubleAnimation
+                {
+                    From = 1.0,
+                    To = 0.0,
+                    Duration = duration,
+                    EasingFunction = generatedEasingFunction
+                };
+                Storyboard.SetTarget(animation, parent);
+                Storyboard.SetTargetProperty(animation, new PropertyPath(WrapperCanvas.SimulationProgressProperty));
+                storyboard.Children.Add(animation);
+                parent.SimulationProgress = 1.0;
+                var newRect = parent.NewRect;
+                if (!IsClose(parent.Width, newRect.Width))
+                {
+                    var animation3 = new DoubleAnimation
+                    {
+                        From = newRect.Width,
+                        To = newRect.Width,
+                        Duration = duration
+                    };
+                    Storyboard.SetTarget(animation3, parent);
+                    Storyboard.SetTargetProperty(animation3, new PropertyPath(FrameworkElement.WidthProperty));
+                    storyboard.Children.Add(animation3);
+                }
+                if (!IsClose(parent.Height, newRect.Height))
+                {
+                    var animation5 = new DoubleAnimation
+                    {
+                        From = newRect.Height,
+                        To = newRect.Height,
+                        Duration = duration
+                    };
+                    Storyboard.SetTarget(animation5, parent);
+                    Storyboard.SetTargetProperty(animation5, new PropertyPath(FrameworkElement.HeightProperty));
+                    storyboard.Children.Add(animation5);
+                }
+                if (parent.DestinationVisibilityCache == Visibility.Collapsed)
+                {
+                    var margin = parent.Margin;
+                    if (!IsClose(margin.Left, 0.0) || !IsClose(margin.Top, 0.0) || !IsClose(margin.Right, 0.0) ||
+                        !IsClose(margin.Bottom, 0.0))
+                    {
+                        var frames = new ObjectAnimationUsingKeyFrames
+                        {
+                            Duration = duration
+                        };
+                        var frame2 = new DiscreteObjectKeyFrame
+                        {
+                            KeyTime = TimeSpan.Zero
+                        };
+                        var thickness2 = new Thickness();
+                        frame2.Value = thickness2;
+                        var keyFrame = frame2;
+                        frames.KeyFrames.Add(keyFrame);
+                        Storyboard.SetTarget(frames, parent);
+                        Storyboard.SetTargetProperty(frames, new PropertyPath(FrameworkElement.MarginProperty));
+                        storyboard.Children.Add(frames);
+                    }
+                    if (!IsClose(parent.MinWidth, 0.0))
+                    {
+                        var animation7 = new DoubleAnimation
+                        {
+                            From = 0.0,
+                            To = 0.0,
+                            Duration = duration
+                        };
+                        Storyboard.SetTarget(animation7, parent);
+                        Storyboard.SetTargetProperty(animation7,
+                            new PropertyPath(FrameworkElement.MinWidthProperty));
+                        storyboard.Children.Add(animation7);
+                    }
+                    if (!IsClose(parent.MinHeight, 0.0))
+                    {
+                        var animation9 = new DoubleAnimation
+                        {
+                            From = 0.0,
+                            To = 0.0,
+                            Duration = duration
+                        };
+                        Storyboard.SetTarget(animation9, parent);
+                        Storyboard.SetTargetProperty(animation9,
+                            new PropertyPath(FrameworkElement.MinHeightProperty));
+                        storyboard.Children.Add(animation9);
+                    }
+                }
+            }
+        }
+        foreach (var element2 in oldOpacities.Keys)
+        {
+            if (element2.Parent is WrapperCanvas canvas2)
+            {
+                var a = oldOpacities[element2];
+                var num2 = canvas2.DestinationVisibilityCache == Visibility.Visible ? 1.0 : 0.0;
+                if (!IsClose(a, 1.0) || !IsClose(num2, 1.0))
+                {
+                    var animation11 = new DoubleAnimation
+                    {
+                        From = a,
+                        To = num2,
                         Duration = duration,
                         EasingFunction = generatedEasingFunction
                     };
-                    Storyboard.SetTarget(animation, parent);
-                    Storyboard.SetTargetProperty(animation, new PropertyPath(WrapperCanvas.SimulationProgressProperty));
-                    storyboard.Children.Add(animation);
-                    parent.SimulationProgress = 1.0;
-                    var newRect = parent.NewRect;
-                    if (!IsClose(parent.Width, newRect.Width))
-                    {
-                        var animation3 = new DoubleAnimation
-                        {
-                            From = newRect.Width,
-                            To = newRect.Width,
-                            Duration = duration
-                        };
-                        Storyboard.SetTarget(animation3, parent);
-                        Storyboard.SetTargetProperty(animation3, new PropertyPath(FrameworkElement.WidthProperty));
-                        storyboard.Children.Add(animation3);
-                    }
-                    if (!IsClose(parent.Height, newRect.Height))
-                    {
-                        var animation5 = new DoubleAnimation
-                        {
-                            From = newRect.Height,
-                            To = newRect.Height,
-                            Duration = duration
-                        };
-                        Storyboard.SetTarget(animation5, parent);
-                        Storyboard.SetTargetProperty(animation5, new PropertyPath(FrameworkElement.HeightProperty));
-                        storyboard.Children.Add(animation5);
-                    }
-                    if (parent.DestinationVisibilityCache == Visibility.Collapsed)
-                    {
-                        var margin = parent.Margin;
-                        if (!IsClose(margin.Left, 0.0) || !IsClose(margin.Top, 0.0) || !IsClose(margin.Right, 0.0) ||
-                            !IsClose(margin.Bottom, 0.0))
-                        {
-                            var frames = new ObjectAnimationUsingKeyFrames
-                            {
-                                Duration = duration
-                            };
-                            var frame2 = new DiscreteObjectKeyFrame
-                            {
-                                KeyTime = TimeSpan.Zero
-                            };
-                            var thickness2 = new Thickness();
-                            frame2.Value = thickness2;
-                            var keyFrame = frame2;
-                            frames.KeyFrames.Add(keyFrame);
-                            Storyboard.SetTarget(frames, parent);
-                            Storyboard.SetTargetProperty(frames, new PropertyPath(FrameworkElement.MarginProperty));
-                            storyboard.Children.Add(frames);
-                        }
-                        if (!IsClose(parent.MinWidth, 0.0))
-                        {
-                            var animation7 = new DoubleAnimation
-                            {
-                                From = 0.0,
-                                To = 0.0,
-                                Duration = duration
-                            };
-                            Storyboard.SetTarget(animation7, parent);
-                            Storyboard.SetTargetProperty(animation7,
-                                new PropertyPath(FrameworkElement.MinWidthProperty));
-                            storyboard.Children.Add(animation7);
-                        }
-                        if (!IsClose(parent.MinHeight, 0.0))
-                        {
-                            var animation9 = new DoubleAnimation
-                            {
-                                From = 0.0,
-                                To = 0.0,
-                                Duration = duration
-                            };
-                            Storyboard.SetTarget(animation9, parent);
-                            Storyboard.SetTargetProperty(animation9,
-                                new PropertyPath(FrameworkElement.MinHeightProperty));
-                            storyboard.Children.Add(animation9);
-                        }
-                    }
+                    Storyboard.SetTarget(animation11, canvas2);
+                    Storyboard.SetTargetProperty(animation11, new PropertyPath(UIElement.OpacityProperty));
+                    storyboard.Children.Add(animation11);
                 }
             }
-            foreach (var element2 in oldOpacities.Keys)
-            {
-                if (element2.Parent is WrapperCanvas canvas2)
-                {
-                    var a = oldOpacities[element2];
-                    var num2 = canvas2.DestinationVisibilityCache == Visibility.Visible ? 1.0 : 0.0;
-                    if (!IsClose(a, 1.0) || !IsClose(num2, 1.0))
-                    {
-                        var animation11 = new DoubleAnimation
-                        {
-                            From = a,
-                            To = num2,
-                            Duration = duration,
-                            EasingFunction = generatedEasingFunction
-                        };
-                        Storyboard.SetTarget(animation11, canvas2);
-                        Storyboard.SetTargetProperty(animation11, new PropertyPath(UIElement.OpacityProperty));
-                        storyboard.Children.Add(animation11);
-                    }
-                }
-            }
-            return storyboard;
         }
+        return storyboard;
+    }
 
-        private static Storyboard ExtractLayoutStoryboard(VisualState state)
+    private static Storyboard ExtractLayoutStoryboard(VisualState state)
+    {
+        Storyboard layoutStoryboard = null;
+        if (state.Storyboard != null)
         {
-            Storyboard layoutStoryboard = null;
-            if (state.Storyboard != null)
-            {
-                layoutStoryboard = GetLayoutStoryboard(state.Storyboard);
-                if (layoutStoryboard == null)
-                {
-                    layoutStoryboard = new Storyboard();
-                    for (var i = state.Storyboard.Children.Count - 1; i >= 0; i--)
-                    {
-                        var timeline = state.Storyboard.Children[i];
-                        if (LayoutPropertyFromTimeline(timeline, false) != null)
-                        {
-                            state.Storyboard.Children.RemoveAt(i);
-                            layoutStoryboard.Children.Add(timeline);
-                        }
-                    }
-                    SetLayoutStoryboard(state.Storyboard, layoutStoryboard);
-                }
-            }
+            layoutStoryboard = GetLayoutStoryboard(state.Storyboard);
             if (layoutStoryboard == null)
-                return new Storyboard();
-            return layoutStoryboard;
-        }
-
-        private static List<FrameworkElement> FindTargetElements(FrameworkElement control,
-            FrameworkElement templateRoot, Storyboard layoutStoryboard,
-            List<OriginalLayoutValueRecord> originalValueRecords, List<FrameworkElement> movingElements)
-        {
-            var list = new List<FrameworkElement>();
-            if (movingElements != null)
-                list.AddRange(movingElements);
-            foreach (var timeline in layoutStoryboard.Children)
             {
-                var item = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
-                if (item != null)
+                layoutStoryboard = new Storyboard();
+                for (var i = state.Storyboard.Children.Count - 1; i >= 0; i--)
                 {
-                    if (!list.Contains(item))
-                        list.Add(item);
-                    if (ChildAffectingLayoutProperties.Contains(LayoutPropertyFromTimeline(timeline, false)))
+                    var timeline = state.Storyboard.Children[i];
+                    if (LayoutPropertyFromTimeline(timeline, false) != null)
                     {
-                        if (item is Panel panel)
-                            foreach (FrameworkElement element2 in panel.Children)
-                                if (!list.Contains(element2) && !(element2 is WrapperCanvas))
-                                    list.Add(element2);
+                        state.Storyboard.Children.RemoveAt(i);
+                        layoutStoryboard.Children.Add(timeline);
                     }
                 }
-            }
-            foreach (var record in originalValueRecords)
-            {
-                if (!list.Contains(record.Element))
-                    list.Add(record.Element);
-                if (ChildAffectingLayoutProperties.Contains(record.Property))
-                {
-                    if (record.Element is Panel element)
-                        foreach (FrameworkElement element3 in element.Children)
-                            if (!list.Contains(element3) && !(element3 is WrapperCanvas))
-                                list.Add(element3);
-                }
-            }
-            for (var i = 0; i < list.Count; i++)
-            {
-                var reference = list[i];
-                var parent = VisualTreeHelper.GetParent(reference) as FrameworkElement;
-                if (movingElements != null && movingElements.Contains(reference) && parent is WrapperCanvas)
-                    parent = VisualTreeHelper.GetParent(parent) as FrameworkElement;
-                if (parent != null)
-                {
-                    if (!list.Contains(parent))
-                        list.Add(parent);
-                    for (var j = 0; j < VisualTreeHelper.GetChildrenCount(parent); j++)
-                    {
-                        if (VisualTreeHelper.GetChild(parent, j) is FrameworkElement child && !list.Contains(child) && !(child is WrapperCanvas))
-                            list.Add(child);
-                    }
-                }
-            }
-            return list;
-        }
-
-        private static VisualTransition FindTransition(VisualStateGroup group, VisualState previousState,
-            VisualState state)
-        {
-            var str = previousState != null ? previousState.Name : string.Empty;
-            var str2 = state != null ? state.Name : string.Empty;
-            var num = -1;
-            VisualTransition transition = null;
-            foreach (VisualTransition transition2 in group.Transitions)
-            {
-                var num2 = 0;
-                if (transition2.From == str)
-                    num2++;
-                else if (!string.IsNullOrEmpty(transition2.From))
-                    continue;
-                if (transition2.To == str2)
-                    num2 += 2;
-                else if (!string.IsNullOrEmpty(transition2.To))
-                    continue;
-                if (num2 > num)
-                {
-                    num = num2;
-                    transition = transition2;
-                }
-            }
-            return transition;
-        }
-
-        private static bool FinishesWithZeroOpacity(FrameworkElement control, FrameworkElement stateGroupsRoot,
-            VisualState state, VisualState previousState)
-        {
-            if (state.Storyboard != null)
-                foreach (var timeline in state.Storyboard.Children)
-                    if (TimelineIsAnimatingRootOpacity(timeline, control, stateGroupsRoot))
-                    {
-                        var valueFromTimeline = GetValueFromTimeline(timeline, out var flag);
-                        return flag && valueFromTimeline is double d && Math.Abs(d) < 0.001;
-                    }
-            if (previousState?.Storyboard == null)
-                return Math.Abs(stateGroupsRoot.Opacity) < 0.001;
-            foreach (var timeline2 in previousState.Storyboard.Children)
-                TimelineIsAnimatingRootOpacity(timeline2, control, stateGroupsRoot);
-            var animationBaseValue = (double) stateGroupsRoot.GetAnimationBaseValue(UIElement.OpacityProperty);
-            return Math.Abs(animationBaseValue) < 0.001;
-        }
-
-        private static void FinishTransitionEffectAnimation(FrameworkElement stateGroupsRoot)
-        {
-            SetTransitionEffectStoryboard(stateGroupsRoot, null);
-            TransferLocalValue(stateGroupsRoot, CachedEffectProperty, UIElement.EffectProperty);
-            if (GetDidCacheBackground(stateGroupsRoot))
-            {
-                TransferLocalValue(stateGroupsRoot, CachedBackgroundProperty, Panel.BackgroundProperty);
-                SetDidCacheBackground(stateGroupsRoot, false);
+                SetLayoutStoryboard(state.Storyboard, layoutStoryboard);
             }
         }
+        if (layoutStoryboard == null)
+            return new Storyboard();
+        return layoutStoryboard;
+    }
 
-        internal static object GetCachedBackground(DependencyObject obj)
+    private static List<FrameworkElement> FindTargetElements(FrameworkElement control,
+        FrameworkElement templateRoot, Storyboard layoutStoryboard,
+        List<OriginalLayoutValueRecord> originalValueRecords, List<FrameworkElement> movingElements)
+    {
+        var list = new List<FrameworkElement>();
+        if (movingElements != null)
+            list.AddRange(movingElements);
+        foreach (var timeline in layoutStoryboard.Children)
         {
-            return obj.GetValue(CachedBackgroundProperty);
-        }
-
-        internal static Effect GetCachedEffect(DependencyObject obj)
-        {
-            return (Effect) obj.GetValue(CachedEffectProperty);
-        }
-
-        internal static VisualState GetCurrentState(DependencyObject obj)
-        {
-            return (VisualState) obj.GetValue(CurrentStateProperty);
-        }
-
-        internal static bool GetDidCacheBackground(DependencyObject obj)
-        {
-            return (bool) obj.GetValue(DidCacheBackgroundProperty);
-        }
-
-        internal static Rect GetLayoutRect(FrameworkElement element)
-        {
-            var actualWidth = element.ActualWidth;
-            var actualHeight = element.ActualHeight;
-            if (element is Image || element is MediaElement)
-                if (element.Parent is Canvas)
-                {
-                    actualWidth = double.IsNaN(element.Width) ? actualWidth : element.Width;
-                    actualHeight = double.IsNaN(element.Height) ? actualHeight : element.Height;
-                }
-                else
-                {
-                    actualWidth = element.RenderSize.Width;
-                    actualHeight = element.RenderSize.Height;
-                }
-            actualWidth = element.Visibility == Visibility.Collapsed ? 0.0 : actualWidth;
-            actualHeight = element.Visibility == Visibility.Collapsed ? 0.0 : actualHeight;
-            var margin = element.Margin;
-            var layoutSlot = LayoutInformation.GetLayoutSlot(element);
-            var x = 0.0;
-            var y = 0.0;
-            x = element.HorizontalAlignment switch
+            var item = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
+            if (item != null)
             {
-                HorizontalAlignment.Left => layoutSlot.Left + margin.Left,
-                HorizontalAlignment.Center => (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 -
-                                              actualWidth / 2.0,
-                HorizontalAlignment.Right => layoutSlot.Right - margin.Right - actualWidth,
-                HorizontalAlignment.Stretch => Math.Max(layoutSlot.Left + margin.Left,
-                    (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 - actualWidth / 2.0),
-                _ => x
-            };
-            y = element.VerticalAlignment switch
-            {
-                VerticalAlignment.Top => layoutSlot.Top + margin.Top,
-                VerticalAlignment.Center => (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 -
-                                            actualHeight / 2.0,
-                VerticalAlignment.Bottom => layoutSlot.Bottom - margin.Bottom - actualHeight,
-                VerticalAlignment.Stretch => Math.Max(layoutSlot.Top + margin.Top,
-                    (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 - actualHeight / 2.0),
-                _ => y
-            };
-            return new Rect(x, y, actualWidth, actualHeight);
-        }
-
-        internal static Storyboard GetLayoutStoryboard(DependencyObject obj)
-        {
-            return (Storyboard) obj.GetValue(LayoutStoryboardProperty);
-        }
-
-        private static Dictionary<FrameworkElement, double> GetOldOpacities(FrameworkElement control,
-            FrameworkElement templateRoot, Storyboard layoutStoryboard,
-            List<OriginalLayoutValueRecord> originalValueRecords, List<FrameworkElement> movingElements)
-        {
-            var dictionary = new Dictionary<FrameworkElement, double>();
-            if (movingElements != null)
-                foreach (var element in movingElements)
+                if (!list.Contains(item))
+                    list.Add(item);
+                if (ChildAffectingLayoutProperties.Contains(LayoutPropertyFromTimeline(timeline, false)))
                 {
-                    if (element.Parent is WrapperCanvas parent)
-                        dictionary.Add(element, parent.Opacity);
-                }
-            for (var i = originalValueRecords.Count - 1; i >= 0; i--)
-            {
-                var record = originalValueRecords[i];
-                if (IsVisibilityProperty(record.Property) && !dictionary.TryGetValue(record.Element, out var num2))
-                {
-                    num2 = (Visibility) record.Element.GetValue(record.Property) == Visibility.Visible ? 1.0 : 0.0;
-                    dictionary.Add(record.Element, num2);
+                    if (item is Panel panel)
+                        foreach (FrameworkElement element2 in panel.Children)
+                            if (!list.Contains(element2) && !(element2 is WrapperCanvas))
+                                list.Add(element2);
                 }
             }
-            foreach (var timeline in layoutStoryboard.Children)
+        }
+        foreach (var record in originalValueRecords)
+        {
+            if (!list.Contains(record.Element))
+                list.Add(record.Element);
+            if (ChildAffectingLayoutProperties.Contains(record.Property))
             {
-                var key = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
-                var property = LayoutPropertyFromTimeline(timeline, true);
-                if (key != null && IsVisibilityProperty(property) && !dictionary.TryGetValue(key, out var num3))
+                if (record.Element is Panel element)
+                    foreach (FrameworkElement element3 in element.Children)
+                        if (!list.Contains(element3) && !(element3 is WrapperCanvas))
+                            list.Add(element3);
+            }
+        }
+        for (var i = 0; i < list.Count; i++)
+        {
+            var reference = list[i];
+            var parent = VisualTreeHelper.GetParent(reference) as FrameworkElement;
+            if (movingElements != null && movingElements.Contains(reference) && parent is WrapperCanvas)
+                parent = VisualTreeHelper.GetParent(parent) as FrameworkElement;
+            if (parent != null)
+            {
+                if (!list.Contains(parent))
+                    list.Add(parent);
+                for (var j = 0; j < VisualTreeHelper.GetChildrenCount(parent); j++)
                 {
-                    num3 = (Visibility) key.GetValue(property) == Visibility.Visible ? 1.0 : 0.0;
-                    dictionary.Add(key, num3);
+                    if (VisualTreeHelper.GetChild(parent, j) is FrameworkElement child && !list.Contains(child) && !(child is WrapperCanvas))
+                        list.Add(child);
                 }
             }
-            return dictionary;
         }
+        return list;
+    }
 
-        internal static List<OriginalLayoutValueRecord> GetOriginalLayoutValues(DependencyObject obj)
+    private static VisualTransition FindTransition(VisualStateGroup group, VisualState previousState,
+        VisualState state)
+    {
+        var str = previousState != null ? previousState.Name : string.Empty;
+        var str2 = state != null ? state.Name : string.Empty;
+        var num = -1;
+        VisualTransition transition = null;
+        foreach (VisualTransition transition2 in group.Transitions)
         {
-            return (List<OriginalLayoutValueRecord>) obj.GetValue(OriginalLayoutValuesProperty);
-        }
-
-        private static Dictionary<FrameworkElement, Rect> GetRectsOfTargets(IEnumerable<FrameworkElement> targets,
-            ICollection<FrameworkElement> movingElements)
-        {
-            var dictionary = new Dictionary<FrameworkElement, Rect>();
-            foreach (var element in targets)
+            var num2 = 0;
+            if (transition2.From == str)
+                num2++;
+            else if (!string.IsNullOrEmpty(transition2.From))
+                continue;
+            if (transition2.To == str2)
+                num2 += 2;
+            else if (!string.IsNullOrEmpty(transition2.To))
+                continue;
+            if (num2 > num)
             {
-                Rect layoutRect;
-                if (movingElements != null && movingElements.Contains(element) && element.Parent is WrapperCanvas parent)
+                num = num2;
+                transition = transition2;
+            }
+        }
+        return transition;
+    }
+
+    private static bool FinishesWithZeroOpacity(FrameworkElement control, FrameworkElement stateGroupsRoot,
+        VisualState state, VisualState previousState)
+    {
+        if (state.Storyboard != null)
+            foreach (var timeline in state.Storyboard.Children)
+                if (TimelineIsAnimatingRootOpacity(timeline, control, stateGroupsRoot))
                 {
-                    layoutRect = GetLayoutRect(parent);
-                    var renderTransform = parent.RenderTransform as TranslateTransform;
-                    var left = Canvas.GetLeft(element);
-                    var top = Canvas.GetTop(element);
-                    layoutRect = new Rect(
-                        layoutRect.Left + (double.IsNaN(left) ? 0.0 : left) +
-                        (renderTransform?.X ?? 0.0),
-                        layoutRect.Top + (double.IsNaN(top) ? 0.0 : top) +
-                        (renderTransform?.Y ?? 0.0), element.ActualWidth, element.ActualHeight);
+                    var valueFromTimeline = GetValueFromTimeline(timeline, out var flag);
+                    return flag && valueFromTimeline is double d && Math.Abs(d) < 0.001;
                 }
-                else
-                {
-                    layoutRect = GetLayoutRect(element);
-                }
-                dictionary.Add(element, layoutRect);
-            }
-            return dictionary;
-        }
+        if (previousState?.Storyboard == null)
+            return Math.Abs(stateGroupsRoot.Opacity) < 0.001;
+        foreach (var timeline2 in previousState.Storyboard.Children)
+            TimelineIsAnimatingRootOpacity(timeline2, control, stateGroupsRoot);
+        var animationBaseValue = (double) stateGroupsRoot.GetAnimationBaseValue(UIElement.OpacityProperty);
+        return Math.Abs(animationBaseValue) < 0.001;
+    }
 
-        public static DependencyProperty GetRuntimeVisibilityProperty(DependencyObject obj)
+    private static void FinishTransitionEffectAnimation(FrameworkElement stateGroupsRoot)
+    {
+        SetTransitionEffectStoryboard(stateGroupsRoot, null);
+        TransferLocalValue(stateGroupsRoot, CachedEffectProperty, UIElement.EffectProperty);
+        if (GetDidCacheBackground(stateGroupsRoot))
         {
-            return (DependencyProperty) obj.GetValue(RuntimeVisibilityPropertyProperty);
+            TransferLocalValue(stateGroupsRoot, CachedBackgroundProperty, Panel.BackgroundProperty);
+            SetDidCacheBackground(stateGroupsRoot, false);
         }
+    }
 
-        private static object GetTimelineTarget(FrameworkElement control, FrameworkElement templateRoot,
-            Timeline timeline)
-        {
-            var targetName = Storyboard.GetTargetName(timeline);
-            if (string.IsNullOrEmpty(targetName))
-                return null;
-            if (control is UserControl)
-                return control.FindName(targetName);
-            return templateRoot.FindName(targetName);
-        }
+    internal static object GetCachedBackground(DependencyObject obj)
+    {
+        return obj.GetValue(CachedBackgroundProperty);
+    }
 
-        public static TransitionEffect GetTransitionEffect(DependencyObject obj)
-        {
-            return (TransitionEffect) obj.GetValue(TransitionEffectProperty);
-        }
+    internal static Effect GetCachedEffect(DependencyObject obj)
+    {
+        return (Effect) obj.GetValue(CachedEffectProperty);
+    }
 
-        internal static Storyboard GetTransitionEffectStoryboard(DependencyObject obj)
-        {
-            return (Storyboard) obj.GetValue(TransitionEffectStoryboardProperty);
-        }
+    internal static VisualState GetCurrentState(DependencyObject obj)
+    {
+        return (VisualState) obj.GetValue(CurrentStateProperty);
+    }
 
-        public static bool GetUseFluidLayout(DependencyObject obj)
-        {
-            return (bool) obj.GetValue(UseFluidLayoutProperty);
-        }
+    internal static bool GetDidCacheBackground(DependencyObject obj)
+    {
+        return (bool) obj.GetValue(DidCacheBackgroundProperty);
+    }
 
-        private static object GetValueFromTimeline(Timeline timeline, out bool gotValue)
-        {
-            if (timeline is ObjectAnimationUsingKeyFrames frames)
+    internal static Rect GetLayoutRect(FrameworkElement element)
+    {
+        var actualWidth = element.ActualWidth;
+        var actualHeight = element.ActualHeight;
+        if (element is Image || element is MediaElement)
+            if (element.Parent is Canvas)
             {
-                gotValue = true;
-                return frames.KeyFrames[0].Value;
-            }
-            if (timeline is DoubleAnimationUsingKeyFrames frames2)
-            {
-                gotValue = true;
-                return frames2.KeyFrames[0].Value;
-            }
-            if (timeline is DoubleAnimation animation)
-            {
-                gotValue = true;
-                return animation.To;
-            }
-            if (timeline is ThicknessAnimationUsingKeyFrames frames3)
-            {
-                gotValue = true;
-                return frames3.KeyFrames[0].Value;
-            }
-            if (timeline is ThicknessAnimation animation2)
-            {
-                gotValue = true;
-                return animation2.To;
-            }
-            if (timeline is Int32AnimationUsingKeyFrames frames4)
-            {
-                gotValue = true;
-                return frames4.KeyFrames[0].Value;
-            }
-            if (timeline is Int32Animation animation3)
-            {
-                gotValue = true;
-                return animation3.To;
-            }
-            gotValue = false;
-            return null;
-        }
-
-        protected override bool GoToStateCore(FrameworkElement control, FrameworkElement stateGroupsRoot,
-            string stateName, VisualStateGroup group, VisualState state, bool useTransitions)
-        {
-            if (_changingState)
-                return false;
-            var currentState = GetCurrentState(group);
-            if (!Equals(currentState, state))
-            {
-                var transition = FindTransition(group, currentState, state);
-                var animateWithTransitionEffect =
-                    PrepareTransitionEffectImage(stateGroupsRoot, useTransitions, transition);
-                if (!GetUseFluidLayout(group))
-                    return TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
-                        useTransitions, transition, animateWithTransitionEffect, currentState);
-                var layoutStoryboard = ExtractLayoutStoryboard(state);
-                var originalLayoutValues = GetOriginalLayoutValues(group);
-                if (originalLayoutValues == null)
-                {
-                    originalLayoutValues = new List<OriginalLayoutValueRecord>();
-                    SetOriginalLayoutValues(group, originalLayoutValues);
-                }
-                if (!useTransitions)
-                {
-                    if (LayoutTransitionStoryboard != null)
-                        StopAnimations();
-                    var flag2 = TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
-                        false, transition, animateWithTransitionEffect, currentState);
-                    SetLayoutStoryboardProperties(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues);
-                    return flag2;
-                }
-                if (layoutStoryboard.Children.Count == 0 && originalLayoutValues.Count == 0)
-                    return TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
-                        true, transition, animateWithTransitionEffect, currentState);
-                try
-                {
-                    _changingState = true;
-                    stateGroupsRoot.UpdateLayout();
-                    var targets = FindTargetElements(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues,
-                        MovingElements);
-                    var rectsOfTargets = GetRectsOfTargets(targets, MovingElements);
-                    var oldOpacities = GetOldOpacities(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues,
-                        MovingElements);
-                    if (LayoutTransitionStoryboard != null)
-                    {
-                        stateGroupsRoot.LayoutUpdated -= control_LayoutUpdated;
-                        StopAnimations();
-                        stateGroupsRoot.UpdateLayout();
-                    }
-                    TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
-                        true, transition, animateWithTransitionEffect, currentState);
-                    SetLayoutStoryboardProperties(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues);
-                    stateGroupsRoot.UpdateLayout();
-                    var newRects = GetRectsOfTargets(targets, null);
-                    MovingElements = new List<FrameworkElement>();
-                    foreach (var element in targets)
-                        if (rectsOfTargets[element] != newRects[element])
-                            MovingElements.Add(element);
-                    foreach (var element2 in oldOpacities.Keys)
-                        if (!MovingElements.Contains(element2))
-                            MovingElements.Add(element2);
-                    WrapMovingElementsInCanvases(MovingElements, rectsOfTargets, newRects);
-                    stateGroupsRoot.LayoutUpdated += control_LayoutUpdated;
-                    LayoutTransitionStoryboard =
-                        CreateLayoutTransitionStoryboard(transition, MovingElements, oldOpacities);
-
-                    void Handler(object sender, EventArgs e)
-                    {
-                        stateGroupsRoot.LayoutUpdated -= control_LayoutUpdated;
-                        StopAnimations();
-                    }
-
-                    LayoutTransitionStoryboard.Completed += Handler;
-                    LayoutTransitionStoryboard.Begin();
-                }
-                finally
-                {
-                    _changingState = false;
-                }
-            }
-            return true;
-        }
-
-        private static bool IsClose(double a, double b)
-        {
-            return Math.Abs(a - b) < 1E-07;
-        }
-
-        private static bool IsVisibilityProperty(DependencyProperty property)
-        {
-            if (property != UIElement.VisibilityProperty)
-                return property.Name == "RuntimeVisibility";
-            return true;
-        }
-
-        private static DependencyProperty LayoutPropertyFromTimeline(Timeline timeline, bool forceRuntimeProperty)
-        {
-            var targetProperty = Storyboard.GetTargetProperty(timeline);
-            if (targetProperty != null &&
-                targetProperty.PathParameters.Count != 0)
-            {
-                if (targetProperty.PathParameters[0] is DependencyProperty item)
-                {
-                    if (item.Name == "RuntimeVisibility" &&
-                        item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
-                    {
-                        if (!LayoutProperties.Contains(item))
-                            LayoutProperties.Add(item);
-                        if (!forceRuntimeProperty)
-                            return UIElement.VisibilityProperty;
-                        return item;
-                    }
-                    if (item.Name == "RuntimeWidth" &&
-                        item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
-                    {
-                        if (!LayoutProperties.Contains(item))
-                            LayoutProperties.Add(item);
-                        if (!forceRuntimeProperty)
-                            return FrameworkElement.WidthProperty;
-                        return item;
-                    }
-                    if (item.Name == "RuntimeHeight" &&
-                        item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
-                    {
-                        if (!LayoutProperties.Contains(item))
-                            LayoutProperties.Add(item);
-                        if (!forceRuntimeProperty)
-                            return FrameworkElement.HeightProperty;
-                        return item;
-                    }
-                    if (LayoutProperties.Contains(item))
-                        return item;
-                }
-            }
-            return null;
-        }
-
-        private static bool PrepareTransitionEffectImage(FrameworkElement stateGroupsRoot, bool useTransitions,
-            VisualTransition transition)
-        {
-            var effect = transition == null ? null : GetTransitionEffect(transition);
-            var flag = false;
-            if (effect != null)
-            {
-                effect = effect.CloneCurrentValue();
-                if (useTransitions)
-                {
-                    flag = true;
-                    var pixelWidth = (int) Math.Max(1.0, stateGroupsRoot.ActualWidth);
-                    var pixelHeight = (int) Math.Max(1.0, stateGroupsRoot.ActualHeight);
-                    var bitmap = new RenderTargetBitmap(pixelWidth, pixelHeight, 96.0, 96.0, PixelFormats.Pbgra32);
-                    bitmap.Render(stateGroupsRoot);
-                    var brush = new ImageBrush
-                    {
-                        ImageSource = bitmap
-                    };
-                    effect.OldImage = brush;
-                }
-                var transitionEffectStoryboard = GetTransitionEffectStoryboard(stateGroupsRoot);
-                if (transitionEffectStoryboard != null)
-                {
-                    transitionEffectStoryboard.Stop();
-                    FinishTransitionEffectAnimation(stateGroupsRoot);
-                }
-                if (useTransitions)
-                {
-                    TransferLocalValue(stateGroupsRoot, UIElement.EffectProperty, CachedEffectProperty);
-                    stateGroupsRoot.Effect = effect;
-                }
-            }
-            return flag;
-        }
-
-        private static void ReplaceCachedLocalValueHelper(FrameworkElement element, DependencyProperty property,
-            object value)
-        {
-            if (value == DependencyProperty.UnsetValue)
-            {
-                element.ClearValue(property);
+                actualWidth = double.IsNaN(element.Width) ? actualWidth : element.Width;
+                actualHeight = double.IsNaN(element.Height) ? actualHeight : element.Height;
             }
             else
             {
-                if (value is BindingExpressionBase base2)
-                    element.SetBinding(property, base2.ParentBindingBase);
-                else
-                    element.SetValue(property, value);
+                actualWidth = element.RenderSize.Width;
+                actualHeight = element.RenderSize.Height;
             }
-        }
-
-        internal static void SetCachedBackground(DependencyObject obj, object value)
+        actualWidth = element.Visibility == Visibility.Collapsed ? 0.0 : actualWidth;
+        actualHeight = element.Visibility == Visibility.Collapsed ? 0.0 : actualHeight;
+        var margin = element.Margin;
+        var layoutSlot = LayoutInformation.GetLayoutSlot(element);
+        var x = 0.0;
+        var y = 0.0;
+        x = element.HorizontalAlignment switch
         {
-            obj.SetValue(CachedBackgroundProperty, value);
-        }
-
-        internal static void SetCachedEffect(DependencyObject obj, Effect value)
+            HorizontalAlignment.Left => layoutSlot.Left + margin.Left,
+            HorizontalAlignment.Center => (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 -
+                                          actualWidth / 2.0,
+            HorizontalAlignment.Right => layoutSlot.Right - margin.Right - actualWidth,
+            HorizontalAlignment.Stretch => Math.Max(layoutSlot.Left + margin.Left,
+                (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 - actualWidth / 2.0),
+            _ => x
+        };
+        y = element.VerticalAlignment switch
         {
-            obj.SetValue(CachedEffectProperty, value);
-        }
+            VerticalAlignment.Top => layoutSlot.Top + margin.Top,
+            VerticalAlignment.Center => (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 -
+                                        actualHeight / 2.0,
+            VerticalAlignment.Bottom => layoutSlot.Bottom - margin.Bottom - actualHeight,
+            VerticalAlignment.Stretch => Math.Max(layoutSlot.Top + margin.Top,
+                (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 - actualHeight / 2.0),
+            _ => y
+        };
+        return new Rect(x, y, actualWidth, actualHeight);
+    }
 
-        internal static void SetCurrentState(DependencyObject obj, VisualState value)
-        {
-            obj.SetValue(CurrentStateProperty, value);
-        }
+    internal static Storyboard GetLayoutStoryboard(DependencyObject obj)
+    {
+        return (Storyboard) obj.GetValue(LayoutStoryboardProperty);
+    }
 
-        internal static void SetDidCacheBackground(DependencyObject obj, bool value)
-        {
-            obj.SetValue(DidCacheBackgroundProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal static void SetLayoutStoryboard(DependencyObject obj, Storyboard value)
-        {
-            obj.SetValue(LayoutStoryboardProperty, value);
-        }
-
-        private static void SetLayoutStoryboardProperties(FrameworkElement control, FrameworkElement templateRoot,
-            Storyboard layoutStoryboard, List<OriginalLayoutValueRecord> originalValueRecords)
-        {
-            foreach (var record in originalValueRecords)
-                ReplaceCachedLocalValueHelper(record.Element, record.Property, record.Value);
-            originalValueRecords.Clear();
-            foreach (var timeline in layoutStoryboard.Children)
-            {
-                var dependencyObject = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
-                var property = LayoutPropertyFromTimeline(timeline, true);
-                if (dependencyObject != null && property != null)
-                {
-                    var valueFromTimeline = GetValueFromTimeline(timeline, out var flag);
-                    if (flag)
-                    {
-                        var item = new OriginalLayoutValueRecord
-                        {
-                            Element = dependencyObject,
-                            Property = property,
-                            Value = CacheLocalValueHelper(dependencyObject, property)
-                        };
-                        originalValueRecords.Add(item);
-                        dependencyObject.SetValue(property, valueFromTimeline);
-                    }
-                }
-            }
-        }
-
-        internal static void SetOriginalLayoutValues(DependencyObject obj, List<OriginalLayoutValueRecord> value)
-        {
-            obj.SetValue(OriginalLayoutValuesProperty, value);
-        }
-
-        public static void SetRuntimeVisibilityProperty(DependencyObject obj, DependencyProperty value)
-        {
-            obj.SetValue(RuntimeVisibilityPropertyProperty, value);
-        }
-
-        public static void SetTransitionEffect(DependencyObject obj, TransitionEffect value)
-        {
-            obj.SetValue(TransitionEffectProperty, value);
-        }
-
-        internal static void SetTransitionEffectStoryboard(DependencyObject obj, Storyboard value)
-        {
-            obj.SetValue(TransitionEffectStoryboardProperty, value);
-        }
-
-        public static void SetUseFluidLayout(DependencyObject obj, bool value)
-        {
-            obj.SetValue(UseFluidLayoutProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        private static void StopAnimations()
-        {
-            if (LayoutTransitionStoryboard != null)
-            {
-                LayoutTransitionStoryboard.Stop();
-                LayoutTransitionStoryboard = null;
-            }
-            if (MovingElements != null)
-            {
-                UnwrapMovingElementsFromCanvases(MovingElements);
-                MovingElements = null;
-            }
-        }
-
-        private static bool TimelineIsAnimatingRootOpacity(Timeline timeline, FrameworkElement control,
-            FrameworkElement stateGroupsRoot)
-        {
-            if (!Equals(GetTimelineTarget(control, stateGroupsRoot, timeline), stateGroupsRoot))
-                return false;
-            var targetProperty = Storyboard.GetTargetProperty(timeline);
-            return targetProperty != null &&
-                   targetProperty.PathParameters.Count != 0 &&
-                   targetProperty.PathParameters[0] == UIElement.OpacityProperty;
-        }
-
-        private static void TransferLocalValue(FrameworkElement element, DependencyProperty sourceProperty,
-            DependencyProperty destProperty)
-        {
-            var obj2 = CacheLocalValueHelper(element, sourceProperty);
-            ReplaceCachedLocalValueHelper(element, destProperty, obj2);
-        }
-
-        private bool TransitionEffectAwareGoToStateCore(FrameworkElement control, FrameworkElement stateGroupsRoot,
-            string stateName, VisualStateGroup group, VisualState state, bool useTransitions,
-            VisualTransition transition, bool animateWithTransitionEffect, VisualState previousState)
-        {
-            IEasingFunction generatedEasingFunction = null;
-            if (animateWithTransitionEffect)
-            {
-                generatedEasingFunction = transition.GeneratedEasingFunction;
-                var function2 = new DummyEasingFunction
-                {
-                    DummyValue = FinishesWithZeroOpacity(control, stateGroupsRoot, state, previousState) ? 0.01 : 0.0
-                };
-                transition.GeneratedEasingFunction = function2;
-            }
-            var flag = base.GoToStateCore(control, stateGroupsRoot, stateName, group, state, useTransitions);
-            if (animateWithTransitionEffect)
-            {
-                transition.GeneratedEasingFunction = generatedEasingFunction;
-                if (flag)
-                    AnimateTransitionEffect(stateGroupsRoot, transition);
-            }
-            SetCurrentState(group, state);
-            return flag;
-        }
-
-        private static void UnwrapMovingElementsFromCanvases(List<FrameworkElement> movingElements)
-        {
+    private static Dictionary<FrameworkElement, double> GetOldOpacities(FrameworkElement control,
+        FrameworkElement templateRoot, Storyboard layoutStoryboard,
+        List<OriginalLayoutValueRecord> originalValueRecords, List<FrameworkElement> movingElements)
+    {
+        var dictionary = new Dictionary<FrameworkElement, double>();
+        if (movingElements != null)
             foreach (var element in movingElements)
             {
                 if (element.Parent is WrapperCanvas parent)
-                {
-                    var obj2 = CacheLocalValueHelper(element, FrameworkElement.DataContextProperty);
-                    element.DataContext = element.DataContext;
-                    var element2 = VisualTreeHelper.GetParent(parent) as FrameworkElement;
-                    parent.Children.Remove(element);
-                    if (element2 is Panel panel)
-                    {
-                        var index = panel.Children.IndexOf(parent);
-                        panel.Children.RemoveAt(index);
-                        panel.Children.Insert(index, element);
-                    }
-                    else
-                    {
-                        if (element2 is Decorator decorator)
-                            decorator.Child = element;
-                    }
-                    CopyLayoutProperties(parent, element, true);
-                    ReplaceCachedLocalValueHelper(element, FrameworkElement.DataContextProperty, obj2);
-                }
+                    dictionary.Add(element, parent.Opacity);
+            }
+        for (var i = originalValueRecords.Count - 1; i >= 0; i--)
+        {
+            var record = originalValueRecords[i];
+            if (IsVisibilityProperty(record.Property) && !dictionary.TryGetValue(record.Element, out var num2))
+            {
+                num2 = (Visibility) record.Element.GetValue(record.Property) == Visibility.Visible ? 1.0 : 0.0;
+                dictionary.Add(record.Element, num2);
             }
         }
-
-        private static void WrapMovingElementsInCanvases(List<FrameworkElement> movingElements,
-            Dictionary<FrameworkElement, Rect> oldRects, Dictionary<FrameworkElement, Rect> newRects)
+        foreach (var timeline in layoutStoryboard.Children)
         {
-            foreach (var element in movingElements)
+            var key = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
+            var property = LayoutPropertyFromTimeline(timeline, true);
+            if (key != null && IsVisibilityProperty(property) && !dictionary.TryGetValue(key, out var num3))
             {
-                var parent = VisualTreeHelper.GetParent(element) as FrameworkElement;
-                var canvas = new WrapperCanvas
+                num3 = (Visibility) key.GetValue(property) == Visibility.Visible ? 1.0 : 0.0;
+                dictionary.Add(key, num3);
+            }
+        }
+        return dictionary;
+    }
+
+    internal static List<OriginalLayoutValueRecord> GetOriginalLayoutValues(DependencyObject obj)
+    {
+        return (List<OriginalLayoutValueRecord>) obj.GetValue(OriginalLayoutValuesProperty);
+    }
+
+    private static Dictionary<FrameworkElement, Rect> GetRectsOfTargets(IEnumerable<FrameworkElement> targets,
+        ICollection<FrameworkElement> movingElements)
+    {
+        var dictionary = new Dictionary<FrameworkElement, Rect>();
+        foreach (var element in targets)
+        {
+            Rect layoutRect;
+            if (movingElements != null && movingElements.Contains(element) && element.Parent is WrapperCanvas parent)
+            {
+                layoutRect = GetLayoutRect(parent);
+                var renderTransform = parent.RenderTransform as TranslateTransform;
+                var left = Canvas.GetLeft(element);
+                var top = Canvas.GetTop(element);
+                layoutRect = new Rect(
+                    layoutRect.Left + (double.IsNaN(left) ? 0.0 : left) +
+                    (renderTransform?.X ?? 0.0),
+                    layoutRect.Top + (double.IsNaN(top) ? 0.0 : top) +
+                    (renderTransform?.Y ?? 0.0), element.ActualWidth, element.ActualHeight);
+            }
+            else
+            {
+                layoutRect = GetLayoutRect(element);
+            }
+            dictionary.Add(element, layoutRect);
+        }
+        return dictionary;
+    }
+
+    public static DependencyProperty GetRuntimeVisibilityProperty(DependencyObject obj)
+    {
+        return (DependencyProperty) obj.GetValue(RuntimeVisibilityPropertyProperty);
+    }
+
+    private static object GetTimelineTarget(FrameworkElement control, FrameworkElement templateRoot,
+        Timeline timeline)
+    {
+        var targetName = Storyboard.GetTargetName(timeline);
+        if (string.IsNullOrEmpty(targetName))
+            return null;
+        if (control is UserControl)
+            return control.FindName(targetName);
+        return templateRoot.FindName(targetName);
+    }
+
+    public static TransitionEffect GetTransitionEffect(DependencyObject obj)
+    {
+        return (TransitionEffect) obj.GetValue(TransitionEffectProperty);
+    }
+
+    internal static Storyboard GetTransitionEffectStoryboard(DependencyObject obj)
+    {
+        return (Storyboard) obj.GetValue(TransitionEffectStoryboardProperty);
+    }
+
+    public static bool GetUseFluidLayout(DependencyObject obj)
+    {
+        return (bool) obj.GetValue(UseFluidLayoutProperty);
+    }
+
+    private static object GetValueFromTimeline(Timeline timeline, out bool gotValue)
+    {
+        if (timeline is ObjectAnimationUsingKeyFrames frames)
+        {
+            gotValue = true;
+            return frames.KeyFrames[0].Value;
+        }
+        if (timeline is DoubleAnimationUsingKeyFrames frames2)
+        {
+            gotValue = true;
+            return frames2.KeyFrames[0].Value;
+        }
+        if (timeline is DoubleAnimation animation)
+        {
+            gotValue = true;
+            return animation.To;
+        }
+        if (timeline is ThicknessAnimationUsingKeyFrames frames3)
+        {
+            gotValue = true;
+            return frames3.KeyFrames[0].Value;
+        }
+        if (timeline is ThicknessAnimation animation2)
+        {
+            gotValue = true;
+            return animation2.To;
+        }
+        if (timeline is Int32AnimationUsingKeyFrames frames4)
+        {
+            gotValue = true;
+            return frames4.KeyFrames[0].Value;
+        }
+        if (timeline is Int32Animation animation3)
+        {
+            gotValue = true;
+            return animation3.To;
+        }
+        gotValue = false;
+        return null;
+    }
+
+    protected override bool GoToStateCore(FrameworkElement control, FrameworkElement stateGroupsRoot,
+        string stateName, VisualStateGroup group, VisualState state, bool useTransitions)
+    {
+        if (_changingState)
+            return false;
+        var currentState = GetCurrentState(group);
+        if (!Equals(currentState, state))
+        {
+            var transition = FindTransition(group, currentState, state);
+            var animateWithTransitionEffect =
+                PrepareTransitionEffectImage(stateGroupsRoot, useTransitions, transition);
+            if (!GetUseFluidLayout(group))
+                return TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
+                    useTransitions, transition, animateWithTransitionEffect, currentState);
+            var layoutStoryboard = ExtractLayoutStoryboard(state);
+            var originalLayoutValues = GetOriginalLayoutValues(group);
+            if (originalLayoutValues == null)
+            {
+                originalLayoutValues = new List<OriginalLayoutValueRecord>();
+                SetOriginalLayoutValues(group, originalLayoutValues);
+            }
+            if (!useTransitions)
+            {
+                if (LayoutTransitionStoryboard != null)
+                    StopAnimations();
+                var flag2 = TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
+                    false, transition, animateWithTransitionEffect, currentState);
+                SetLayoutStoryboardProperties(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues);
+                return flag2;
+            }
+            if (layoutStoryboard.Children.Count == 0 && originalLayoutValues.Count == 0)
+                return TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
+                    true, transition, animateWithTransitionEffect, currentState);
+            try
+            {
+                _changingState = true;
+                stateGroupsRoot.UpdateLayout();
+                var targets = FindTargetElements(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues,
+                    MovingElements);
+                var rectsOfTargets = GetRectsOfTargets(targets, MovingElements);
+                var oldOpacities = GetOldOpacities(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues,
+                    MovingElements);
+                if (LayoutTransitionStoryboard != null)
                 {
-                    OldRect = oldRects[element],
-                    NewRect = newRects[element]
+                    stateGroupsRoot.LayoutUpdated -= control_LayoutUpdated;
+                    StopAnimations();
+                    stateGroupsRoot.UpdateLayout();
+                }
+                TransitionEffectAwareGoToStateCore(control, stateGroupsRoot, stateName, group, state,
+                    true, transition, animateWithTransitionEffect, currentState);
+                SetLayoutStoryboardProperties(control, stateGroupsRoot, layoutStoryboard, originalLayoutValues);
+                stateGroupsRoot.UpdateLayout();
+                var newRects = GetRectsOfTargets(targets, null);
+                MovingElements = new List<FrameworkElement>();
+                foreach (var element in targets)
+                    if (rectsOfTargets[element] != newRects[element])
+                        MovingElements.Add(element);
+                foreach (var element2 in oldOpacities.Keys)
+                    if (!MovingElements.Contains(element2))
+                        MovingElements.Add(element2);
+                WrapMovingElementsInCanvases(MovingElements, rectsOfTargets, newRects);
+                stateGroupsRoot.LayoutUpdated += control_LayoutUpdated;
+                LayoutTransitionStoryboard =
+                    CreateLayoutTransitionStoryboard(transition, MovingElements, oldOpacities);
+
+                void Handler(object sender, EventArgs e)
+                {
+                    stateGroupsRoot.LayoutUpdated -= control_LayoutUpdated;
+                    StopAnimations();
+                }
+
+                LayoutTransitionStoryboard.Completed += Handler;
+                LayoutTransitionStoryboard.Begin();
+            }
+            finally
+            {
+                _changingState = false;
+            }
+        }
+        return true;
+    }
+
+    private static bool IsClose(double a, double b)
+    {
+        return Math.Abs(a - b) < 1E-07;
+    }
+
+    private static bool IsVisibilityProperty(DependencyProperty property)
+    {
+        if (property != UIElement.VisibilityProperty)
+            return property.Name == "RuntimeVisibility";
+        return true;
+    }
+
+    private static DependencyProperty LayoutPropertyFromTimeline(Timeline timeline, bool forceRuntimeProperty)
+    {
+        var targetProperty = Storyboard.GetTargetProperty(timeline);
+        if (targetProperty != null &&
+            targetProperty.PathParameters.Count != 0)
+        {
+            if (targetProperty.PathParameters[0] is DependencyProperty item)
+            {
+                if (item.Name == "RuntimeVisibility" &&
+                    item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
+                {
+                    if (!LayoutProperties.Contains(item))
+                        LayoutProperties.Add(item);
+                    if (!forceRuntimeProperty)
+                        return UIElement.VisibilityProperty;
+                    return item;
+                }
+                if (item.Name == "RuntimeWidth" &&
+                    item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
+                {
+                    if (!LayoutProperties.Contains(item))
+                        LayoutProperties.Add(item);
+                    if (!forceRuntimeProperty)
+                        return FrameworkElement.WidthProperty;
+                    return item;
+                }
+                if (item.Name == "RuntimeHeight" &&
+                    item.OwnerType.Name.EndsWith("DesignTimeProperties", StringComparison.Ordinal))
+                {
+                    if (!LayoutProperties.Contains(item))
+                        LayoutProperties.Add(item);
+                    if (!forceRuntimeProperty)
+                        return FrameworkElement.HeightProperty;
+                    return item;
+                }
+                if (LayoutProperties.Contains(item))
+                    return item;
+            }
+        }
+        return null;
+    }
+
+    private static bool PrepareTransitionEffectImage(FrameworkElement stateGroupsRoot, bool useTransitions,
+        VisualTransition transition)
+    {
+        var effect = transition == null ? null : GetTransitionEffect(transition);
+        var flag = false;
+        if (effect != null)
+        {
+            effect = effect.CloneCurrentValue();
+            if (useTransitions)
+            {
+                flag = true;
+                var pixelWidth = (int) Math.Max(1.0, stateGroupsRoot.ActualWidth);
+                var pixelHeight = (int) Math.Max(1.0, stateGroupsRoot.ActualHeight);
+                var bitmap = new RenderTargetBitmap(pixelWidth, pixelHeight, 96.0, 96.0, PixelFormats.Pbgra32);
+                bitmap.Render(stateGroupsRoot);
+                var brush = new ImageBrush
+                {
+                    ImageSource = bitmap
                 };
-                var obj2 = CacheLocalValueHelper(element, FrameworkElement.DataContextProperty);
-                element.DataContext = element.DataContext;
-                var flag = true;
-                if (parent is Panel panel && !panel.IsItemsHost)
-                {
-                    var index = panel.Children.IndexOf(element);
-                    panel.Children.RemoveAt(index);
-                    panel.Children.Insert(index, canvas);
-                }
-                else
-                {
-                    if (parent is Decorator decorator)
-                        decorator.Child = canvas;
-                    else
-                        flag = false;
-                }
+                effect.OldImage = brush;
+            }
+            var transitionEffectStoryboard = GetTransitionEffectStoryboard(stateGroupsRoot);
+            if (transitionEffectStoryboard != null)
+            {
+                transitionEffectStoryboard.Stop();
+                FinishTransitionEffectAnimation(stateGroupsRoot);
+            }
+            if (useTransitions)
+            {
+                TransferLocalValue(stateGroupsRoot, UIElement.EffectProperty, CachedEffectProperty);
+                stateGroupsRoot.Effect = effect;
+            }
+        }
+        return flag;
+    }
+
+    private static void ReplaceCachedLocalValueHelper(FrameworkElement element, DependencyProperty property,
+        object value)
+    {
+        if (value == DependencyProperty.UnsetValue)
+        {
+            element.ClearValue(property);
+        }
+        else
+        {
+            if (value is BindingExpressionBase base2)
+                element.SetBinding(property, base2.ParentBindingBase);
+            else
+                element.SetValue(property, value);
+        }
+    }
+
+    internal static void SetCachedBackground(DependencyObject obj, object value)
+    {
+        obj.SetValue(CachedBackgroundProperty, value);
+    }
+
+    internal static void SetCachedEffect(DependencyObject obj, Effect value)
+    {
+        obj.SetValue(CachedEffectProperty, value);
+    }
+
+    internal static void SetCurrentState(DependencyObject obj, VisualState value)
+    {
+        obj.SetValue(CurrentStateProperty, value);
+    }
+
+    internal static void SetDidCacheBackground(DependencyObject obj, bool value)
+    {
+        obj.SetValue(DidCacheBackgroundProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal static void SetLayoutStoryboard(DependencyObject obj, Storyboard value)
+    {
+        obj.SetValue(LayoutStoryboardProperty, value);
+    }
+
+    private static void SetLayoutStoryboardProperties(FrameworkElement control, FrameworkElement templateRoot,
+        Storyboard layoutStoryboard, List<OriginalLayoutValueRecord> originalValueRecords)
+    {
+        foreach (var record in originalValueRecords)
+            ReplaceCachedLocalValueHelper(record.Element, record.Property, record.Value);
+        originalValueRecords.Clear();
+        foreach (var timeline in layoutStoryboard.Children)
+        {
+            var dependencyObject = (FrameworkElement) GetTimelineTarget(control, templateRoot, timeline);
+            var property = LayoutPropertyFromTimeline(timeline, true);
+            if (dependencyObject != null && property != null)
+            {
+                var valueFromTimeline = GetValueFromTimeline(timeline, out var flag);
                 if (flag)
                 {
-                    canvas.Children.Add(element);
-                    CopyLayoutProperties(element, canvas, false);
-                    ReplaceCachedLocalValueHelper(element, FrameworkElement.DataContextProperty, obj2);
-                }
-            }
-        }
-
-        // Nested Types
-        private class DummyEasingFunction : EasingFunctionBase
-        {
-            // Fields
-            public static readonly DependencyProperty DummyValueProperty = DependencyProperty.Register("DummyValue",
-                typeof(double), typeof(DummyEasingFunction), new PropertyMetadata(0.0));
-
-            // Properties
-            public double DummyValue
-            {
-                private get => (double) GetValue(DummyValueProperty);
-                set => SetValue(DummyValueProperty, value);
-            }
-
-            // Methods
-            protected override Freezable CreateInstanceCore()
-            {
-                return new DummyEasingFunction();
-            }
-
-            protected override double EaseInCore(double normalizedTime)
-            {
-                return DummyValue;
-            }
-        }
-
-        internal class OriginalLayoutValueRecord
-        {
-            // Properties
-            public FrameworkElement Element { get; set; }
-
-            public DependencyProperty Property { get; set; }
-
-            public object Value { get; set; }
-        }
-
-        internal class WrapperCanvas : Canvas
-        {
-            // Fields
-            internal static readonly DependencyProperty SimulationProgressProperty =
-                DependencyProperty.Register("SimulationProgress", typeof(double), typeof(WrapperCanvas),
-                    new PropertyMetadata(0.0, SimulationProgressChanged));
-
-            // Properties
-            public Visibility DestinationVisibilityCache { get; set; }
-
-            public Dictionary<DependencyProperty, object> LocalValueCache { get; set; }
-
-            public Rect NewRect { get; set; }
-
-            public Rect OldRect { get; set; }
-
-            public double SimulationProgress
-            {
-                get =>
-                    (double) GetValue(SimulationProgressProperty);
-                set => SetValue(SimulationProgressProperty, value);
-            }
-
-            // Methods
-            private static void SimulationProgressChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-            {
-                var canvas = d as WrapperCanvas;
-                var newValue = (double) e.NewValue;
-                if (canvas != null && canvas.Children.Count > 0)
-                {
-                    if (canvas.Children[0] is FrameworkElement element)
+                    var item = new OriginalLayoutValueRecord
                     {
-                        element.Width = Math.Max(0.0,
-                            canvas.OldRect.Width * newValue + canvas.NewRect.Width * (1.0 - newValue));
-                        element.Height = Math.Max(0.0,
-                            canvas.OldRect.Height * newValue + canvas.NewRect.Height * (1.0 - newValue));
-                        SetLeft(element, newValue * (canvas.OldRect.Left - canvas.NewRect.Left));
-                        SetTop(element, newValue * (canvas.OldRect.Top - canvas.NewRect.Top));
-                    }
+                        Element = dependencyObject,
+                        Property = property,
+                        Value = CacheLocalValueHelper(dependencyObject, property)
+                    };
+                    originalValueRecords.Add(item);
+                    dependencyObject.SetValue(property, valueFromTimeline);
                 }
             }
         }
     }
-}
+
+    internal static void SetOriginalLayoutValues(DependencyObject obj, List<OriginalLayoutValueRecord> value)
+    {
+        obj.SetValue(OriginalLayoutValuesProperty, value);
+    }
+
+    public static void SetRuntimeVisibilityProperty(DependencyObject obj, DependencyProperty value)
+    {
+        obj.SetValue(RuntimeVisibilityPropertyProperty, value);
+    }
+
+    public static void SetTransitionEffect(DependencyObject obj, TransitionEffect value)
+    {
+        obj.SetValue(TransitionEffectProperty, value);
+    }
+
+    internal static void SetTransitionEffectStoryboard(DependencyObject obj, Storyboard value)
+    {
+        obj.SetValue(TransitionEffectStoryboardProperty, value);
+    }
+
+    public static void SetUseFluidLayout(DependencyObject obj, bool value)
+    {
+        obj.SetValue(UseFluidLayoutProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    private static void StopAnimations()
+    {
+        if (LayoutTransitionStoryboard != null)
+        {
+            LayoutTransitionStoryboard.Stop();
+            LayoutTransitionStoryboard = null;
+        }
+        if (MovingElements != null)
+        {
+            UnwrapMovingElementsFromCanvases(MovingElements);
+            MovingElements = null;
+        }
+    }
+
+    private static bool TimelineIsAnimatingRootOpacity(Timeline timeline, FrameworkElement control,
+        FrameworkElement stateGroupsRoot)
+    {
+        if (!Equals(GetTimelineTarget(control, stateGroupsRoot, timeline), stateGroupsRoot))
+            return false;
+        var targetProperty = Storyboard.GetTargetProperty(timeline);
+        return targetProperty != null &&
+               targetProperty.PathParameters.Count != 0 &&
+               targetProperty.PathParameters[0] == UIElement.OpacityProperty;
+    }
+
+    private static void TransferLocalValue(FrameworkElement element, DependencyProperty sourceProperty,
+        DependencyProperty destProperty)
+    {
+        var obj2 = CacheLocalValueHelper(element, sourceProperty);
+        ReplaceCachedLocalValueHelper(element, destProperty, obj2);
+    }
+
+    private bool TransitionEffectAwareGoToStateCore(FrameworkElement control, FrameworkElement stateGroupsRoot,
+        string stateName, VisualStateGroup group, VisualState state, bool useTransitions,
+        VisualTransition transition, bool animateWithTransitionEffect, VisualState previousState)
+    {
+        IEasingFunction generatedEasingFunction = null;
+        if (animateWithTransitionEffect)
+        {
+            generatedEasingFunction = transition.GeneratedEasingFunction;
+            var function2 = new DummyEasingFunction
+            {
+                DummyValue = FinishesWithZeroOpacity(control, stateGroupsRoot, state, previousState) ? 0.01 : 0.0
+            };
+            transition.GeneratedEasingFunction = function2;
+        }
+        var flag = base.GoToStateCore(control, stateGroupsRoot, stateName, group, state, useTransitions);
+        if (animateWithTransitionEffect)
+        {
+            transition.GeneratedEasingFunction = generatedEasingFunction;
+            if (flag)
+                AnimateTransitionEffect(stateGroupsRoot, transition);
+        }
+        SetCurrentState(group, state);
+        return flag;
+    }
+
+    private static void UnwrapMovingElementsFromCanvases(List<FrameworkElement> movingElements)
+    {
+        foreach (var element in movingElements)
+        {
+            if (element.Parent is WrapperCanvas parent)
+            {
+                var obj2 = CacheLocalValueHelper(element, FrameworkElement.DataContextProperty);
+                element.DataContext = element.DataContext;
+                var element2 = VisualTreeHelper.GetParent(parent) as FrameworkElement;
+                parent.Children.Remove(element);
+                if (element2 is Panel panel)
+                {
+                    var index = panel.Children.IndexOf(parent);
+                    panel.Children.RemoveAt(index);
+                    panel.Children.Insert(index, element);
+                }
+                else
+                {
+                    if (element2 is Decorator decorator)
+                        decorator.Child = element;
+                }
+                CopyLayoutProperties(parent, element, true);
+                ReplaceCachedLocalValueHelper(element, FrameworkElement.DataContextProperty, obj2);
+            }
+        }
+    }
+
+    private static void WrapMovingElementsInCanvases(List<FrameworkElement> movingElements,
+        Dictionary<FrameworkElement, Rect> oldRects, Dictionary<FrameworkElement, Rect> newRects)
+    {
+        foreach (var element in movingElements)
+        {
+            var parent = VisualTreeHelper.GetParent(element) as FrameworkElement;
+            var canvas = new WrapperCanvas
+            {
+                OldRect = oldRects[element],
+                NewRect = newRects[element]
+            };
+            var obj2 = CacheLocalValueHelper(element, FrameworkElement.DataContextProperty);
+            element.DataContext = element.DataContext;
+            var flag = true;
+            if (parent is Panel panel && !panel.IsItemsHost)
+            {
+                var index = panel.Children.IndexOf(element);
+                panel.Children.RemoveAt(index);
+                panel.Children.Insert(index, canvas);
+            }
+            else
+            {
+                if (parent is Decorator decorator)
+                    decorator.Child = canvas;
+                else
+                    flag = false;
+            }
+            if (flag)
+            {
+                canvas.Children.Add(element);
+                CopyLayoutProperties(element, canvas, false);
+                ReplaceCachedLocalValueHelper(element, FrameworkElement.DataContextProperty, obj2);
+            }
+        }
+    }
+
+    // Nested Types
+    private class DummyEasingFunction : EasingFunctionBase
+    {
+        // Fields
+        public static readonly DependencyProperty DummyValueProperty = DependencyProperty.Register("DummyValue",
+            typeof(double), typeof(DummyEasingFunction), new PropertyMetadata(0.0));
+
+        // Properties
+        public double DummyValue
+        {
+            private get => (double) GetValue(DummyValueProperty);
+            set => SetValue(DummyValueProperty, value);
+        }
+
+        // Methods
+        protected override Freezable CreateInstanceCore()
+        {
+            return new DummyEasingFunction();
+        }
+
+        protected override double EaseInCore(double normalizedTime)
+        {
+            return DummyValue;
+        }
+    }
+
+    internal class OriginalLayoutValueRecord
+    {
+        // Properties
+        public FrameworkElement Element { get; set; }
+
+        public DependencyProperty Property { get; set; }
+
+        public object Value { get; set; }
+    }
+
+    internal class WrapperCanvas : Canvas
+    {
+        // Fields
+        internal static readonly DependencyProperty SimulationProgressProperty =
+            DependencyProperty.Register("SimulationProgress", typeof(double), typeof(WrapperCanvas),
+                new PropertyMetadata(0.0, SimulationProgressChanged));
+
+        // Properties
+        public Visibility DestinationVisibilityCache { get; set; }
+
+        public Dictionary<DependencyProperty, object> LocalValueCache { get; set; }
+
+        public Rect NewRect { get; set; }
+
+        public Rect OldRect { get; set; }
+
+        public double SimulationProgress
+        {
+            get =>
+                (double) GetValue(SimulationProgressProperty);
+            set => SetValue(SimulationProgressProperty, value);
+        }
+
+        // Methods
+        private static void SimulationProgressChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var canvas = d as WrapperCanvas;
+            var newValue = (double) e.NewValue;
+            if (canvas != null && canvas.Children.Count > 0)
+            {
+                if (canvas.Children[0] is FrameworkElement element)
+                {
+                    element.Width = Math.Max(0.0,
+                        canvas.OldRect.Width * newValue + canvas.NewRect.Width * (1.0 - newValue));
+                    element.Height = Math.Max(0.0,
+                        canvas.OldRect.Height * newValue + canvas.NewRect.Height * (1.0 - newValue));
+                    SetLeft(element, newValue * (canvas.OldRect.Left - canvas.NewRect.Left));
+                    SetTop(element, newValue * (canvas.OldRect.Top - canvas.NewRect.Top));
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs b/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs
index 6db025b2..dee335f4 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public enum FluidMoveScope
 {
-    public enum FluidMoveScope
-    {
-        Self,
-        Children
-    }
-}
+    Self,
+    Children
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs b/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs
index 22d5d08e..60c71b19 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs
@@ -1,12 +1,11 @@
 using System.Windows;
 
-namespace HandyControl.Interactivity
-{
-    public interface IAttachedObject
-    {
-        void Attach(DependencyObject dependencyObject);
-        void Detach();
+namespace HandyControl.Interactivity;
 
-        DependencyObject AssociatedObject { get; }
-    }
-}
+public interface IAttachedObject
+{
+    void Attach(DependencyObject dependencyObject);
+    void Detach();
+
+    DependencyObject AssociatedObject { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs b/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
index e05fbfb4..a704cded 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
@@ -22,10 +22,9 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //SOFTWARE.
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public interface IEventArgsConverter
 {
-    public interface IEventArgsConverter
-    {
-        object Convert(object value, object parameter);
-    }
-}
+    object Convert(object value, object parameter);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs b/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs
index e3b567dc..b3205f3f 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs
@@ -1,77 +1,76 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public static class Interaction
 {
-    public static class Interaction
+    private static readonly DependencyProperty TriggersProperty =
+        DependencyProperty.RegisterAttached("ShadowTriggers", typeof(TriggerCollection), typeof(Interaction),
+            new FrameworkPropertyMetadata(OnTriggersChanged));
+
+    private static readonly DependencyProperty BehaviorsProperty =
+        DependencyProperty.RegisterAttached("ShadowBehaviors", typeof(BehaviorCollection), typeof(Interaction),
+            new FrameworkPropertyMetadata(OnBehaviorsChanged));
+
+    internal static bool ShouldRunInDesignMode { get; set; }
+
+    public static TriggerCollection GetTriggers(DependencyObject obj)
     {
-        private static readonly DependencyProperty TriggersProperty =
-            DependencyProperty.RegisterAttached("ShadowTriggers", typeof(TriggerCollection), typeof(Interaction),
-                new FrameworkPropertyMetadata(OnTriggersChanged));
-
-        private static readonly DependencyProperty BehaviorsProperty =
-            DependencyProperty.RegisterAttached("ShadowBehaviors", typeof(BehaviorCollection), typeof(Interaction),
-                new FrameworkPropertyMetadata(OnBehaviorsChanged));
-
-        internal static bool ShouldRunInDesignMode { get; set; }
-
-        public static TriggerCollection GetTriggers(DependencyObject obj)
+        var triggerCollection = (TriggerCollection) obj.GetValue(TriggersProperty);
+        if (triggerCollection == null)
         {
-            var triggerCollection = (TriggerCollection) obj.GetValue(TriggersProperty);
-            if (triggerCollection == null)
-            {
-                triggerCollection = new TriggerCollection();
-                obj.SetValue(TriggersProperty, triggerCollection);
-            }
-            return triggerCollection;
-        }
-
-        public static BehaviorCollection GetBehaviors(DependencyObject obj)
-        {
-            var behaviorCollection = (BehaviorCollection) obj.GetValue(BehaviorsProperty);
-            if (behaviorCollection == null)
-            {
-                behaviorCollection = new BehaviorCollection();
-                obj.SetValue(BehaviorsProperty, behaviorCollection);
-            }
-            return behaviorCollection;
-        }
-
-        private static void OnBehaviorsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
-            var oldValue = (BehaviorCollection) args.OldValue;
-            var newValue = (BehaviorCollection) args.NewValue;
-            if (Equals(oldValue, newValue))
-                return;
-            if (oldValue?.AssociatedObject != null)
-                oldValue.Detach();
-            if (newValue == null || obj == null)
-                return;
-            if (newValue.AssociatedObject != null)
-                throw new InvalidOperationException(ExceptionStringTable
-                    .CannotHostBehaviorCollectionMultipleTimesExceptionMessage);
-            newValue.Attach(obj);
-        }
-
-        private static void OnTriggersChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
-        {
-            var oldValue = args.OldValue as TriggerCollection;
-            var newValue = args.NewValue as TriggerCollection;
-            if (Equals(oldValue, newValue))
-                return;
-            if (oldValue?.AssociatedObject != null)
-                oldValue.Detach();
-            if (newValue == null || obj == null)
-                return;
-            if (newValue.AssociatedObject != null)
-                throw new InvalidOperationException(ExceptionStringTable
-                    .CannotHostTriggerCollectionMultipleTimesExceptionMessage);
-            newValue.Attach(obj);
-        }
-
-        internal static bool IsElementLoaded(FrameworkElement element)
-        {
-            return element.IsLoaded;
+            triggerCollection = new TriggerCollection();
+            obj.SetValue(TriggersProperty, triggerCollection);
         }
+        return triggerCollection;
     }
-}
+
+    public static BehaviorCollection GetBehaviors(DependencyObject obj)
+    {
+        var behaviorCollection = (BehaviorCollection) obj.GetValue(BehaviorsProperty);
+        if (behaviorCollection == null)
+        {
+            behaviorCollection = new BehaviorCollection();
+            obj.SetValue(BehaviorsProperty, behaviorCollection);
+        }
+        return behaviorCollection;
+    }
+
+    private static void OnBehaviorsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        var oldValue = (BehaviorCollection) args.OldValue;
+        var newValue = (BehaviorCollection) args.NewValue;
+        if (Equals(oldValue, newValue))
+            return;
+        if (oldValue?.AssociatedObject != null)
+            oldValue.Detach();
+        if (newValue == null || obj == null)
+            return;
+        if (newValue.AssociatedObject != null)
+            throw new InvalidOperationException(ExceptionStringTable
+                .CannotHostBehaviorCollectionMultipleTimesExceptionMessage);
+        newValue.Attach(obj);
+    }
+
+    private static void OnTriggersChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        var oldValue = args.OldValue as TriggerCollection;
+        var newValue = args.NewValue as TriggerCollection;
+        if (Equals(oldValue, newValue))
+            return;
+        if (oldValue?.AssociatedObject != null)
+            oldValue.Detach();
+        if (newValue == null || obj == null)
+            return;
+        if (newValue.AssociatedObject != null)
+            throw new InvalidOperationException(ExceptionStringTable
+                .CannotHostTriggerCollectionMultipleTimesExceptionMessage);
+        newValue.Attach(obj);
+    }
+
+    internal static bool IsElementLoaded(FrameworkElement element)
+    {
+        return element.IsLoaded;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs b/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs
index 2a10a040..7a5f79a4 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs
@@ -3,70 +3,69 @@ using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public sealed class InvokeCommandAction : TriggerAction<DependencyObject>
 {
-    public sealed class InvokeCommandAction : TriggerAction<DependencyObject>
+    public static readonly DependencyProperty CommandProperty =
+        DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(InvokeCommandAction), null);
+
+    public static readonly DependencyProperty CommandParameterProperty =
+        DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(InvokeCommandAction),
+            null);
+
+    private string _commandName;
+
+    public string CommandName
     {
-        public static readonly DependencyProperty CommandProperty =
-            DependencyProperty.Register(nameof(Command), typeof(ICommand), typeof(InvokeCommandAction), null);
-
-        public static readonly DependencyProperty CommandParameterProperty =
-            DependencyProperty.Register(nameof(CommandParameter), typeof(object), typeof(InvokeCommandAction),
-                null);
-
-        private string _commandName;
-
-        public string CommandName
+        get
         {
-            get
-            {
-                ReadPreamble();
-                return _commandName;
-            }
-            set
-            {
-                if (CommandName == value)
-                    return;
-                WritePreamble();
-                _commandName = value;
-                WritePostscript();
-            }
+            ReadPreamble();
+            return _commandName;
         }
-
-        public ICommand Command
+        set
         {
-            get => (ICommand) GetValue(CommandProperty);
-            set => SetValue(CommandProperty, value);
-        }
-
-        public object CommandParameter
-        {
-            get => GetValue(CommandParameterProperty);
-            set => SetValue(CommandParameterProperty, value);
-        }
-
-        protected override void Invoke(object parameter)
-        {
-            if (AssociatedObject == null)
+            if (CommandName == value)
                 return;
-            var command = ResolveCommand();
-            if (command == null || !command.CanExecute(CommandParameter))
-                return;
-            command.Execute(CommandParameter);
-        }
-
-        private ICommand ResolveCommand()
-        {
-            var command = (ICommand) null;
-            if (Command != null)
-                command = Command;
-            else if (AssociatedObject != null)
-                foreach (var property in AssociatedObject.GetType()
-                    .GetProperties(BindingFlags.Instance | BindingFlags.Public))
-                    if (typeof(ICommand).IsAssignableFrom(property.PropertyType) &&
-                        string.Equals(property.Name, CommandName, StringComparison.Ordinal))
-                        command = (ICommand) property.GetValue(AssociatedObject, null);
-            return command;
+            WritePreamble();
+            _commandName = value;
+            WritePostscript();
         }
     }
-}
+
+    public ICommand Command
+    {
+        get => (ICommand) GetValue(CommandProperty);
+        set => SetValue(CommandProperty, value);
+    }
+
+    public object CommandParameter
+    {
+        get => GetValue(CommandParameterProperty);
+        set => SetValue(CommandParameterProperty, value);
+    }
+
+    protected override void Invoke(object parameter)
+    {
+        if (AssociatedObject == null)
+            return;
+        var command = ResolveCommand();
+        if (command == null || !command.CanExecute(CommandParameter))
+            return;
+        command.Execute(CommandParameter);
+    }
+
+    private ICommand ResolveCommand()
+    {
+        var command = (ICommand) null;
+        if (Command != null)
+            command = Command;
+        else if (AssociatedObject != null)
+            foreach (var property in AssociatedObject.GetType()
+                         .GetProperties(BindingFlags.Instance | BindingFlags.Public))
+                if (typeof(ICommand).IsAssignableFrom(property.PropertyType) &&
+                    string.Equals(property.Name, CommandName, StringComparison.Ordinal))
+                    command = (ICommand) property.GetValue(AssociatedObject, null);
+        return command;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs b/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs
index a915e997..4ce11261 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+internal sealed class NameResolvedEventArgs : EventArgs
 {
-    internal sealed class NameResolvedEventArgs : EventArgs
+    public NameResolvedEventArgs(object oldObject, object newObject)
     {
-        public NameResolvedEventArgs(object oldObject, object newObject)
-        {
-            OldObject = oldObject;
-            NewObject = newObject;
-        }
-
-        public object NewObject { get; }
-
-        public object OldObject { get; }
+        OldObject = oldObject;
+        NewObject = newObject;
     }
-}
+
+    public object NewObject { get; }
+
+    public object OldObject { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs b/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs
index 125a5fb2..c3ff049c 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs
@@ -1,124 +1,123 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+internal sealed class NameResolver
 {
-    internal sealed class NameResolver
+    private string _name;
+    private FrameworkElement _nameScopeReferenceElement;
+
+    private FrameworkElement ActualNameScopeReferenceElement
     {
-        private string _name;
-        private FrameworkElement _nameScopeReferenceElement;
-
-        private FrameworkElement ActualNameScopeReferenceElement
+        get
         {
-            get
-            {
-                if (NameScopeReferenceElement != null && Interaction.IsElementLoaded(NameScopeReferenceElement))
-                    return GetActualNameScopeReference(NameScopeReferenceElement);
-                return null;
-            }
-        }
-
-        private bool HasAttempedResolve { get; set; }
-
-        public string Name
-        {
-            get =>
-                _name;
-            set
-            {
-                var oldObject = Object;
-                _name = value;
-                UpdateObjectFromName(oldObject);
-            }
-        }
-
-        public FrameworkElement NameScopeReferenceElement
-        {
-            get =>
-                _nameScopeReferenceElement;
-            set
-            {
-                var nameScopeReferenceElement = NameScopeReferenceElement;
-                _nameScopeReferenceElement = value;
-                OnNameScopeReferenceElementChanged(nameScopeReferenceElement);
-            }
-        }
-
-        public DependencyObject Object
-        {
-            get
-            {
-                if (string.IsNullOrEmpty(Name) && HasAttempedResolve)
-                    return NameScopeReferenceElement;
-                return ResolvedObject;
-            }
-        }
-
-        private bool PendingReferenceElementLoad { get; set; }
-
-        private DependencyObject ResolvedObject { get; set; }
-
-        public event EventHandler<NameResolvedEventArgs> ResolvedElementChanged;
-
-        private FrameworkElement GetActualNameScopeReference(FrameworkElement initialReferenceElement)
-        {
-            var element = initialReferenceElement;
-            if (!IsNameScope(initialReferenceElement))
-                return element;
-            return initialReferenceElement.Parent as FrameworkElement ?? element;
-        }
-
-        private bool IsNameScope(FrameworkElement frameworkElement)
-        {
-            return frameworkElement.Parent is FrameworkElement parent && parent.FindName(Name) != null;
-        }
-
-        private void OnNameScopeReferenceElementChanged(FrameworkElement oldNameScopeReference)
-        {
-            if (PendingReferenceElementLoad)
-            {
-                oldNameScopeReference.Loaded -= OnNameScopeReferenceLoaded;
-                PendingReferenceElementLoad = false;
-            }
-            HasAttempedResolve = false;
-            UpdateObjectFromName(Object);
-        }
-
-        private void OnNameScopeReferenceLoaded(object sender, RoutedEventArgs e)
-        {
-            PendingReferenceElementLoad = false;
-            NameScopeReferenceElement.Loaded -= OnNameScopeReferenceLoaded;
-            UpdateObjectFromName(Object);
-        }
-
-        private void OnObjectChanged(DependencyObject oldTarget, DependencyObject newTarget)
-        {
-            ResolvedElementChanged?.Invoke(this, new NameResolvedEventArgs(oldTarget, newTarget));
-        }
-
-        private void UpdateObjectFromName(DependencyObject oldObject)
-        {
-            DependencyObject obj2 = null;
-            ResolvedObject = null;
-            if (NameScopeReferenceElement != null)
-            {
-                if (!Interaction.IsElementLoaded(NameScopeReferenceElement))
-                {
-                    NameScopeReferenceElement.Loaded += OnNameScopeReferenceLoaded;
-                    PendingReferenceElementLoad = true;
-                    return;
-                }
-                if (!string.IsNullOrEmpty(Name))
-                {
-                    var actualNameScopeReferenceElement = ActualNameScopeReferenceElement;
-                    if (actualNameScopeReferenceElement != null)
-                        obj2 = actualNameScopeReferenceElement.FindName(Name) as DependencyObject;
-                }
-            }
-            HasAttempedResolve = true;
-            ResolvedObject = obj2;
-            if (!Equals(oldObject, Object))
-                OnObjectChanged(oldObject, Object);
+            if (NameScopeReferenceElement != null && Interaction.IsElementLoaded(NameScopeReferenceElement))
+                return GetActualNameScopeReference(NameScopeReferenceElement);
+            return null;
         }
     }
-}
+
+    private bool HasAttempedResolve { get; set; }
+
+    public string Name
+    {
+        get =>
+            _name;
+        set
+        {
+            var oldObject = Object;
+            _name = value;
+            UpdateObjectFromName(oldObject);
+        }
+    }
+
+    public FrameworkElement NameScopeReferenceElement
+    {
+        get =>
+            _nameScopeReferenceElement;
+        set
+        {
+            var nameScopeReferenceElement = NameScopeReferenceElement;
+            _nameScopeReferenceElement = value;
+            OnNameScopeReferenceElementChanged(nameScopeReferenceElement);
+        }
+    }
+
+    public DependencyObject Object
+    {
+        get
+        {
+            if (string.IsNullOrEmpty(Name) && HasAttempedResolve)
+                return NameScopeReferenceElement;
+            return ResolvedObject;
+        }
+    }
+
+    private bool PendingReferenceElementLoad { get; set; }
+
+    private DependencyObject ResolvedObject { get; set; }
+
+    public event EventHandler<NameResolvedEventArgs> ResolvedElementChanged;
+
+    private FrameworkElement GetActualNameScopeReference(FrameworkElement initialReferenceElement)
+    {
+        var element = initialReferenceElement;
+        if (!IsNameScope(initialReferenceElement))
+            return element;
+        return initialReferenceElement.Parent as FrameworkElement ?? element;
+    }
+
+    private bool IsNameScope(FrameworkElement frameworkElement)
+    {
+        return frameworkElement.Parent is FrameworkElement parent && parent.FindName(Name) != null;
+    }
+
+    private void OnNameScopeReferenceElementChanged(FrameworkElement oldNameScopeReference)
+    {
+        if (PendingReferenceElementLoad)
+        {
+            oldNameScopeReference.Loaded -= OnNameScopeReferenceLoaded;
+            PendingReferenceElementLoad = false;
+        }
+        HasAttempedResolve = false;
+        UpdateObjectFromName(Object);
+    }
+
+    private void OnNameScopeReferenceLoaded(object sender, RoutedEventArgs e)
+    {
+        PendingReferenceElementLoad = false;
+        NameScopeReferenceElement.Loaded -= OnNameScopeReferenceLoaded;
+        UpdateObjectFromName(Object);
+    }
+
+    private void OnObjectChanged(DependencyObject oldTarget, DependencyObject newTarget)
+    {
+        ResolvedElementChanged?.Invoke(this, new NameResolvedEventArgs(oldTarget, newTarget));
+    }
+
+    private void UpdateObjectFromName(DependencyObject oldObject)
+    {
+        DependencyObject obj2 = null;
+        ResolvedObject = null;
+        if (NameScopeReferenceElement != null)
+        {
+            if (!Interaction.IsElementLoaded(NameScopeReferenceElement))
+            {
+                NameScopeReferenceElement.Loaded += OnNameScopeReferenceLoaded;
+                PendingReferenceElementLoad = true;
+                return;
+            }
+            if (!string.IsNullOrEmpty(Name))
+            {
+                var actualNameScopeReferenceElement = ActualNameScopeReferenceElement;
+                if (actualNameScopeReferenceElement != null)
+                    obj2 = actualNameScopeReferenceElement.FindName(Name) as DependencyObject;
+            }
+        }
+        HasAttempedResolve = true;
+        ResolvedObject = obj2;
+        if (!Equals(oldObject, Object))
+            OnObjectChanged(oldObject, Object);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs b/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs
index e6ff78eb..9e7fd948 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class PreviewInvokeEventArgs : EventArgs
 {
-    public class PreviewInvokeEventArgs : EventArgs
-    {
-        public bool Cancelling { get; set; }
-    }
-}
+    public bool Cancelling { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs b/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
index 47ae37e9..757c08da 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
@@ -1,29 +1,28 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class RoutedEventTrigger : EventTriggerBase<DependencyObject>
 {
-    public class RoutedEventTrigger : EventTriggerBase<DependencyObject>
+    public RoutedEvent RoutedEvent { get; set; }
+
+    protected override void OnAttached()
     {
-        public RoutedEvent RoutedEvent { get; set; }
-
-        protected override void OnAttached()
-        {
-            var behavior = AssociatedObject as Behavior;
-            var associatedElement = AssociatedObject as FrameworkElement;
-            if (behavior != null) associatedElement = ((IAttachedObject) behavior).AssociatedObject as FrameworkElement;
-            if (associatedElement == null) throw new ArgumentException();
-            if (RoutedEvent != null) associatedElement.AddHandler(RoutedEvent, new RoutedEventHandler(OnRoutedEvent));
-        }
-
-        private void OnRoutedEvent(object sender, RoutedEventArgs args)
-        {
-            OnEvent(args);
-        }
-
-        protected override string GetEventName()
-        {
-            return RoutedEvent.Name;
-        }
+        var behavior = AssociatedObject as Behavior;
+        var associatedElement = AssociatedObject as FrameworkElement;
+        if (behavior != null) associatedElement = ((IAttachedObject) behavior).AssociatedObject as FrameworkElement;
+        if (associatedElement == null) throw new ArgumentException();
+        if (RoutedEvent != null) associatedElement.AddHandler(RoutedEvent, new RoutedEventHandler(OnRoutedEvent));
     }
-}
+
+    private void OnRoutedEvent(object sender, RoutedEventArgs args)
+    {
+        OnEvent(args);
+    }
+
+    protected override string GetEventName()
+    {
+        return RoutedEvent.Name;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TagType.cs b/src/Shared/HandyControl_Shared/Interactivity/TagType.cs
index 01b30e07..2abb20e1 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TagType.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TagType.cs
@@ -1,8 +1,7 @@
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public enum TagType
 {
-    public enum TagType
-    {
-        Element,
-        DataContext
-    }
-}
+    Element,
+    DataContext
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs b/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs
index 55c3abc3..baf128e5 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs
@@ -2,55 +2,54 @@
 using System.Windows.Media;
 using System.Windows.Media.Effects;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class TransitionEffect : ShaderEffect
 {
-    public abstract class TransitionEffect : ShaderEffect
+    // Fields
+    public static readonly DependencyProperty InputProperty =
+        RegisterPixelShaderSamplerProperty("Input", typeof(TransitionEffect), 0, SamplingMode.NearestNeighbor);
+
+    public static readonly DependencyProperty OldImageProperty =
+        RegisterPixelShaderSamplerProperty("OldImage", typeof(TransitionEffect), 1, SamplingMode.NearestNeighbor);
+
+    public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register("Progress",
+        typeof(double), typeof(TransitionEffect), new PropertyMetadata(0.0, PixelShaderConstantCallback(0)));
+
+    // Methods
+    protected TransitionEffect()
     {
-        // Fields
-        public static readonly DependencyProperty InputProperty =
-            RegisterPixelShaderSamplerProperty("Input", typeof(TransitionEffect), 0, SamplingMode.NearestNeighbor);
-
-        public static readonly DependencyProperty OldImageProperty =
-            RegisterPixelShaderSamplerProperty("OldImage", typeof(TransitionEffect), 1, SamplingMode.NearestNeighbor);
-
-        public static readonly DependencyProperty ProgressProperty = DependencyProperty.Register("Progress",
-            typeof(double), typeof(TransitionEffect), new PropertyMetadata(0.0, PixelShaderConstantCallback(0)));
-
-        // Methods
-        protected TransitionEffect()
-        {
-            UpdateShaderValue(InputProperty);
-            UpdateShaderValue(OldImageProperty);
-            UpdateShaderValue(ProgressProperty);
-        }
-
-        // Properties
-        public Brush Input
-        {
-            get =>
-                (Brush) GetValue(InputProperty);
-            set => SetValue(InputProperty, value);
-        }
-
-        public Brush OldImage
-        {
-            get =>
-                (Brush) GetValue(OldImageProperty);
-            set => SetValue(OldImageProperty, value);
-        }
-
-        public double Progress
-        {
-            get =>
-                (double) GetValue(ProgressProperty);
-            set => SetValue(ProgressProperty, value);
-        }
-
-        public new TransitionEffect CloneCurrentValue()
-        {
-            return (TransitionEffect) base.CloneCurrentValue();
-        }
-
-        protected abstract TransitionEffect DeepCopy();
+        UpdateShaderValue(InputProperty);
+        UpdateShaderValue(OldImageProperty);
+        UpdateShaderValue(ProgressProperty);
     }
-}
+
+    // Properties
+    public Brush Input
+    {
+        get =>
+            (Brush) GetValue(InputProperty);
+        set => SetValue(InputProperty, value);
+    }
+
+    public Brush OldImage
+    {
+        get =>
+            (Brush) GetValue(OldImageProperty);
+        set => SetValue(OldImageProperty, value);
+    }
+
+    public double Progress
+    {
+        get =>
+            (double) GetValue(ProgressProperty);
+        set => SetValue(ProgressProperty, value);
+    }
+
+    public new TransitionEffect CloneCurrentValue()
+    {
+        return (TransitionEffect) base.CloneCurrentValue();
+    }
+
+    protected abstract TransitionEffect DeepCopy();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs
index 2cbae724..de84cb51 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs
@@ -5,114 +5,113 @@ using System.Windows.Controls.Primitives;
 using System.Windows.Media.Animation;
 using HandyControl.Data;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+[DefaultTrigger(typeof(UIElement), typeof(EventTrigger), "MouseLeftButtonDown")]
+[DefaultTrigger(typeof(ButtonBase), typeof(EventTrigger), "Click")]
+public abstract class TriggerAction : Animatable, IAttachedObject
 {
-    [DefaultTrigger(typeof(UIElement), typeof(EventTrigger), "MouseLeftButtonDown")]
-    [DefaultTrigger(typeof(ButtonBase), typeof(EventTrigger), "Click")]
-    public abstract class TriggerAction : Animatable, IAttachedObject
+    public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.Register("IsEnabled",
+        typeof(bool), typeof(TriggerAction), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
+
+    private readonly Type _associatedObjectTypeConstraint;
+
+    private DependencyObject _associatedObject;
+    private bool _isHosted;
+
+    internal TriggerAction(Type associatedObjectTypeConstraint)
     {
-        public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.Register("IsEnabled",
-            typeof(bool), typeof(TriggerAction), new FrameworkPropertyMetadata(ValueBoxes.TrueBox));
+        _associatedObjectTypeConstraint = associatedObjectTypeConstraint;
+    }
 
-        private readonly Type _associatedObjectTypeConstraint;
-
-        private DependencyObject _associatedObject;
-        private bool _isHosted;
-
-        internal TriggerAction(Type associatedObjectTypeConstraint)
-        {
-            _associatedObjectTypeConstraint = associatedObjectTypeConstraint;
-        }
-
-        protected DependencyObject AssociatedObject
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedObject;
-            }
-        }
-
-        protected virtual Type AssociatedObjectTypeConstraint
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedObjectTypeConstraint;
-            }
-        }
-
-        public bool IsEnabled
-        {
-            get => (bool) GetValue(IsEnabledProperty);
-            set => SetValue(IsEnabledProperty, ValueBoxes.BooleanBox(value));
-        }
-
-        internal bool IsHosted
-        {
-            get
-            {
-                ReadPreamble();
-                return _isHosted;
-            }
-            set
-            {
-                WritePreamble();
-                _isHosted = value;
-                WritePostscript();
-            }
-        }
-
-        public void Attach(DependencyObject dependencyObject)
-        {
-            if (!Equals(dependencyObject, AssociatedObject))
-            {
-                if (AssociatedObject != null)
-                    throw new InvalidOperationException(ExceptionStringTable
-                        .CannotHostTriggerActionMultipleTimesExceptionMessage);
-                if (dependencyObject != null &&
-                    !AssociatedObjectTypeConstraint.IsInstanceOfType(dependencyObject))
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
-                        new object[]
-                            {GetType().Name, dependencyObject.GetType().Name, AssociatedObjectTypeConstraint.Name}));
-                WritePreamble();
-                _associatedObject = dependencyObject;
-                WritePostscript();
-                OnAttached();
-            }
-        }
-
-        public void Detach()
-        {
-            OnDetaching();
-            WritePreamble();
-            _associatedObject = null;
-            WritePostscript();
-        }
-
-        DependencyObject IAttachedObject.AssociatedObject =>
-            AssociatedObject;
-
-        internal void CallInvoke(object parameter)
-        {
-            if (IsEnabled)
-                Invoke(parameter);
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return (Freezable) Activator.CreateInstance(GetType());
-        }
-
-        protected abstract void Invoke(object parameter);
-
-        protected virtual void OnAttached()
-        {
-        }
-
-        protected virtual void OnDetaching()
+    protected DependencyObject AssociatedObject
+    {
+        get
         {
+            ReadPreamble();
+            return _associatedObject;
         }
     }
-}
+
+    protected virtual Type AssociatedObjectTypeConstraint
+    {
+        get
+        {
+            ReadPreamble();
+            return _associatedObjectTypeConstraint;
+        }
+    }
+
+    public bool IsEnabled
+    {
+        get => (bool) GetValue(IsEnabledProperty);
+        set => SetValue(IsEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    internal bool IsHosted
+    {
+        get
+        {
+            ReadPreamble();
+            return _isHosted;
+        }
+        set
+        {
+            WritePreamble();
+            _isHosted = value;
+            WritePostscript();
+        }
+    }
+
+    public void Attach(DependencyObject dependencyObject)
+    {
+        if (!Equals(dependencyObject, AssociatedObject))
+        {
+            if (AssociatedObject != null)
+                throw new InvalidOperationException(ExceptionStringTable
+                    .CannotHostTriggerActionMultipleTimesExceptionMessage);
+            if (dependencyObject != null &&
+                !AssociatedObjectTypeConstraint.IsInstanceOfType(dependencyObject))
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
+                    new object[]
+                        {GetType().Name, dependencyObject.GetType().Name, AssociatedObjectTypeConstraint.Name}));
+            WritePreamble();
+            _associatedObject = dependencyObject;
+            WritePostscript();
+            OnAttached();
+        }
+    }
+
+    public void Detach()
+    {
+        OnDetaching();
+        WritePreamble();
+        _associatedObject = null;
+        WritePostscript();
+    }
+
+    DependencyObject IAttachedObject.AssociatedObject =>
+        AssociatedObject;
+
+    internal void CallInvoke(object parameter)
+    {
+        if (IsEnabled)
+            Invoke(parameter);
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return (Freezable) Activator.CreateInstance(GetType());
+    }
+
+    protected abstract void Invoke(object parameter);
+
+    protected virtual void OnAttached()
+    {
+    }
+
+    protected virtual void OnDetaching()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs
index 4f41f01b..fc158b10 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs
@@ -1,46 +1,45 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public class TriggerActionCollection : AttachableCollection<TriggerAction>
 {
-    public class TriggerActionCollection : AttachableCollection<TriggerAction>
+    internal TriggerActionCollection()
     {
-        internal TriggerActionCollection()
-        {
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new TriggerActionCollection();
-        }
-
-        internal override void ItemAdded(TriggerAction item)
-        {
-            if (item.IsHosted)
-                throw new InvalidOperationException(ExceptionStringTable
-                    .CannotHostTriggerActionMultipleTimesExceptionMessage);
-            if (AssociatedObject != null)
-                item.Attach(AssociatedObject);
-            item.IsHosted = true;
-        }
-
-        internal override void ItemRemoved(TriggerAction item)
-        {
-            if (((IAttachedObject) item).AssociatedObject != null)
-                item.Detach();
-            item.IsHosted = false;
-        }
-
-        protected override void OnAttached()
-        {
-            foreach (var action in this)
-                action.Attach(AssociatedObject);
-        }
-
-        protected override void OnDetaching()
-        {
-            foreach (var action in this)
-                action.Detach();
-        }
     }
-}
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return new TriggerActionCollection();
+    }
+
+    internal override void ItemAdded(TriggerAction item)
+    {
+        if (item.IsHosted)
+            throw new InvalidOperationException(ExceptionStringTable
+                .CannotHostTriggerActionMultipleTimesExceptionMessage);
+        if (AssociatedObject != null)
+            item.Attach(AssociatedObject);
+        item.IsHosted = true;
+    }
+
+    internal override void ItemRemoved(TriggerAction item)
+    {
+        if (((IAttachedObject) item).AssociatedObject != null)
+            item.Detach();
+        item.IsHosted = false;
+    }
+
+    protected override void OnAttached()
+    {
+        foreach (var action in this)
+            action.Attach(AssociatedObject);
+    }
+
+    protected override void OnDetaching()
+    {
+        foreach (var action in this)
+            action.Detach();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs
index af2bdab6..e719c299 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public abstract class TriggerAction<T> : TriggerAction where T : DependencyObject
 {
-    public abstract class TriggerAction<T> : TriggerAction where T : DependencyObject
+    protected TriggerAction() : base(typeof(T))
     {
-        protected TriggerAction() : base(typeof(T))
-        {
-        }
+    }
 
 #pragma warning disable 108,114
-        protected T AssociatedObject => (T) base.AssociatedObject;
+    protected T AssociatedObject => (T) base.AssociatedObject;
 #pragma warning restore 108,114
 
-        protected sealed override Type AssociatedObjectTypeConstraint =>
-            base.AssociatedObjectTypeConstraint;
-    }
-}
+    protected sealed override Type AssociatedObjectTypeConstraint =>
+        base.AssociatedObjectTypeConstraint;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs
index f66e0341..08b0e2cc 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs
@@ -4,107 +4,106 @@ using System.Windows;
 using System.Windows.Markup;
 using System.Windows.Media.Animation;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+[ContentProperty("Actions")]
+public abstract class TriggerBase : Animatable, IAttachedObject
 {
-    [ContentProperty("Actions")]
-    public abstract class TriggerBase : Animatable, IAttachedObject
+    private static readonly DependencyPropertyKey ActionsPropertyKey =
+        DependencyProperty.RegisterReadOnly("Actions", typeof(TriggerActionCollection), typeof(TriggerBase),
+            new FrameworkPropertyMetadata());
+
+    public static readonly DependencyProperty ActionsProperty = ActionsPropertyKey.DependencyProperty;
+
+    private DependencyObject _associatedObject;
+    private readonly Type _associatedObjectTypeConstraint;
+
+    internal TriggerBase(Type associatedObjectTypeConstraint)
     {
-        private static readonly DependencyPropertyKey ActionsPropertyKey =
-            DependencyProperty.RegisterReadOnly("Actions", typeof(TriggerActionCollection), typeof(TriggerBase),
-                new FrameworkPropertyMetadata());
+        _associatedObjectTypeConstraint = associatedObjectTypeConstraint;
+        var actions = new TriggerActionCollection();
+        SetValue(ActionsPropertyKey, actions);
+    }
 
-        public static readonly DependencyProperty ActionsProperty = ActionsPropertyKey.DependencyProperty;
+    public TriggerActionCollection Actions =>
+        (TriggerActionCollection) GetValue(ActionsProperty);
 
-        private DependencyObject _associatedObject;
-        private readonly Type _associatedObjectTypeConstraint;
-
-        internal TriggerBase(Type associatedObjectTypeConstraint)
-        {
-            _associatedObjectTypeConstraint = associatedObjectTypeConstraint;
-            var actions = new TriggerActionCollection();
-            SetValue(ActionsPropertyKey, actions);
-        }
-
-        public TriggerActionCollection Actions =>
-            (TriggerActionCollection) GetValue(ActionsProperty);
-
-        protected DependencyObject AssociatedObject
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedObject;
-            }
-        }
-
-        protected virtual Type AssociatedObjectTypeConstraint
-        {
-            get
-            {
-                ReadPreamble();
-                return _associatedObjectTypeConstraint;
-            }
-        }
-
-        public void Attach(DependencyObject dependencyObject)
-        {
-            if (!Equals(dependencyObject, AssociatedObject))
-            {
-                if (AssociatedObject != null)
-                    throw new InvalidOperationException(ExceptionStringTable
-                        .CannotHostTriggerMultipleTimesExceptionMessage);
-                if (dependencyObject != null &&
-                    !AssociatedObjectTypeConstraint.IsInstanceOfType(dependencyObject))
-                    throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
-                        ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
-                        new object[]
-                            {GetType().Name, dependencyObject.GetType().Name, AssociatedObjectTypeConstraint.Name}));
-                WritePreamble();
-                _associatedObject = dependencyObject;
-                WritePostscript();
-                Actions.Attach(dependencyObject);
-                OnAttached();
-            }
-        }
-
-        public void Detach()
-        {
-            OnDetaching();
-            WritePreamble();
-            _associatedObject = null;
-            WritePostscript();
-            Actions.Detach();
-        }
-
-        DependencyObject IAttachedObject.AssociatedObject =>
-            AssociatedObject;
-
-        public event EventHandler<PreviewInvokeEventArgs> PreviewInvoke;
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return (Freezable) Activator.CreateInstance(GetType());
-        }
-
-        protected void InvokeActions(object parameter)
-        {
-            if (PreviewInvoke != null)
-            {
-                var e = new PreviewInvokeEventArgs();
-                PreviewInvoke(this, e);
-                if (e.Cancelling)
-                    return;
-            }
-            foreach (var action in Actions)
-                action.CallInvoke(parameter);
-        }
-
-        protected virtual void OnAttached()
-        {
-        }
-
-        protected virtual void OnDetaching()
+    protected DependencyObject AssociatedObject
+    {
+        get
         {
+            ReadPreamble();
+            return _associatedObject;
         }
     }
-}
+
+    protected virtual Type AssociatedObjectTypeConstraint
+    {
+        get
+        {
+            ReadPreamble();
+            return _associatedObjectTypeConstraint;
+        }
+    }
+
+    public void Attach(DependencyObject dependencyObject)
+    {
+        if (!Equals(dependencyObject, AssociatedObject))
+        {
+            if (AssociatedObject != null)
+                throw new InvalidOperationException(ExceptionStringTable
+                    .CannotHostTriggerMultipleTimesExceptionMessage);
+            if (dependencyObject != null &&
+                !AssociatedObjectTypeConstraint.IsInstanceOfType(dependencyObject))
+                throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture,
+                    ExceptionStringTable.TypeConstraintViolatedExceptionMessage,
+                    new object[]
+                        {GetType().Name, dependencyObject.GetType().Name, AssociatedObjectTypeConstraint.Name}));
+            WritePreamble();
+            _associatedObject = dependencyObject;
+            WritePostscript();
+            Actions.Attach(dependencyObject);
+            OnAttached();
+        }
+    }
+
+    public void Detach()
+    {
+        OnDetaching();
+        WritePreamble();
+        _associatedObject = null;
+        WritePostscript();
+        Actions.Detach();
+    }
+
+    DependencyObject IAttachedObject.AssociatedObject =>
+        AssociatedObject;
+
+    public event EventHandler<PreviewInvokeEventArgs> PreviewInvoke;
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return (Freezable) Activator.CreateInstance(GetType());
+    }
+
+    protected void InvokeActions(object parameter)
+    {
+        if (PreviewInvoke != null)
+        {
+            var e = new PreviewInvokeEventArgs();
+            PreviewInvoke(this, e);
+            if (e.Cancelling)
+                return;
+        }
+        foreach (var action in Actions)
+            action.CallInvoke(parameter);
+    }
+
+    protected virtual void OnAttached()
+    {
+    }
+
+    protected virtual void OnDetaching()
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs b/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs
index 84fce1c2..b2dadec9 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs
@@ -1,42 +1,41 @@
 using System.Windows;
 
-namespace HandyControl.Interactivity
+namespace HandyControl.Interactivity;
+
+public sealed class TriggerCollection : AttachableCollection<TriggerBase>
 {
-    public sealed class TriggerCollection : AttachableCollection<TriggerBase>
+    internal TriggerCollection()
     {
-        internal TriggerCollection()
-        {
-        }
-
-        protected override void OnAttached()
-        {
-            foreach (var triggerBase in this)
-                triggerBase.Attach(AssociatedObject);
-        }
-
-        protected override void OnDetaching()
-        {
-            foreach (var triggerBase in this)
-                triggerBase.Detach();
-        }
-
-        internal override void ItemAdded(TriggerBase item)
-        {
-            if (AssociatedObject == null)
-                return;
-            item.Attach(AssociatedObject);
-        }
-
-        internal override void ItemRemoved(TriggerBase item)
-        {
-            if (((IAttachedObject) item).AssociatedObject == null)
-                return;
-            item.Detach();
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new TriggerCollection();
-        }
     }
-}
+
+    protected override void OnAttached()
+    {
+        foreach (var triggerBase in this)
+            triggerBase.Attach(AssociatedObject);
+    }
+
+    protected override void OnDetaching()
+    {
+        foreach (var triggerBase in this)
+            triggerBase.Detach();
+    }
+
+    internal override void ItemAdded(TriggerBase item)
+    {
+        if (AssociatedObject == null)
+            return;
+        item.Attach(AssociatedObject);
+    }
+
+    internal override void ItemRemoved(TriggerBase item)
+    {
+        if (((IAttachedObject) item).AssociatedObject == null)
+            return;
+        item.Detach();
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return new TriggerCollection();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs b/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs
index 1984e7d2..2838a824 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace HandyControl.Interactivity
-{
-    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
-    public sealed class TypeConstraintAttribute : Attribute
-    {
-        public TypeConstraintAttribute(Type constraint)
-        {
-            Constraint = constraint;
-        }
+namespace HandyControl.Interactivity;
 
-        public Type Constraint { get; }
+[AttributeUsage(AttributeTargets.Class, Inherited = false)]
+public sealed class TypeConstraintAttribute : Attribute
+{
+    public TypeConstraintAttribute(Type constraint)
+    {
+        Constraint = constraint;
     }
-}
+
+    public Type Constraint { get; }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
index 38c46d6d..f7ed1112 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
@@ -2,24 +2,23 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class DiscreteGeometryKeyFrame : GeometryKeyFrame
 {
-    public class DiscreteGeometryKeyFrame : GeometryKeyFrame
+    public DiscreteGeometryKeyFrame()
     {
-        public DiscreteGeometryKeyFrame()
-        {
-        }
-
-        public DiscreteGeometryKeyFrame(Geometry value) : base(value)
-        {
-        }
-
-        public DiscreteGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
-        {
-        }
-
-        protected override Freezable CreateInstanceCore() => new DiscreteGeometryKeyFrame();
-
-        protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress) => keyFrameProgress < 1.0 ? baseValue : Numbers;
     }
-}
+
+    public DiscreteGeometryKeyFrame(Geometry value) : base(value)
+    {
+    }
+
+    public DiscreteGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
+    {
+    }
+
+    protected override Freezable CreateInstanceCore() => new DiscreteGeometryKeyFrame();
+
+    protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress) => keyFrameProgress < 1.0 ? baseValue : Numbers;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
index 7c70bef3..726c03a5 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
@@ -4,60 +4,59 @@ using System.Windows.Media.Animation;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class EasingGeometryKeyFrame : GeometryKeyFrame
 {
-    public class EasingGeometryKeyFrame : GeometryKeyFrame
+    public EasingGeometryKeyFrame()
     {
-        public EasingGeometryKeyFrame()
-        {
 
-        }
-
-        public EasingGeometryKeyFrame(Geometry value) : base(value)
-        {
-
-        }
-
-        public EasingGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
-        {
-
-        }
-
-        public EasingGeometryKeyFrame(Geometry value, KeyTime keyTime, IEasingFunction easingFunction) : base(value, keyTime)
-        {
-            EasingFunction = easingFunction;
-        }
-
-        protected override Freezable CreateInstanceCore() => new EasingGeometryKeyFrame();
-
-        protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
-        {
-            var easingFunction = EasingFunction;
-            if (easingFunction != null)
-            {
-                keyFrameProgress = easingFunction.Ease(keyFrameProgress);
-            }
-
-            if (MathHelper.IsVerySmall(keyFrameProgress))
-            {
-                return baseValue;
-            }
-
-            if (MathHelper.AreClose(keyFrameProgress, 1))
-            {
-                return Numbers;
-            }
-
-            return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, keyFrameProgress);
-        }
-
-        public static readonly DependencyProperty EasingFunctionProperty = DependencyProperty.Register(
-            "EasingFunction", typeof(IEasingFunction), typeof(EasingGeometryKeyFrame), new PropertyMetadata(default(IEasingFunction)));
-
-        public IEasingFunction EasingFunction
-        {
-            get => (IEasingFunction) GetValue(EasingFunctionProperty);
-            set => SetValue(EasingFunctionProperty, value);
-        }
     }
-}
+
+    public EasingGeometryKeyFrame(Geometry value) : base(value)
+    {
+
+    }
+
+    public EasingGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
+    {
+
+    }
+
+    public EasingGeometryKeyFrame(Geometry value, KeyTime keyTime, IEasingFunction easingFunction) : base(value, keyTime)
+    {
+        EasingFunction = easingFunction;
+    }
+
+    protected override Freezable CreateInstanceCore() => new EasingGeometryKeyFrame();
+
+    protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
+    {
+        var easingFunction = EasingFunction;
+        if (easingFunction != null)
+        {
+            keyFrameProgress = easingFunction.Ease(keyFrameProgress);
+        }
+
+        if (MathHelper.IsVerySmall(keyFrameProgress))
+        {
+            return baseValue;
+        }
+
+        if (MathHelper.AreClose(keyFrameProgress, 1))
+        {
+            return Numbers;
+        }
+
+        return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, keyFrameProgress);
+    }
+
+    public static readonly DependencyProperty EasingFunctionProperty = DependencyProperty.Register(
+        "EasingFunction", typeof(IEasingFunction), typeof(EasingGeometryKeyFrame), new PropertyMetadata(default(IEasingFunction)));
+
+    public IEasingFunction EasingFunction
+    {
+        get => (IEasingFunction) GetValue(EasingFunctionProperty);
+        set => SetValue(EasingFunctionProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
index 9233c100..497f847f 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
@@ -7,174 +7,173 @@ using HandyControl.Data;
 using HandyControl.Tools;
 
 // ReSharper disable PossibleInvalidOperationException
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class GeometryAnimation : GeometryAnimationBase
 {
-    public class GeometryAnimation : GeometryAnimationBase
+    private string[] _strings;
+
+    private double[] _numbersFrom;
+
+    private double[] _numbersTo;
+
+    private double[] _numbersAccumulator;
+
+    public GeometryAnimation()
     {
-        private string[] _strings;
 
-        private double[] _numbersFrom;
+    }
 
-        private double[] _numbersTo;
+    public GeometryAnimation(string fromValue, string toValue) : this()
+    {
+        From = Geometry.Parse(fromValue);
+        To = Geometry.Parse(toValue);
+    }
 
-        private double[] _numbersAccumulator;
+    private void UpdateValue()
+    {
+        if (_numbersFrom == null || _numbersTo == null || _numbersFrom.Length != _numbersTo.Length) return;
 
-        public GeometryAnimation()
+        _numbersAccumulator = new double[_numbersFrom.Length];
+        for (var i = 0; i < _numbersFrom.Length; i++)
         {
-
-        }
-
-        public GeometryAnimation(string fromValue, string toValue) : this()
-        {
-            From = Geometry.Parse(fromValue);
-            To = Geometry.Parse(toValue);
-        }
-
-        private void UpdateValue()
-        {
-            if (_numbersFrom == null || _numbersTo == null || _numbersFrom.Length != _numbersTo.Length) return;
-
-            _numbersAccumulator = new double[_numbersFrom.Length];
-            for (var i = 0; i < _numbersFrom.Length; i++)
-            {
-                _numbersAccumulator[i] = _numbersTo[i] - _numbersFrom[i];
-            }
-        }
-
-        public GeometryAnimation(Geometry fromValue, Geometry toValue) : this()
-        {
-            From = fromValue;
-            To = toValue;
-        }
-
-        public GeometryAnimation(Geometry fromValue, Geometry toValue, Duration duration) : this()
-        {
-            From = fromValue;
-            To = toValue;
-            Duration = duration;
-        }
-
-        public GeometryAnimation(Geometry fromValue, Geometry toValue, Duration duration, FillBehavior fillBehavior) : this()
-        {
-            From = fromValue;
-            To = toValue;
-            Duration = duration;
-            FillBehavior = fillBehavior;
-        }
-
-        public new GeometryAnimation Clone() => (GeometryAnimation) base.Clone();
-
-        protected override Freezable CreateInstanceCore() => new GeometryAnimation();
-
-        protected override Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
-        {
-            if (_numbersAccumulator == null)
-            {
-                if (_numbersFrom == null)
-                {
-                    var geometryStr = defaultOriginValue.ToString(CultureInfo.InvariantCulture);
-                    AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersFrom);
-                }
-
-                if (_numbersTo == null)
-                {
-                    var geometryStr = defaultDestinationValue.ToString(CultureInfo.InvariantCulture);
-                    AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersTo);
-                    _strings = Regex.Split(geometryStr, RegexPatterns.DigitsPattern);
-                }
-
-                UpdateValue();
-            }
-
-            if (_numbersAccumulator == null) return defaultOriginValue;
-
-            var progress = animationClock.CurrentProgress.Value;
-
-            var easingFunction = EasingFunction;
-            if (easingFunction != null)
-            {
-                progress = easingFunction.Ease(progress);
-            }
-
-            var accumulated = new double[_numbersAccumulator.Length];
-
-            if (IsCumulative)
-            {
-                var currentRepeat = (double) (animationClock.CurrentIteration - 1);
-
-                if (currentRepeat > 0.0)
-                {
-                    accumulated = new double[_numbersAccumulator.Length];
-                    for (var i = 0; i < _numbersAccumulator.Length; i++)
-                    {
-                        accumulated[i] = _numbersAccumulator[i] * currentRepeat;
-                    }
-                }
-            }
-
-            var numbers = new double[_numbersAccumulator.Length];
-
-            for (var i = 0; i < _numbersAccumulator.Length; i++)
-            {
-                numbers[i] = accumulated[i] + _numbersFrom[i] + _numbersAccumulator[i] * progress;
-            }
-
-            return AnimationHelper.ComposeGeometry(_strings, numbers);
-        }
-
-        public static readonly DependencyProperty FromProperty = DependencyProperty.Register(
-            "From", typeof(Geometry), typeof(GeometryAnimation), new PropertyMetadata(default(Geometry), OnFromChanged));
-
-        private static void OnFromChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var obj = (GeometryAnimation) d;
-            if (e.NewValue is Geometry geometry)
-            {
-                AnimationHelper.DecomposeGeometryStr(geometry.ToString(CultureInfo.InvariantCulture), out obj._numbersFrom);
-                obj.UpdateValue();
-            }
-        }
-
-        public Geometry From
-        {
-            get => (Geometry) GetValue(FromProperty);
-            set => SetValue(FromProperty, value);
-        }
-
-        public static readonly DependencyProperty ToProperty = DependencyProperty.Register(
-            "To", typeof(Geometry), typeof(GeometryAnimation), new PropertyMetadata(default(Geometry), OnToChanged));
-
-        private static void OnToChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var obj = (GeometryAnimation) d;
-            if (e.NewValue is Geometry geometry)
-            {
-                var geometryStr = geometry.ToString(CultureInfo.InvariantCulture);
-                AnimationHelper.DecomposeGeometryStr(geometryStr, out obj._numbersTo);
-                obj._strings = Regex.Split(geometryStr, RegexPatterns.DigitsPattern);
-                obj.UpdateValue();
-            }
-        }
-
-        public Geometry To
-        {
-            get => (Geometry) GetValue(ToProperty);
-            set => SetValue(ToProperty, value);
-        }
-
-        public static readonly DependencyProperty EasingFunctionProperty = DependencyProperty.Register(
-            "EasingFunction", typeof(IEasingFunction), typeof(GeometryAnimation), new PropertyMetadata(default(IEasingFunction)));
-
-        public IEasingFunction EasingFunction
-        {
-            get => (IEasingFunction) GetValue(EasingFunctionProperty);
-            set => SetValue(EasingFunctionProperty, value);
-        }
-
-        public bool IsCumulative
-        {
-            get => (bool) GetValue(IsCumulativeProperty);
-            set => SetValue(IsCumulativeProperty, ValueBoxes.BooleanBox(value));
+            _numbersAccumulator[i] = _numbersTo[i] - _numbersFrom[i];
         }
     }
-}
+
+    public GeometryAnimation(Geometry fromValue, Geometry toValue) : this()
+    {
+        From = fromValue;
+        To = toValue;
+    }
+
+    public GeometryAnimation(Geometry fromValue, Geometry toValue, Duration duration) : this()
+    {
+        From = fromValue;
+        To = toValue;
+        Duration = duration;
+    }
+
+    public GeometryAnimation(Geometry fromValue, Geometry toValue, Duration duration, FillBehavior fillBehavior) : this()
+    {
+        From = fromValue;
+        To = toValue;
+        Duration = duration;
+        FillBehavior = fillBehavior;
+    }
+
+    public new GeometryAnimation Clone() => (GeometryAnimation) base.Clone();
+
+    protected override Freezable CreateInstanceCore() => new GeometryAnimation();
+
+    protected override Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
+    {
+        if (_numbersAccumulator == null)
+        {
+            if (_numbersFrom == null)
+            {
+                var geometryStr = defaultOriginValue.ToString(CultureInfo.InvariantCulture);
+                AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersFrom);
+            }
+
+            if (_numbersTo == null)
+            {
+                var geometryStr = defaultDestinationValue.ToString(CultureInfo.InvariantCulture);
+                AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersTo);
+                _strings = Regex.Split(geometryStr, RegexPatterns.DigitsPattern);
+            }
+
+            UpdateValue();
+        }
+
+        if (_numbersAccumulator == null) return defaultOriginValue;
+
+        var progress = animationClock.CurrentProgress.Value;
+
+        var easingFunction = EasingFunction;
+        if (easingFunction != null)
+        {
+            progress = easingFunction.Ease(progress);
+        }
+
+        var accumulated = new double[_numbersAccumulator.Length];
+
+        if (IsCumulative)
+        {
+            var currentRepeat = (double) (animationClock.CurrentIteration - 1);
+
+            if (currentRepeat > 0.0)
+            {
+                accumulated = new double[_numbersAccumulator.Length];
+                for (var i = 0; i < _numbersAccumulator.Length; i++)
+                {
+                    accumulated[i] = _numbersAccumulator[i] * currentRepeat;
+                }
+            }
+        }
+
+        var numbers = new double[_numbersAccumulator.Length];
+
+        for (var i = 0; i < _numbersAccumulator.Length; i++)
+        {
+            numbers[i] = accumulated[i] + _numbersFrom[i] + _numbersAccumulator[i] * progress;
+        }
+
+        return AnimationHelper.ComposeGeometry(_strings, numbers);
+    }
+
+    public static readonly DependencyProperty FromProperty = DependencyProperty.Register(
+        "From", typeof(Geometry), typeof(GeometryAnimation), new PropertyMetadata(default(Geometry), OnFromChanged));
+
+    private static void OnFromChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var obj = (GeometryAnimation) d;
+        if (e.NewValue is Geometry geometry)
+        {
+            AnimationHelper.DecomposeGeometryStr(geometry.ToString(CultureInfo.InvariantCulture), out obj._numbersFrom);
+            obj.UpdateValue();
+        }
+    }
+
+    public Geometry From
+    {
+        get => (Geometry) GetValue(FromProperty);
+        set => SetValue(FromProperty, value);
+    }
+
+    public static readonly DependencyProperty ToProperty = DependencyProperty.Register(
+        "To", typeof(Geometry), typeof(GeometryAnimation), new PropertyMetadata(default(Geometry), OnToChanged));
+
+    private static void OnToChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var obj = (GeometryAnimation) d;
+        if (e.NewValue is Geometry geometry)
+        {
+            var geometryStr = geometry.ToString(CultureInfo.InvariantCulture);
+            AnimationHelper.DecomposeGeometryStr(geometryStr, out obj._numbersTo);
+            obj._strings = Regex.Split(geometryStr, RegexPatterns.DigitsPattern);
+            obj.UpdateValue();
+        }
+    }
+
+    public Geometry To
+    {
+        get => (Geometry) GetValue(ToProperty);
+        set => SetValue(ToProperty, value);
+    }
+
+    public static readonly DependencyProperty EasingFunctionProperty = DependencyProperty.Register(
+        "EasingFunction", typeof(IEasingFunction), typeof(GeometryAnimation), new PropertyMetadata(default(IEasingFunction)));
+
+    public IEasingFunction EasingFunction
+    {
+        get => (IEasingFunction) GetValue(EasingFunctionProperty);
+        set => SetValue(EasingFunctionProperty, value);
+    }
+
+    public bool IsCumulative
+    {
+        get => (bool) GetValue(IsCumulativeProperty);
+        set => SetValue(IsCumulativeProperty, ValueBoxes.BooleanBox(value));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
index f791b568..82efee27 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
@@ -4,57 +4,56 @@ using System.Threading;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public abstract class GeometryAnimationBase : AnimationTimeline
 {
-    public abstract class GeometryAnimationBase : AnimationTimeline
+    protected GeometryAnimationBase()
     {
-        protected GeometryAnimationBase()
+        Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+    }
+
+    public new GeometryAnimationBase Clone() => (GeometryAnimationBase) base.Clone();
+
+    public sealed override object GetCurrentValue(object defaultOriginValue, object defaultDestinationValue, AnimationClock animationClock)
+    {
+        if (defaultOriginValue == null)
         {
-            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+            throw new ArgumentNullException(nameof(defaultOriginValue));
         }
-
-        public new GeometryAnimationBase Clone() => (GeometryAnimationBase) base.Clone();
-
-        public sealed override object GetCurrentValue(object defaultOriginValue, object defaultDestinationValue, AnimationClock animationClock)
+        if (defaultDestinationValue == null)
         {
-            if (defaultOriginValue == null)
-            {
-                throw new ArgumentNullException(nameof(defaultOriginValue));
-            }
-            if (defaultDestinationValue == null)
-            {
-                throw new ArgumentNullException(nameof(defaultDestinationValue));
-            }
-            return GetCurrentValue((Geometry) defaultOriginValue, (Geometry) defaultDestinationValue, animationClock);
+            throw new ArgumentNullException(nameof(defaultDestinationValue));
         }
+        return GetCurrentValue((Geometry) defaultOriginValue, (Geometry) defaultDestinationValue, animationClock);
+    }
 
-        public override Type TargetPropertyType
-        {
-            get
-            {
-                ReadPreamble();
-
-                return typeof(Geometry);
-            }
-        }
-
-        public Geometry GetCurrentValue(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
+    public override Type TargetPropertyType
+    {
+        get
         {
             ReadPreamble();
 
-            if (animationClock == null)
-            {
-                throw new ArgumentNullException(nameof(animationClock));
-            }
+            return typeof(Geometry);
+        }
+    }
 
-            if (animationClock.CurrentState == ClockState.Stopped)
-            {
-                return defaultDestinationValue;
-            }
+    public Geometry GetCurrentValue(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
+    {
+        ReadPreamble();
 
-            return GetCurrentValueCore(defaultOriginValue, defaultDestinationValue, animationClock);
+        if (animationClock == null)
+        {
+            throw new ArgumentNullException(nameof(animationClock));
         }
 
-        protected abstract Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock);
+        if (animationClock.CurrentState == ClockState.Stopped)
+        {
+            return defaultDestinationValue;
+        }
+
+        return GetCurrentValueCore(defaultOriginValue, defaultDestinationValue, animationClock);
     }
-}
+
+    protected abstract Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
index e9c85231..11d0636a 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
@@ -11,511 +11,510 @@ using System.Windows.Media.Animation;
 using HandyControl.Tools;
 
 // ReSharper disable PossibleInvalidOperationException
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+[ContentProperty("KeyFrames")]
+public class GeometryAnimationUsingKeyFrames : GeometryAnimationBase, IKeyFrameAnimation, IAddChild
 {
-    [ContentProperty("KeyFrames")]
-    public class GeometryAnimationUsingKeyFrames : GeometryAnimationBase, IKeyFrameAnimation, IAddChild
+    private string[] _strings;
+
+    public string[] Strings
     {
-        private string[] _strings;
-
-        public string[] Strings
+        get
         {
-            get
+            if (_keyFrames == null || _keyFrames.Count == 0)
             {
-                if (_keyFrames == null || _keyFrames.Count == 0)
-                {
-                    return null;
-                }
-
-                return _strings ??= Regex.Split(_keyFrames[0].Value.ToString(CultureInfo.InvariantCulture), RegexPatterns.DigitsPattern);
-            }
-        }
-
-        private GeometryKeyFrameCollection _keyFrames;
-
-        private ResolvedKeyFrameEntry[] _sortedResolvedKeyFrames;
-
-        private bool _areKeyTimesValid;
-
-        public GeometryAnimationUsingKeyFrames()
-        {
-            _areKeyTimesValid = true;
-        }
-
-        public new GeometryAnimationUsingKeyFrames Clone() => (GeometryAnimationUsingKeyFrames) base.Clone();
-
-        public new GeometryAnimationUsingKeyFrames CloneCurrentValue() => (GeometryAnimationUsingKeyFrames) base.CloneCurrentValue();
-
-        protected override bool FreezeCore(bool isChecking)
-        {
-            var canFreeze = base.FreezeCore(isChecking);
-
-            canFreeze &= Freeze(_keyFrames, isChecking);
-
-            if (canFreeze & !_areKeyTimesValid)
-            {
-                ResolveKeyTimes();
+                return null;
             }
 
-            return canFreeze;
+            return _strings ??= Regex.Split(_keyFrames[0].Value.ToString(CultureInfo.InvariantCulture), RegexPatterns.DigitsPattern);
+        }
+    }
+
+    private GeometryKeyFrameCollection _keyFrames;
+
+    private ResolvedKeyFrameEntry[] _sortedResolvedKeyFrames;
+
+    private bool _areKeyTimesValid;
+
+    public GeometryAnimationUsingKeyFrames()
+    {
+        _areKeyTimesValid = true;
+    }
+
+    public new GeometryAnimationUsingKeyFrames Clone() => (GeometryAnimationUsingKeyFrames) base.Clone();
+
+    public new GeometryAnimationUsingKeyFrames CloneCurrentValue() => (GeometryAnimationUsingKeyFrames) base.CloneCurrentValue();
+
+    protected override bool FreezeCore(bool isChecking)
+    {
+        var canFreeze = base.FreezeCore(isChecking);
+
+        canFreeze &= Freeze(_keyFrames, isChecking);
+
+        if (canFreeze & !_areKeyTimesValid)
+        {
+            ResolveKeyTimes();
         }
 
-        protected override void OnChanged()
-        {
-            _areKeyTimesValid = false;
+        return canFreeze;
+    }
 
-            base.OnChanged();
+    protected override void OnChanged()
+    {
+        _areKeyTimesValid = false;
+
+        base.OnChanged();
+    }
+
+    protected override Freezable CreateInstanceCore() => new GeometryAnimationUsingKeyFrames();
+
+    protected override void CloneCore(Freezable sourceFreezable)
+    {
+        var sourceAnimation = (GeometryAnimationUsingKeyFrames) sourceFreezable;
+        base.CloneCore(sourceFreezable);
+
+        CopyCommon(sourceAnimation, false);
+    }
+
+    protected override void CloneCurrentValueCore(Freezable sourceFreezable)
+    {
+        var sourceAnimation = (GeometryAnimationUsingKeyFrames) sourceFreezable;
+        base.CloneCurrentValueCore(sourceFreezable);
+
+        CopyCommon(sourceAnimation, true);
+    }
+
+    protected override void GetAsFrozenCore(Freezable source)
+    {
+        var sourceAnimation = (GeometryAnimationUsingKeyFrames) source;
+        base.GetAsFrozenCore(source);
+
+        CopyCommon(sourceAnimation, false);
+    }
+
+    protected override void GetCurrentValueAsFrozenCore(Freezable source)
+    {
+        var sourceAnimation = (GeometryAnimationUsingKeyFrames) source;
+        base.GetCurrentValueAsFrozenCore(source);
+
+        CopyCommon(sourceAnimation, true);
+    }
+
+    private void CopyCommon(GeometryAnimationUsingKeyFrames sourceAnimation, bool isCurrentValueClone)
+    {
+        _areKeyTimesValid = sourceAnimation._areKeyTimesValid;
+
+        if (_areKeyTimesValid && sourceAnimation._sortedResolvedKeyFrames != null)
+        {
+            _sortedResolvedKeyFrames = (ResolvedKeyFrameEntry[]) sourceAnimation._sortedResolvedKeyFrames.Clone();
         }
 
-        protected override Freezable CreateInstanceCore() => new GeometryAnimationUsingKeyFrames();
-
-        protected override void CloneCore(Freezable sourceFreezable)
+        if (sourceAnimation._keyFrames != null)
         {
-            var sourceAnimation = (GeometryAnimationUsingKeyFrames) sourceFreezable;
-            base.CloneCore(sourceFreezable);
-
-            CopyCommon(sourceAnimation, false);
-        }
-
-        protected override void CloneCurrentValueCore(Freezable sourceFreezable)
-        {
-            var sourceAnimation = (GeometryAnimationUsingKeyFrames) sourceFreezable;
-            base.CloneCurrentValueCore(sourceFreezable);
-
-            CopyCommon(sourceAnimation, true);
-        }
-
-        protected override void GetAsFrozenCore(Freezable source)
-        {
-            var sourceAnimation = (GeometryAnimationUsingKeyFrames) source;
-            base.GetAsFrozenCore(source);
-
-            CopyCommon(sourceAnimation, false);
-        }
-
-        protected override void GetCurrentValueAsFrozenCore(Freezable source)
-        {
-            var sourceAnimation = (GeometryAnimationUsingKeyFrames) source;
-            base.GetCurrentValueAsFrozenCore(source);
-
-            CopyCommon(sourceAnimation, true);
-        }
-
-        private void CopyCommon(GeometryAnimationUsingKeyFrames sourceAnimation, bool isCurrentValueClone)
-        {
-            _areKeyTimesValid = sourceAnimation._areKeyTimesValid;
-
-            if (_areKeyTimesValid && sourceAnimation._sortedResolvedKeyFrames != null)
+            if (isCurrentValueClone)
             {
-                _sortedResolvedKeyFrames = (ResolvedKeyFrameEntry[]) sourceAnimation._sortedResolvedKeyFrames.Clone();
-            }
-
-            if (sourceAnimation._keyFrames != null)
-            {
-                if (isCurrentValueClone)
-                {
-                    _keyFrames = (GeometryKeyFrameCollection) sourceAnimation._keyFrames.CloneCurrentValue();
-                }
-                else
-                {
-                    _keyFrames = sourceAnimation._keyFrames.Clone();
-                }
-
-                OnFreezablePropertyChanged(null, _keyFrames);
-            }
-        }
-
-        void IAddChild.AddChild(object child)
-        {
-            WritePreamble();
-
-            if (child == null)
-            {
-                throw new ArgumentNullException(nameof(child));
-            }
-
-            AddChild(child);
-
-            WritePostscript();
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        protected virtual void AddChild(object child)
-        {
-            if (child is GeometryKeyFrame keyFrame)
-            {
-                KeyFrames.Add(keyFrame);
+                _keyFrames = (GeometryKeyFrameCollection) sourceAnimation._keyFrames.CloneCurrentValue();
             }
             else
             {
-                throw new ArgumentException("Animation_ChildMustBeKeyFrame", nameof(child));
+                _keyFrames = sourceAnimation._keyFrames.Clone();
             }
+
+            OnFreezablePropertyChanged(null, _keyFrames);
+        }
+    }
+
+    void IAddChild.AddChild(object child)
+    {
+        WritePreamble();
+
+        if (child == null)
+        {
+            throw new ArgumentNullException(nameof(child));
         }
 
-        void IAddChild.AddText(string childText)
+        AddChild(child);
+
+        WritePostscript();
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void AddChild(object child)
+    {
+        if (child is GeometryKeyFrame keyFrame)
         {
-            if (childText == null)
+            KeyFrames.Add(keyFrame);
+        }
+        else
+        {
+            throw new ArgumentException("Animation_ChildMustBeKeyFrame", nameof(child));
+        }
+    }
+
+    void IAddChild.AddText(string childText)
+    {
+        if (childText == null)
+        {
+            throw new ArgumentNullException(nameof(childText));
+        }
+
+        AddText(childText);
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Advanced)]
+    protected virtual void AddText(string childText) => throw new InvalidOperationException("Animation_NoTextChildren");
+
+    protected override Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
+    {
+        if (_keyFrames == null)
+        {
+            return defaultDestinationValue;
+        }
+
+        if (!_areKeyTimesValid)
+        {
+            ResolveKeyTimes();
+        }
+
+        if (_sortedResolvedKeyFrames == null)
+        {
+            return defaultDestinationValue;
+        }
+
+        var currentTime = animationClock.CurrentTime.Value;
+        var keyFrameCount = _sortedResolvedKeyFrames.Length;
+        var maxKeyFrameIndex = keyFrameCount - 1;
+
+        double[] currentIterationValue;
+
+        var currentResolvedKeyFrameIndex = 0;
+
+        while (currentResolvedKeyFrameIndex < keyFrameCount && currentTime > _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime)
+        {
+            currentResolvedKeyFrameIndex++;
+        }
+
+        while (currentResolvedKeyFrameIndex < maxKeyFrameIndex && currentTime == _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex + 1]._resolvedKeyTime)
+        {
+            currentResolvedKeyFrameIndex++;
+        }
+
+        if (currentResolvedKeyFrameIndex == keyFrameCount)
+        {
+            currentIterationValue = GetResolvedKeyFrameValue(maxKeyFrameIndex);
+        }
+        else if (currentTime == _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime)
+        {
+            currentIterationValue = GetResolvedKeyFrameValue(currentResolvedKeyFrameIndex);
+        }
+        else
+        {
+            double currentSegmentProgress;
+            double[] fromValue;
+
+            if (currentResolvedKeyFrameIndex == 0)
             {
-                throw new ArgumentNullException(nameof(childText));
+                AnimationHelper.DecomposeGeometryStr(defaultOriginValue.ToString(CultureInfo.InvariantCulture), out fromValue);
+
+                currentSegmentProgress = currentTime.TotalMilliseconds / _sortedResolvedKeyFrames[0]._resolvedKeyTime.TotalMilliseconds;
+            }
+            else
+            {
+                var previousResolvedKeyFrameIndex = currentResolvedKeyFrameIndex - 1;
+                var previousResolvedKeyTime = _sortedResolvedKeyFrames[previousResolvedKeyFrameIndex]._resolvedKeyTime;
+
+                fromValue = GetResolvedKeyFrameValue(previousResolvedKeyFrameIndex);
+
+                var segmentCurrentTime = currentTime - previousResolvedKeyTime;
+                var segmentDuration = _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime - previousResolvedKeyTime;
+
+                currentSegmentProgress = segmentCurrentTime.TotalMilliseconds / segmentDuration.TotalMilliseconds;
             }
 
-            AddText(childText);
+            currentIterationValue = GetResolvedKeyFrame(currentResolvedKeyFrameIndex).InterpolateValue(fromValue, currentSegmentProgress);
         }
 
-        [EditorBrowsable(EditorBrowsableState.Advanced)]
-        protected virtual void AddText(string childText) => throw new InvalidOperationException("Animation_NoTextChildren");
+        return AnimationHelper.ComposeGeometry(Strings, currentIterationValue);
+    }
 
-        protected override Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock)
+    protected sealed override Duration GetNaturalDurationCore(Clock clock) => new(LargestTimeSpanKeyTime);
+
+    IList IKeyFrameAnimation.KeyFrames
+    {
+        get => KeyFrames;
+        set => KeyFrames = (GeometryKeyFrameCollection) value;
+    }
+
+    public GeometryKeyFrameCollection KeyFrames
+    {
+        get
         {
+            ReadPreamble();
+
             if (_keyFrames == null)
             {
-                return defaultDestinationValue;
-            }
-
-            if (!_areKeyTimesValid)
-            {
-                ResolveKeyTimes();
-            }
-
-            if (_sortedResolvedKeyFrames == null)
-            {
-                return defaultDestinationValue;
-            }
-
-            var currentTime = animationClock.CurrentTime.Value;
-            var keyFrameCount = _sortedResolvedKeyFrames.Length;
-            var maxKeyFrameIndex = keyFrameCount - 1;
-
-            double[] currentIterationValue;
-
-            var currentResolvedKeyFrameIndex = 0;
-
-            while (currentResolvedKeyFrameIndex < keyFrameCount && currentTime > _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime)
-            {
-                currentResolvedKeyFrameIndex++;
-            }
-
-            while (currentResolvedKeyFrameIndex < maxKeyFrameIndex && currentTime == _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex + 1]._resolvedKeyTime)
-            {
-                currentResolvedKeyFrameIndex++;
-            }
-
-            if (currentResolvedKeyFrameIndex == keyFrameCount)
-            {
-                currentIterationValue = GetResolvedKeyFrameValue(maxKeyFrameIndex);
-            }
-            else if (currentTime == _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime)
-            {
-                currentIterationValue = GetResolvedKeyFrameValue(currentResolvedKeyFrameIndex);
-            }
-            else
-            {
-                double currentSegmentProgress;
-                double[] fromValue;
-
-                if (currentResolvedKeyFrameIndex == 0)
+                if (IsFrozen)
                 {
-                    AnimationHelper.DecomposeGeometryStr(defaultOriginValue.ToString(CultureInfo.InvariantCulture), out fromValue);
-
-                    currentSegmentProgress = currentTime.TotalMilliseconds / _sortedResolvedKeyFrames[0]._resolvedKeyTime.TotalMilliseconds;
+                    _keyFrames = GeometryKeyFrameCollection.Empty;
                 }
                 else
                 {
-                    var previousResolvedKeyFrameIndex = currentResolvedKeyFrameIndex - 1;
-                    var previousResolvedKeyTime = _sortedResolvedKeyFrames[previousResolvedKeyFrameIndex]._resolvedKeyTime;
+                    WritePreamble();
 
-                    fromValue = GetResolvedKeyFrameValue(previousResolvedKeyFrameIndex);
+                    _keyFrames = new GeometryKeyFrameCollection();
 
-                    var segmentCurrentTime = currentTime - previousResolvedKeyTime;
-                    var segmentDuration = _sortedResolvedKeyFrames[currentResolvedKeyFrameIndex]._resolvedKeyTime - previousResolvedKeyTime;
-
-                    currentSegmentProgress = segmentCurrentTime.TotalMilliseconds / segmentDuration.TotalMilliseconds;
-                }
-
-                currentIterationValue = GetResolvedKeyFrame(currentResolvedKeyFrameIndex).InterpolateValue(fromValue, currentSegmentProgress);
-            }
-
-            return AnimationHelper.ComposeGeometry(Strings, currentIterationValue);
-        }
-
-        protected sealed override Duration GetNaturalDurationCore(Clock clock) => new(LargestTimeSpanKeyTime);
-
-        IList IKeyFrameAnimation.KeyFrames
-        {
-            get => KeyFrames;
-            set => KeyFrames = (GeometryKeyFrameCollection) value;
-        }
-
-        public GeometryKeyFrameCollection KeyFrames
-        {
-            get
-            {
-                ReadPreamble();
-
-                if (_keyFrames == null)
-                {
-                    if (IsFrozen)
-                    {
-                        _keyFrames = GeometryKeyFrameCollection.Empty;
-                    }
-                    else
-                    {
-                        WritePreamble();
-
-                        _keyFrames = new GeometryKeyFrameCollection();
-
-                        OnFreezablePropertyChanged(null, _keyFrames);
-
-                        WritePostscript();
-                    }
-                }
-
-                return _keyFrames;
-            }
-            set
-            {
-                if (value == null)
-                {
-                    throw new ArgumentNullException(nameof(value));
-                }
-
-                WritePreamble();
-
-                if (value != _keyFrames)
-                {
-                    OnFreezablePropertyChanged(_keyFrames, value);
-                    _keyFrames = value;
+                    OnFreezablePropertyChanged(null, _keyFrames);
 
                     WritePostscript();
                 }
             }
+
+            return _keyFrames;
         }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool ShouldSerializeKeyFrames()
+        set
         {
-            ReadPreamble();
-
-            return _keyFrames != null && _keyFrames.Count > 0;
-        }
-
-        private struct KeyTimeBlock
-        {
-            public int BeginIndex;
-            public int EndIndex;
-        }
-
-        private double[] GetResolvedKeyFrameValue(int resolvedKeyFrameIndex) =>
-            GetResolvedKeyFrame(resolvedKeyFrameIndex).Numbers;
-
-        private GeometryKeyFrame GetResolvedKeyFrame(int resolvedKeyFrameIndex) =>
-            _keyFrames[_sortedResolvedKeyFrames[resolvedKeyFrameIndex]._originalKeyFrameIndex];
-
-        private TimeSpan LargestTimeSpanKeyTime
-        {
-            get
+            if (value == null)
             {
-                var hasTimeSpanKeyTime = false;
-                var largestTimeSpanKeyTime = TimeSpan.Zero;
+                throw new ArgumentNullException(nameof(value));
+            }
 
-                if (_keyFrames != null)
-                {
-                    var keyFrameCount = _keyFrames.Count;
+            WritePreamble();
 
-                    for (var index = 0; index < keyFrameCount; index++)
-                    {
-                        var keyTime = _keyFrames[index].KeyTime;
+            if (value != _keyFrames)
+            {
+                OnFreezablePropertyChanged(_keyFrames, value);
+                _keyFrames = value;
 
-                        if (keyTime.Type == KeyTimeType.TimeSpan)
-                        {
-                            hasTimeSpanKeyTime = true;
-
-                            if (keyTime.TimeSpan > largestTimeSpanKeyTime)
-                            {
-                                largestTimeSpanKeyTime = keyTime.TimeSpan;
-                            }
-                        }
-                    }
-                }
-
-                return hasTimeSpanKeyTime ? largestTimeSpanKeyTime : TimeSpan.FromSeconds(1.0);
+                WritePostscript();
             }
         }
+    }
 
-        private void ResolveKeyTimes()
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public bool ShouldSerializeKeyFrames()
+    {
+        ReadPreamble();
+
+        return _keyFrames != null && _keyFrames.Count > 0;
+    }
+
+    private struct KeyTimeBlock
+    {
+        public int BeginIndex;
+        public int EndIndex;
+    }
+
+    private double[] GetResolvedKeyFrameValue(int resolvedKeyFrameIndex) =>
+        GetResolvedKeyFrame(resolvedKeyFrameIndex).Numbers;
+
+    private GeometryKeyFrame GetResolvedKeyFrame(int resolvedKeyFrameIndex) =>
+        _keyFrames[_sortedResolvedKeyFrames[resolvedKeyFrameIndex]._originalKeyFrameIndex];
+
+    private TimeSpan LargestTimeSpanKeyTime
+    {
+        get
         {
-            var keyFrameCount = 0;
+            var hasTimeSpanKeyTime = false;
+            var largestTimeSpanKeyTime = TimeSpan.Zero;
 
             if (_keyFrames != null)
             {
-                keyFrameCount = _keyFrames.Count;
-            }
+                var keyFrameCount = _keyFrames.Count;
 
-            if (keyFrameCount == 0)
-            {
-                _sortedResolvedKeyFrames = null;
-                _areKeyTimesValid = true;
-                return;
-            }
-
-            _sortedResolvedKeyFrames = new ResolvedKeyFrameEntry[keyFrameCount];
-
-            var index = 0;
-
-            for (; index < keyFrameCount; index++)
-            {
-                _sortedResolvedKeyFrames[index]._originalKeyFrameIndex = index;
-            }
-
-            var duration = Duration;
-            var calculationDuration = duration.HasTimeSpan ? duration.TimeSpan : LargestTimeSpanKeyTime;
-            var maxKeyFrameIndex = keyFrameCount - 1;
-            var unspecifiedBlocks = new List<KeyTimeBlock>();
-            var hasPacedKeyTimes = false;
-
-            index = 0;
-            while (index < keyFrameCount)
-            {
-                // ReSharper disable once PossibleNullReferenceException
-                var keyTime = _keyFrames[index].KeyTime;
-
-                switch (keyTime.Type)
+                for (var index = 0; index < keyFrameCount; index++)
                 {
-                    case KeyTimeType.Percent:
+                    var keyTime = _keyFrames[index].KeyTime;
 
-                        _sortedResolvedKeyFrames[index]._resolvedKeyTime = TimeSpan.FromMilliseconds(keyTime.Percent * calculationDuration.TotalMilliseconds);
-                        index++;
-                        break;
+                    if (keyTime.Type == KeyTimeType.TimeSpan)
+                    {
+                        hasTimeSpanKeyTime = true;
 
-                    case KeyTimeType.TimeSpan:
-
-                        _sortedResolvedKeyFrames[index]._resolvedKeyTime = keyTime.TimeSpan;
-
-                        index++;
-                        break;
-
-                    case KeyTimeType.Paced:
-                    case KeyTimeType.Uniform:
-
-                        if (index == maxKeyFrameIndex)
+                        if (keyTime.TimeSpan > largestTimeSpanKeyTime)
                         {
-                            _sortedResolvedKeyFrames[index]._resolvedKeyTime = calculationDuration;
-                            index++;
+                            largestTimeSpanKeyTime = keyTime.TimeSpan;
                         }
-                        else if (index == 0 && keyTime.Type == KeyTimeType.Paced)
+                    }
+                }
+            }
+
+            return hasTimeSpanKeyTime ? largestTimeSpanKeyTime : TimeSpan.FromSeconds(1.0);
+        }
+    }
+
+    private void ResolveKeyTimes()
+    {
+        var keyFrameCount = 0;
+
+        if (_keyFrames != null)
+        {
+            keyFrameCount = _keyFrames.Count;
+        }
+
+        if (keyFrameCount == 0)
+        {
+            _sortedResolvedKeyFrames = null;
+            _areKeyTimesValid = true;
+            return;
+        }
+
+        _sortedResolvedKeyFrames = new ResolvedKeyFrameEntry[keyFrameCount];
+
+        var index = 0;
+
+        for (; index < keyFrameCount; index++)
+        {
+            _sortedResolvedKeyFrames[index]._originalKeyFrameIndex = index;
+        }
+
+        var duration = Duration;
+        var calculationDuration = duration.HasTimeSpan ? duration.TimeSpan : LargestTimeSpanKeyTime;
+        var maxKeyFrameIndex = keyFrameCount - 1;
+        var unspecifiedBlocks = new List<KeyTimeBlock>();
+        var hasPacedKeyTimes = false;
+
+        index = 0;
+        while (index < keyFrameCount)
+        {
+            // ReSharper disable once PossibleNullReferenceException
+            var keyTime = _keyFrames[index].KeyTime;
+
+            switch (keyTime.Type)
+            {
+                case KeyTimeType.Percent:
+
+                    _sortedResolvedKeyFrames[index]._resolvedKeyTime = TimeSpan.FromMilliseconds(keyTime.Percent * calculationDuration.TotalMilliseconds);
+                    index++;
+                    break;
+
+                case KeyTimeType.TimeSpan:
+
+                    _sortedResolvedKeyFrames[index]._resolvedKeyTime = keyTime.TimeSpan;
+
+                    index++;
+                    break;
+
+                case KeyTimeType.Paced:
+                case KeyTimeType.Uniform:
+
+                    if (index == maxKeyFrameIndex)
+                    {
+                        _sortedResolvedKeyFrames[index]._resolvedKeyTime = calculationDuration;
+                        index++;
+                    }
+                    else if (index == 0 && keyTime.Type == KeyTimeType.Paced)
+                    {
+                        _sortedResolvedKeyFrames[index]._resolvedKeyTime = TimeSpan.Zero;
+                        index++;
+                    }
+                    else
+                    {
+                        if (keyTime.Type == KeyTimeType.Paced)
                         {
-                            _sortedResolvedKeyFrames[index]._resolvedKeyTime = TimeSpan.Zero;
-                            index++;
+                            hasPacedKeyTimes = true;
                         }
-                        else
+
+                        var block = new KeyTimeBlock
                         {
-                            if (keyTime.Type == KeyTimeType.Paced)
+                            BeginIndex = index
+                        };
+
+                        while (++index < maxKeyFrameIndex)
+                        {
+                            var type = _keyFrames[index].KeyTime.Type;
+
+                            if (type == KeyTimeType.Percent || type == KeyTimeType.TimeSpan)
+                            {
+                                break;
+                            }
+
+                            if (type == KeyTimeType.Paced)
                             {
                                 hasPacedKeyTimes = true;
                             }
-
-                            var block = new KeyTimeBlock
-                            {
-                                BeginIndex = index
-                            };
-
-                            while (++index < maxKeyFrameIndex)
-                            {
-                                var type = _keyFrames[index].KeyTime.Type;
-
-                                if (type == KeyTimeType.Percent || type == KeyTimeType.TimeSpan)
-                                {
-                                    break;
-                                }
-
-                                if (type == KeyTimeType.Paced)
-                                {
-                                    hasPacedKeyTimes = true;
-                                }
-                            }
-
-                            block.EndIndex = index;
-                            unspecifiedBlocks.Add(block);
                         }
 
-                        break;
-                }
+                        block.EndIndex = index;
+                        unspecifiedBlocks.Add(block);
+                    }
+
+                    break;
             }
-
-            foreach (var block in unspecifiedBlocks)
-            {
-                var blockBeginTime = TimeSpan.Zero;
-
-                if (block.BeginIndex > 0)
-                {
-                    blockBeginTime = _sortedResolvedKeyFrames[block.BeginIndex - 1]._resolvedKeyTime;
-                }
-
-                long segmentCount = block.EndIndex - block.BeginIndex + 1;
-                var uniformTimeStep = TimeSpan.FromTicks((_sortedResolvedKeyFrames[block.EndIndex]._resolvedKeyTime - blockBeginTime).Ticks / segmentCount);
-
-                index = block.BeginIndex;
-                var resolvedTime = blockBeginTime + uniformTimeStep;
-
-                while (index < block.EndIndex)
-                {
-                    _sortedResolvedKeyFrames[index]._resolvedKeyTime = resolvedTime;
-
-                    resolvedTime += uniformTimeStep;
-                    index++;
-                }
-            }
-
-            if (hasPacedKeyTimes)
-            {
-                ResolvePacedKeyTimes();
-            }
-
-            Array.Sort(_sortedResolvedKeyFrames);
-
-            _areKeyTimesValid = true;
         }
 
-        private void ResolvePacedKeyTimes()
+        foreach (var block in unspecifiedBlocks)
         {
-            var index = 1;
-            var maxKeyFrameIndex = _sortedResolvedKeyFrames.Length - 1;
+            var blockBeginTime = TimeSpan.Zero;
 
-            do
+            if (block.BeginIndex > 0)
             {
-                if (_keyFrames[index].KeyTime.Type == KeyTimeType.Paced)
-                {
-                    var firstPacedBlockKeyFrameIndex = index;
-
-                    var segmentLengths = new List<double>();
-                    var prePacedBlockKeyTime = _sortedResolvedKeyFrames[index - 1]._resolvedKeyTime;
-                    var totalLength = 0.0;
-                    var prevKeyValue = _keyFrames[index - 1].Numbers;
-
-                    do
-                    {
-                        var currentKeyValue = _keyFrames[index].Numbers;
-                        totalLength += Math.Abs(currentKeyValue[0] - prevKeyValue[0]);
-                        segmentLengths.Add(totalLength);
-                        prevKeyValue = currentKeyValue;
-                        index++;
-                    }
-                    while (index < maxKeyFrameIndex && _keyFrames[index].KeyTime.Type == KeyTimeType.Paced);
-                    totalLength += Math.Abs(_keyFrames[index].Numbers[0] - prevKeyValue[0]);
-
-                    var pacedBlockDuration = _sortedResolvedKeyFrames[index]._resolvedKeyTime - prePacedBlockKeyTime;
-
-                    for (int i = 0, currentKeyFrameIndex = firstPacedBlockKeyFrameIndex; i < segmentLengths.Count; i++, currentKeyFrameIndex++)
-                    {
-                        _sortedResolvedKeyFrames[currentKeyFrameIndex]._resolvedKeyTime = prePacedBlockKeyTime + TimeSpan.FromMilliseconds(segmentLengths[i] / totalLength * pacedBlockDuration.TotalMilliseconds);
-                    }
-                }
-                else
+                blockBeginTime = _sortedResolvedKeyFrames[block.BeginIndex - 1]._resolvedKeyTime;
+            }
+
+            long segmentCount = block.EndIndex - block.BeginIndex + 1;
+            var uniformTimeStep = TimeSpan.FromTicks((_sortedResolvedKeyFrames[block.EndIndex]._resolvedKeyTime - blockBeginTime).Ticks / segmentCount);
+
+            index = block.BeginIndex;
+            var resolvedTime = blockBeginTime + uniformTimeStep;
+
+            while (index < block.EndIndex)
+            {
+                _sortedResolvedKeyFrames[index]._resolvedKeyTime = resolvedTime;
+
+                resolvedTime += uniformTimeStep;
+                index++;
+            }
+        }
+
+        if (hasPacedKeyTimes)
+        {
+            ResolvePacedKeyTimes();
+        }
+
+        Array.Sort(_sortedResolvedKeyFrames);
+
+        _areKeyTimesValid = true;
+    }
+
+    private void ResolvePacedKeyTimes()
+    {
+        var index = 1;
+        var maxKeyFrameIndex = _sortedResolvedKeyFrames.Length - 1;
+
+        do
+        {
+            if (_keyFrames[index].KeyTime.Type == KeyTimeType.Paced)
+            {
+                var firstPacedBlockKeyFrameIndex = index;
+
+                var segmentLengths = new List<double>();
+                var prePacedBlockKeyTime = _sortedResolvedKeyFrames[index - 1]._resolvedKeyTime;
+                var totalLength = 0.0;
+                var prevKeyValue = _keyFrames[index - 1].Numbers;
+
+                do
                 {
+                    var currentKeyValue = _keyFrames[index].Numbers;
+                    totalLength += Math.Abs(currentKeyValue[0] - prevKeyValue[0]);
+                    segmentLengths.Add(totalLength);
+                    prevKeyValue = currentKeyValue;
                     index++;
                 }
+                while (index < maxKeyFrameIndex && _keyFrames[index].KeyTime.Type == KeyTimeType.Paced);
+                totalLength += Math.Abs(_keyFrames[index].Numbers[0] - prevKeyValue[0]);
+
+                var pacedBlockDuration = _sortedResolvedKeyFrames[index]._resolvedKeyTime - prePacedBlockKeyTime;
+
+                for (int i = 0, currentKeyFrameIndex = firstPacedBlockKeyFrameIndex; i < segmentLengths.Count; i++, currentKeyFrameIndex++)
+                {
+                    _sortedResolvedKeyFrames[currentKeyFrameIndex]._resolvedKeyTime = prePacedBlockKeyTime + TimeSpan.FromMilliseconds(segmentLengths[i] / totalLength * pacedBlockDuration.TotalMilliseconds);
+                }
+            }
+            else
+            {
+                index++;
             }
-            while (index < maxKeyFrameIndex);
         }
+        while (index < maxKeyFrameIndex);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
index f8fdf353..32ee9f89 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
@@ -4,320 +4,319 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class GeometryKeyFrameCollection : Freezable, IList
 {
-    public class GeometryKeyFrameCollection : Freezable, IList
+    private List<GeometryKeyFrame> _keyFrames;
+
+    private static GeometryKeyFrameCollection s_emptyCollection;
+
+    public GeometryKeyFrameCollection()
     {
-        private List<GeometryKeyFrame> _keyFrames;
+        _keyFrames = new List<GeometryKeyFrame>(2);
+    }
 
-        private static GeometryKeyFrameCollection s_emptyCollection;
-
-        public GeometryKeyFrameCollection()
+    public static GeometryKeyFrameCollection Empty
+    {
+        get
         {
-            _keyFrames = new List<GeometryKeyFrame>(2);
-        }
-
-        public static GeometryKeyFrameCollection Empty
-        {
-            get
+            if (s_emptyCollection == null)
             {
-                if (s_emptyCollection == null)
+                var emptyCollection = new GeometryKeyFrameCollection
                 {
-                    var emptyCollection = new GeometryKeyFrameCollection
-                    {
-                        _keyFrames = new List<GeometryKeyFrame>(0)
-                    };
+                    _keyFrames = new List<GeometryKeyFrame>(0)
+                };
 
-                    emptyCollection.Freeze();
+                emptyCollection.Freeze();
 
-                    s_emptyCollection = emptyCollection;
-                }
-
-                return s_emptyCollection;
-            }
-        }
-
-        public new GeometryKeyFrameCollection Clone() => (GeometryKeyFrameCollection) base.Clone();
-
-        protected override Freezable CreateInstanceCore() => new GeometryKeyFrameCollection();
-
-        protected override void CloneCore(Freezable sourceFreezable)
-        {
-            var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
-            base.CloneCore(sourceFreezable);
-
-            var count = sourceCollection._keyFrames.Count;
-
-            _keyFrames = new List<GeometryKeyFrame>(count);
-
-            for (var i = 0; i < count; i++)
-            {
-                var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].Clone();
-                _keyFrames.Add(keyFrame);
-                OnFreezablePropertyChanged(null, keyFrame);
-            }
-        }
-
-        protected override void CloneCurrentValueCore(Freezable sourceFreezable)
-        {
-            var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
-            base.CloneCurrentValueCore(sourceFreezable);
-
-            var count = sourceCollection._keyFrames.Count;
-
-            _keyFrames = new List<GeometryKeyFrame>(count);
-
-            for (var i = 0; i < count; i++)
-            {
-                var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].CloneCurrentValue();
-                _keyFrames.Add(keyFrame);
-                OnFreezablePropertyChanged(null, keyFrame);
-            }
-        }
-
-        protected override void GetAsFrozenCore(Freezable sourceFreezable)
-        {
-            var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
-            base.GetAsFrozenCore(sourceFreezable);
-
-            var count = sourceCollection._keyFrames.Count;
-
-            _keyFrames = new List<GeometryKeyFrame>(count);
-
-            for (var i = 0; i < count; i++)
-            {
-                var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].GetAsFrozen();
-                _keyFrames.Add(keyFrame);
-                OnFreezablePropertyChanged(null, keyFrame);
-            }
-        }
-
-        protected override void GetCurrentValueAsFrozenCore(Freezable sourceFreezable)
-        {
-            var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
-            base.GetCurrentValueAsFrozenCore(sourceFreezable);
-
-            var count = sourceCollection._keyFrames.Count;
-
-            _keyFrames = new List<GeometryKeyFrame>(count);
-
-            for (var i = 0; i < count; i++)
-            {
-                var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].GetCurrentValueAsFrozen();
-                _keyFrames.Add(keyFrame);
-                OnFreezablePropertyChanged(null, keyFrame);
-            }
-        }
-
-        protected override bool FreezeCore(bool isChecking)
-        {
-            var canFreeze = base.FreezeCore(isChecking);
-
-            for (var i = 0; i < _keyFrames.Count && canFreeze; i++)
-            {
-                canFreeze &= Freeze(_keyFrames[i], isChecking);
+                s_emptyCollection = emptyCollection;
             }
 
-            return canFreeze;
+            return s_emptyCollection;
         }
+    }
 
-        public IEnumerator GetEnumerator()
+    public new GeometryKeyFrameCollection Clone() => (GeometryKeyFrameCollection) base.Clone();
+
+    protected override Freezable CreateInstanceCore() => new GeometryKeyFrameCollection();
+
+    protected override void CloneCore(Freezable sourceFreezable)
+    {
+        var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
+        base.CloneCore(sourceFreezable);
+
+        var count = sourceCollection._keyFrames.Count;
+
+        _keyFrames = new List<GeometryKeyFrame>(count);
+
+        for (var i = 0; i < count; i++)
         {
-            ReadPreamble();
-
-            return _keyFrames.GetEnumerator();
-        }
-
-        void ICollection.CopyTo(Array array, int index)
-        {
-            ReadPreamble();
-
-            ((ICollection) _keyFrames).CopyTo(array, index);
-        }
-
-        public void CopyTo(GeometryKeyFrame[] array, int index)
-        {
-            ReadPreamble();
-
-            _keyFrames.CopyTo(array, index);
-        }
-
-        public int Count
-        {
-            get
-            {
-                ReadPreamble();
-
-                return _keyFrames.Count;
-            }
-        }
-
-        public object SyncRoot
-        {
-            get
-            {
-                ReadPreamble();
-
-                return ((ICollection) _keyFrames).SyncRoot;
-            }
-        }
-
-        public bool IsSynchronized
-        {
-            get
-            {
-                ReadPreamble();
-
-                return IsFrozen || Dispatcher != null;
-            }
-        }
-
-        int IList.Add(object keyFrame) => Add((GeometryKeyFrame) keyFrame);
-
-        public int Add(GeometryKeyFrame keyFrame)
-        {
-            if (keyFrame == null)
-            {
-                throw new ArgumentNullException(nameof(keyFrame));
-            }
-
-            WritePreamble();
-
-            OnFreezablePropertyChanged(null, keyFrame);
+            var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].Clone();
             _keyFrames.Add(keyFrame);
-
-            WritePostscript();
-
-            return _keyFrames.Count - 1;
-        }
-
-        public void Clear()
-        {
-            WritePreamble();
-
-            if (_keyFrames.Count <= 0) return;
-
-            foreach (var frame in _keyFrames)
-            {
-                OnFreezablePropertyChanged(frame, null);
-            }
-
-            _keyFrames.Clear();
-
-            WritePostscript();
-        }
-
-        bool IList.Contains(object keyFrame) => Contains((GeometryKeyFrame) keyFrame);
-
-        public bool Contains(GeometryKeyFrame keyFrame)
-        {
-            ReadPreamble();
-
-            return _keyFrames.Contains(keyFrame);
-        }
-
-        int IList.IndexOf(object keyFrame) => IndexOf((GeometryKeyFrame) keyFrame);
-
-        public int IndexOf(GeometryKeyFrame keyFrame)
-        {
-            ReadPreamble();
-
-            return _keyFrames.IndexOf(keyFrame);
-        }
-
-        void IList.Insert(int index, object keyFrame) => Insert(index, (GeometryKeyFrame) keyFrame);
-
-        public void Insert(int index, GeometryKeyFrame keyFrame)
-        {
-            if (keyFrame == null)
-            {
-                throw new ArgumentNullException(nameof(keyFrame));
-            }
-
-            WritePreamble();
-
             OnFreezablePropertyChanged(null, keyFrame);
-            _keyFrames.Insert(index, keyFrame);
+        }
+    }
+
+    protected override void CloneCurrentValueCore(Freezable sourceFreezable)
+    {
+        var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
+        base.CloneCurrentValueCore(sourceFreezable);
+
+        var count = sourceCollection._keyFrames.Count;
+
+        _keyFrames = new List<GeometryKeyFrame>(count);
+
+        for (var i = 0; i < count; i++)
+        {
+            var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].CloneCurrentValue();
+            _keyFrames.Add(keyFrame);
+            OnFreezablePropertyChanged(null, keyFrame);
+        }
+    }
+
+    protected override void GetAsFrozenCore(Freezable sourceFreezable)
+    {
+        var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
+        base.GetAsFrozenCore(sourceFreezable);
+
+        var count = sourceCollection._keyFrames.Count;
+
+        _keyFrames = new List<GeometryKeyFrame>(count);
+
+        for (var i = 0; i < count; i++)
+        {
+            var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].GetAsFrozen();
+            _keyFrames.Add(keyFrame);
+            OnFreezablePropertyChanged(null, keyFrame);
+        }
+    }
+
+    protected override void GetCurrentValueAsFrozenCore(Freezable sourceFreezable)
+    {
+        var sourceCollection = (GeometryKeyFrameCollection) sourceFreezable;
+        base.GetCurrentValueAsFrozenCore(sourceFreezable);
+
+        var count = sourceCollection._keyFrames.Count;
+
+        _keyFrames = new List<GeometryKeyFrame>(count);
+
+        for (var i = 0; i < count; i++)
+        {
+            var keyFrame = (GeometryKeyFrame) sourceCollection._keyFrames[i].GetCurrentValueAsFrozen();
+            _keyFrames.Add(keyFrame);
+            OnFreezablePropertyChanged(null, keyFrame);
+        }
+    }
+
+    protected override bool FreezeCore(bool isChecking)
+    {
+        var canFreeze = base.FreezeCore(isChecking);
+
+        for (var i = 0; i < _keyFrames.Count && canFreeze; i++)
+        {
+            canFreeze &= Freeze(_keyFrames[i], isChecking);
+        }
+
+        return canFreeze;
+    }
+
+    public IEnumerator GetEnumerator()
+    {
+        ReadPreamble();
+
+        return _keyFrames.GetEnumerator();
+    }
+
+    void ICollection.CopyTo(Array array, int index)
+    {
+        ReadPreamble();
+
+        ((ICollection) _keyFrames).CopyTo(array, index);
+    }
+
+    public void CopyTo(GeometryKeyFrame[] array, int index)
+    {
+        ReadPreamble();
+
+        _keyFrames.CopyTo(array, index);
+    }
+
+    public int Count
+    {
+        get
+        {
+            ReadPreamble();
+
+            return _keyFrames.Count;
+        }
+    }
+
+    public object SyncRoot
+    {
+        get
+        {
+            ReadPreamble();
+
+            return ((ICollection) _keyFrames).SyncRoot;
+        }
+    }
+
+    public bool IsSynchronized
+    {
+        get
+        {
+            ReadPreamble();
+
+            return IsFrozen || Dispatcher != null;
+        }
+    }
+
+    int IList.Add(object keyFrame) => Add((GeometryKeyFrame) keyFrame);
+
+    public int Add(GeometryKeyFrame keyFrame)
+    {
+        if (keyFrame == null)
+        {
+            throw new ArgumentNullException(nameof(keyFrame));
+        }
+
+        WritePreamble();
+
+        OnFreezablePropertyChanged(null, keyFrame);
+        _keyFrames.Add(keyFrame);
+
+        WritePostscript();
+
+        return _keyFrames.Count - 1;
+    }
+
+    public void Clear()
+    {
+        WritePreamble();
+
+        if (_keyFrames.Count <= 0) return;
+
+        foreach (var frame in _keyFrames)
+        {
+            OnFreezablePropertyChanged(frame, null);
+        }
+
+        _keyFrames.Clear();
+
+        WritePostscript();
+    }
+
+    bool IList.Contains(object keyFrame) => Contains((GeometryKeyFrame) keyFrame);
+
+    public bool Contains(GeometryKeyFrame keyFrame)
+    {
+        ReadPreamble();
+
+        return _keyFrames.Contains(keyFrame);
+    }
+
+    int IList.IndexOf(object keyFrame) => IndexOf((GeometryKeyFrame) keyFrame);
+
+    public int IndexOf(GeometryKeyFrame keyFrame)
+    {
+        ReadPreamble();
+
+        return _keyFrames.IndexOf(keyFrame);
+    }
+
+    void IList.Insert(int index, object keyFrame) => Insert(index, (GeometryKeyFrame) keyFrame);
+
+    public void Insert(int index, GeometryKeyFrame keyFrame)
+    {
+        if (keyFrame == null)
+        {
+            throw new ArgumentNullException(nameof(keyFrame));
+        }
+
+        WritePreamble();
+
+        OnFreezablePropertyChanged(null, keyFrame);
+        _keyFrames.Insert(index, keyFrame);
+
+        WritePostscript();
+    }
+
+    void IList.Remove(object keyFrame) => Remove((GeometryKeyFrame) keyFrame);
+
+    public void Remove(GeometryKeyFrame keyFrame)
+    {
+        WritePreamble();
+
+        if (_keyFrames.Contains(keyFrame))
+        {
+            OnFreezablePropertyChanged(keyFrame, null);
+            _keyFrames.Remove(keyFrame);
 
             WritePostscript();
         }
+    }
 
-        void IList.Remove(object keyFrame) => Remove((GeometryKeyFrame) keyFrame);
+    public void RemoveAt(int index)
+    {
+        WritePreamble();
 
-        public void Remove(GeometryKeyFrame keyFrame)
+        OnFreezablePropertyChanged(_keyFrames[index], null);
+        _keyFrames.RemoveAt(index);
+
+        WritePostscript();
+    }
+
+    object IList.this[int index]
+    {
+        get => this[index];
+        set => this[index] = (GeometryKeyFrame) value;
+    }
+
+    public GeometryKeyFrame this[int index]
+    {
+        get
         {
+            ReadPreamble();
+
+            return _keyFrames[index];
+        }
+        set
+        {
+            if (value == null)
+            {
+                throw new ArgumentNullException(string.Format(CultureInfo.InvariantCulture, "DoubleKeyFrameCollection[{0}]", index));
+            }
+
             WritePreamble();
 
-            if (_keyFrames.Contains(keyFrame))
+            if (value != _keyFrames[index])
             {
-                OnFreezablePropertyChanged(keyFrame, null);
-                _keyFrames.Remove(keyFrame);
+                OnFreezablePropertyChanged(_keyFrames[index], value);
+                _keyFrames[index] = value;
 
                 WritePostscript();
             }
         }
+    }
 
-        public void RemoveAt(int index)
+    public bool IsReadOnly
+    {
+        get
         {
-            WritePreamble();
+            ReadPreamble();
 
-            OnFreezablePropertyChanged(_keyFrames[index], null);
-            _keyFrames.RemoveAt(index);
-
-            WritePostscript();
-        }
-
-        object IList.this[int index]
-        {
-            get => this[index];
-            set => this[index] = (GeometryKeyFrame) value;
-        }
-
-        public GeometryKeyFrame this[int index]
-        {
-            get
-            {
-                ReadPreamble();
-
-                return _keyFrames[index];
-            }
-            set
-            {
-                if (value == null)
-                {
-                    throw new ArgumentNullException(string.Format(CultureInfo.InvariantCulture, "DoubleKeyFrameCollection[{0}]", index));
-                }
-
-                WritePreamble();
-
-                if (value != _keyFrames[index])
-                {
-                    OnFreezablePropertyChanged(_keyFrames[index], value);
-                    _keyFrames[index] = value;
-
-                    WritePostscript();
-                }
-            }
-        }
-
-        public bool IsReadOnly
-        {
-            get
-            {
-                ReadPreamble();
-
-                return IsFrozen;
-            }
-        }
-
-        public bool IsFixedSize
-        {
-            get
-            {
-                ReadPreamble();
-
-                return IsFrozen;
-            }
+            return IsFrozen;
         }
     }
-}
+
+    public bool IsFixedSize
+    {
+        get
+        {
+            ReadPreamble();
+
+            return IsFrozen;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
index 71e9a372..445a1437 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
@@ -4,40 +4,39 @@ using System.Windows.Media.Animation;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class LinearGeometryKeyFrame : GeometryKeyFrame
 {
-    public class LinearGeometryKeyFrame : GeometryKeyFrame
+    public LinearGeometryKeyFrame()
     {
-        public LinearGeometryKeyFrame()
-        {
 
-        }
-
-        public LinearGeometryKeyFrame(Geometry value) : base(value)
-        {
-
-        }
-
-        public LinearGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
-        {
-
-        }
-
-        protected override Freezable CreateInstanceCore() => new LinearGeometryKeyFrame();
-
-        protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
-        {
-            if (MathHelper.IsVerySmall(keyFrameProgress))
-            {
-                return baseValue;
-            }
-
-            if (MathHelper.AreClose(keyFrameProgress, 1))
-            {
-                return Numbers;
-            }
-
-            return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, keyFrameProgress);
-        }
     }
-}
+
+    public LinearGeometryKeyFrame(Geometry value) : base(value)
+    {
+
+    }
+
+    public LinearGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
+    {
+
+    }
+
+    protected override Freezable CreateInstanceCore() => new LinearGeometryKeyFrame();
+
+    protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
+    {
+        if (MathHelper.IsVerySmall(keyFrameProgress))
+        {
+            return baseValue;
+        }
+
+        if (MathHelper.AreClose(keyFrameProgress, 1))
+        {
+            return Numbers;
+        }
+
+        return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, keyFrameProgress);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs b/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
index 485128fa..b9311576 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
@@ -1,38 +1,37 @@
 using System;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+internal struct ResolvedKeyFrameEntry : IComparable
 {
-    internal struct ResolvedKeyFrameEntry : IComparable
+    internal int _originalKeyFrameIndex;
+
+    internal TimeSpan _resolvedKeyTime;
+
+    public int CompareTo(object other)
     {
-        internal int _originalKeyFrameIndex;
+        var otherEntry = (ResolvedKeyFrameEntry) other;
 
-        internal TimeSpan _resolvedKeyTime;
-
-        public int CompareTo(object other)
+        if (otherEntry._resolvedKeyTime > _resolvedKeyTime)
         {
-            var otherEntry = (ResolvedKeyFrameEntry) other;
-
-            if (otherEntry._resolvedKeyTime > _resolvedKeyTime)
-            {
-                return -1;
-            }
-
-            if (otherEntry._resolvedKeyTime < _resolvedKeyTime)
-            {
-                return 1;
-            }
-
-            if (otherEntry._originalKeyFrameIndex > _originalKeyFrameIndex)
-            {
-                return -1;
-            }
-
-            if (otherEntry._originalKeyFrameIndex < _originalKeyFrameIndex)
-            {
-                return 1;
-            }
-
-            return 0;
+            return -1;
         }
+
+        if (otherEntry._resolvedKeyTime < _resolvedKeyTime)
+        {
+            return 1;
+        }
+
+        if (otherEntry._originalKeyFrameIndex > _originalKeyFrameIndex)
+        {
+            return -1;
+        }
+
+        if (otherEntry._originalKeyFrameIndex < _originalKeyFrameIndex)
+        {
+            return 1;
+        }
+
+        return 0;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
index b04ad928..e64a06c2 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
@@ -5,55 +5,54 @@ using System.Windows.Media.Animation;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools;
 
-namespace HandyControl.Media.Animation
+namespace HandyControl.Media.Animation;
+
+public class SplineGeometryKeyFrame : GeometryKeyFrame
 {
-    public class SplineGeometryKeyFrame : GeometryKeyFrame
+    public SplineGeometryKeyFrame()
     {
-        public SplineGeometryKeyFrame()
-        {
 
-        }
-
-        public SplineGeometryKeyFrame(Geometry value) : base(value)
-        {
-
-        }
-
-        public SplineGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
-        {
-
-        }
-
-        public SplineGeometryKeyFrame(Geometry value, KeyTime keyTime, KeySpline keySpline) : base(value, keyTime)
-        {
-            KeySpline = keySpline ?? throw new ArgumentNullException(nameof(keySpline));
-        }
-
-        protected override Freezable CreateInstanceCore() => new SplineGeometryKeyFrame();
-
-        protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
-        {
-            if (MathHelper.IsVerySmall(keyFrameProgress))
-            {
-                return baseValue;
-            }
-
-            if (MathHelper.AreClose(keyFrameProgress, 1))
-            {
-                return Numbers;
-            }
-
-            var splineProgress = KeySpline.GetSplineProgress(keyFrameProgress);
-            return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, splineProgress);
-        }
-
-        public static readonly DependencyProperty KeySplineProperty = DependencyProperty.Register(
-            "KeySpline", typeof(KeySpline), typeof(SplineGeometryKeyFrame), new PropertyMetadata(new KeySpline()));
-
-        public KeySpline KeySpline
-        {
-            get => (KeySpline) GetValue(KeySplineProperty);
-            set => SetValue(KeySplineProperty, value);
-        }
     }
-}
+
+    public SplineGeometryKeyFrame(Geometry value) : base(value)
+    {
+
+    }
+
+    public SplineGeometryKeyFrame(Geometry value, KeyTime keyTime) : base(value, keyTime)
+    {
+
+    }
+
+    public SplineGeometryKeyFrame(Geometry value, KeyTime keyTime, KeySpline keySpline) : base(value, keyTime)
+    {
+        KeySpline = keySpline ?? throw new ArgumentNullException(nameof(keySpline));
+    }
+
+    protected override Freezable CreateInstanceCore() => new SplineGeometryKeyFrame();
+
+    protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress)
+    {
+        if (MathHelper.IsVerySmall(keyFrameProgress))
+        {
+            return baseValue;
+        }
+
+        if (MathHelper.AreClose(keyFrameProgress, 1))
+        {
+            return Numbers;
+        }
+
+        var splineProgress = KeySpline.GetSplineProgress(keyFrameProgress);
+        return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, splineProgress);
+    }
+
+    public static readonly DependencyProperty KeySplineProperty = DependencyProperty.Register(
+        "KeySpline", typeof(KeySpline), typeof(SplineGeometryKeyFrame), new PropertyMetadata(new KeySpline()));
+
+    public KeySpline KeySpline
+    {
+        get => (KeySpline) GetValue(KeySplineProperty);
+        set => SetValue(KeySplineProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
index bd0e86cc..f0ee1481 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
@@ -3,35 +3,34 @@ using System.Windows;
 using System.Windows.Media.Effects;
 using HandyControl.Data;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Media.Effects;
+
+public class BrightnessEffect : EffectBase
 {
-    public class BrightnessEffect : EffectBase
+    private static readonly PixelShader Shader;
+
+    static BrightnessEffect()
     {
-        private static readonly PixelShader Shader;
-
-        static BrightnessEffect()
+        Shader = new PixelShader
         {
-            Shader = new PixelShader
-            {
-                UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/BrightnessEffect.ps")
-            };
-        }
-
-        public BrightnessEffect()
-        {
-            PixelShader = Shader;
-
-            UpdateShaderValue(InputProperty);
-            UpdateShaderValue(BrightnessProperty);
-        }
-
-        public static readonly DependencyProperty BrightnessProperty = DependencyProperty.Register(
-            "Brightness", typeof(double), typeof(BrightnessEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
-
-        public double Brightness
-        {
-            get => (double) GetValue(BrightnessProperty);
-            set => SetValue(BrightnessProperty, value);
-        }
+            UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/BrightnessEffect.ps")
+        };
     }
-}
+
+    public BrightnessEffect()
+    {
+        PixelShader = Shader;
+
+        UpdateShaderValue(InputProperty);
+        UpdateShaderValue(BrightnessProperty);
+    }
+
+    public static readonly DependencyProperty BrightnessProperty = DependencyProperty.Register(
+        "Brightness", typeof(double), typeof(BrightnessEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
+
+    public double Brightness
+    {
+        get => (double) GetValue(BrightnessProperty);
+        set => SetValue(BrightnessProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
index faef4eda..ff5889ae 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
@@ -1,25 +1,24 @@
 using System;
 using System.Windows.Media.Effects;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Media.Effects;
+
+public class ColorComplementEffect : EffectBase
 {
-    public class ColorComplementEffect : EffectBase
+    private static readonly PixelShader Shader;
+
+    static ColorComplementEffect()
     {
-        private static readonly PixelShader Shader;
-
-        static ColorComplementEffect()
+        Shader = new PixelShader
         {
-            Shader = new PixelShader
-            {
-                UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ColorComplementEffect.ps")
-            };
-        }
-
-        public ColorComplementEffect()
-        {
-            PixelShader = Shader;
-
-            UpdateShaderValue(InputProperty);
-        }
+            UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ColorComplementEffect.ps")
+        };
     }
-}
+
+    public ColorComplementEffect()
+    {
+        PixelShader = Shader;
+
+        UpdateShaderValue(InputProperty);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
index ed6595d1..4d9a5ed6 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
@@ -3,245 +3,244 @@ using System.Windows;
 using System.Windows.Media.Effects;
 using HandyControl.Data;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Media.Effects;
+
+public class ColorMatrixEffect : EffectBase
 {
-    public class ColorMatrixEffect : EffectBase
+    private static readonly PixelShader Shader;
+
+    static ColorMatrixEffect()
     {
-        private static readonly PixelShader Shader;
-
-        static ColorMatrixEffect()
+        Shader = new PixelShader
         {
-            Shader = new PixelShader
-            {
-                UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ColorMatrixEffect.ps")
-            };
-        }
-
-        public ColorMatrixEffect()
-        {
-            PixelShader = Shader;
-
-            UpdateShaderValue(InputProperty);
-
-            UpdateShaderValue(M11Property);
-            UpdateShaderValue(M21Property);
-            UpdateShaderValue(M31Property);
-            UpdateShaderValue(M41Property);
-            UpdateShaderValue(M51Property);
-
-            UpdateShaderValue(M12Property);
-            UpdateShaderValue(M22Property);
-            UpdateShaderValue(M32Property);
-            UpdateShaderValue(M42Property);
-            UpdateShaderValue(M52Property);
-
-            UpdateShaderValue(M13Property);
-            UpdateShaderValue(M23Property);
-            UpdateShaderValue(M33Property);
-            UpdateShaderValue(M43Property);
-            UpdateShaderValue(M53Property);
-
-            UpdateShaderValue(M14Property);
-            UpdateShaderValue(M24Property);
-            UpdateShaderValue(M34Property);
-            UpdateShaderValue(M44Property);
-            UpdateShaderValue(M54Property);
-        }
-
-        #region Line1
-
-        public static readonly DependencyProperty M11Property = DependencyProperty.Register(
-            "M11", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
-
-        public double M11
-        {
-            get => (double) GetValue(M11Property);
-            set => SetValue(M11Property, value);
-        }
-
-        public static readonly DependencyProperty M21Property = DependencyProperty.Register(
-            "M21", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(1)));
-
-        public double M21
-        {
-            get => (double) GetValue(M21Property);
-            set => SetValue(M21Property, value);
-        }
-
-        public static readonly DependencyProperty M31Property = DependencyProperty.Register(
-            "M31", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(2)));
-
-        public double M31
-        {
-            get => (double) GetValue(M31Property);
-            set => SetValue(M31Property, value);
-        }
-
-        public static readonly DependencyProperty M41Property = DependencyProperty.Register(
-            "M41", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(3)));
-
-        public double M41
-        {
-            get => (double) GetValue(M41Property);
-            set => SetValue(M41Property, value);
-        }
-
-        public static readonly DependencyProperty M51Property = DependencyProperty.Register(
-            "M51", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(4)));
-
-        public double M51
-        {
-            get => (double) GetValue(M51Property);
-            set => SetValue(M51Property, value);
-        }
-
-        #endregion
-
-        #region Line2
-
-        public static readonly DependencyProperty M12Property = DependencyProperty.Register(
-            "M12", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(5)));
-
-        public double M12
-        {
-            get => (double) GetValue(M12Property);
-            set => SetValue(M12Property, value);
-        }
-
-        public static readonly DependencyProperty M22Property = DependencyProperty.Register(
-            "M22", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(6)));
-
-        public double M22
-        {
-            get => (double) GetValue(M22Property);
-            set => SetValue(M22Property, value);
-        }
-
-        public static readonly DependencyProperty M32Property = DependencyProperty.Register(
-            "M32", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(7)));
-
-        public double M32
-        {
-            get => (double) GetValue(M32Property);
-            set => SetValue(M32Property, value);
-        }
-
-        public static readonly DependencyProperty M42Property = DependencyProperty.Register(
-            "M42", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(8)));
-
-        public double M42
-        {
-            get => (double) GetValue(M42Property);
-            set => SetValue(M42Property, value);
-        }
-
-        public static readonly DependencyProperty M52Property = DependencyProperty.Register(
-            "M52", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(9)));
-
-        public double M52
-        {
-            get => (double) GetValue(M52Property);
-            set => SetValue(M52Property, value);
-        }
-
-        #endregion
-
-        #region Line3
-
-        public static readonly DependencyProperty M13Property = DependencyProperty.Register(
-            "M13", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(10)));
-
-        public double M13
-        {
-            get => (double) GetValue(M13Property);
-            set => SetValue(M13Property, value);
-        }
-
-        public static readonly DependencyProperty M23Property = DependencyProperty.Register(
-            "M23", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(11)));
-
-        public double M23
-        {
-            get => (double) GetValue(M23Property);
-            set => SetValue(M23Property, value);
-        }
-
-        public static readonly DependencyProperty M33Property = DependencyProperty.Register(
-            "M33", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(12)));
-
-        public double M33
-        {
-            get => (double) GetValue(M33Property);
-            set => SetValue(M33Property, value);
-        }
-
-        public static readonly DependencyProperty M43Property = DependencyProperty.Register(
-            "M43", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(13)));
-
-        public double M43
-        {
-            get => (double) GetValue(M43Property);
-            set => SetValue(M43Property, value);
-        }
-
-        public static readonly DependencyProperty M53Property = DependencyProperty.Register(
-            "M53", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(14)));
-
-        public double M53
-        {
-            get => (double) GetValue(M53Property);
-            set => SetValue(M53Property, value);
-        }
-
-        #endregion
-
-        #region Line4
-
-        public static readonly DependencyProperty M14Property = DependencyProperty.Register(
-            "M14", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(15)));
-
-        public double M14
-        {
-            get => (double) GetValue(M14Property);
-            set => SetValue(M14Property, value);
-        }
-
-        public static readonly DependencyProperty M24Property = DependencyProperty.Register(
-            "M24", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(16)));
-
-        public double M24
-        {
-            get => (double) GetValue(M24Property);
-            set => SetValue(M24Property, value);
-        }
-
-        public static readonly DependencyProperty M34Property = DependencyProperty.Register(
-            "M34", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(17)));
-
-        public double M34
-        {
-            get => (double) GetValue(M34Property);
-            set => SetValue(M34Property, value);
-        }
-
-        public static readonly DependencyProperty M44Property = DependencyProperty.Register(
-            "M44", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(18)));
-
-        public double M44
-        {
-            get => (double) GetValue(M44Property);
-            set => SetValue(M44Property, value);
-        }
-
-        public static readonly DependencyProperty M54Property = DependencyProperty.Register(
-            "M54", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(19)));
-
-        public double M54
-        {
-            get => (double) GetValue(M54Property);
-            set => SetValue(M54Property, value);
-        }
-
-        #endregion
+            UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ColorMatrixEffect.ps")
+        };
     }
-}
+
+    public ColorMatrixEffect()
+    {
+        PixelShader = Shader;
+
+        UpdateShaderValue(InputProperty);
+
+        UpdateShaderValue(M11Property);
+        UpdateShaderValue(M21Property);
+        UpdateShaderValue(M31Property);
+        UpdateShaderValue(M41Property);
+        UpdateShaderValue(M51Property);
+
+        UpdateShaderValue(M12Property);
+        UpdateShaderValue(M22Property);
+        UpdateShaderValue(M32Property);
+        UpdateShaderValue(M42Property);
+        UpdateShaderValue(M52Property);
+
+        UpdateShaderValue(M13Property);
+        UpdateShaderValue(M23Property);
+        UpdateShaderValue(M33Property);
+        UpdateShaderValue(M43Property);
+        UpdateShaderValue(M53Property);
+
+        UpdateShaderValue(M14Property);
+        UpdateShaderValue(M24Property);
+        UpdateShaderValue(M34Property);
+        UpdateShaderValue(M44Property);
+        UpdateShaderValue(M54Property);
+    }
+
+    #region Line1
+
+    public static readonly DependencyProperty M11Property = DependencyProperty.Register(
+        "M11", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
+
+    public double M11
+    {
+        get => (double) GetValue(M11Property);
+        set => SetValue(M11Property, value);
+    }
+
+    public static readonly DependencyProperty M21Property = DependencyProperty.Register(
+        "M21", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(1)));
+
+    public double M21
+    {
+        get => (double) GetValue(M21Property);
+        set => SetValue(M21Property, value);
+    }
+
+    public static readonly DependencyProperty M31Property = DependencyProperty.Register(
+        "M31", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(2)));
+
+    public double M31
+    {
+        get => (double) GetValue(M31Property);
+        set => SetValue(M31Property, value);
+    }
+
+    public static readonly DependencyProperty M41Property = DependencyProperty.Register(
+        "M41", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(3)));
+
+    public double M41
+    {
+        get => (double) GetValue(M41Property);
+        set => SetValue(M41Property, value);
+    }
+
+    public static readonly DependencyProperty M51Property = DependencyProperty.Register(
+        "M51", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(4)));
+
+    public double M51
+    {
+        get => (double) GetValue(M51Property);
+        set => SetValue(M51Property, value);
+    }
+
+    #endregion
+
+    #region Line2
+
+    public static readonly DependencyProperty M12Property = DependencyProperty.Register(
+        "M12", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(5)));
+
+    public double M12
+    {
+        get => (double) GetValue(M12Property);
+        set => SetValue(M12Property, value);
+    }
+
+    public static readonly DependencyProperty M22Property = DependencyProperty.Register(
+        "M22", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(6)));
+
+    public double M22
+    {
+        get => (double) GetValue(M22Property);
+        set => SetValue(M22Property, value);
+    }
+
+    public static readonly DependencyProperty M32Property = DependencyProperty.Register(
+        "M32", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(7)));
+
+    public double M32
+    {
+        get => (double) GetValue(M32Property);
+        set => SetValue(M32Property, value);
+    }
+
+    public static readonly DependencyProperty M42Property = DependencyProperty.Register(
+        "M42", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(8)));
+
+    public double M42
+    {
+        get => (double) GetValue(M42Property);
+        set => SetValue(M42Property, value);
+    }
+
+    public static readonly DependencyProperty M52Property = DependencyProperty.Register(
+        "M52", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(9)));
+
+    public double M52
+    {
+        get => (double) GetValue(M52Property);
+        set => SetValue(M52Property, value);
+    }
+
+    #endregion
+
+    #region Line3
+
+    public static readonly DependencyProperty M13Property = DependencyProperty.Register(
+        "M13", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(10)));
+
+    public double M13
+    {
+        get => (double) GetValue(M13Property);
+        set => SetValue(M13Property, value);
+    }
+
+    public static readonly DependencyProperty M23Property = DependencyProperty.Register(
+        "M23", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(11)));
+
+    public double M23
+    {
+        get => (double) GetValue(M23Property);
+        set => SetValue(M23Property, value);
+    }
+
+    public static readonly DependencyProperty M33Property = DependencyProperty.Register(
+        "M33", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(12)));
+
+    public double M33
+    {
+        get => (double) GetValue(M33Property);
+        set => SetValue(M33Property, value);
+    }
+
+    public static readonly DependencyProperty M43Property = DependencyProperty.Register(
+        "M43", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(13)));
+
+    public double M43
+    {
+        get => (double) GetValue(M43Property);
+        set => SetValue(M43Property, value);
+    }
+
+    public static readonly DependencyProperty M53Property = DependencyProperty.Register(
+        "M53", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(14)));
+
+    public double M53
+    {
+        get => (double) GetValue(M53Property);
+        set => SetValue(M53Property, value);
+    }
+
+    #endregion
+
+    #region Line4
+
+    public static readonly DependencyProperty M14Property = DependencyProperty.Register(
+        "M14", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(15)));
+
+    public double M14
+    {
+        get => (double) GetValue(M14Property);
+        set => SetValue(M14Property, value);
+    }
+
+    public static readonly DependencyProperty M24Property = DependencyProperty.Register(
+        "M24", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(16)));
+
+    public double M24
+    {
+        get => (double) GetValue(M24Property);
+        set => SetValue(M24Property, value);
+    }
+
+    public static readonly DependencyProperty M34Property = DependencyProperty.Register(
+        "M34", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(17)));
+
+    public double M34
+    {
+        get => (double) GetValue(M34Property);
+        set => SetValue(M34Property, value);
+    }
+
+    public static readonly DependencyProperty M44Property = DependencyProperty.Register(
+        "M44", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(18)));
+
+    public double M44
+    {
+        get => (double) GetValue(M44Property);
+        set => SetValue(M44Property, value);
+    }
+
+    public static readonly DependencyProperty M54Property = DependencyProperty.Register(
+        "M54", typeof(double), typeof(ColorMatrixEffect), new PropertyMetadata(ValueBoxes.Double0Box, PixelShaderConstantCallback(19)));
+
+    public double M54
+    {
+        get => (double) GetValue(M54Property);
+        set => SetValue(M54Property, value);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
index ef837f7e..2558537b 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
@@ -3,35 +3,34 @@ using System.Windows;
 using System.Windows.Media.Effects;
 using HandyControl.Data;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Media.Effects;
+
+public class ContrastEffect : EffectBase
 {
-    public class ContrastEffect : EffectBase
+    private static readonly PixelShader Shader;
+
+    static ContrastEffect()
     {
-        private static readonly PixelShader Shader;
-
-        static ContrastEffect()
+        Shader = new PixelShader
         {
-            Shader = new PixelShader
-            {
-                UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ContrastEffect.ps")
-            };
-        }
-
-        public ContrastEffect()
-        {
-            PixelShader = Shader;
-
-            UpdateShaderValue(InputProperty);
-            UpdateShaderValue(ContrastProperty);
-        }
-
-        public static readonly DependencyProperty ContrastProperty = DependencyProperty.Register(
-            "Contrast", typeof(double), typeof(ContrastEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
-
-        public double Contrast
-        {
-            get => (double) GetValue(ContrastProperty);
-            set => SetValue(ContrastProperty, value);
-        }
+            UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/ContrastEffect.ps")
+        };
     }
-}
+
+    public ContrastEffect()
+    {
+        PixelShader = Shader;
+
+        UpdateShaderValue(InputProperty);
+        UpdateShaderValue(ContrastProperty);
+    }
+
+    public static readonly DependencyProperty ContrastProperty = DependencyProperty.Register(
+        "Contrast", typeof(double), typeof(ContrastEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
+
+    public double Contrast
+    {
+        get => (double) GetValue(ContrastProperty);
+        set => SetValue(ContrastProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs b/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
index 5e7f9bc5..c0dd2011 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
@@ -2,16 +2,15 @@
 using System.Windows.Media;
 using System.Windows.Media.Effects;
 
-namespace HandyControl.Media.Effects
-{
-    public abstract class EffectBase : ShaderEffect
-    {
-        public static readonly DependencyProperty InputProperty = RegisterPixelShaderSamplerProperty("Input", typeof(EffectBase), 0);
+namespace HandyControl.Media.Effects;
 
-        public Brush Input
-        {
-            get => (Brush) GetValue(InputProperty);
-            set => SetValue(InputProperty, value);
-        }
+public abstract class EffectBase : ShaderEffect
+{
+    public static readonly DependencyProperty InputProperty = RegisterPixelShaderSamplerProperty("Input", typeof(EffectBase), 0);
+
+    public Brush Input
+    {
+        get => (Brush) GetValue(InputProperty);
+        set => SetValue(InputProperty, value);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
index 4b26f23e..5535cb56 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
@@ -3,35 +3,34 @@ using System.Windows;
 using System.Windows.Media.Effects;
 using HandyControl.Data;
 
-namespace HandyControl.Media.Effects
+namespace HandyControl.Media.Effects;
+
+public class GrayScaleEffect : EffectBase
 {
-    public class GrayScaleEffect : EffectBase
+    private static readonly PixelShader Shader;
+
+    static GrayScaleEffect()
     {
-        private static readonly PixelShader Shader;
-
-        static GrayScaleEffect()
+        Shader = new PixelShader
         {
-            Shader = new PixelShader
-            {
-                UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/GrayScaleEffect.ps")
-            };
-        }
-
-        public GrayScaleEffect()
-        {
-            PixelShader = Shader;
-
-            UpdateShaderValue(InputProperty);
-            UpdateShaderValue(ScaleProperty);
-        }
-
-        public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register(
-            "Scale", typeof(double), typeof(GrayScaleEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
-
-        public double Scale
-        {
-            get => (double) GetValue(ScaleProperty);
-            set => SetValue(ScaleProperty, value);
-        }
+            UriSource = new Uri("pack://application:,,,/HandyControl;component/Resources/Effects/GrayScaleEffect.ps")
+        };
     }
-}
+
+    public GrayScaleEffect()
+    {
+        PixelShader = Shader;
+
+        UpdateShaderValue(InputProperty);
+        UpdateShaderValue(ScaleProperty);
+    }
+
+    public static readonly DependencyProperty ScaleProperty = DependencyProperty.Register(
+        "Scale", typeof(double), typeof(GrayScaleEffect), new PropertyMetadata(ValueBoxes.Double1Box, PixelShaderConstantCallback(0)));
+
+    public double Scale
+    {
+        get => (double) GetValue(ScaleProperty);
+        set => SetValue(ScaleProperty, value);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
index 1a2e4b8f..cdc5f4cb 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
@@ -4,489 +4,488 @@ using System.Windows;
 using System.Windows.Data;
 using HandyControl.Tools;
 
-namespace HandyControl.Properties.Langs
+namespace HandyControl.Properties.Langs;
+
+public class LangProvider : INotifyPropertyChanged
 {
-    public class LangProvider : INotifyPropertyChanged
+    internal static LangProvider Instance { get; } = ResourceHelper.GetResourceInternal<LangProvider>("Langs");
+
+    private static string CultureInfoStr;
+
+    internal static CultureInfo Culture
     {
-        internal static LangProvider Instance { get; } = ResourceHelper.GetResourceInternal<LangProvider>("Langs");
-
-        private static string CultureInfoStr;
-
-        internal static CultureInfo Culture
+        get => Lang.Culture;
+        set
         {
-            get => Lang.Culture;
-            set
-            {
-                if (value == null) return;
-                if (Equals(CultureInfoStr, value.EnglishName)) return;
-                Lang.Culture = value;
-                CultureInfoStr = value.EnglishName;
+            if (value == null) return;
+            if (Equals(CultureInfoStr, value.EnglishName)) return;
+            Lang.Culture = value;
+            CultureInfoStr = value.EnglishName;
 
-                Instance.UpdateLangs();
-            }
+            Instance.UpdateLangs();
         }
-
-        public static string GetLang(string key) => Lang.ResourceManager.GetString(key, Culture);
-
-        public static void SetLang(DependencyObject dependencyObject, DependencyProperty dependencyProperty, string key) =>
-            BindingOperations.SetBinding(dependencyObject, dependencyProperty, new Binding(key)
-            {
-                Source = Instance,
-                Mode = BindingMode.OneWay
-            });
-
-        private void UpdateLangs()
-        {
-            OnPropertyChanged(nameof(All));
-            OnPropertyChanged(nameof(Am));
-            OnPropertyChanged(nameof(Cancel));
-            OnPropertyChanged(nameof(Clear));
-            OnPropertyChanged(nameof(Close));
-            OnPropertyChanged(nameof(CloseAll));
-            OnPropertyChanged(nameof(CloseOther));
-            OnPropertyChanged(nameof(Confirm));
-            OnPropertyChanged(nameof(ErrorImgPath));
-            OnPropertyChanged(nameof(ErrorImgSize));
-            OnPropertyChanged(nameof(Find));
-            OnPropertyChanged(nameof(FormatError));
-            OnPropertyChanged(nameof(Interval10m));
-            OnPropertyChanged(nameof(Interval1h));
-            OnPropertyChanged(nameof(Interval1m));
-            OnPropertyChanged(nameof(Interval2h));
-            OnPropertyChanged(nameof(Interval30m));
-            OnPropertyChanged(nameof(Interval30s));
-            OnPropertyChanged(nameof(Interval5m));
-            OnPropertyChanged(nameof(IsNecessary));
-            OnPropertyChanged(nameof(Jump));
-            OnPropertyChanged(nameof(LangComment));
-            OnPropertyChanged(nameof(Miscellaneous));
-            OnPropertyChanged(nameof(NextPage));
-            OnPropertyChanged(nameof(No));
-            OnPropertyChanged(nameof(NoData));
-            OnPropertyChanged(nameof(OutOfRange));
-            OnPropertyChanged(nameof(PageMode));
-            OnPropertyChanged(nameof(Pm));
-            OnPropertyChanged(nameof(PngImg));
-            OnPropertyChanged(nameof(PreviousPage));
-            OnPropertyChanged(nameof(ScrollMode));
-            OnPropertyChanged(nameof(Tip));
-            OnPropertyChanged(nameof(TooLarge));
-            OnPropertyChanged(nameof(TwoPageMode));
-            OnPropertyChanged(nameof(Unknown));
-            OnPropertyChanged(nameof(UnknownSize));
-            OnPropertyChanged(nameof(Yes));
-            OnPropertyChanged(nameof(ZoomIn));
-            OnPropertyChanged(nameof(ZoomOut));
-        }
-
-        /// <summary>
-        ///   查找类似 全部 的本地化字符串。
-        /// </summary>
-		public string All => Lang.All;
-
-        /// <summary>
-        ///   查找类似 上午 的本地化字符串。
-        /// </summary>
-		public string Am => Lang.Am;
-
-        /// <summary>
-        ///   查找类似 取消 的本地化字符串。
-        /// </summary>
-		public string Cancel => Lang.Cancel;
-
-        /// <summary>
-        ///   查找类似 清空 的本地化字符串。
-        /// </summary>
-		public string Clear => Lang.Clear;
-
-        /// <summary>
-        ///   查找类似 关闭 的本地化字符串。
-        /// </summary>
-		public string Close => Lang.Close;
-
-        /// <summary>
-        ///   查找类似 关闭所有 的本地化字符串。
-        /// </summary>
-		public string CloseAll => Lang.CloseAll;
-
-        /// <summary>
-        ///   查找类似 关闭其他 的本地化字符串。
-        /// </summary>
-		public string CloseOther => Lang.CloseOther;
-
-        /// <summary>
-        ///   查找类似 确定 的本地化字符串。
-        /// </summary>
-		public string Confirm => Lang.Confirm;
-
-        /// <summary>
-        ///   查找类似 错误的图片路径 的本地化字符串。
-        /// </summary>
-		public string ErrorImgPath => Lang.ErrorImgPath;
-
-        /// <summary>
-        ///   查找类似 非法的图片尺寸 的本地化字符串。
-        /// </summary>
-		public string ErrorImgSize => Lang.ErrorImgSize;
-
-        /// <summary>
-        ///   查找类似 查找 的本地化字符串。
-        /// </summary>
-		public string Find => Lang.Find;
-
-        /// <summary>
-        ///   查找类似 格式错误 的本地化字符串。
-        /// </summary>
-		public string FormatError => Lang.FormatError;
-
-        /// <summary>
-        ///   查找类似 间隔10分钟 的本地化字符串。
-        /// </summary>
-		public string Interval10m => Lang.Interval10m;
-
-        /// <summary>
-        ///   查找类似 间隔1小时 的本地化字符串。
-        /// </summary>
-		public string Interval1h => Lang.Interval1h;
-
-        /// <summary>
-        ///   查找类似 间隔1分钟 的本地化字符串。
-        /// </summary>
-		public string Interval1m => Lang.Interval1m;
-
-        /// <summary>
-        ///   查找类似 间隔2小时 的本地化字符串。
-        /// </summary>
-		public string Interval2h => Lang.Interval2h;
-
-        /// <summary>
-        ///   查找类似 间隔30分钟 的本地化字符串。
-        /// </summary>
-		public string Interval30m => Lang.Interval30m;
-
-        /// <summary>
-        ///   查找类似 间隔30秒 的本地化字符串。
-        /// </summary>
-		public string Interval30s => Lang.Interval30s;
-
-        /// <summary>
-        ///   查找类似 间隔5分钟 的本地化字符串。
-        /// </summary>
-		public string Interval5m => Lang.Interval5m;
-
-        /// <summary>
-        ///   查找类似 不能为空 的本地化字符串。
-        /// </summary>
-		public string IsNecessary => Lang.IsNecessary;
-
-        /// <summary>
-        ///   查找类似 跳转 的本地化字符串。
-        /// </summary>
-		public string Jump => Lang.Jump;
-
-        /// <summary>
-        ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
-        /// </summary>
-		public string LangComment => Lang.LangComment;
-
-        /// <summary>
-        ///   查找类似 杂项 的本地化字符串。
-        /// </summary>
-		public string Miscellaneous => Lang.Miscellaneous;
-
-        /// <summary>
-        ///   查找类似 下一页 的本地化字符串。
-        /// </summary>
-		public string NextPage => Lang.NextPage;
-
-        /// <summary>
-        ///   查找类似 否 的本地化字符串。
-        /// </summary>
-		public string No => Lang.No;
-
-        /// <summary>
-        ///   查找类似 暂无数据 的本地化字符串。
-        /// </summary>
-        public string NoData => Lang.NoData;
-
-        /// <summary>
-        ///   查找类似 不在范围内 的本地化字符串。
-        /// </summary>
-		public string OutOfRange => Lang.OutOfRange;
-
-        /// <summary>
-        ///   查找类似 页面模式 的本地化字符串。
-        /// </summary>
-		public string PageMode => Lang.PageMode;
-
-        /// <summary>
-        ///   查找类似 下午 的本地化字符串。
-        /// </summary>
-		public string Pm => Lang.Pm;
-
-        /// <summary>
-        ///   查找类似 PNG图片 的本地化字符串。
-        /// </summary>
-		public string PngImg => Lang.PngImg;
-
-        /// <summary>
-        ///   查找类似 上一页 的本地化字符串。
-        /// </summary>
-		public string PreviousPage => Lang.PreviousPage;
-
-        /// <summary>
-        ///   查找类似 滚动模式 的本地化字符串。
-        /// </summary>
-		public string ScrollMode => Lang.ScrollMode;
-
-        /// <summary>
-        ///   查找类似 提示 的本地化字符串。
-        /// </summary>
-		public string Tip => Lang.Tip;
-
-        /// <summary>
-        ///   查找类似 过大 的本地化字符串。
-        /// </summary>
-		public string TooLarge => Lang.TooLarge;
-
-        /// <summary>
-        ///   查找类似 双页模式 的本地化字符串。
-        /// </summary>
-		public string TwoPageMode => Lang.TwoPageMode;
-
-        /// <summary>
-        ///   查找类似 未知 的本地化字符串。
-        /// </summary>
-		public string Unknown => Lang.Unknown;
-
-        /// <summary>
-        ///   查找类似 未知大小 的本地化字符串。
-        /// </summary>
-		public string UnknownSize => Lang.UnknownSize;
-
-        /// <summary>
-        ///   查找类似 是 的本地化字符串。
-        /// </summary>
-		public string Yes => Lang.Yes;
-
-        /// <summary>
-        ///   查找类似 放大 的本地化字符串。
-        /// </summary>
-		public string ZoomIn => Lang.ZoomIn;
-
-        /// <summary>
-        ///   查找类似 缩小 的本地化字符串。
-        /// </summary>
-		public string ZoomOut => Lang.ZoomOut;
-
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName) =>
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 
-    public class LangKeys
+    public static string GetLang(string key) => Lang.ResourceManager.GetString(key, Culture);
+
+    public static void SetLang(DependencyObject dependencyObject, DependencyProperty dependencyProperty, string key) =>
+        BindingOperations.SetBinding(dependencyObject, dependencyProperty, new Binding(key)
+        {
+            Source = Instance,
+            Mode = BindingMode.OneWay
+        });
+
+    private void UpdateLangs()
     {
-        /// <summary>
-        ///   查找类似 全部 的本地化字符串。
-        /// </summary>
-		public static string All = nameof(All);
-
-        /// <summary>
-        ///   查找类似 上午 的本地化字符串。
-        /// </summary>
-		public static string Am = nameof(Am);
-
-        /// <summary>
-        ///   查找类似 取消 的本地化字符串。
-        /// </summary>
-		public static string Cancel = nameof(Cancel);
-
-        /// <summary>
-        ///   查找类似 清空 的本地化字符串。
-        /// </summary>
-		public static string Clear = nameof(Clear);
-
-        /// <summary>
-        ///   查找类似 关闭 的本地化字符串。
-        /// </summary>
-		public static string Close = nameof(Close);
-
-        /// <summary>
-        ///   查找类似 关闭所有 的本地化字符串。
-        /// </summary>
-		public static string CloseAll = nameof(CloseAll);
-
-        /// <summary>
-        ///   查找类似 关闭其他 的本地化字符串。
-        /// </summary>
-		public static string CloseOther = nameof(CloseOther);
-
-        /// <summary>
-        ///   查找类似 确定 的本地化字符串。
-        /// </summary>
-		public static string Confirm = nameof(Confirm);
-
-        /// <summary>
-        ///   查找类似 错误的图片路径 的本地化字符串。
-        /// </summary>
-		public static string ErrorImgPath = nameof(ErrorImgPath);
-
-        /// <summary>
-        ///   查找类似 非法的图片尺寸 的本地化字符串。
-        /// </summary>
-		public static string ErrorImgSize = nameof(ErrorImgSize);
-
-        /// <summary>
-        ///   查找类似 查找 的本地化字符串。
-        /// </summary>
-		public static string Find = nameof(Find);
-
-        /// <summary>
-        ///   查找类似 格式错误 的本地化字符串。
-        /// </summary>
-		public static string FormatError = nameof(FormatError);
-
-        /// <summary>
-        ///   查找类似 间隔10分钟 的本地化字符串。
-        /// </summary>
-		public static string Interval10m = nameof(Interval10m);
-
-        /// <summary>
-        ///   查找类似 间隔1小时 的本地化字符串。
-        /// </summary>
-		public static string Interval1h = nameof(Interval1h);
-
-        /// <summary>
-        ///   查找类似 间隔1分钟 的本地化字符串。
-        /// </summary>
-		public static string Interval1m = nameof(Interval1m);
-
-        /// <summary>
-        ///   查找类似 间隔2小时 的本地化字符串。
-        /// </summary>
-		public static string Interval2h = nameof(Interval2h);
-
-        /// <summary>
-        ///   查找类似 间隔30分钟 的本地化字符串。
-        /// </summary>
-		public static string Interval30m = nameof(Interval30m);
-
-        /// <summary>
-        ///   查找类似 间隔30秒 的本地化字符串。
-        /// </summary>
-		public static string Interval30s = nameof(Interval30s);
-
-        /// <summary>
-        ///   查找类似 间隔5分钟 的本地化字符串。
-        /// </summary>
-		public static string Interval5m = nameof(Interval5m);
-
-        /// <summary>
-        ///   查找类似 不能为空 的本地化字符串。
-        /// </summary>
-		public static string IsNecessary = nameof(IsNecessary);
-
-        /// <summary>
-        ///   查找类似 跳转 的本地化字符串。
-        /// </summary>
-		public static string Jump = nameof(Jump);
-
-        /// <summary>
-        ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
-        /// </summary>
-		public static string LangComment = nameof(LangComment);
-
-        /// <summary>
-        ///   查找类似 杂项 的本地化字符串。
-        /// </summary>
-		public static string Miscellaneous = nameof(Miscellaneous);
-
-        /// <summary>
-        ///   查找类似 下一页 的本地化字符串。
-        /// </summary>
-		public static string NextPage = nameof(NextPage);
-
-        /// <summary>
-        ///   查找类似 否 的本地化字符串。
-        /// </summary>
-		public static string No = nameof(No);
-
-        /// <summary>
-        ///   查找类似 暂无数据 的本地化字符串。
-        /// </summary>
-        public static string NoData = nameof(NoData);
-
-        /// <summary>
-        ///   查找类似 不在范围内 的本地化字符串。
-        /// </summary>
-		public static string OutOfRange = nameof(OutOfRange);
-
-        /// <summary>
-        ///   查找类似 页面模式 的本地化字符串。
-        /// </summary>
-		public static string PageMode = nameof(PageMode);
-
-        /// <summary>
-        ///   查找类似 下午 的本地化字符串。
-        /// </summary>
-		public static string Pm = nameof(Pm);
-
-        /// <summary>
-        ///   查找类似 PNG图片 的本地化字符串。
-        /// </summary>
-		public static string PngImg = nameof(PngImg);
-
-        /// <summary>
-        ///   查找类似 上一页 的本地化字符串。
-        /// </summary>
-		public static string PreviousPage = nameof(PreviousPage);
-
-        /// <summary>
-        ///   查找类似 滚动模式 的本地化字符串。
-        /// </summary>
-		public static string ScrollMode = nameof(ScrollMode);
-
-        /// <summary>
-        ///   查找类似 提示 的本地化字符串。
-        /// </summary>
-		public static string Tip = nameof(Tip);
-
-        /// <summary>
-        ///   查找类似 过大 的本地化字符串。
-        /// </summary>
-		public static string TooLarge = nameof(TooLarge);
-
-        /// <summary>
-        ///   查找类似 双页模式 的本地化字符串。
-        /// </summary>
-		public static string TwoPageMode = nameof(TwoPageMode);
-
-        /// <summary>
-        ///   查找类似 未知 的本地化字符串。
-        /// </summary>
-		public static string Unknown = nameof(Unknown);
-
-        /// <summary>
-        ///   查找类似 未知大小 的本地化字符串。
-        /// </summary>
-		public static string UnknownSize = nameof(UnknownSize);
-
-        /// <summary>
-        ///   查找类似 是 的本地化字符串。
-        /// </summary>
-		public static string Yes = nameof(Yes);
-
-        /// <summary>
-        ///   查找类似 放大 的本地化字符串。
-        /// </summary>
-		public static string ZoomIn = nameof(ZoomIn);
-
-        /// <summary>
-        ///   查找类似 缩小 的本地化字符串。
-        /// </summary>
-		public static string ZoomOut = nameof(ZoomOut);
-
+        OnPropertyChanged(nameof(All));
+        OnPropertyChanged(nameof(Am));
+        OnPropertyChanged(nameof(Cancel));
+        OnPropertyChanged(nameof(Clear));
+        OnPropertyChanged(nameof(Close));
+        OnPropertyChanged(nameof(CloseAll));
+        OnPropertyChanged(nameof(CloseOther));
+        OnPropertyChanged(nameof(Confirm));
+        OnPropertyChanged(nameof(ErrorImgPath));
+        OnPropertyChanged(nameof(ErrorImgSize));
+        OnPropertyChanged(nameof(Find));
+        OnPropertyChanged(nameof(FormatError));
+        OnPropertyChanged(nameof(Interval10m));
+        OnPropertyChanged(nameof(Interval1h));
+        OnPropertyChanged(nameof(Interval1m));
+        OnPropertyChanged(nameof(Interval2h));
+        OnPropertyChanged(nameof(Interval30m));
+        OnPropertyChanged(nameof(Interval30s));
+        OnPropertyChanged(nameof(Interval5m));
+        OnPropertyChanged(nameof(IsNecessary));
+        OnPropertyChanged(nameof(Jump));
+        OnPropertyChanged(nameof(LangComment));
+        OnPropertyChanged(nameof(Miscellaneous));
+        OnPropertyChanged(nameof(NextPage));
+        OnPropertyChanged(nameof(No));
+        OnPropertyChanged(nameof(NoData));
+        OnPropertyChanged(nameof(OutOfRange));
+        OnPropertyChanged(nameof(PageMode));
+        OnPropertyChanged(nameof(Pm));
+        OnPropertyChanged(nameof(PngImg));
+        OnPropertyChanged(nameof(PreviousPage));
+        OnPropertyChanged(nameof(ScrollMode));
+        OnPropertyChanged(nameof(Tip));
+        OnPropertyChanged(nameof(TooLarge));
+        OnPropertyChanged(nameof(TwoPageMode));
+        OnPropertyChanged(nameof(Unknown));
+        OnPropertyChanged(nameof(UnknownSize));
+        OnPropertyChanged(nameof(Yes));
+        OnPropertyChanged(nameof(ZoomIn));
+        OnPropertyChanged(nameof(ZoomOut));
     }
+
+    /// <summary>
+    ///   查找类似 全部 的本地化字符串。
+    /// </summary>
+    public string All => Lang.All;
+
+    /// <summary>
+    ///   查找类似 上午 的本地化字符串。
+    /// </summary>
+    public string Am => Lang.Am;
+
+    /// <summary>
+    ///   查找类似 取消 的本地化字符串。
+    /// </summary>
+    public string Cancel => Lang.Cancel;
+
+    /// <summary>
+    ///   查找类似 清空 的本地化字符串。
+    /// </summary>
+    public string Clear => Lang.Clear;
+
+    /// <summary>
+    ///   查找类似 关闭 的本地化字符串。
+    /// </summary>
+    public string Close => Lang.Close;
+
+    /// <summary>
+    ///   查找类似 关闭所有 的本地化字符串。
+    /// </summary>
+    public string CloseAll => Lang.CloseAll;
+
+    /// <summary>
+    ///   查找类似 关闭其他 的本地化字符串。
+    /// </summary>
+    public string CloseOther => Lang.CloseOther;
+
+    /// <summary>
+    ///   查找类似 确定 的本地化字符串。
+    /// </summary>
+    public string Confirm => Lang.Confirm;
+
+    /// <summary>
+    ///   查找类似 错误的图片路径 的本地化字符串。
+    /// </summary>
+    public string ErrorImgPath => Lang.ErrorImgPath;
+
+    /// <summary>
+    ///   查找类似 非法的图片尺寸 的本地化字符串。
+    /// </summary>
+    public string ErrorImgSize => Lang.ErrorImgSize;
+
+    /// <summary>
+    ///   查找类似 查找 的本地化字符串。
+    /// </summary>
+    public string Find => Lang.Find;
+
+    /// <summary>
+    ///   查找类似 格式错误 的本地化字符串。
+    /// </summary>
+    public string FormatError => Lang.FormatError;
+
+    /// <summary>
+    ///   查找类似 间隔10分钟 的本地化字符串。
+    /// </summary>
+    public string Interval10m => Lang.Interval10m;
+
+    /// <summary>
+    ///   查找类似 间隔1小时 的本地化字符串。
+    /// </summary>
+    public string Interval1h => Lang.Interval1h;
+
+    /// <summary>
+    ///   查找类似 间隔1分钟 的本地化字符串。
+    /// </summary>
+    public string Interval1m => Lang.Interval1m;
+
+    /// <summary>
+    ///   查找类似 间隔2小时 的本地化字符串。
+    /// </summary>
+    public string Interval2h => Lang.Interval2h;
+
+    /// <summary>
+    ///   查找类似 间隔30分钟 的本地化字符串。
+    /// </summary>
+    public string Interval30m => Lang.Interval30m;
+
+    /// <summary>
+    ///   查找类似 间隔30秒 的本地化字符串。
+    /// </summary>
+    public string Interval30s => Lang.Interval30s;
+
+    /// <summary>
+    ///   查找类似 间隔5分钟 的本地化字符串。
+    /// </summary>
+    public string Interval5m => Lang.Interval5m;
+
+    /// <summary>
+    ///   查找类似 不能为空 的本地化字符串。
+    /// </summary>
+    public string IsNecessary => Lang.IsNecessary;
+
+    /// <summary>
+    ///   查找类似 跳转 的本地化字符串。
+    /// </summary>
+    public string Jump => Lang.Jump;
+
+    /// <summary>
+    ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
+    /// </summary>
+    public string LangComment => Lang.LangComment;
+
+    /// <summary>
+    ///   查找类似 杂项 的本地化字符串。
+    /// </summary>
+    public string Miscellaneous => Lang.Miscellaneous;
+
+    /// <summary>
+    ///   查找类似 下一页 的本地化字符串。
+    /// </summary>
+    public string NextPage => Lang.NextPage;
+
+    /// <summary>
+    ///   查找类似 否 的本地化字符串。
+    /// </summary>
+    public string No => Lang.No;
+
+    /// <summary>
+    ///   查找类似 暂无数据 的本地化字符串。
+    /// </summary>
+    public string NoData => Lang.NoData;
+
+    /// <summary>
+    ///   查找类似 不在范围内 的本地化字符串。
+    /// </summary>
+    public string OutOfRange => Lang.OutOfRange;
+
+    /// <summary>
+    ///   查找类似 页面模式 的本地化字符串。
+    /// </summary>
+    public string PageMode => Lang.PageMode;
+
+    /// <summary>
+    ///   查找类似 下午 的本地化字符串。
+    /// </summary>
+    public string Pm => Lang.Pm;
+
+    /// <summary>
+    ///   查找类似 PNG图片 的本地化字符串。
+    /// </summary>
+    public string PngImg => Lang.PngImg;
+
+    /// <summary>
+    ///   查找类似 上一页 的本地化字符串。
+    /// </summary>
+    public string PreviousPage => Lang.PreviousPage;
+
+    /// <summary>
+    ///   查找类似 滚动模式 的本地化字符串。
+    /// </summary>
+    public string ScrollMode => Lang.ScrollMode;
+
+    /// <summary>
+    ///   查找类似 提示 的本地化字符串。
+    /// </summary>
+    public string Tip => Lang.Tip;
+
+    /// <summary>
+    ///   查找类似 过大 的本地化字符串。
+    /// </summary>
+    public string TooLarge => Lang.TooLarge;
+
+    /// <summary>
+    ///   查找类似 双页模式 的本地化字符串。
+    /// </summary>
+    public string TwoPageMode => Lang.TwoPageMode;
+
+    /// <summary>
+    ///   查找类似 未知 的本地化字符串。
+    /// </summary>
+    public string Unknown => Lang.Unknown;
+
+    /// <summary>
+    ///   查找类似 未知大小 的本地化字符串。
+    /// </summary>
+    public string UnknownSize => Lang.UnknownSize;
+
+    /// <summary>
+    ///   查找类似 是 的本地化字符串。
+    /// </summary>
+    public string Yes => Lang.Yes;
+
+    /// <summary>
+    ///   查找类似 放大 的本地化字符串。
+    /// </summary>
+    public string ZoomIn => Lang.ZoomIn;
+
+    /// <summary>
+    ///   查找类似 缩小 的本地化字符串。
+    /// </summary>
+    public string ZoomOut => Lang.ZoomOut;
+
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    protected virtual void OnPropertyChanged(string propertyName) =>
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 }
+
+public class LangKeys
+{
+    /// <summary>
+    ///   查找类似 全部 的本地化字符串。
+    /// </summary>
+    public static string All = nameof(All);
+
+    /// <summary>
+    ///   查找类似 上午 的本地化字符串。
+    /// </summary>
+    public static string Am = nameof(Am);
+
+    /// <summary>
+    ///   查找类似 取消 的本地化字符串。
+    /// </summary>
+    public static string Cancel = nameof(Cancel);
+
+    /// <summary>
+    ///   查找类似 清空 的本地化字符串。
+    /// </summary>
+    public static string Clear = nameof(Clear);
+
+    /// <summary>
+    ///   查找类似 关闭 的本地化字符串。
+    /// </summary>
+    public static string Close = nameof(Close);
+
+    /// <summary>
+    ///   查找类似 关闭所有 的本地化字符串。
+    /// </summary>
+    public static string CloseAll = nameof(CloseAll);
+
+    /// <summary>
+    ///   查找类似 关闭其他 的本地化字符串。
+    /// </summary>
+    public static string CloseOther = nameof(CloseOther);
+
+    /// <summary>
+    ///   查找类似 确定 的本地化字符串。
+    /// </summary>
+    public static string Confirm = nameof(Confirm);
+
+    /// <summary>
+    ///   查找类似 错误的图片路径 的本地化字符串。
+    /// </summary>
+    public static string ErrorImgPath = nameof(ErrorImgPath);
+
+    /// <summary>
+    ///   查找类似 非法的图片尺寸 的本地化字符串。
+    /// </summary>
+    public static string ErrorImgSize = nameof(ErrorImgSize);
+
+    /// <summary>
+    ///   查找类似 查找 的本地化字符串。
+    /// </summary>
+    public static string Find = nameof(Find);
+
+    /// <summary>
+    ///   查找类似 格式错误 的本地化字符串。
+    /// </summary>
+    public static string FormatError = nameof(FormatError);
+
+    /// <summary>
+    ///   查找类似 间隔10分钟 的本地化字符串。
+    /// </summary>
+    public static string Interval10m = nameof(Interval10m);
+
+    /// <summary>
+    ///   查找类似 间隔1小时 的本地化字符串。
+    /// </summary>
+    public static string Interval1h = nameof(Interval1h);
+
+    /// <summary>
+    ///   查找类似 间隔1分钟 的本地化字符串。
+    /// </summary>
+    public static string Interval1m = nameof(Interval1m);
+
+    /// <summary>
+    ///   查找类似 间隔2小时 的本地化字符串。
+    /// </summary>
+    public static string Interval2h = nameof(Interval2h);
+
+    /// <summary>
+    ///   查找类似 间隔30分钟 的本地化字符串。
+    /// </summary>
+    public static string Interval30m = nameof(Interval30m);
+
+    /// <summary>
+    ///   查找类似 间隔30秒 的本地化字符串。
+    /// </summary>
+    public static string Interval30s = nameof(Interval30s);
+
+    /// <summary>
+    ///   查找类似 间隔5分钟 的本地化字符串。
+    /// </summary>
+    public static string Interval5m = nameof(Interval5m);
+
+    /// <summary>
+    ///   查找类似 不能为空 的本地化字符串。
+    /// </summary>
+    public static string IsNecessary = nameof(IsNecessary);
+
+    /// <summary>
+    ///   查找类似 跳转 的本地化字符串。
+    /// </summary>
+    public static string Jump = nameof(Jump);
+
+    /// <summary>
+    ///   查找类似 查找类似 {0} 的本地化字符串。 的本地化字符串。
+    /// </summary>
+    public static string LangComment = nameof(LangComment);
+
+    /// <summary>
+    ///   查找类似 杂项 的本地化字符串。
+    /// </summary>
+    public static string Miscellaneous = nameof(Miscellaneous);
+
+    /// <summary>
+    ///   查找类似 下一页 的本地化字符串。
+    /// </summary>
+    public static string NextPage = nameof(NextPage);
+
+    /// <summary>
+    ///   查找类似 否 的本地化字符串。
+    /// </summary>
+    public static string No = nameof(No);
+
+    /// <summary>
+    ///   查找类似 暂无数据 的本地化字符串。
+    /// </summary>
+    public static string NoData = nameof(NoData);
+
+    /// <summary>
+    ///   查找类似 不在范围内 的本地化字符串。
+    /// </summary>
+    public static string OutOfRange = nameof(OutOfRange);
+
+    /// <summary>
+    ///   查找类似 页面模式 的本地化字符串。
+    /// </summary>
+    public static string PageMode = nameof(PageMode);
+
+    /// <summary>
+    ///   查找类似 下午 的本地化字符串。
+    /// </summary>
+    public static string Pm = nameof(Pm);
+
+    /// <summary>
+    ///   查找类似 PNG图片 的本地化字符串。
+    /// </summary>
+    public static string PngImg = nameof(PngImg);
+
+    /// <summary>
+    ///   查找类似 上一页 的本地化字符串。
+    /// </summary>
+    public static string PreviousPage = nameof(PreviousPage);
+
+    /// <summary>
+    ///   查找类似 滚动模式 的本地化字符串。
+    /// </summary>
+    public static string ScrollMode = nameof(ScrollMode);
+
+    /// <summary>
+    ///   查找类似 提示 的本地化字符串。
+    /// </summary>
+    public static string Tip = nameof(Tip);
+
+    /// <summary>
+    ///   查找类似 过大 的本地化字符串。
+    /// </summary>
+    public static string TooLarge = nameof(TooLarge);
+
+    /// <summary>
+    ///   查找类似 双页模式 的本地化字符串。
+    /// </summary>
+    public static string TwoPageMode = nameof(TwoPageMode);
+
+    /// <summary>
+    ///   查找类似 未知 的本地化字符串。
+    /// </summary>
+    public static string Unknown = nameof(Unknown);
+
+    /// <summary>
+    ///   查找类似 未知大小 的本地化字符串。
+    /// </summary>
+    public static string UnknownSize = nameof(UnknownSize);
+
+    /// <summary>
+    ///   查找类似 是 的本地化字符串。
+    /// </summary>
+    public static string Yes = nameof(Yes);
+
+    /// <summary>
+    ///   查找类似 放大 的本地化字符串。
+    /// </summary>
+    public static string ZoomIn = nameof(ZoomIn);
+
+    /// <summary>
+    ///   查找类似 缩小 的本地化字符串。
+    /// </summary>
+    public static string ZoomOut = nameof(ZoomOut);
+
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs b/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
index 9e7fd999..9c0f67d3 100644
--- a/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
+++ b/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
@@ -3,37 +3,36 @@ using System.Collections.Generic;
 using System.Windows;
 using HandyControl.Tools;
 
-namespace HandyControl.Themes
+namespace HandyControl.Themes;
+
+public class SharedResourceDictionary : ResourceDictionary
 {
-    public class SharedResourceDictionary : ResourceDictionary
+    public static Dictionary<Uri, ResourceDictionary> SharedDictionaries = new();
+
+    private Uri _sourceUri;
+
+    public new Uri Source
     {
-        public static Dictionary<Uri, ResourceDictionary> SharedDictionaries = new();
-
-        private Uri _sourceUri;
-
-        public new Uri Source
+        get => DesignerHelper.IsInDesignMode ? base.Source : _sourceUri;
+        set
         {
-            get => DesignerHelper.IsInDesignMode ? base.Source : _sourceUri;
-            set
+            if (value == null) return;
+            if (DesignerHelper.IsInDesignMode)
             {
-                if (value == null) return;
-                if (DesignerHelper.IsInDesignMode)
-                {
-                    base.Source = value;
-                    return;
-                }
-                _sourceUri = value;
+                base.Source = value;
+                return;
+            }
+            _sourceUri = value;
 
-                if (!SharedDictionaries.ContainsKey(value))
-                {
-                    base.Source = value;
-                    SharedDictionaries.Add(value, this);
-                }
-                else
-                {
-                    MergedDictionaries.Add(SharedDictionaries[value]);
-                }
+            if (!SharedDictionaries.ContainsKey(value))
+            {
+                base.Source = value;
+                SharedDictionaries.Add(value, this);
+            }
+            else
+            {
+                MergedDictionaries.Add(SharedDictionaries[value]);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.cs b/src/Shared/HandyControl_Shared/Themes/Theme.cs
index a4ececf0..ac8a707c 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.cs
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.cs
@@ -9,239 +9,238 @@ using HandyControl.Tools.Helper;
 using HandyControl.Tools.Interop;
 using Microsoft.Win32;
 
-namespace HandyControl.Themes
+namespace HandyControl.Themes;
+
+public class Theme : ResourceDictionary
 {
-    public class Theme : ResourceDictionary
+    public Theme()
     {
-        public Theme()
+        if (DesignerHelper.IsInDesignMode)
         {
-            if (DesignerHelper.IsInDesignMode)
-            {
-                MergedDictionaries.Add(ResourceHelper.GetSkin(SkinType.Default));
-                MergedDictionaries.Add(ResourceHelper.GetTheme());
-            }
-            else
-            {
-                InitResource();
-            }
+            MergedDictionaries.Add(ResourceHelper.GetSkin(SkinType.Default));
+            MergedDictionaries.Add(ResourceHelper.GetTheme());
         }
-
-        #region Skin
-
-        private SkinType _manualSkinType;
-
-        private SkinType _skin;
-
-        public virtual SkinType Skin
+        else
         {
-            get => _skin;
-            set
-            {
-                if (_skin == value) return;
-                _skin = value;
-
-                UpdateSkin();
-            }
+            InitResource();
         }
+    }
 
-        public static readonly DependencyProperty SkinProperty = DependencyProperty.RegisterAttached(
-            "Skin", typeof(SkinType), typeof(Theme), new PropertyMetadata(default(SkinType), OnSkinChanged));
+    #region Skin
 
-        private static void OnSkinChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private SkinType _manualSkinType;
+
+    private SkinType _skin;
+
+    public virtual SkinType Skin
+    {
+        get => _skin;
+        set
         {
-            if (d is not FrameworkElement element)
-            {
-                return;
-            }
+            if (_skin == value) return;
+            _skin = value;
 
-            var skin = (SkinType) e.NewValue;
-
-            var themes = new List<Theme>();
-            GetAllThemes(element.Resources, ref themes);
-
-            if (themes.Count > 0)
-            {
-                foreach (var theme in themes)
-                {
-                    theme.Skin = skin;
-                }
-            }
-            else
-            {
-                element.Resources.MergedDictionaries.Add(new Theme
-                {
-                    Skin = skin
-                });
-            }
-        }
-
-        private static void GetAllThemes(ResourceDictionary resourceDictionary, ref List<Theme> themes)
-        {
-            if (resourceDictionary is Theme theme)
-            {
-                themes.Add(theme);
-            }
-
-            // we must consider it's MergedDictionaries
-            foreach (var dictionaryMergedDictionary in resourceDictionary.MergedDictionaries)
-            {
-                GetAllThemes(dictionaryMergedDictionary, ref themes);
-            }
-        }
-
-        public static void SetSkin(DependencyObject element, SkinType value)
-            => element.SetValue(SkinProperty, value);
-
-        public static SkinType GetSkin(DependencyObject element)
-            => (SkinType) element.GetValue(SkinProperty);
-
-        #endregion
-
-        #region SyncWithSystem
-
-        private bool _syncWithSystem;
-
-        public bool SyncWithSystem
-        {
-            get => _syncWithSystem;
-            set
-            {
-                _syncWithSystem = value;
-
-                if (value)
-                {
-                    _manualSkinType = _skin;
-                    SyncWithSystemTheme();
-
-                    SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
-                }
-                else
-                {
-                    SystemEvents.UserPreferenceChanged -= SystemEvents_UserPreferenceChanged;
-
-                    _skin = _manualSkinType;
-                    UpdateSkin();
-                }
-            }
-        }
-
-        private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
-        {
-            if (e.Category == UserPreferenceCategory.General)
-            {
-                SyncWithSystemTheme();
-            }
-        }
-
-        private void SyncWithSystemTheme()
-        {
-            _skin = SystemHelper.DetermineIfInLightThemeMode() ? SkinType.Default : SkinType.Dark;
             UpdateSkin();
         }
+    }
 
-        #endregion
+    public static readonly DependencyProperty SkinProperty = DependencyProperty.RegisterAttached(
+        "Skin", typeof(SkinType), typeof(Theme), new PropertyMetadata(default(SkinType), OnSkinChanged));
 
-        #region AccentColor
-
-        private Color? _accentColor;
-
-        public Color? AccentColor
+    private static void OnSkinChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not FrameworkElement element)
         {
-            get => _accentColor;
-            set
-            {
-                _accentColor = value;
-
-                if (value == null)
-                {
-                    _precSkin = null;
-                }
-
-                UpdateSkin();
-            }
+            return;
         }
 
-        #endregion
+        var skin = (SkinType) e.NewValue;
 
-        #region Source
+        var themes = new List<Theme>();
+        GetAllThemes(element.Resources, ref themes);
 
-        private Uri _source;
-
-        public new Uri Source
+        if (themes.Count > 0)
         {
-            get => DesignerHelper.IsInDesignMode ? null : _source;
-            set => _source = value;
+            foreach (var theme in themes)
+            {
+                theme.Skin = skin;
+            }
+        }
+        else
+        {
+            element.Resources.MergedDictionaries.Add(new Theme
+            {
+                Skin = skin
+            });
+        }
+    }
+
+    private static void GetAllThemes(ResourceDictionary resourceDictionary, ref List<Theme> themes)
+    {
+        if (resourceDictionary is Theme theme)
+        {
+            themes.Add(theme);
         }
 
-        #endregion
-
-        public string Name { get; set; }
-
-        private SkinType _prevSkinType;
-
-        private ResourceDictionary _precSkin;
-
-        public virtual ResourceDictionary GetSkin(SkinType skinType)
+        // we must consider it's MergedDictionaries
+        foreach (var dictionaryMergedDictionary in resourceDictionary.MergedDictionaries)
         {
-            if (_precSkin == null || _prevSkinType != skinType)
-            {
-                _precSkin = ResourceHelper.GetSkin(skinType);
-                _prevSkinType = skinType;
-            }
+            GetAllThemes(dictionaryMergedDictionary, ref themes);
+        }
+    }
 
-            if (!SyncWithSystem)
+    public static void SetSkin(DependencyObject element, SkinType value)
+        => element.SetValue(SkinProperty, value);
+
+    public static SkinType GetSkin(DependencyObject element)
+        => (SkinType) element.GetValue(SkinProperty);
+
+    #endregion
+
+    #region SyncWithSystem
+
+    private bool _syncWithSystem;
+
+    public bool SyncWithSystem
+    {
+        get => _syncWithSystem;
+        set
+        {
+            _syncWithSystem = value;
+
+            if (value)
             {
-                if (AccentColor != null)
-                {
-                    UpdateAccentColor(AccentColor.Value);
-                }
+                _manualSkinType = _skin;
+                SyncWithSystemTheme();
+
+                SystemEvents.UserPreferenceChanged += SystemEvents_UserPreferenceChanged;
             }
             else
             {
-                InteropMethods.DwmGetColorizationColor(out var color, out _);
-                UpdateAccentColor(ColorHelper.ToColor(color));
+                SystemEvents.UserPreferenceChanged -= SystemEvents_UserPreferenceChanged;
+
+                _skin = _manualSkinType;
+                UpdateSkin();
             }
-
-            return _precSkin;
         }
-
-        public static Theme GetTheme(string name, ResourceDictionary resourceDictionary)
-        {
-            if (string.IsNullOrEmpty(name) || resourceDictionary == null)
-            {
-                return null;
-            }
-
-            return resourceDictionary.MergedDictionaries.OfType<Theme>().FirstOrDefault(item => Equals(item.Name, name));
-        }
-
-        public virtual ResourceDictionary GetTheme() => ResourceHelper.GetTheme();
-
-        private void InitResource()
-        {
-            if (DesignerHelper.IsInDesignMode)
-            {
-                return;
-            }
-
-            MergedDictionaries.Clear();
-            MergedDictionaries.Add(GetSkin(Skin));
-            MergedDictionaries.Add(GetTheme());
-        }
-
-        private void UpdateAccentColor(Color color)
-        {
-            _precSkin[ResourceToken.PrimaryColor] = color;
-            _precSkin[ResourceToken.DarkPrimaryColor] = color;
-            _precSkin[ResourceToken.TitleColor] = color;
-            _precSkin[ResourceToken.SecondaryTitleColor] = color;
-        }
-
-        private void UpdateSkin() => MergedDictionaries[0] = GetSkin(Skin);
     }
 
-    public class StandaloneTheme : Theme
+    private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
     {
-        public override ResourceDictionary GetTheme() => ResourceHelper.GetStandaloneTheme();
+        if (e.Category == UserPreferenceCategory.General)
+        {
+            SyncWithSystemTheme();
+        }
     }
+
+    private void SyncWithSystemTheme()
+    {
+        _skin = SystemHelper.DetermineIfInLightThemeMode() ? SkinType.Default : SkinType.Dark;
+        UpdateSkin();
+    }
+
+    #endregion
+
+    #region AccentColor
+
+    private Color? _accentColor;
+
+    public Color? AccentColor
+    {
+        get => _accentColor;
+        set
+        {
+            _accentColor = value;
+
+            if (value == null)
+            {
+                _precSkin = null;
+            }
+
+            UpdateSkin();
+        }
+    }
+
+    #endregion
+
+    #region Source
+
+    private Uri _source;
+
+    public new Uri Source
+    {
+        get => DesignerHelper.IsInDesignMode ? null : _source;
+        set => _source = value;
+    }
+
+    #endregion
+
+    public string Name { get; set; }
+
+    private SkinType _prevSkinType;
+
+    private ResourceDictionary _precSkin;
+
+    public virtual ResourceDictionary GetSkin(SkinType skinType)
+    {
+        if (_precSkin == null || _prevSkinType != skinType)
+        {
+            _precSkin = ResourceHelper.GetSkin(skinType);
+            _prevSkinType = skinType;
+        }
+
+        if (!SyncWithSystem)
+        {
+            if (AccentColor != null)
+            {
+                UpdateAccentColor(AccentColor.Value);
+            }
+        }
+        else
+        {
+            InteropMethods.DwmGetColorizationColor(out var color, out _);
+            UpdateAccentColor(ColorHelper.ToColor(color));
+        }
+
+        return _precSkin;
+    }
+
+    public static Theme GetTheme(string name, ResourceDictionary resourceDictionary)
+    {
+        if (string.IsNullOrEmpty(name) || resourceDictionary == null)
+        {
+            return null;
+        }
+
+        return resourceDictionary.MergedDictionaries.OfType<Theme>().FirstOrDefault(item => Equals(item.Name, name));
+    }
+
+    public virtual ResourceDictionary GetTheme() => ResourceHelper.GetTheme();
+
+    private void InitResource()
+    {
+        if (DesignerHelper.IsInDesignMode)
+        {
+            return;
+        }
+
+        MergedDictionaries.Clear();
+        MergedDictionaries.Add(GetSkin(Skin));
+        MergedDictionaries.Add(GetTheme());
+    }
+
+    private void UpdateAccentColor(Color color)
+    {
+        _precSkin[ResourceToken.PrimaryColor] = color;
+        _precSkin[ResourceToken.DarkPrimaryColor] = color;
+        _precSkin[ResourceToken.TitleColor] = color;
+        _precSkin[ResourceToken.SecondaryTitleColor] = color;
+    }
+
+    private void UpdateSkin() => MergedDictionaries[0] = GetSkin(Skin);
 }
+
+public class StandaloneTheme : Theme
+{
+    public override ResourceDictionary GetTheme() => ResourceHelper.GetStandaloneTheme();
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
index 2c551e59..5938d564 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
@@ -2,26 +2,25 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Boolean2BooleanReConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is bool boolValue)
-            {
-                return !boolValue;
-            }
-            return value;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class Boolean2BooleanReConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool boolValue)
         {
-            if (value is bool boolValue)
-            {
-                return !boolValue;
-            }
-            return value;
+            return !boolValue;
         }
+        return value;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is bool boolValue)
+        {
+            return !boolValue;
+        }
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
index 08754c0c..c81a1e7e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
@@ -2,31 +2,30 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class Boolean2StringConverter : IValueConverter
 {
-    public class Boolean2StringConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        if (value is bool boolValue)
         {
-            if (value is bool boolValue)
+            if (parameter is string str)
             {
-                if (parameter is string str)
+                var arr = str.Split(';');
+                if (arr.Length > 1)
                 {
-                    var arr = str.Split(';');
-                    if (arr.Length > 1)
-                    {
-                        return boolValue ? arr[1] : arr[0];
-                    }
-                    return "";
+                    return boolValue ? arr[1] : arr[0];
                 }
                 return "";
             }
             return "";
         }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return "";
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
index 6c0efe81..0c173e94 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
@@ -3,18 +3,17 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Boolean2VisibilityReConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && (bool) value ? Visibility.Collapsed : Visibility.Visible;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class Boolean2VisibilityReConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value != null && (bool) value ? Visibility.Collapsed : Visibility.Visible;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
index b154e6be..c24781d3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
@@ -5,36 +5,35 @@ using System.Linq;
 using System.Windows.Data;
 using HandyControl.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class BooleanArr2BooleanConverter : IMultiValueConverter
 {
-    public class BooleanArr2BooleanConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values == null)
         {
-            if (values == null)
+            return ValueBoxes.FalseBox;
+        }
+
+        var arr = new List<bool>();
+        foreach (var item in values)
+        {
+            if (item is bool boolValue)
+            {
+                arr.Add(boolValue);
+            }
+            else
             {
                 return ValueBoxes.FalseBox;
             }
-
-            var arr = new List<bool>();
-            foreach (var item in values)
-            {
-                if (item is bool boolValue)
-                {
-                    arr.Add(boolValue);
-                }
-                else
-                {
-                    return ValueBoxes.FalseBox;
-                }
-            }
-
-            return ValueBoxes.BooleanBox(arr.All(item => item));
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return ValueBoxes.BooleanBox(arr.All(item => item));
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
index fb17a66c..3c93217a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
@@ -5,35 +5,34 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class BooleanArr2VisibilityConverter : IMultiValueConverter
 {
-    public class BooleanArr2VisibilityConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values == null)
         {
-            if (values == null)
+            return Visibility.Collapsed;
+        }
+
+        var arr = new List<bool>();
+        foreach (var item in values)
+        {
+            if (item is bool boolValue)
+            {
+                arr.Add(boolValue);
+            }
+            else
             {
                 return Visibility.Collapsed;
             }
-
-            var arr = new List<bool>();
-            foreach (var item in values)
-            {
-                if (item is bool boolValue)
-                {
-                    arr.Add(boolValue);
-                }
-                else
-                {
-                    return Visibility.Collapsed;
-                }
-            }
-            return arr.All(item => item) ? Visibility.Visible : Visibility.Collapsed;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
         }
+        return arr.All(item => item) ? Visibility.Visible : Visibility.Collapsed;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
index a47acf92..ca6aa5de 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
@@ -6,31 +6,30 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class BorderCircularClipConverter : IMultiValueConverter
 {
-    public class BorderCircularClipConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values.Length == 3 && values[0] is double width && values[1] is double height && values[2] is CornerRadius radius)
         {
-            if (values.Length == 3 && values[0] is double width && values[1] is double height && values[2] is CornerRadius radius)
+            if (width < double.Epsilon || height < double.Epsilon)
             {
-                if (width < double.Epsilon || height < double.Epsilon)
-                {
-                    return Geometry.Empty;
-                }
-
-                var clip = new RectangleGeometry(new Rect(0, 0, width, height), radius.TopLeft, radius.TopLeft);
-                clip.Freeze();
-
-                return clip;
+                return Geometry.Empty;
             }
 
-            return DependencyProperty.UnsetValue;
+            var clip = new RectangleGeometry(new Rect(0, 0, width, height), radius.TopLeft, radius.TopLeft);
+            clip.Freeze();
+
+            return clip;
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return DependencyProperty.UnsetValue;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
index 13ec9abb..ceead447 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
@@ -3,29 +3,28 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class BorderCircularConverter : 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)
-            {
-                if (width < double.Epsilon || height < double.Epsilon)
-                {
-                    return new CornerRadius();
-                }
+namespace HandyControl.Tools.Converter;
 
-                var min = Math.Min(width, height);
-                return new CornerRadius(min / 2);
+public class BorderCircularConverter : 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)
+        {
+            if (width < double.Epsilon || height < double.Epsilon)
+            {
+                return new CornerRadius();
             }
 
-            return DependencyProperty.UnsetValue;
+            var min = Math.Min(width, height);
+            return new CornerRadius(min / 2);
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return DependencyProperty.UnsetValue;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
index f5361168..404e4d54 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
@@ -4,47 +4,46 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class BorderClipConverter : IMultiValueConverter
 {
-    public class BorderClipConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values.Length == 3 && values[0] is double width && values[1] is double height && values[2] is CornerRadius radius)
         {
-            if (values.Length == 3 && values[0] is double width && values[1] is double height && values[2] is CornerRadius radius)
+            if (width < double.Epsilon || height < double.Epsilon)
             {
-                if (width < double.Epsilon || height < double.Epsilon)
-                {
-                    return Geometry.Empty;
-                }
-
-                var clip = new PathGeometry
-                {
-                    Figures = new PathFigureCollection
-                    {
-                        new(new Point(radius.TopLeft, 0), new PathSegment[]
-                        {
-                            new LineSegment(new Point(width - radius.TopRight, 0), false),
-                            new ArcSegment(new Point(width, radius.TopRight), new Size(radius.TopRight, radius.TopRight), 90, false, SweepDirection.Clockwise, false),
-                            new LineSegment(new Point(width, height - radius.BottomRight), false),
-                            new ArcSegment(new Point(width - radius.BottomRight, height), new Size(radius.BottomRight, radius.BottomRight), 90, false, SweepDirection.Clockwise, false),
-                            new LineSegment(new Point(radius.BottomLeft, height), false),
-                            new ArcSegment(new Point(0, height - radius.BottomLeft), new Size(radius.BottomLeft, radius.BottomLeft), 90, false, SweepDirection.Clockwise, false),
-                            new LineSegment(new Point(0, radius.TopLeft), false),
-                            new ArcSegment(new Point(radius.TopLeft, 0), new Size(radius.TopLeft, radius.TopLeft), 90, false, SweepDirection.Clockwise, false),
-                        }, false)
-                    }
-                };
-                clip.Freeze();
-
-                return clip;
+                return Geometry.Empty;
             }
 
-            return DependencyProperty.UnsetValue;
+            var clip = new PathGeometry
+            {
+                Figures = new PathFigureCollection
+                {
+                    new(new Point(radius.TopLeft, 0), new PathSegment[]
+                    {
+                        new LineSegment(new Point(width - radius.TopRight, 0), false),
+                        new ArcSegment(new Point(width, radius.TopRight), new Size(radius.TopRight, radius.TopRight), 90, false, SweepDirection.Clockwise, false),
+                        new LineSegment(new Point(width, height - radius.BottomRight), false),
+                        new ArcSegment(new Point(width - radius.BottomRight, height), new Size(radius.BottomRight, radius.BottomRight), 90, false, SweepDirection.Clockwise, false),
+                        new LineSegment(new Point(radius.BottomLeft, height), false),
+                        new ArcSegment(new Point(0, height - radius.BottomLeft), new Size(radius.BottomLeft, radius.BottomLeft), 90, false, SweepDirection.Clockwise, false),
+                        new LineSegment(new Point(0, radius.TopLeft), false),
+                        new ArcSegment(new Point(radius.TopLeft, 0), new Size(radius.TopLeft, radius.TopLeft), 90, false, SweepDirection.Clockwise, false),
+                    }, false)
+                }
+            };
+            clip.Freeze();
+
+            return clip;
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return DependencyProperty.UnsetValue;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
index 5411a8bc..cf226a43 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
@@ -6,130 +6,129 @@ using System.Security;
 using System.Text;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class ColLayoutConverter : TypeConverter
 {
-    public class ColLayoutConverter : TypeConverter
+    public override bool CanConvertFrom(ITypeDescriptorContext typeDescriptorContext, Type sourceType)
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext typeDescriptorContext, Type sourceType)
+        switch (Type.GetTypeCode(sourceType))
         {
-            switch (Type.GetTypeCode(sourceType))
-            {
-                case TypeCode.Int16:
-                case TypeCode.UInt16:
-                case TypeCode.Int32:
-                case TypeCode.UInt32:
-                case TypeCode.Int64:
-                case TypeCode.UInt64:
-                case TypeCode.Single:
-                case TypeCode.Double:
-                case TypeCode.Decimal:
-                case TypeCode.String:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool CanConvertTo(ITypeDescriptorContext typeDescriptorContext, Type destinationType) =>
-            destinationType == typeof(InstanceDescriptor) || destinationType == typeof(string);
-
-        public override object ConvertFrom(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object source)
-        {
-            if (source == null) throw GetConvertFromException(null);
-
-            return source switch
-            {
-                string s => FromString(s, cultureInfo),
-                double d => new ColLayout((int) d),
-                _ => new ColLayout(Convert.ToInt32(source, cultureInfo))
-            };
-        }
-
-        [SecurityCritical]
-        public override object ConvertTo(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value, Type destinationType)
-        {
-            if (value == null) throw new ArgumentNullException(nameof(value));
-
-            if (destinationType == null) throw new ArgumentNullException(nameof(destinationType));
-
-            if (!(value is ColLayout th)) throw new ArgumentException("UnexpectedParameterType");
-
-            if (destinationType == typeof(string)) return ToString(th, cultureInfo);
-            if (destinationType == typeof(InstanceDescriptor))
-            {
-                var ci = typeof(ColLayout).GetConstructor(new[] { typeof(int), typeof(int), typeof(int), typeof(int), typeof(int), typeof(int) });
-                return new InstanceDescriptor(ci, new object[] { th.Xs, th.Sm, th.Md, th.Lg, th.Xl, th.Xxl });
-            }
-
-            throw new ArgumentException("CannotConvertType");
-        }
-
-        private static string ToString(ColLayout th, CultureInfo cultureInfo)
-        {
-            var listSeparator = TokenizerHelper.GetNumericListSeparator(cultureInfo);
-
-            // Initial capacity [128] is an estimate based on a sum of:
-            // 72 = 6x double (twelve digits is generous for the range of values likely)
-            //  4 = 4x separator characters
-            var sb = new StringBuilder(128);
-
-            sb.Append(th.Xs.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(th.Sm.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(th.Md.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(th.Lg.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(th.Xl.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(th.Xxl.ToString(cultureInfo));
-            return th.ToString();
-        }
-
-        private static ColLayout FromString(string s, CultureInfo cultureInfo)
-        {
-            var th = new TokenizerHelper(s, cultureInfo);
-            var lengths = new int[6];
-            var i = 0;
-
-            while (th.NextToken())
-            {
-                if (i >= 6)
-                {
-                    i = 7;    // Set i to a bad value. 
-                    break;
-                }
-
-                lengths[i] = th.GetCurrentToken().Value<int>();
-                i++;
-            }
-
-            return i switch
-            {
-                1 => new ColLayout(lengths[0]),
-                2 => new ColLayout { Xs = lengths[0], Sm = lengths[1] },
-                3 => new ColLayout { Xs = lengths[0], Sm = lengths[1], Md = lengths[2] },
-                4 => new ColLayout { Xs = lengths[0], Sm = lengths[1], Md = lengths[2], Lg = lengths[3] },
-                5 => new ColLayout
-                {
-                    Xs = lengths[0],
-                    Sm = lengths[1],
-                    Md = lengths[2],
-                    Lg = lengths[3],
-                    Xl = lengths[4]
-                },
-                6 => new ColLayout
-                {
-                    Xs = lengths[0],
-                    Sm = lengths[1],
-                    Md = lengths[2],
-                    Lg = lengths[3],
-                    Xl = lengths[4],
-                    Xxl = lengths[5]
-                },
-                _ => throw new FormatException("InvalidStringColLayout")
-            };
+            case TypeCode.Int16:
+            case TypeCode.UInt16:
+            case TypeCode.Int32:
+            case TypeCode.UInt32:
+            case TypeCode.Int64:
+            case TypeCode.UInt64:
+            case TypeCode.Single:
+            case TypeCode.Double:
+            case TypeCode.Decimal:
+            case TypeCode.String:
+                return true;
+            default:
+                return false;
         }
     }
-}
+
+    public override bool CanConvertTo(ITypeDescriptorContext typeDescriptorContext, Type destinationType) =>
+        destinationType == typeof(InstanceDescriptor) || destinationType == typeof(string);
+
+    public override object ConvertFrom(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object source)
+    {
+        if (source == null) throw GetConvertFromException(null);
+
+        return source switch
+        {
+            string s => FromString(s, cultureInfo),
+            double d => new ColLayout((int) d),
+            _ => new ColLayout(Convert.ToInt32(source, cultureInfo))
+        };
+    }
+
+    [SecurityCritical]
+    public override object ConvertTo(ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value, Type destinationType)
+    {
+        if (value == null) throw new ArgumentNullException(nameof(value));
+
+        if (destinationType == null) throw new ArgumentNullException(nameof(destinationType));
+
+        if (!(value is ColLayout th)) throw new ArgumentException("UnexpectedParameterType");
+
+        if (destinationType == typeof(string)) return ToString(th, cultureInfo);
+        if (destinationType == typeof(InstanceDescriptor))
+        {
+            var ci = typeof(ColLayout).GetConstructor(new[] { typeof(int), typeof(int), typeof(int), typeof(int), typeof(int), typeof(int) });
+            return new InstanceDescriptor(ci, new object[] { th.Xs, th.Sm, th.Md, th.Lg, th.Xl, th.Xxl });
+        }
+
+        throw new ArgumentException("CannotConvertType");
+    }
+
+    private static string ToString(ColLayout th, CultureInfo cultureInfo)
+    {
+        var listSeparator = TokenizerHelper.GetNumericListSeparator(cultureInfo);
+
+        // Initial capacity [128] is an estimate based on a sum of:
+        // 72 = 6x double (twelve digits is generous for the range of values likely)
+        //  4 = 4x separator characters
+        var sb = new StringBuilder(128);
+
+        sb.Append(th.Xs.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(th.Sm.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(th.Md.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(th.Lg.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(th.Xl.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(th.Xxl.ToString(cultureInfo));
+        return th.ToString();
+    }
+
+    private static ColLayout FromString(string s, CultureInfo cultureInfo)
+    {
+        var th = new TokenizerHelper(s, cultureInfo);
+        var lengths = new int[6];
+        var i = 0;
+
+        while (th.NextToken())
+        {
+            if (i >= 6)
+            {
+                i = 7;    // Set i to a bad value. 
+                break;
+            }
+
+            lengths[i] = th.GetCurrentToken().Value<int>();
+            i++;
+        }
+
+        return i switch
+        {
+            1 => new ColLayout(lengths[0]),
+            2 => new ColLayout { Xs = lengths[0], Sm = lengths[1] },
+            3 => new ColLayout { Xs = lengths[0], Sm = lengths[1], Md = lengths[2] },
+            4 => new ColLayout { Xs = lengths[0], Sm = lengths[1], Md = lengths[2], Lg = lengths[3] },
+            5 => new ColLayout
+            {
+                Xs = lengths[0],
+                Sm = lengths[1],
+                Md = lengths[2],
+                Lg = lengths[3],
+                Xl = lengths[4]
+            },
+            6 => new ColLayout
+            {
+                Xs = lengths[0],
+                Sm = lengths[1],
+                Md = lengths[2],
+                Lg = lengths[3],
+                Xl = lengths[4],
+                Xxl = lengths[5]
+            },
+            _ => throw new FormatException("InvalidStringColLayout")
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
index 2402f1d8..c25f91b7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
@@ -3,37 +3,36 @@ using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Color2ChannelAConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is SolidColorBrush brush)
-            {
-                return brush.Color.A;
-            }
-            return 0;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class Color2ChannelAConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is SolidColorBrush brush)
         {
-            if (value is string str)
+            return brush.Color.A;
+        }
+        return 0;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is string str)
+        {
+            try
             {
-                try
+                if (ColorConverter.ConvertFromString(str) is Color color)
                 {
-                    if (ColorConverter.ConvertFromString(str) is Color color)
-                    {
-                        return new SolidColorBrush(color);
-                    }
-                }
-                catch
-                {
-                    return parameter;
+                    return new SolidColorBrush(color);
                 }
+            }
+            catch
+            {
                 return parameter;
             }
             return parameter;
         }
+        return parameter;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
index 5bf18280..150c6d60 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
@@ -3,38 +3,37 @@ using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Color2HexStringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is SolidColorBrush brush)
-            {
-                var color = brush.Color;
-                return color.A < 255 ? $"#{color.A:X2}{color.R:X2}{color.G:X2}{color.B:X2}" : $"#{color.R:X2}{color.G:X2}{color.B:X2}";
-            }
-            return "";
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class Color2HexStringConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is SolidColorBrush brush)
         {
-            if (value is string str)
+            var color = brush.Color;
+            return color.A < 255 ? $"#{color.A:X2}{color.R:X2}{color.G:X2}{color.B:X2}" : $"#{color.R:X2}{color.G:X2}{color.B:X2}";
+        }
+        return "";
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is string str)
+        {
+            try
             {
-                try
+                if (ColorConverter.ConvertFromString(str) is Color color)
                 {
-                    if (ColorConverter.ConvertFromString(str) is Color color)
-                    {
-                        return new SolidColorBrush(color);
-                    }
-                }
-                catch
-                {
-                    return new SolidColorBrush(default);
+                    return new SolidColorBrush(color);
                 }
+            }
+            catch
+            {
                 return new SolidColorBrush(default);
             }
             return new SolidColorBrush(default);
         }
+        return new SolidColorBrush(default);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
index 449db208..3bbf7209 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
@@ -3,32 +3,31 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class CornerRadiusSplitConverter : IValueConverter
 {
-    public class CornerRadiusSplitConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        if (value is CornerRadius cornerRadius)
         {
-            if (value is CornerRadius cornerRadius)
+            if (parameter is string str)
             {
-                if (parameter is string str)
-                {
-                    var arr = str.Split(',');
-                    if (arr.Length != 4) return cornerRadius;
+                var arr = str.Split(',');
+                if (arr.Length != 4) return cornerRadius;
 
-                    return new CornerRadius(
-                        arr[0].Equals("1") ? cornerRadius.TopLeft : 0,
-                        arr[1].Equals("1") ? cornerRadius.TopRight : 0,
-                        arr[2].Equals("1") ? cornerRadius.BottomRight : 0,
-                        arr[3].Equals("1") ? cornerRadius.BottomLeft : 0);
-                }
+                return new CornerRadius(
+                    arr[0].Equals("1") ? cornerRadius.TopLeft : 0,
+                    arr[1].Equals("1") ? cornerRadius.TopRight : 0,
+                    arr[2].Equals("1") ? cornerRadius.BottomRight : 0,
+                    arr[3].Equals("1") ? cornerRadius.BottomLeft : 0);
             }
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
         }
+        return value;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
index 2b0d5b57..2febc984 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
@@ -4,46 +4,43 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class DataGridSelectAllButtonVisibilityConverter : IMultiValueConverter
 {
-    public class DataGridSelectAllButtonVisibilityConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        if (values == null)
         {
-            if (values == null)
-            {
-                return Visibility.Collapsed;
-            }
+            return Visibility.Collapsed;
+        }
 
-            if (values.Length != 2)
-            {
-                return Visibility.Collapsed;
-            }
+        if (values.Length != 2)
+        {
+            return Visibility.Collapsed;
+        }
 
-            if (values[0] is DataGridHeadersVisibility headersVisibility)
+        if (values[0] is DataGridHeadersVisibility headersVisibility)
+        {
+            if (values[1] is bool showButton)
             {
-                if (values[1] is bool showButton)
+                if (headersVisibility == DataGridHeadersVisibility.All)
                 {
-                    if (headersVisibility == DataGridHeadersVisibility.All)
-                    {
-                        return showButton ? Visibility.Visible : Visibility.Collapsed;
-                    }
-
-                    return Visibility.Collapsed;
+                    return showButton ? Visibility.Visible : Visibility.Collapsed;
                 }
 
                 return Visibility.Collapsed;
             }
-            else if (values[0] is bool showButton)
-            {
-                if (values[1] is DataGridHeadersVisibility visibility)
-                {
-                    if (visibility == DataGridHeadersVisibility.All)
-                    {
-                        return showButton ? Visibility.Visible : Visibility.Collapsed;
-                    }
 
-                    return Visibility.Collapsed;
+            return Visibility.Collapsed;
+        }
+        else if (values[0] is bool showButton)
+        {
+            if (values[1] is DataGridHeadersVisibility visibility)
+            {
+                if (visibility == DataGridHeadersVisibility.All)
+                {
+                    return showButton ? Visibility.Visible : Visibility.Collapsed;
                 }
 
                 return Visibility.Collapsed;
@@ -52,9 +49,11 @@ namespace HandyControl.Tools.Converter
             return Visibility.Collapsed;
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return Visibility.Collapsed;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
index b0098f4b..9c2c8b5c 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
@@ -3,27 +3,26 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class Double2GridLengthConverter : IValueConverter
 {
-    public class Double2GridLengthConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        if (value is double doubleValue)
         {
-            if (value is double doubleValue)
+            if (double.IsNaN(doubleValue) || double.IsInfinity(doubleValue))
             {
-                if (double.IsNaN(doubleValue) || double.IsInfinity(doubleValue))
-                {
-                    return new GridLength(1.0, GridUnitType.Star);
-                }
-                return new GridLength(doubleValue);
+                return new GridLength(1.0, GridUnitType.Star);
             }
-
-            return new GridLength(0);
+            return new GridLength(doubleValue);
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return new GridLength(0);
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
index 75fb1add..200690db 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
@@ -3,29 +3,28 @@ using System.Globalization;
 using System.Windows.Data;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Tools.Converter
-{
-    public class DoubleMinConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is double doubleValue)
-            {
-                if (parameter is string str)
-                {
-                    var minValue = str.Value<double>();
-                    return doubleValue < minValue ? minValue : doubleValue;
-                }
+namespace HandyControl.Tools.Converter;
 
-                return doubleValue < .0 ? .0 : doubleValue;
+public class DoubleMinConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is double doubleValue)
+        {
+            if (parameter is string str)
+            {
+                var minValue = str.Value<double>();
+                return doubleValue < minValue ? minValue : doubleValue;
             }
 
-            return .0;
+            return doubleValue < .0 ? .0 : doubleValue;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return .0;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
index bb71ee23..53c97cfb 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
@@ -2,37 +2,36 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Int2StringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                if (int.TryParse(value.ToString(), out var intValue))
-                {
-                    if (parameter is string str)
-                    {
-                        var arr = str.Split(';');
-                        if (arr.Length > intValue)
-                        {
-                            return arr[intValue];
-                        }
+namespace HandyControl.Tools.Converter;
 
-                        return intValue;
+public class Int2StringConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value != null)
+        {
+            if (int.TryParse(value.ToString(), out var intValue))
+            {
+                if (parameter is string str)
+                {
+                    var arr = str.Split(';');
+                    if (arr.Length > intValue)
+                    {
+                        return arr[intValue];
                     }
 
                     return intValue;
                 }
+
+                return intValue;
             }
-
-            return value;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return value;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
index f8fb3cf5..f28c6a6b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
@@ -2,51 +2,50 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Long2FileSizeConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null) return Properties.Langs.Lang.UnknownSize;
-            if (value is long intValue)
-            {
-                if (intValue < 0)
-                {
-                    return Properties.Langs.Lang.UnknownSize;
-                }
-                if (intValue < 1024)
-                {
-                    return $"{intValue} B";
-                }
-                if (intValue < 1048576)
-                {
-                    return $"{intValue / 1024.0:0.00} KB";
-                }
-                if (intValue < 1073741824)
-                {
-                    return $"{intValue / 1048576.0:0.00} MB";
-                }
-                if (intValue < 1099511627776)
-                {
-                    return $"{intValue / 1073741824.0:0.00} GB";
-                }
-                if (intValue < 1125899906842624)
-                {
-                    return $"{intValue / 1099511627776.0:0.00} TB";
-                }
-                if (intValue < 1152921504606847000)
-                {
-                    return $"{intValue / 1125899906842624.0:0.00} PB";
-                }
-                return Properties.Langs.Lang.TooLarge;
-            }
-            return Properties.Langs.Lang.Unknown;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+public class Long2FileSizeConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value == null) return Properties.Langs.Lang.UnknownSize;
+        if (value is long intValue)
         {
-            throw new NotSupportedException();
+            if (intValue < 0)
+            {
+                return Properties.Langs.Lang.UnknownSize;
+            }
+            if (intValue < 1024)
+            {
+                return $"{intValue} B";
+            }
+            if (intValue < 1048576)
+            {
+                return $"{intValue / 1024.0:0.00} KB";
+            }
+            if (intValue < 1073741824)
+            {
+                return $"{intValue / 1048576.0:0.00} MB";
+            }
+            if (intValue < 1099511627776)
+            {
+                return $"{intValue / 1073741824.0:0.00} GB";
+            }
+            if (intValue < 1125899906842624)
+            {
+                return $"{intValue / 1099511627776.0:0.00} TB";
+            }
+            if (intValue < 1152921504606847000)
+            {
+                return $"{intValue / 1125899906842624.0:0.00} PB";
+            }
+            return Properties.Langs.Lang.TooLarge;
         }
+        return Properties.Langs.Lang.Unknown;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
index 785e618e..3eae416a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
@@ -4,33 +4,32 @@ using System.Windows.Data;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class Number2PercentageConverter : IMultiValueConverter
 {
-    public class Number2PercentageConverter : IMultiValueConverter
+    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values == null || values.Length != 2) return .0;
+        if (values == null || values.Length != 2) return .0;
 
-            var obj1 = values[0];
-            var obj2 = values[1];
+        var obj1 = values[0];
+        var obj2 = values[1];
 
-            if (obj1 == null || obj2 == null) return .0;
+        if (obj1 == null || obj2 == null) return .0;
 
-            var str1 = values[0].ToString();
-            var str2 = values[1].ToString();
+        var str1 = values[0].ToString();
+        var str2 = values[1].ToString();
 
-            var v1 = str1.Value<double>();
-            var v2 = str2.Value<double>();
+        var v1 = str1.Value<double>();
+        var v2 = str2.Value<double>();
 
-            if (MathHelper.IsVerySmall(v2)) return 100.0;
+        if (MathHelper.IsVerySmall(v2)) return 100.0;
 
-            return v1 / v2 * 100;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return v1 / v2 * 100;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
index d160d5f1..4a5dc520 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
@@ -2,15 +2,14 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Object2BooleanConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => !(value is null);
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class Object2BooleanConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => !(value is null);
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
index 7db10f32..641fec1d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
@@ -2,15 +2,14 @@
 using System.Globalization;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Object2StringConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => value?.ToString();
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class Object2StringConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture) => value?.ToString();
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
index 3a753049..5e37b618 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
@@ -3,18 +3,17 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Object2VisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value == null ? Visibility.Collapsed : Visibility.Visible;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class Object2VisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value == null ? Visibility.Collapsed : Visibility.Visible;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
index b1d5f3a2..2ed99ba4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
@@ -3,18 +3,17 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class Object2VisibilityReConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value == null ? Visibility.Visible : Visibility.Collapsed;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+public class Object2VisibilityReConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value == null ? Visibility.Visible : Visibility.Collapsed;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
index 5e2e818d..22910714 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
@@ -3,29 +3,28 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class RectangleCircularConverter : 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)
-            {
-                if (width < double.Epsilon || height < double.Epsilon)
-                {
-                    return .0;
-                }
+namespace HandyControl.Tools.Converter;
 
-                var min = Math.Min(width, height);
-                return min / 2;
+public class RectangleCircularConverter : 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)
+        {
+            if (width < double.Epsilon || height < double.Epsilon)
+            {
+                return .0;
             }
 
-            return DependencyProperty.UnsetValue;
+            var min = Math.Min(width, height);
+            return min / 2;
         }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
-        }
+        return DependencyProperty.UnsetValue;
     }
-}
+
+    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
index 6a8fba25..c6991e1c 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
@@ -3,18 +3,17 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class String2VisibilityConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return string.IsNullOrEmpty((string) value) ? Visibility.Collapsed : Visibility.Visible;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && (Visibility) value == Visibility.Collapsed;
-        }
+public class String2VisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return string.IsNullOrEmpty((string) value) ? Visibility.Collapsed : Visibility.Visible;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value != null && (Visibility) value == Visibility.Collapsed;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
index 42fb8816..5d829835 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
@@ -3,18 +3,17 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
-{
-    public class String2VisibilityReConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return string.IsNullOrEmpty((string) value) ? Visibility.Visible : Visibility.Collapsed;
-        }
+namespace HandyControl.Tools.Converter;
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value != null && (Visibility) value == Visibility.Collapsed;
-        }
+public class String2VisibilityReConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return string.IsNullOrEmpty((string) value) ? Visibility.Visible : Visibility.Collapsed;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        return value != null && (Visibility) value == Visibility.Collapsed;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
index a1dbc5c0..00399d92 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
@@ -3,32 +3,31 @@ using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class ThicknessSplitConverter : IValueConverter
 {
-    public class ThicknessSplitConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        if (value is Thickness thickness)
         {
-            if (value is Thickness thickness)
+            if (parameter is string str)
             {
-                if (parameter is string str)
-                {
-                    var arr = str.Split(',');
-                    if (arr.Length != 4) return thickness;
+                var arr = str.Split(',');
+                if (arr.Length != 4) return thickness;
 
-                    return new Thickness(
-                        arr[0].Equals("1") ? thickness.Left : 0,
-                        arr[1].Equals("1") ? thickness.Top : 0,
-                        arr[2].Equals("1") ? thickness.Right : 0,
-                        arr[3].Equals("1") ? thickness.Bottom : 0);
-                }
+                return new Thickness(
+                    arr[0].Equals("1") ? thickness.Left : 0,
+                    arr[1].Equals("1") ? thickness.Top : 0,
+                    arr[2].Equals("1") ? thickness.Right : 0,
+                    arr[3].Equals("1") ? thickness.Bottom : 0);
             }
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotSupportedException();
         }
+        return value;
     }
-}
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
index cc379701..fe65cda5 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
@@ -4,25 +4,24 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Converter
+namespace HandyControl.Tools.Converter;
+
+public class TreeViewItemMarginConverter : IValueConverter
 {
-    public class TreeViewItemMarginConverter : IValueConverter
+    public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        var left = 0.0;
+        UIElement element = value as TreeViewItem;
+        while (element != null && element.GetType() != typeof(TreeView))
         {
-            var left = 0.0;
-            UIElement element = value as TreeViewItem;
-            while (element != null && element.GetType() != typeof(TreeView))
-            {
-                element = (UIElement) VisualTreeHelper.GetParent(element);
-                if (element is TreeViewItem)
-                    left += 19.0;
-            }
-            return new Thickness(left, 0, 0, 0);
-        }
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotSupportedException();
+            element = (UIElement) VisualTreeHelper.GetParent(element);
+            if (element is TreeViewItem)
+                left += 19.0;
         }
+        return new Thickness(left, 0, 0, 0);
     }
-}
+    public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+    {
+        throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
index 08bc0915..28985b55 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
@@ -6,122 +6,121 @@ using System.Windows.Markup;
 using HandyControl.Data;
 using HandyControl.Tools.Converter;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+[TypeConverter(typeof(ColLayoutConverter))]
+public class ColLayout : MarkupExtension
 {
-    [TypeConverter(typeof(ColLayoutConverter))]
-    public class ColLayout : MarkupExtension
+    public static readonly int ColMaxCellCount = 24;
+
+    public static readonly int HalfColMaxCellCount = 12;
+
+    public static readonly int XsMaxWidth = 768;
+
+    public static readonly int SmMaxWidth = 992;
+
+    public static readonly int MdMaxWidth = 1200;
+
+    public static readonly int LgMaxWidth = 1920;
+
+    public static readonly int XlMaxWidth = 2560;
+
+    public int Xs { get; set; } = 24;
+
+    public int Sm { get; set; } = 12;
+
+    public int Md { get; set; } = 8;
+
+    public int Lg { get; set; } = 6;
+
+    public int Xl { get; set; } = 4;
+
+    public int Xxl { get; set; } = 2;
+
+    public ColLayout()
     {
-        public static readonly int ColMaxCellCount = 24;
 
-        public static readonly int HalfColMaxCellCount = 12;
-
-        public static readonly int XsMaxWidth = 768;
-
-        public static readonly int SmMaxWidth = 992;
-
-        public static readonly int MdMaxWidth = 1200;
-
-        public static readonly int LgMaxWidth = 1920;
-
-        public static readonly int XlMaxWidth = 2560;
-
-        public int Xs { get; set; } = 24;
-
-        public int Sm { get; set; } = 12;
-
-        public int Md { get; set; } = 8;
-
-        public int Lg { get; set; } = 6;
-
-        public int Xl { get; set; } = 4;
-
-        public int Xxl { get; set; } = 2;
-
-        public ColLayout()
-        {
-
-        }
-
-        public ColLayout(int uniformWidth)
-        {
-            Xs = uniformWidth;
-            Sm = uniformWidth;
-            Md = uniformWidth;
-            Lg = uniformWidth;
-            Xl = uniformWidth;
-            Xxl = uniformWidth;
-        }
-
-        public ColLayout(int xs, int sm, int md, int lg, int xl, int xxl)
-        {
-            Xs = xs;
-            Sm = sm;
-            Md = md;
-            Lg = lg;
-            Xl = xl;
-            Xxl = xxl;
-        }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            return new ColLayout
-            {
-                Xs = Xs,
-                Sm = Sm,
-                Md = Md,
-                Lg = Lg,
-                Xl = Xl,
-                Xxl = Xxl
-            };
-        }
-
-        public static ColLayoutStatus GetLayoutStatus(double width)
-        {
-            if (width < MdMaxWidth)
-            {
-                if (width < SmMaxWidth)
-                {
-                    if (width < XsMaxWidth)
-                    {
-                        return ColLayoutStatus.Xs;
-                    }
-                    return ColLayoutStatus.Sm;
-                }
-                return ColLayoutStatus.Md;
-            }
-            if (width < XlMaxWidth)
-            {
-                if (width < LgMaxWidth)
-                {
-                    return ColLayoutStatus.Lg;
-                }
-                return ColLayoutStatus.Xl;
-            }
-            return ColLayoutStatus.Xxl;
-        }
-
-        public override string ToString()
-        {
-            var cultureInfo = CultureInfo.CurrentCulture;
-            var listSeparator = TokenizerHelper.GetNumericListSeparator(cultureInfo);
-
-            // Initial capacity [128] is an estimate based on a sum of:
-            // 72 = 6x double (twelve digits is generous for the range of values likely)
-            //  4 = 4x separator characters
-            var sb = new StringBuilder(128);
-
-            sb.Append(Xs.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(Sm.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(Md.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(Lg.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(Xl.ToString(cultureInfo));
-            sb.Append(listSeparator);
-            sb.Append(Xxl.ToString(cultureInfo));
-            return sb.ToString();
-        }
     }
-}
+
+    public ColLayout(int uniformWidth)
+    {
+        Xs = uniformWidth;
+        Sm = uniformWidth;
+        Md = uniformWidth;
+        Lg = uniformWidth;
+        Xl = uniformWidth;
+        Xxl = uniformWidth;
+    }
+
+    public ColLayout(int xs, int sm, int md, int lg, int xl, int xxl)
+    {
+        Xs = xs;
+        Sm = sm;
+        Md = md;
+        Lg = lg;
+        Xl = xl;
+        Xxl = xxl;
+    }
+
+    public override object ProvideValue(IServiceProvider serviceProvider)
+    {
+        return new ColLayout
+        {
+            Xs = Xs,
+            Sm = Sm,
+            Md = Md,
+            Lg = Lg,
+            Xl = Xl,
+            Xxl = Xxl
+        };
+    }
+
+    public static ColLayoutStatus GetLayoutStatus(double width)
+    {
+        if (width < MdMaxWidth)
+        {
+            if (width < SmMaxWidth)
+            {
+                if (width < XsMaxWidth)
+                {
+                    return ColLayoutStatus.Xs;
+                }
+                return ColLayoutStatus.Sm;
+            }
+            return ColLayoutStatus.Md;
+        }
+        if (width < XlMaxWidth)
+        {
+            if (width < LgMaxWidth)
+            {
+                return ColLayoutStatus.Lg;
+            }
+            return ColLayoutStatus.Xl;
+        }
+        return ColLayoutStatus.Xxl;
+    }
+
+    public override string ToString()
+    {
+        var cultureInfo = CultureInfo.CurrentCulture;
+        var listSeparator = TokenizerHelper.GetNumericListSeparator(cultureInfo);
+
+        // Initial capacity [128] is an estimate based on a sum of:
+        // 72 = 6x double (twelve digits is generous for the range of values likely)
+        //  4 = 4x separator characters
+        var sb = new StringBuilder(128);
+
+        sb.Append(Xs.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(Sm.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(Md.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(Lg.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(Xl.ToString(cultureInfo));
+        sb.Append(listSeparator);
+        sb.Append(Xxl.ToString(cultureInfo));
+        return sb.ToString();
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
index 95ac893f..09ceca5c 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
@@ -2,32 +2,31 @@
 using System.Windows.Media;
 
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+/// <summary>
+///     颜色扩展类
+/// </summary>
+public static class ColorExtension
 {
     /// <summary>
-    ///     颜色扩展类
+    ///     将颜色转换为10进制表示（rgb顺序颠倒）
     /// </summary>
-    public static class ColorExtension
+    /// <param name="color"></param>
+    /// <returns></returns>
+    public static int ToInt32(this Color color) => color.R << 16 | color.G << 8 | color.B;
+
+    /// <summary>
+    ///     将颜色转换为10进制表示（rgb顺序颠倒）
+    /// </summary>
+    /// <param name="color"></param>
+    /// <returns></returns>
+    public static int ToInt32Reverse(this Color color) => color.R | color.G << 8 | color.B << 18;
+
+    internal static List<byte> ToList(this Color color) => new()
     {
-        /// <summary>
-        ///     将颜色转换为10进制表示（rgb顺序颠倒）
-        /// </summary>
-        /// <param name="color"></param>
-        /// <returns></returns>
-        public static int ToInt32(this Color color) => color.R << 16 | color.G << 8 | color.B;
-
-        /// <summary>
-        ///     将颜色转换为10进制表示（rgb顺序颠倒）
-        /// </summary>
-        /// <param name="color"></param>
-        /// <returns></returns>
-        public static int ToInt32Reverse(this Color color) => color.R | color.G << 8 | color.B << 18;
-
-        internal static List<byte> ToList(this Color color) => new()
-        {
-            color.R,
-            color.G,
-            color.B
-        };
-    }
-}
+        color.R,
+        color.G,
+        color.B
+    };
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
index 779d25bf..d8d0a947 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
@@ -1,18 +1,17 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public static class DependencyObjectExtension
 {
-    public static class DependencyObjectExtension
+    public static DependencyObject GetVisualOrLogicalParent(this DependencyObject sourceElement)
     {
-        public static DependencyObject GetVisualOrLogicalParent(this DependencyObject sourceElement)
+        return sourceElement switch
         {
-            return sourceElement switch
-            {
-                null => null,
-                Visual _ => (VisualTreeHelper.GetParent(sourceElement) ?? LogicalTreeHelper.GetParent(sourceElement)),
-                _ => LogicalTreeHelper.GetParent(sourceElement)
-            };
-        }
+            null => null,
+            Visual _ => (VisualTreeHelper.GetParent(sourceElement) ?? LogicalTreeHelper.GetParent(sourceElement)),
+            _ => LogicalTreeHelper.GetParent(sourceElement)
+        };
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
index aae15918..08aaf8d9 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
@@ -3,76 +3,75 @@ using System.Threading.Tasks;
 using System.Windows;
 using HandyControl.Controls;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public interface IDialogResultable<T>
 {
-    public interface IDialogResultable<T>
-    {
-        T Result { get; set; }
+    T Result { get; set; }
 
-        Action CloseAction { get; set; }
-    }
+    Action CloseAction { get; set; }
+}
 
-    public static class DialogExtension
+public static class DialogExtension
+{
+    public static Task<TResult> GetResultAsync<TResult>(this Dialog dialog)
     {
-        public static Task<TResult> GetResultAsync<TResult>(this Dialog dialog)
+        var tcs = new TaskCompletionSource<TResult>();
+
+        try
         {
-            var tcs = new TaskCompletionSource<TResult>();
+            if (dialog.IsClosed)
+            {
+                SetResult();
+            }
+            else
+            {
+                dialog.Unloaded += OnUnloaded;
+                dialog.GetViewModel<IDialogResultable<TResult>>().CloseAction = dialog.Close;
+            }
+        }
+        catch (Exception e)
+        {
+            tcs.TrySetException(e);
+        }
 
+        return tcs.Task;
+
+        // ReSharper disable once ImplicitlyCapturedClosure
+        void OnUnloaded(object sender, RoutedEventArgs args)
+        {
+            dialog.Unloaded -= OnUnloaded;
+            SetResult();
+        }
+
+        void SetResult()
+        {
             try
             {
-                if (dialog.IsClosed)
-                {
-                    SetResult();
-                }
-                else
-                {
-                    dialog.Unloaded += OnUnloaded;
-                    dialog.GetViewModel<IDialogResultable<TResult>>().CloseAction = dialog.Close;
-                }
+                tcs.TrySetResult(dialog.GetViewModel<IDialogResultable<TResult>>().Result);
             }
             catch (Exception e)
             {
                 tcs.TrySetException(e);
             }
-
-            return tcs.Task;
-
-            // ReSharper disable once ImplicitlyCapturedClosure
-            void OnUnloaded(object sender, RoutedEventArgs args)
-            {
-                dialog.Unloaded -= OnUnloaded;
-                SetResult();
-            }
-
-            void SetResult()
-            {
-                try
-                {
-                    tcs.TrySetResult(dialog.GetViewModel<IDialogResultable<TResult>>().Result);
-                }
-                catch (Exception e)
-                {
-                    tcs.TrySetException(e);
-                }
-            }
-        }
-
-        public static Dialog Initialize<TViewModel>(this Dialog dialog, Action<TViewModel> configure)
-        {
-            configure?.Invoke(dialog.GetViewModel<TViewModel>());
-
-            return dialog;
-        }
-
-        public static TViewModel GetViewModel<TViewModel>(this Dialog dialog)
-        {
-            if (!(dialog.Content is FrameworkElement frameworkElement))
-                throw new InvalidOperationException("The dialog is not a derived class of the FrameworkElement. ");
-
-            if (!(frameworkElement.DataContext is TViewModel viewModel))
-                throw new InvalidOperationException($"The view model of the dialog is not the {typeof(TViewModel)} type or its derived class. ");
-
-            return viewModel;
         }
     }
-}
+
+    public static Dialog Initialize<TViewModel>(this Dialog dialog, Action<TViewModel> configure)
+    {
+        configure?.Invoke(dialog.GetViewModel<TViewModel>());
+
+        return dialog;
+    }
+
+    public static TViewModel GetViewModel<TViewModel>(this Dialog dialog)
+    {
+        if (!(dialog.Content is FrameworkElement frameworkElement))
+            throw new InvalidOperationException("The dialog is not a derived class of the FrameworkElement. ");
+
+        if (!(frameworkElement.DataContext is TViewModel viewModel))
+            throw new InvalidOperationException($"The view model of the dialog is not the {typeof(TViewModel)} type or its derived class. ");
+
+        return viewModel;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
index 631001ad..0f34b603 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
@@ -2,30 +2,29 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public static class EnumerableExtension
 {
-    public static class EnumerableExtension
+    public static IEnumerable<TSource> Do<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
     {
-        public static IEnumerable<TSource> Do<TSource>(this IEnumerable<TSource> source, Action<TSource> predicate)
+        var enumerable = source as IList<TSource> ?? source.ToList();
+        foreach (var item in enumerable)
         {
-            var enumerable = source as IList<TSource> ?? source.ToList();
-            foreach (var item in enumerable)
-            {
-                predicate.Invoke(item);
-            }
-
-            return enumerable;
+            predicate.Invoke(item);
         }
 
-        public static IEnumerable<TSource> DoWithIndex<TSource>(this IEnumerable<TSource> source, Action<TSource, int> predicate)
-        {
-            var enumerable = source as IList<TSource> ?? source.ToList();
-            for (var i = 0; i < enumerable.Count; i++)
-            {
-                predicate.Invoke(enumerable[i], i);
-            }
-
-            return enumerable;
-        }
+        return enumerable;
     }
-}
+
+    public static IEnumerable<TSource> DoWithIndex<TSource>(this IEnumerable<TSource> source, Action<TSource, int> predicate)
+    {
+        var enumerable = source as IList<TSource> ?? source.ToList();
+        for (var i = 0; i < enumerable.Count; i++)
+        {
+            predicate.Invoke(enumerable[i], i);
+        }
+
+        return enumerable;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
index 28b26358..3a032c87 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
@@ -1,58 +1,57 @@
 using System.Windows;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public static class FrameworkElementExtension
 {
-    public static class FrameworkElementExtension
+
+    public static double GetValidWidth(this FrameworkElement element)
     {
-
-        public static double GetValidWidth(this FrameworkElement element)
+        if (!double.IsNaN(element.Width))
         {
-            if (!double.IsNaN(element.Width))
+            if (element.Width > 0)
             {
-                if (element.Width > 0)
-                {
-                    return element.Width;
-                }
+                return element.Width;
             }
-            else
+        }
+        else
+        {
+            if (element.ActualWidth > 0)
             {
-                if (element.ActualWidth > 0)
-                {
-                    return element.ActualWidth;
-                }
-
-                if (element.DesiredSize.Width > 0)
-                {
-                    return element.DesiredSize.Width;
-                }
+                return element.ActualWidth;
             }
 
-            return 0;
+            if (element.DesiredSize.Width > 0)
+            {
+                return element.DesiredSize.Width;
+            }
         }
 
-        public static double GetValidHeight(this FrameworkElement element)
-        {
-            if (!double.IsNaN(element.Height))
-            {
-                if (element.Height > 0)
-                {
-                    return element.Height;
-                }
-            }
-            else
-            {
-                if (element.ActualHeight > 0)
-                {
-                    return element.ActualHeight;
-                }
-
-                if (element.DesiredSize.Height > 0)
-                {
-                    return element.DesiredSize.Height;
-                }
-            }
-
-            return 0;
-        }
+        return 0;
     }
-}
+
+    public static double GetValidHeight(this FrameworkElement element)
+    {
+        if (!double.IsNaN(element.Height))
+        {
+            if (element.Height > 0)
+            {
+                return element.Height;
+            }
+        }
+        else
+        {
+            if (element.ActualHeight > 0)
+            {
+                return element.ActualHeight;
+            }
+
+            if (element.DesiredSize.Height > 0)
+            {
+                return element.DesiredSize.Height;
+            }
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
index f7b4ad68..a0c44fcd 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
@@ -3,48 +3,47 @@ using System.Windows;
 using System.Windows.Media;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public static class GeometryExtension
 {
-    public static class GeometryExtension
+    /// <summary>
+    ///     获取路径总长度
+    /// </summary>
+    /// <param name="geometry"></param>
+    /// <returns></returns>
+    public static double GetTotalLength(this Geometry geometry)
     {
-        /// <summary>
-        ///     获取路径总长度
-        /// </summary>
-        /// <param name="geometry"></param>
-        /// <returns></returns>
-        public static double GetTotalLength(this Geometry geometry)
-        {
-            if (geometry == null) return 0;
+        if (geometry == null) return 0;
 
-            var pathGeometry = PathGeometry.CreateFromGeometry(geometry);
-            pathGeometry.GetPointAtFractionLength(1e-4, out var point, out _);
-            var length = (pathGeometry.Figures[0].StartPoint - point).Length * 1e+4;
+        var pathGeometry = PathGeometry.CreateFromGeometry(geometry);
+        pathGeometry.GetPointAtFractionLength(1e-4, out var point, out _);
+        var length = (pathGeometry.Figures[0].StartPoint - point).Length * 1e+4;
 
-            return length;
-        }
-
-        /// <summary>
-        ///     获取路径总长度
-        /// </summary>
-        /// <param name="geometry"></param>
-        /// <param name="size"></param>
-        /// <param name="strokeThickness"></param>
-        /// <returns></returns>
-        public static double GetTotalLength(this Geometry geometry, Size size, double strokeThickness = 1)
-        {
-            if (geometry == null) return 0;
-
-            if (MathHelper.IsVerySmall(size.Width) || MathHelper.IsVerySmall(size.Height)) return 0;
-
-            var length = GetTotalLength(geometry);
-            var sw = geometry.Bounds.Width / size.Width;
-            var sh = geometry.Bounds.Height / size.Height;
-            var min = Math.Min(sw, sh);
-
-            if (MathHelper.IsVerySmall(min) || MathHelper.IsVerySmall(strokeThickness)) return 0;
-
-            length /= min;
-            return length / strokeThickness;
-        }
+        return length;
     }
-}
+
+    /// <summary>
+    ///     获取路径总长度
+    /// </summary>
+    /// <param name="geometry"></param>
+    /// <param name="size"></param>
+    /// <param name="strokeThickness"></param>
+    /// <returns></returns>
+    public static double GetTotalLength(this Geometry geometry, Size size, double strokeThickness = 1)
+    {
+        if (geometry == null) return 0;
+
+        if (MathHelper.IsVerySmall(size.Width) || MathHelper.IsVerySmall(size.Height)) return 0;
+
+        var length = GetTotalLength(geometry);
+        var sw = geometry.Bounds.Width / size.Width;
+        var sh = geometry.Bounds.Height / size.Height;
+        var min = Math.Min(sw, sh);
+
+        if (MathHelper.IsVerySmall(min) || MathHelper.IsVerySmall(strokeThickness)) return 0;
+
+        length /= min;
+        return length / strokeThickness;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
index 6cbca4b4..f60df3fd 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
@@ -4,148 +4,147 @@ using System.Windows.Data;
 using System.Windows.Markup;
 using HandyControl.Properties.Langs;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public class LangExtension : MarkupExtension
 {
-    public class LangExtension : MarkupExtension
+    private readonly DependencyObject _proxy;
+
+    public LangExtension()
     {
-        private readonly DependencyObject _proxy;
-
-        public LangExtension()
-        {
-            _proxy = new DependencyObject();
-            Source = LangProvider.Instance;
-        }
-
-        public LangExtension(string key) : this()
-        {
-            Key = key;
-        }
-
-        public static readonly DependencyProperty KeyProperty = DependencyProperty.RegisterAttached(
-            "Key", typeof(object), typeof(LangExtension), new PropertyMetadata(default));
-
-        public object Key
-        {
-            get => _proxy.GetValue(KeyProperty);
-            set => _proxy.SetValue(KeyProperty, value);
-        }
-
-        private static readonly DependencyProperty TargetPropertyProperty = DependencyProperty.RegisterAttached(
-            "TargetProperty", typeof(DependencyProperty), typeof(LangExtension), new PropertyMetadata(default(DependencyProperty)));
-
-        private static void SetTargetProperty(DependencyObject element, DependencyProperty value)
-            => element.SetValue(TargetPropertyProperty, value);
-
-        private static DependencyProperty GetTargetProperty(DependencyObject element)
-            => (DependencyProperty) element.GetValue(TargetPropertyProperty);
-
-        public BindingMode Mode { get; set; }
-
-        public IValueConverter Converter { get; set; }
-
-        public object ConverterParameter { get; set; }
-
-        public object Source { get; set; }
-
-        public override object ProvideValue(IServiceProvider serviceProvider)
-        {
-            if (!(serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget provideValueTarget)) return this;
-            if (provideValueTarget.TargetObject.GetType().FullName == "System.Windows.SharedDp") return this;
-            if (!(provideValueTarget.TargetObject is DependencyObject targetObject)) return this;
-            if (!(provideValueTarget.TargetProperty is DependencyProperty targetProperty)) return this;
-
-            switch (Key)
-            {
-                case string key:
-                    {
-                        var binding = CreateLangBinding(key);
-                        BindingOperations.SetBinding(targetObject, targetProperty, binding);
-                        return binding.ProvideValue(serviceProvider);
-                    }
-                case Binding keyBinding when targetObject is FrameworkElement element:
-                    {
-                        if (element.DataContext != null)
-                        {
-                            var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                            return binding.ProvideValue(serviceProvider);
-                        }
-
-                        SetTargetProperty(element, targetProperty);
-                        element.DataContextChanged += LangExtension_DataContextChanged;
-
-                        break;
-                    }
-                case Binding keyBinding when targetObject is FrameworkContentElement element:
-                    {
-                        if (element.DataContext != null)
-                        {
-                            var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                            return binding.ProvideValue(serviceProvider);
-                        }
-
-                        SetTargetProperty(element, targetProperty);
-                        element.DataContextChanged += LangExtension_DataContextChanged;
-
-                        break;
-                    }
-            }
-
-            return string.Empty;
-        }
-
-        private void LangExtension_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            switch (sender)
-            {
-                case FrameworkElement element:
-                    {
-                        element.DataContextChanged -= LangExtension_DataContextChanged;
-                        if (!(Key is Binding keyBinding)) return;
-
-                        var targetProperty = GetTargetProperty(element);
-                        SetTargetProperty(element, null);
-                        SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                        break;
-                    }
-                case FrameworkContentElement element:
-                    {
-                        element.DataContextChanged -= LangExtension_DataContextChanged;
-                        if (!(Key is Binding keyBinding)) return;
-
-                        var targetProperty = GetTargetProperty(element);
-                        SetTargetProperty(element, null);
-                        SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                        break;
-                    }
-            }
-        }
-
-        private BindingBase SetLangBinding(DependencyObject targetObject, DependencyProperty targetProperty, PropertyPath path, object dataContext)
-        {
-            if (targetProperty == null) return null;
-
-            BindingOperations.SetBinding(targetObject, targetProperty, new Binding
-            {
-                Path = path,
-                Source = dataContext,
-                Mode = BindingMode.OneWay
-            });
-
-            var key = targetObject.GetValue(targetProperty) as string;
-            if (string.IsNullOrEmpty(key)) return null;
-
-            var binding = CreateLangBinding(key);
-            BindingOperations.SetBinding(targetObject, targetProperty, binding);
-            return binding;
-        }
-
-        private BindingBase CreateLangBinding(string key) => new Binding(key)
-        {
-            Converter = Converter,
-            ConverterParameter = ConverterParameter,
-            UpdateSourceTrigger = UpdateSourceTrigger.Explicit,
-            Source = Source,
-            Mode = BindingMode.OneWay
-        };
+        _proxy = new DependencyObject();
+        Source = LangProvider.Instance;
     }
-}
+
+    public LangExtension(string key) : this()
+    {
+        Key = key;
+    }
+
+    public static readonly DependencyProperty KeyProperty = DependencyProperty.RegisterAttached(
+        "Key", typeof(object), typeof(LangExtension), new PropertyMetadata(default));
+
+    public object Key
+    {
+        get => _proxy.GetValue(KeyProperty);
+        set => _proxy.SetValue(KeyProperty, value);
+    }
+
+    private static readonly DependencyProperty TargetPropertyProperty = DependencyProperty.RegisterAttached(
+        "TargetProperty", typeof(DependencyProperty), typeof(LangExtension), new PropertyMetadata(default(DependencyProperty)));
+
+    private static void SetTargetProperty(DependencyObject element, DependencyProperty value)
+        => element.SetValue(TargetPropertyProperty, value);
+
+    private static DependencyProperty GetTargetProperty(DependencyObject element)
+        => (DependencyProperty) element.GetValue(TargetPropertyProperty);
+
+    public BindingMode Mode { get; set; }
+
+    public IValueConverter Converter { get; set; }
+
+    public object ConverterParameter { get; set; }
+
+    public object Source { get; set; }
+
+    public override object ProvideValue(IServiceProvider serviceProvider)
+    {
+        if (!(serviceProvider.GetService(typeof(IProvideValueTarget)) is IProvideValueTarget provideValueTarget)) return this;
+        if (provideValueTarget.TargetObject.GetType().FullName == "System.Windows.SharedDp") return this;
+        if (!(provideValueTarget.TargetObject is DependencyObject targetObject)) return this;
+        if (!(provideValueTarget.TargetProperty is DependencyProperty targetProperty)) return this;
+
+        switch (Key)
+        {
+            case string key:
+            {
+                var binding = CreateLangBinding(key);
+                BindingOperations.SetBinding(targetObject, targetProperty, binding);
+                return binding.ProvideValue(serviceProvider);
+            }
+            case Binding keyBinding when targetObject is FrameworkElement element:
+            {
+                if (element.DataContext != null)
+                {
+                    var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                    return binding.ProvideValue(serviceProvider);
+                }
+
+                SetTargetProperty(element, targetProperty);
+                element.DataContextChanged += LangExtension_DataContextChanged;
+
+                break;
+            }
+            case Binding keyBinding when targetObject is FrameworkContentElement element:
+            {
+                if (element.DataContext != null)
+                {
+                    var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                    return binding.ProvideValue(serviceProvider);
+                }
+
+                SetTargetProperty(element, targetProperty);
+                element.DataContextChanged += LangExtension_DataContextChanged;
+
+                break;
+            }
+        }
+
+        return string.Empty;
+    }
+
+    private void LangExtension_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        switch (sender)
+        {
+            case FrameworkElement element:
+            {
+                element.DataContextChanged -= LangExtension_DataContextChanged;
+                if (!(Key is Binding keyBinding)) return;
+
+                var targetProperty = GetTargetProperty(element);
+                SetTargetProperty(element, null);
+                SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                break;
+            }
+            case FrameworkContentElement element:
+            {
+                element.DataContextChanged -= LangExtension_DataContextChanged;
+                if (!(Key is Binding keyBinding)) return;
+
+                var targetProperty = GetTargetProperty(element);
+                SetTargetProperty(element, null);
+                SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                break;
+            }
+        }
+    }
+
+    private BindingBase SetLangBinding(DependencyObject targetObject, DependencyProperty targetProperty, PropertyPath path, object dataContext)
+    {
+        if (targetProperty == null) return null;
+
+        BindingOperations.SetBinding(targetObject, targetProperty, new Binding
+        {
+            Path = path,
+            Source = dataContext,
+            Mode = BindingMode.OneWay
+        });
+
+        var key = targetObject.GetValue(targetProperty) as string;
+        if (string.IsNullOrEmpty(key)) return null;
+
+        var binding = CreateLangBinding(key);
+        BindingOperations.SetBinding(targetObject, targetProperty, binding);
+        return binding;
+    }
+
+    private BindingBase CreateLangBinding(string key) => new Binding(key)
+    {
+        Converter = Converter,
+        ConverterParameter = ConverterParameter,
+        UpdateSourceTrigger = UpdateSourceTrigger.Explicit,
+        Source = Source,
+        Mode = BindingMode.OneWay
+    };
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
index 9ecf53bf..84e24f1e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
@@ -1,32 +1,31 @@
 using System;
 using System.ComponentModel;
 
-namespace HandyControl.Tools.Extension
-{
-    public static class StringExtension
-    {
-        public static T Value<T>(this string input)
-        {
-            try
-            {
-                return (T) TypeDescriptor.GetConverter(typeof(T)).ConvertFromString(input);
-            }
-            catch
-            {
-                return default;
-            }
-        }
+namespace HandyControl.Tools.Extension;
 
-        public static object Value(this string input, Type type)
+public static class StringExtension
+{
+    public static T Value<T>(this string input)
+    {
+        try
         {
-            try
-            {
-                return TypeDescriptor.GetConverter(type).ConvertFromString(input);
-            }
-            catch
-            {
-                return null;
-            }
+            return (T) TypeDescriptor.GetConverter(typeof(T)).ConvertFromString(input);
+        }
+        catch
+        {
+            return default;
         }
     }
-}
+
+    public static object Value(this string input, Type type)
+    {
+        try
+        {
+            return TypeDescriptor.GetConverter(type).ConvertFromString(input);
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
index 2784b127..891b46f2 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
@@ -1,33 +1,32 @@
 using System.Windows;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+// ReSharper disable once InconsistentNaming
+public static class UIElementExtension
 {
-    // ReSharper disable once InconsistentNaming
-    public static class UIElementExtension
-    {
-        /// <summary>
-        ///     显示元素
-        /// </summary>
-        /// <param name="element"></param>
-        public static void Show(this UIElement element) => element.Visibility = Visibility.Visible;
+    /// <summary>
+    ///     显示元素
+    /// </summary>
+    /// <param name="element"></param>
+    public static void Show(this UIElement element) => element.Visibility = Visibility.Visible;
 
-        /// <summary>
-        ///     显示元素
-        /// </summary>
-        /// <param name="element"></param>
-        /// <param name="show"></param>
-        public static void Show(this UIElement element, bool show) => element.Visibility = show ? Visibility.Visible : Visibility.Collapsed;
+    /// <summary>
+    ///     显示元素
+    /// </summary>
+    /// <param name="element"></param>
+    /// <param name="show"></param>
+    public static void Show(this UIElement element, bool show) => element.Visibility = show ? Visibility.Visible : Visibility.Collapsed;
 
-        /// <summary>
-        ///     不现实元素，但保留空间
-        /// </summary>
-        /// <param name="element"></param>
-        public static void Hide(this UIElement element) => element.Visibility = Visibility.Hidden;
+    /// <summary>
+    ///     不现实元素，但保留空间
+    /// </summary>
+    /// <param name="element"></param>
+    public static void Hide(this UIElement element) => element.Visibility = Visibility.Hidden;
 
-        /// <summary>
-        ///     不显示元素，且不保留空间
-        /// </summary>
-        /// <param name="element"></param>
-        public static void Collapse(this UIElement element) => element.Visibility = Visibility.Collapsed;
-    }
-}
+    /// <summary>
+    ///     不显示元素，且不保留空间
+    /// </summary>
+    /// <param name="element"></param>
+    public static void Collapse(this UIElement element) => element.Visibility = Visibility.Collapsed;
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
index 7d5ae5f1..f5d63390 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
@@ -1,23 +1,22 @@
 using System.Windows;
 using HandyControl.Expression.Drawing;
 
-namespace HandyControl.Tools.Extension
+namespace HandyControl.Tools.Extension;
+
+public static class ValueExtension
 {
-    public static class ValueExtension
-    {
-        public static Thickness Add(this Thickness a, Thickness b) => new(a.Left + b.Left, a.Top + b.Top, a.Right + b.Right, a.Bottom + b.Bottom);
+    public static Thickness Add(this Thickness a, Thickness b) => new(a.Left + b.Left, a.Top + b.Top, a.Right + b.Right, a.Bottom + b.Bottom);
 
-        public static bool IsZero(this Thickness thickness) =>
-            MathHelper.IsZero(thickness.Left)
-            && MathHelper.IsZero(thickness.Top)
-            && MathHelper.IsZero(thickness.Right)
-            && MathHelper.IsZero(thickness.Bottom);
+    public static bool IsZero(this Thickness thickness) =>
+        MathHelper.IsZero(thickness.Left)
+        && MathHelper.IsZero(thickness.Top)
+        && MathHelper.IsZero(thickness.Right)
+        && MathHelper.IsZero(thickness.Bottom);
 
-        public static bool IsUniform(this Thickness thickness) =>
-            MathHelper.AreClose(thickness.Left, thickness.Top)
-            && MathHelper.AreClose(thickness.Left, thickness.Right)
-            && MathHelper.AreClose(thickness.Left, thickness.Bottom);
+    public static bool IsUniform(this Thickness thickness) =>
+        MathHelper.AreClose(thickness.Left, thickness.Top)
+        && MathHelper.AreClose(thickness.Left, thickness.Right)
+        && MathHelper.AreClose(thickness.Left, thickness.Bottom);
 
-        public static bool IsNaN(this double value) => double.IsNaN(value);
-    }
-}
+    public static bool IsNaN(this double value) => double.IsNaN(value);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
index e02a258b..83461450 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
@@ -3,33 +3,32 @@ using System.Collections.Generic;
 using HandyControl.Collections;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class ComparerGenerator
 {
-    public class ComparerGenerator
+    private static readonly Dictionary<Type, ComparerTypeCode> TypeCodeDic = new()
     {
-        private static readonly Dictionary<Type, ComparerTypeCode> TypeCodeDic = new()
-        {
-            [typeof(DateTimeRange)] = ComparerTypeCode.DateTimeRange,
-        };
+        [typeof(DateTimeRange)] = ComparerTypeCode.DateTimeRange,
+    };
 
-        public static IComparer<T> GetComparer<T>()
+    public static IComparer<T> GetComparer<T>()
+    {
+        if (TypeCodeDic.TryGetValue(typeof(T), out var comparerType))
         {
-            if (TypeCodeDic.TryGetValue(typeof(T), out var comparerType))
+            if (comparerType == ComparerTypeCode.DateTimeRange)
             {
-                if (comparerType == ComparerTypeCode.DateTimeRange)
-                {
-                    return (IComparer<T>) new DateTimeRangeComparer();
-                }
-
-                return null;
+                return (IComparer<T>) new DateTimeRangeComparer();
             }
 
             return null;
         }
 
-        private enum ComparerTypeCode
-        {
-            DateTimeRange
-        }
+        return null;
     }
-}
+
+    private enum ComparerTypeCode
+    {
+        DateTimeRange
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs b/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
index 361ce4c0..fc7b067f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
@@ -1,15 +1,14 @@
 using System.Collections.Generic;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class DateTimeRangeComparer : IComparer<DateTimeRange>
 {
-    public class DateTimeRangeComparer : IComparer<DateTimeRange>
+    public int Compare(DateTimeRange x, DateTimeRange y)
     {
-        public int Compare(DateTimeRange x, DateTimeRange y)
-        {
-            if (x.Start > y.Start && x.End > y.End) return 1;
-            if (x.Start < y.Start && x.End < y.End) return -1;
-            return 0;
-        }
+        if (x.Start > y.Start && x.End > y.End) return 1;
+        if (x.Start < y.Start && x.End < y.End) return -1;
+        return 0;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
index d647c3f7..d8502f17 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
@@ -7,114 +7,113 @@ using System.Windows.Media;
 using System.Windows.Shapes;
 using HandyControl.Controls;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class GithubGravatarGenerator : IGravatarGenerator
 {
-    public class GithubGravatarGenerator : IGravatarGenerator
+    private const int RenderDataMaxLength = 15;
+
+    public object GetGravatar(string id)
     {
-        private const int RenderDataMaxLength = 15;
+        var hashcode = GetHashCode(id);
+        var renderData = GetRenderData(hashcode);
+        var renderBrush = GetRenderBrush(hashcode);
+        var geometryGroup = new GeometryGroup();
 
-        public object GetGravatar(string id)
+        void AddRec(int i, int j, bool hidden = false)
         {
-            var hashcode = GetHashCode(id);
-            var renderData = GetRenderData(hashcode);
-            var renderBrush = GetRenderBrush(hashcode);
-            var geometryGroup = new GeometryGroup();
-
-            void AddRec(int i, int j, bool hidden = false)
-            {
-                var rec = new RectangleGeometry(new Rect(new Point(i, j), hidden ? new Size() : new Size(1, 1)));
-                geometryGroup.Children.Add(rec);
-            }
-
-            var index = 0;
-            for (var i = 0; i < 2; i++)
-            {
-                for (var j = 0; j < 5; j++, index++)
-                {
-                    AddRec(i, j, renderData[index] == 0);
-                }
-            }
+            var rec = new RectangleGeometry(new Rect(new Point(i, j), hidden ? new Size() : new Size(1, 1)));
+            geometryGroup.Children.Add(rec);
+        }
 
+        var index = 0;
+        for (var i = 0; i < 2; i++)
+        {
             for (var j = 0; j < 5; j++, index++)
             {
-                AddRec(2, j, renderData[index] == 0);
+                AddRec(i, j, renderData[index] == 0);
             }
+        }
 
+        for (var j = 0; j < 5; j++, index++)
+        {
+            AddRec(2, j, renderData[index] == 0);
+        }
+
+        index -= 10;
+        for (var i = 3; i < 5; i++)
+        {
+            for (var j = 0; j < 5; j++, index++)
+            {
+                AddRec(i, j, renderData[index] == 0);
+            }
             index -= 10;
-            for (var i = 3; i < 5; i++)
-            {
-                for (var j = 0; j < 5; j++, index++)
-                {
-                    AddRec(i, j, renderData[index] == 0);
-                }
-                index -= 10;
-            }
-
-            var path = new Path
-            {
-                Data = geometryGroup,
-                Fill = renderBrush,
-                VerticalAlignment = VerticalAlignment.Top,
-                Stretch = Stretch.Uniform
-            };
-
-            RenderOptions.SetEdgeMode(path, EdgeMode.Aliased);
-
-            return path;
         }
 
-        private string GetHashCode(string id)
+        var path = new Path
         {
-            var md5 = MD5.Create();
-            var bytes = Encoding.ASCII.GetBytes(id);
-            var hash = md5.ComputeHash(bytes);
-            var stringBuilder = new StringBuilder();
-            foreach (var item in hash)
-            {
-                stringBuilder.Append(item.ToString("X2"));
-            }
-            return stringBuilder.ToString();
-        }
+            Data = geometryGroup,
+            Fill = renderBrush,
+            VerticalAlignment = VerticalAlignment.Top,
+            Stretch = Stretch.Uniform
+        };
 
-        private int[] GetRenderData(string hashcode)
-        {
-            var arr = new int[RenderDataMaxLength];
-            for (var i = 0; i < RenderDataMaxLength; i++)
-            {
-                var c = hashcode[i];
-                var v = (int) c;
-                arr[i] = v % 2;
-            }
+        RenderOptions.SetEdgeMode(path, EdgeMode.Aliased);
 
-            return arr;
-        }
-
-        private Brush GetRenderBrush(string hashcode)
-        {
-            var v = (double) int.Parse(hashcode.Substring(hashcode.Length - 7), NumberStyles.HexNumber);
-            var scale = v / 0xfffffff;
-            var color = Hsl2Rgb(scale);
-            return new SolidColorBrush(color);
-        }
-
-        //adapted from https://github.com/stewartlord/identicon.js/blob/4fad7cafec1b7a4d896015e084e861625ef5d64f/identicon.js#L110
-        private Color Hsl2Rgb(double h, double s = 0.7, double b = 0.5)
-        {
-            h *= 6;
-            var arr = new[]
-            {
-                b += s *= b < .5 ? b : 1 - b,
-                b - h % 1 * s * 2,
-                b -= s *= 2,
-                b,
-                b + h % 1 * s,
-                b + s
-            };
-
-            var hValue = (int) Math.Floor(h);
-
-            return Color.FromRgb((byte) (arr[hValue % 6] * 255), (byte) (arr[(hValue | 16) % 6] * 255),
-                (byte) (arr[(hValue | 8) % 6] * 255));
-        }
+        return path;
     }
-}
+
+    private string GetHashCode(string id)
+    {
+        var md5 = MD5.Create();
+        var bytes = Encoding.ASCII.GetBytes(id);
+        var hash = md5.ComputeHash(bytes);
+        var stringBuilder = new StringBuilder();
+        foreach (var item in hash)
+        {
+            stringBuilder.Append(item.ToString("X2"));
+        }
+        return stringBuilder.ToString();
+    }
+
+    private int[] GetRenderData(string hashcode)
+    {
+        var arr = new int[RenderDataMaxLength];
+        for (var i = 0; i < RenderDataMaxLength; i++)
+        {
+            var c = hashcode[i];
+            var v = (int) c;
+            arr[i] = v % 2;
+        }
+
+        return arr;
+    }
+
+    private Brush GetRenderBrush(string hashcode)
+    {
+        var v = (double) int.Parse(hashcode.Substring(hashcode.Length - 7), NumberStyles.HexNumber);
+        var scale = v / 0xfffffff;
+        var color = Hsl2Rgb(scale);
+        return new SolidColorBrush(color);
+    }
+
+    //adapted from https://github.com/stewartlord/identicon.js/blob/4fad7cafec1b7a4d896015e084e861625ef5d64f/identicon.js#L110
+    private Color Hsl2Rgb(double h, double s = 0.7, double b = 0.5)
+    {
+        h *= 6;
+        var arr = new[]
+        {
+            b += s *= b < .5 ? b : 1 - b,
+            b - h % 1 * s * 2,
+            b -= s *= 2,
+            b,
+            b + h % 1 * s,
+            b + s
+        };
+
+        var hValue = (int) Math.Floor(h);
+
+        return Color.FromRgb((byte) (arr[hValue % 6] * 255), (byte) (arr[(hValue | 16) % 6] * 255),
+            (byte) (arr[(hValue | 8) % 6] * 255));
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
index 1ad76fa2..894caaae 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
@@ -3,115 +3,114 @@ using System.Windows;
 using System.Windows.Media;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class HatchBrushGenerator
 {
-    public class HatchBrushGenerator
+    private static readonly byte[][] HatchBrushes =
     {
-        private static readonly byte[][] HatchBrushes =
+        new byte[] {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00}, // Horizontal
+        new byte[] {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, // Vertical
+        new byte[] {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, // ForwardDiagonal
+        new byte[] {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, // BackwardDiagonal
+        new byte[] {0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08}, // Cross
+        new byte[] {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81}, // DiagonalCross
+        new byte[] {0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80}, // Percent05
+        new byte[] {0x00, 0x02, 0x00, 0x88, 0x00, 0x20, 0x00, 0x88}, // Percent10
+        new byte[] {0x00, 0x22, 0x00, 0xcc, 0x00, 0x22, 0x00, 0xcc}, // Percent20
+        new byte[] {0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc}, // Percent25
+        new byte[] {0x00, 0xcc, 0x04, 0xcc, 0x00, 0xcc, 0x40, 0xcc}, // Percent30
+        new byte[] {0x44, 0xcc, 0x22, 0xcc, 0x44, 0xcc, 0x22, 0xcc}, // Percent40
+        new byte[] {0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc}, // Percent50
+        new byte[] {0x55, 0xcd, 0x55, 0xee, 0x55, 0xdc, 0x55, 0xee}, // Percent60
+        new byte[] {0x55, 0xdd, 0x55, 0xff, 0x55, 0xdd, 0x55, 0xff}, // Percent70
+        new byte[] {0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff}, // Percent75
+        new byte[] {0x55, 0xff, 0x59, 0xff, 0x55, 0xff, 0x99, 0xff}, // Percent80
+        new byte[] {0x77, 0xff, 0xdd, 0xff, 0x77, 0xff, 0xfd, 0xff}, // Percent90
+        new byte[] {0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88}, // LightDownwardDiagonal
+        new byte[] {0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11}, // LightUpwardDiagonal
+        new byte[] {0x99, 0x33, 0x66, 0xcc, 0x99, 0x33, 0x66, 0xcc}, // DarkDownwardDiagonal
+        new byte[] {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}, // DarkUpwardDiagonal
+        new byte[] {0xc1, 0x83, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0}, // WideDownwardDiagonal
+        new byte[] {0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x83, 0xc1}, // WideUpwardDiagonal
+        new byte[] {0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88}, // LightVertical
+        new byte[] {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff}, // LightHorizontal
+        new byte[] {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, // NarrowVertical
+        new byte[] {0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff}, // NarrowHorizontal
+        new byte[] {0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc}, // DarkVertical
+        new byte[] {0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff}, // DarkHorizontal
+        new byte[] {0x11, 0x22, 0x44, 0x88, 0x00, 0x00, 0x00, 0x00}, // DashedDownwardDiagonal
+        new byte[] {0x88, 0x44, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00}, // DashedUpwardDiagonal
+        new byte[] {0x0f, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00}, // DashedHorizontal
+        new byte[] {0x01, 0x01, 0x01, 0x01, 0x10, 0x10, 0x10, 0x10}, // DashedVertical
+        new byte[] {0x01, 0x08, 0x80, 0x10, 0x02, 0x40, 0x04, 0x20}, // SmallConfetti
+        new byte[] {0x03, 0x63, 0x6c, 0x0c, 0xc0, 0xc6, 0x36, 0x30}, // LargeConfetti
+        new byte[] {0x03, 0x84, 0x48, 0x30, 0x03, 0x84, 0x48, 0x30}, // ZigZag
+        new byte[] {0x30, 0x49, 0x06, 0x00, 0x30, 0x49, 0x06, 0x00}, // Wave
+        new byte[] {0x81, 0x42, 0x24, 0x18, 0x08, 0x04, 0x02, 0x01}, // DiagonalBrick
+        new byte[] {0xff, 0x01, 0x01, 0x01, 0xff, 0x10, 0x10, 0x10}, // HorizontalBrick
+        new byte[] {0x11, 0x82, 0x44, 0xa8, 0x11, 0xa2, 0x44, 0x2a}, // Weave
+        new byte[] {0x55, 0xaa, 0x55, 0xaa, 0x0f, 0x0f, 0x0f, 0x0f}, // Plaid
+        new byte[] {0x02, 0x01, 0x02, 0x00, 0x10, 0x20, 0x10, 0x00}, // Divot
+        new byte[] {0x55, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00}, // DottedGrid
+        new byte[] {0x11, 0x00, 0x04, 0x00, 0x11, 0x00, 0x40, 0x00}, // DottedDiamond
+        new byte[] {0x03, 0x0c, 0x10, 0x20, 0x20, 0x30, 0x48, 0x84}, // Shingle
+        new byte[] {0xff, 0x33, 0xff, 0xcc, 0xff, 0x33, 0xff, 0xcc}, // Trellis
+        new byte[] {0xee, 0x19, 0x1f, 0x1f, 0xee, 0x91, 0xf1, 0xf1}, // Sphere
+        new byte[] {0xff, 0x11, 0x11, 0x11, 0xff, 0x11, 0x11, 0x11}, // SmallGrid
+        new byte[] {0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc}, // SmallCheckerBoard
+        new byte[] {0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0}, // LargeCheckerBoard
+        new byte[] {0x01, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82}, // OutlinedDiamond
+        new byte[] {0x08, 0x1c, 0x3e, 0x7f, 0x3e, 0x1c, 0x08, 0x00} // SolidDiamond
+    };
+
+    public Brush GetHatchBrush(HatchStyle hatchStyle, Color foreColor, Color backColor)
+    {
+        var hatchData = GetHatchData(hatchStyle);
+
+        var foreGeometryGroup = new GeometryGroup();
+
+        for (var y = 0; y < 8; y++)
         {
-            new byte[] {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00}, // Horizontal
-            new byte[] {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, // Vertical
-            new byte[] {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, // ForwardDiagonal
-            new byte[] {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, // BackwardDiagonal
-            new byte[] {0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08}, // Cross
-            new byte[] {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81}, // DiagonalCross
-            new byte[] {0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80}, // Percent05
-            new byte[] {0x00, 0x02, 0x00, 0x88, 0x00, 0x20, 0x00, 0x88}, // Percent10
-            new byte[] {0x00, 0x22, 0x00, 0xcc, 0x00, 0x22, 0x00, 0xcc}, // Percent20
-            new byte[] {0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc}, // Percent25
-            new byte[] {0x00, 0xcc, 0x04, 0xcc, 0x00, 0xcc, 0x40, 0xcc}, // Percent30
-            new byte[] {0x44, 0xcc, 0x22, 0xcc, 0x44, 0xcc, 0x22, 0xcc}, // Percent40
-            new byte[] {0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc}, // Percent50
-            new byte[] {0x55, 0xcd, 0x55, 0xee, 0x55, 0xdc, 0x55, 0xee}, // Percent60
-            new byte[] {0x55, 0xdd, 0x55, 0xff, 0x55, 0xdd, 0x55, 0xff}, // Percent70
-            new byte[] {0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff}, // Percent75
-            new byte[] {0x55, 0xff, 0x59, 0xff, 0x55, 0xff, 0x99, 0xff}, // Percent80
-            new byte[] {0x77, 0xff, 0xdd, 0xff, 0x77, 0xff, 0xfd, 0xff}, // Percent90
-            new byte[] {0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88}, // LightDownwardDiagonal
-            new byte[] {0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11}, // LightUpwardDiagonal
-            new byte[] {0x99, 0x33, 0x66, 0xcc, 0x99, 0x33, 0x66, 0xcc}, // DarkDownwardDiagonal
-            new byte[] {0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99}, // DarkUpwardDiagonal
-            new byte[] {0xc1, 0x83, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0}, // WideDownwardDiagonal
-            new byte[] {0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x83, 0xc1}, // WideUpwardDiagonal
-            new byte[] {0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88}, // LightVertical
-            new byte[] {0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff}, // LightHorizontal
-            new byte[] {0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}, // NarrowVertical
-            new byte[] {0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff}, // NarrowHorizontal
-            new byte[] {0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc}, // DarkVertical
-            new byte[] {0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff}, // DarkHorizontal
-            new byte[] {0x11, 0x22, 0x44, 0x88, 0x00, 0x00, 0x00, 0x00}, // DashedDownwardDiagonal
-            new byte[] {0x88, 0x44, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00}, // DashedUpwardDiagonal
-            new byte[] {0x0f, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00}, // DashedHorizontal
-            new byte[] {0x01, 0x01, 0x01, 0x01, 0x10, 0x10, 0x10, 0x10}, // DashedVertical
-            new byte[] {0x01, 0x08, 0x80, 0x10, 0x02, 0x40, 0x04, 0x20}, // SmallConfetti
-            new byte[] {0x03, 0x63, 0x6c, 0x0c, 0xc0, 0xc6, 0x36, 0x30}, // LargeConfetti
-            new byte[] {0x03, 0x84, 0x48, 0x30, 0x03, 0x84, 0x48, 0x30}, // ZigZag
-            new byte[] {0x30, 0x49, 0x06, 0x00, 0x30, 0x49, 0x06, 0x00}, // Wave
-            new byte[] {0x81, 0x42, 0x24, 0x18, 0x08, 0x04, 0x02, 0x01}, // DiagonalBrick
-            new byte[] {0xff, 0x01, 0x01, 0x01, 0xff, 0x10, 0x10, 0x10}, // HorizontalBrick
-            new byte[] {0x11, 0x82, 0x44, 0xa8, 0x11, 0xa2, 0x44, 0x2a}, // Weave
-            new byte[] {0x55, 0xaa, 0x55, 0xaa, 0x0f, 0x0f, 0x0f, 0x0f}, // Plaid
-            new byte[] {0x02, 0x01, 0x02, 0x00, 0x10, 0x20, 0x10, 0x00}, // Divot
-            new byte[] {0x55, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00}, // DottedGrid
-            new byte[] {0x11, 0x00, 0x04, 0x00, 0x11, 0x00, 0x40, 0x00}, // DottedDiamond
-            new byte[] {0x03, 0x0c, 0x10, 0x20, 0x20, 0x30, 0x48, 0x84}, // Shingle
-            new byte[] {0xff, 0x33, 0xff, 0xcc, 0xff, 0x33, 0xff, 0xcc}, // Trellis
-            new byte[] {0xee, 0x19, 0x1f, 0x1f, 0xee, 0x91, 0xf1, 0xf1}, // Sphere
-            new byte[] {0xff, 0x11, 0x11, 0x11, 0xff, 0x11, 0x11, 0x11}, // SmallGrid
-            new byte[] {0x33, 0x33, 0xcc, 0xcc, 0x33, 0x33, 0xcc, 0xcc}, // SmallCheckerBoard
-            new byte[] {0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0}, // LargeCheckerBoard
-            new byte[] {0x01, 0x82, 0x44, 0x28, 0x10, 0x28, 0x44, 0x82}, // OutlinedDiamond
-            new byte[] {0x08, 0x1c, 0x3e, 0x7f, 0x3e, 0x1c, 0x08, 0x00} // SolidDiamond
-        };
-
-        public Brush GetHatchBrush(HatchStyle hatchStyle, Color foreColor, Color backColor)
-        {
-            var hatchData = GetHatchData(hatchStyle);
-
-            var foreGeometryGroup = new GeometryGroup();
-
-            for (var y = 0; y < 8; y++)
+            for (var x = 0; x < 8; x++)
             {
-                for (var x = 0; x < 8; x++)
+                if ((hatchData[y] & (0x80 >> x)) > 0)
                 {
-                    if ((hatchData[y] & (0x80 >> x)) > 0)
+                    foreGeometryGroup.Children.Add(new RectangleGeometry(new Rect(x, y, 1, 1)));
+                }
+            }
+        }
+
+        var drawingBrush = new DrawingBrush
+        {
+            Viewport = new Rect(0, 0, 8, 8),
+            ViewportUnits = BrushMappingMode.Absolute,
+            Stretch = Stretch.None,
+            TileMode = TileMode.Tile,
+            Drawing = new DrawingGroup
+            {
+                Children =
+                {
+                    new GeometryDrawing
                     {
-                        foreGeometryGroup.Children.Add(new RectangleGeometry(new Rect(x, y, 1, 1)));
+                        Brush = new SolidColorBrush(backColor),
+                        Geometry = new RectangleGeometry(new Rect(0, 0, 8, 8))
+                    },
+                    new GeometryDrawing
+                    {
+                        Brush = new SolidColorBrush(foreColor),
+                        Geometry = foreGeometryGroup
                     }
                 }
             }
+        };
+        RenderOptions.SetCachingHint(drawingBrush, CachingHint.Cache);
 
-            var drawingBrush = new DrawingBrush
-            {
-                Viewport = new Rect(0, 0, 8, 8),
-                ViewportUnits = BrushMappingMode.Absolute,
-                Stretch = Stretch.None,
-                TileMode = TileMode.Tile,
-                Drawing = new DrawingGroup
-                {
-                    Children =
-                    {
-                        new GeometryDrawing
-                        {
-                            Brush = new SolidColorBrush(backColor),
-                            Geometry = new RectangleGeometry(new Rect(0, 0, 8, 8))
-                        },
-                        new GeometryDrawing
-                        {
-                            Brush = new SolidColorBrush(foreColor),
-                            Geometry = foreGeometryGroup
-                        }
-                    }
-                }
-            };
-            RenderOptions.SetCachingHint(drawingBrush, CachingHint.Cache);
-
-            return drawingBrush;
-        }
-
-        private byte[] GetHatchData(HatchStyle hatchStyle) =>
-            hatchStyle < HatchStyle.Horizontal || hatchStyle > HatchStyle.SolidDiamond
-                ? throw new ArgumentOutOfRangeException(nameof(hatchStyle))
-                : HatchBrushes[(int) hatchStyle];
+        return drawingBrush;
     }
-}
+
+    private byte[] GetHatchData(HatchStyle hatchStyle) =>
+        hatchStyle < HatchStyle.Horizontal || hatchStyle > HatchStyle.SolidDiamond
+            ? throw new ArgumentOutOfRangeException(nameof(hatchStyle))
+            : HatchBrushes[(int) hatchStyle];
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs b/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
index 97c1ce5a..b2c5b678 100644
--- a/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GifImageAnimator.cs
@@ -6,270 +6,269 @@ using System.Threading;
 using HandyControl.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+internal class ImageAnimator
 {
-    internal class ImageAnimator
+    private static List<GifImageInfo> ImageInfoList;
+
+    private static readonly ReaderWriterLock RwImgListLock = new();
+
+    private static Thread AnimationThread;
+
+    private static bool AnyFrameDirty;
+
+    [ThreadStatic]
+    private static int ThreadWriterLockWaitCount;
+
+    public static bool CanAnimate(GifImage image)
     {
-        private static List<GifImageInfo> ImageInfoList;
-
-        private static readonly ReaderWriterLock RwImgListLock = new();
-
-        private static Thread AnimationThread;
-
-        private static bool AnyFrameDirty;
-
-        [ThreadStatic]
-        private static int ThreadWriterLockWaitCount;
-
-        public static bool CanAnimate(GifImage image)
+        if (image == null)
         {
-            if (image == null)
-            {
-                return false;
-            }
-
-            lock (image)
-            {
-                var dimensions = image.FrameDimensionsList;
-
-                if (dimensions.Select(guid => new GifFrameDimension(guid)).Contains(GifFrameDimension.Time))
-                {
-                    return image.GetFrameCount(GifFrameDimension.Time) > 1;
-                }
-            }
-
             return false;
         }
 
-        public static void Animate(GifImage image, EventHandler onFrameChangedHandler)
+        lock (image)
         {
-            if (image == null)
+            var dimensions = image.FrameDimensionsList;
+
+            if (dimensions.Select(guid => new GifFrameDimension(guid)).Contains(GifFrameDimension.Time))
             {
-                return;
-            }
-
-            GifImageInfo imageInfo;
-
-            // See comment in the class header about locking the image ref.
-            lock (image)
-            {
-                // could we avoid creating an ImageInfo object if FrameCount == 1 ?
-                imageInfo = new GifImageInfo(image);
-            }
-
-            // If the image is already animating, stop animating it
-            StopAnimate(image, onFrameChangedHandler);
-
-            // Acquire a writer lock to modify the image info list.  If the thread has a reader lock we need to upgrade
-            // it to a writer lock; acquiring a reader lock in this case would block the thread on itself.  
-            // If the thread already has a writer lock its ref count will be incremented w/o placing the request in the 
-            // writer queue.  See ReaderWriterLock.AcquireWriterLock method in the MSDN.
-
-            var readerLockHeld = RwImgListLock.IsReaderLockHeld;
-            var lockDowngradeCookie = new LockCookie();
-
-            ThreadWriterLockWaitCount++;
-
-            try
-            {
-                if (readerLockHeld)
-                {
-                    lockDowngradeCookie = RwImgListLock.UpgradeToWriterLock(Timeout.Infinite);
-                }
-                else
-                {
-                    RwImgListLock.AcquireWriterLock(Timeout.Infinite);
-                }
-            }
-            finally
-            {
-                ThreadWriterLockWaitCount--;
-            }
-
-            try
-            {
-                if (imageInfo.Animated)
-                {
-                    // Construct the image array
-                    //                               
-                    ImageInfoList ??= new List<GifImageInfo>();
-
-                    // Add the new image
-                    //
-                    imageInfo.FrameChangedHandler = onFrameChangedHandler;
-                    ImageInfoList.Add(imageInfo);
-
-                    // Construct a new timer thread if we haven't already
-                    //
-                    if (AnimationThread == null)
-                    {
-                        AnimationThread = new Thread(AnimateImages50Ms)
-                        {
-                            Name = nameof(ImageAnimator),
-                            IsBackground = true
-                        };
-                        AnimationThread.Start();
-                    }
-                }
-            }
-            finally
-            {
-                if (readerLockHeld)
-                {
-                    RwImgListLock.DowngradeFromWriterLock(ref lockDowngradeCookie);
-                }
-                else
-                {
-                    RwImgListLock.ReleaseWriterLock();
-                }
+                return image.GetFrameCount(GifFrameDimension.Time) > 1;
             }
         }
 
-        public static void StopAnimate(GifImage image, EventHandler onFrameChangedHandler)
+        return false;
+    }
+
+    public static void Animate(GifImage image, EventHandler onFrameChangedHandler)
+    {
+        if (image == null)
         {
-            // Make sure we have a list of images                       
-            if (image == null || ImageInfoList == null)
+            return;
+        }
+
+        GifImageInfo imageInfo;
+
+        // See comment in the class header about locking the image ref.
+        lock (image)
+        {
+            // could we avoid creating an ImageInfo object if FrameCount == 1 ?
+            imageInfo = new GifImageInfo(image);
+        }
+
+        // If the image is already animating, stop animating it
+        StopAnimate(image, onFrameChangedHandler);
+
+        // Acquire a writer lock to modify the image info list.  If the thread has a reader lock we need to upgrade
+        // it to a writer lock; acquiring a reader lock in this case would block the thread on itself.  
+        // If the thread already has a writer lock its ref count will be incremented w/o placing the request in the 
+        // writer queue.  See ReaderWriterLock.AcquireWriterLock method in the MSDN.
+
+        var readerLockHeld = RwImgListLock.IsReaderLockHeld;
+        var lockDowngradeCookie = new LockCookie();
+
+        ThreadWriterLockWaitCount++;
+
+        try
+        {
+            if (readerLockHeld)
             {
-                return;
+                lockDowngradeCookie = RwImgListLock.UpgradeToWriterLock(Timeout.Infinite);
             }
-
-            // Acquire a writer lock to modify the image info list - See comments on Animate() about this locking.
-
-            var readerLockHeld = RwImgListLock.IsReaderLockHeld;
-            var lockDowngradeCookie = new LockCookie();
-
-            ThreadWriterLockWaitCount++;
-
-            try
+            else
             {
-                if (readerLockHeld)
-                {
-                    lockDowngradeCookie = RwImgListLock.UpgradeToWriterLock(Timeout.Infinite);
-                }
-                else
-                {
-                    RwImgListLock.AcquireWriterLock(Timeout.Infinite);
-                }
-            }
-            finally
-            {
-                ThreadWriterLockWaitCount--;
+                RwImgListLock.AcquireWriterLock(Timeout.Infinite);
             }
+        }
+        finally
+        {
+            ThreadWriterLockWaitCount--;
+        }
 
-            try
+        try
+        {
+            if (imageInfo.Animated)
             {
-                // Find the corresponding reference and remove it
-                for (var i = 0; i < ImageInfoList.Count; i++)
+                // Construct the image array
+                //                               
+                ImageInfoList ??= new List<GifImageInfo>();
+
+                // Add the new image
+                //
+                imageInfo.FrameChangedHandler = onFrameChangedHandler;
+                ImageInfoList.Add(imageInfo);
+
+                // Construct a new timer thread if we haven't already
+                //
+                if (AnimationThread == null)
                 {
-                    var imageInfo = ImageInfoList[i];
-
-                    if (Equals(image, imageInfo.Image))
+                    AnimationThread = new Thread(AnimateImages50Ms)
                     {
-                        if (onFrameChangedHandler == imageInfo.FrameChangedHandler || onFrameChangedHandler != null && onFrameChangedHandler.Equals(imageInfo.FrameChangedHandler))
-                        {
-                            ImageInfoList.Remove(imageInfo);
-                        }
-                        break;
-                    }
-                }
-
-                if (!ImageInfoList.Any())
-                {
-                    AnimationThread?.Join();
-                    AnimationThread = null;
-                }
-            }
-            finally
-            {
-                if (readerLockHeld)
-                {
-                    RwImgListLock.DowngradeFromWriterLock(ref lockDowngradeCookie);
-                }
-                else
-                {
-                    RwImgListLock.ReleaseWriterLock();
+                        Name = nameof(ImageAnimator),
+                        IsBackground = true
+                    };
+                    AnimationThread.Start();
                 }
             }
         }
-
-        public static void UpdateFrames()
+        finally
         {
-            if (!AnyFrameDirty || ImageInfoList == null)
+            if (readerLockHeld)
             {
-                return;
+                RwImgListLock.DowngradeFromWriterLock(ref lockDowngradeCookie);
             }
-            if (ThreadWriterLockWaitCount > 0)
+            else
             {
-                // Cannot acquire reader lock at this time, frames update will be missed.
-                return;
+                RwImgListLock.ReleaseWriterLock();
+            }
+        }
+    }
+
+    public static void StopAnimate(GifImage image, EventHandler onFrameChangedHandler)
+    {
+        // Make sure we have a list of images                       
+        if (image == null || ImageInfoList == null)
+        {
+            return;
+        }
+
+        // Acquire a writer lock to modify the image info list - See comments on Animate() about this locking.
+
+        var readerLockHeld = RwImgListLock.IsReaderLockHeld;
+        var lockDowngradeCookie = new LockCookie();
+
+        ThreadWriterLockWaitCount++;
+
+        try
+        {
+            if (readerLockHeld)
+            {
+                lockDowngradeCookie = RwImgListLock.UpgradeToWriterLock(Timeout.Infinite);
+            }
+            else
+            {
+                RwImgListLock.AcquireWriterLock(Timeout.Infinite);
+            }
+        }
+        finally
+        {
+            ThreadWriterLockWaitCount--;
+        }
+
+        try
+        {
+            // Find the corresponding reference and remove it
+            for (var i = 0; i < ImageInfoList.Count; i++)
+            {
+                var imageInfo = ImageInfoList[i];
+
+                if (Equals(image, imageInfo.Image))
+                {
+                    if (onFrameChangedHandler == imageInfo.FrameChangedHandler || onFrameChangedHandler != null && onFrameChangedHandler.Equals(imageInfo.FrameChangedHandler))
+                    {
+                        ImageInfoList.Remove(imageInfo);
+                    }
+                    break;
+                }
             }
 
+            if (!ImageInfoList.Any())
+            {
+                AnimationThread?.Join();
+                AnimationThread = null;
+            }
+        }
+        finally
+        {
+            if (readerLockHeld)
+            {
+                RwImgListLock.DowngradeFromWriterLock(ref lockDowngradeCookie);
+            }
+            else
+            {
+                RwImgListLock.ReleaseWriterLock();
+            }
+        }
+    }
+
+    public static void UpdateFrames()
+    {
+        if (!AnyFrameDirty || ImageInfoList == null)
+        {
+            return;
+        }
+        if (ThreadWriterLockWaitCount > 0)
+        {
+            // Cannot acquire reader lock at this time, frames update will be missed.
+            return;
+        }
+
+        RwImgListLock.AcquireReaderLock(Timeout.Infinite);
+
+        try
+        {
+            foreach (var imageInfo in ImageInfoList)
+            {
+                // See comment in the class header about locking the image ref.
+                lock (imageInfo.Image)
+                {
+                    imageInfo.UpdateFrame();
+                }
+            }
+            AnyFrameDirty = false;
+        }
+        finally
+        {
+            RwImgListLock.ReleaseReaderLock();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
+    private static void AnimateImages50Ms()
+    {
+        while (ImageInfoList.Any())
+        {
+            // Acquire reader-lock to access imageInfoList, elemens in the list can be modified w/o needing a writer-lock.
+            // Observe that we don't need to check if the thread is waiting or a writer lock here since the thread this 
+            // method runs in never acquires a writer lock.
             RwImgListLock.AcquireReaderLock(Timeout.Infinite);
-
             try
             {
                 foreach (var imageInfo in ImageInfoList)
                 {
-                    // See comment in the class header about locking the image ref.
-                    lock (imageInfo.Image)
+                    // Frame delay is measured in 1/100ths of a second. This thread
+                    // sleeps for 50 ms = 5/100ths of a second between frame updates,
+                    // so we increase the frame delay count 5/100ths of a second
+                    // at a time.
+                    //
+                    imageInfo.FrameTimer += 5;
+                    if (imageInfo.FrameTimer >= imageInfo.FrameDelay(imageInfo.Frame))
                     {
-                        imageInfo.UpdateFrame();
+                        imageInfo.FrameTimer = 0;
+
+                        if (imageInfo.Frame + 1 < imageInfo.FrameCount)
+                        {
+                            imageInfo.Frame++;
+                        }
+                        else
+                        {
+                            imageInfo.Frame = 0;
+                        }
+
+                        if (imageInfo.FrameDirty)
+                        {
+                            AnyFrameDirty = true;
+                        }
                     }
                 }
-                AnyFrameDirty = false;
             }
             finally
             {
                 RwImgListLock.ReleaseReaderLock();
             }
-        }
 
-        [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
-        private static void AnimateImages50Ms()
-        {
-            while (ImageInfoList.Any())
-            {
-                // Acquire reader-lock to access imageInfoList, elemens in the list can be modified w/o needing a writer-lock.
-                // Observe that we don't need to check if the thread is waiting or a writer lock here since the thread this 
-                // method runs in never acquires a writer lock.
-                RwImgListLock.AcquireReaderLock(Timeout.Infinite);
-                try
-                {
-                    foreach (var imageInfo in ImageInfoList)
-                    {
-                        // Frame delay is measured in 1/100ths of a second. This thread
-                        // sleeps for 50 ms = 5/100ths of a second between frame updates,
-                        // so we increase the frame delay count 5/100ths of a second
-                        // at a time.
-                        //
-                        imageInfo.FrameTimer += 5;
-                        if (imageInfo.FrameTimer >= imageInfo.FrameDelay(imageInfo.Frame))
-                        {
-                            imageInfo.FrameTimer = 0;
-
-                            if (imageInfo.Frame + 1 < imageInfo.FrameCount)
-                            {
-                                imageInfo.Frame++;
-                            }
-                            else
-                            {
-                                imageInfo.Frame = 0;
-                            }
-
-                            if (imageInfo.FrameDirty)
-                            {
-                                AnyFrameDirty = true;
-                            }
-                        }
-                    }
-                }
-                finally
-                {
-                    RwImgListLock.ReleaseReaderLock();
-                }
-
-                Thread.Sleep(50);
-            }
+            Thread.Sleep(50);
         }
     }
 }
diff --git a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
index 1fbc6071..d83161c6 100644
--- a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
@@ -5,117 +5,116 @@ using System.Windows;
 using System.Windows.Input;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class GlobalShortcut
 {
-    public class GlobalShortcut
+    private static ObservableCollection<KeyBinding> KeyBindingCollection;
+
+    private static readonly Dictionary<string, KeyBinding> CommandDic = new();
+
+    private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
+
+    static GlobalShortcut()
     {
-        private static ObservableCollection<KeyBinding> KeyBindingCollection;
-
-        private static readonly Dictionary<string, KeyBinding> CommandDic = new();
-
-        private static void KeyboardHook_KeyDown(object sender, KeyboardHookEventArgs e) => HitTest(e.Key);
-
-        static GlobalShortcut()
-        {
-            KeyboardHook.KeyDown += KeyboardHook_KeyDown;
-        }
-
-        private static void HitTest(Key key)
-        {
-            if (IsModifierKey(key)) return;
-
-            var modifierKeys = Keyboard.Modifiers;
-            var keyStr = modifierKeys != ModifierKeys.None ? $"{modifierKeys.ToString()}, {key.ToString()}" : key.ToString();
-            ExecuteCommand(keyStr);
-        }
-
-        private static void ExecuteCommand(string key)
-        {
-            if (string.IsNullOrEmpty(key)) return;
-            if (CommandDic.ContainsKey(key))
-            {
-                var keyBinding = CommandDic[key];
-                var command = keyBinding.Command;
-                if (command != null && command.CanExecute(keyBinding.CommandParameter))
-                {
-                    command.Execute(keyBinding.CommandParameter);
-                }
-            }
-        }
-
-        private static bool IsModifierKey(Key key)
-        {
-            return key == Key.LeftCtrl || key == Key.LeftAlt || key == Key.LeftShift || key == Key.LWin ||
-                   key == Key.RightCtrl || key == Key.RightAlt || key == Key.RightShift || key == Key.RWin;
-        }
-
-        public static void Init(List<KeyBinding> list)
-        {
-            CommandDic.Clear();
-
-            if (list == null) return;
-            KeyBindingCollection = new ObservableCollection<KeyBinding>(list);
-            if (KeyBindingCollection.Count == 0) return;
-
-            AddKeyBindings(KeyBindingCollection);
-            KeyboardHook.Start();
-        }
-
-        private static void AddKeyBindings(IEnumerable<KeyBinding> keyBindings)
-        {
-            foreach (var item in keyBindings)
-            {
-                if (item.Key == Key.None) continue;
-
-                if (item.Modifiers == ModifierKeys.None)
-                {
-                    CommandDic[item.Key.ToString()] = item;
-                }
-                else
-                {
-                    var keyStr = $"{item.Modifiers.ToString()}, {item.Key.ToString()}";
-                    CommandDic[keyStr] = item;
-                }
-            }
-        }
-
-        public static readonly DependencyProperty HostProperty = DependencyProperty.RegisterAttached(
-            "Host", typeof(bool), typeof(GlobalShortcut), new PropertyMetadata(ValueBoxes.FalseBox, OnHostChanged));
-
-        private static void OnHostChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (DesignerHelper.IsInDesignMode) return;
-
-            if (KeyBindingCollection != null)
-            {
-                KeyBindingCollection.CollectionChanged -= KeyBindingCollection_CollectionChanged;
-            }
-            KeyBindingCollection = GetKeyBindings(d);
-            if (KeyBindingCollection != null)
-            {
-                KeyBindingCollection.CollectionChanged += KeyBindingCollection_CollectionChanged;
-            }
-        }
-
-        private static void KeyBindingCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            AddKeyBindings(KeyBindingCollection);
-            KeyboardHook.Start();
-        }
-
-        public static void SetHost(DependencyObject element, bool value)
-            => element.SetValue(HostProperty, ValueBoxes.BooleanBox(value));
-
-        public static bool GetHost(DependencyObject element)
-            => (bool) element.GetValue(HostProperty);
-
-        public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
-            "KeyBindings", typeof(ObservableCollection<KeyBinding>), typeof(GlobalShortcut), new PropertyMetadata(new ObservableCollection<KeyBinding>()));
-
-        public static void SetKeyBindings(DependencyObject element, ObservableCollection<KeyBinding> value)
-            => element.SetValue(KeyBindingsProperty, value);
-
-        public static ObservableCollection<KeyBinding> GetKeyBindings(DependencyObject element)
-            => (ObservableCollection<KeyBinding>) element.GetValue(KeyBindingsProperty);
+        KeyboardHook.KeyDown += KeyboardHook_KeyDown;
     }
-}
+
+    private static void HitTest(Key key)
+    {
+        if (IsModifierKey(key)) return;
+
+        var modifierKeys = Keyboard.Modifiers;
+        var keyStr = modifierKeys != ModifierKeys.None ? $"{modifierKeys.ToString()}, {key.ToString()}" : key.ToString();
+        ExecuteCommand(keyStr);
+    }
+
+    private static void ExecuteCommand(string key)
+    {
+        if (string.IsNullOrEmpty(key)) return;
+        if (CommandDic.ContainsKey(key))
+        {
+            var keyBinding = CommandDic[key];
+            var command = keyBinding.Command;
+            if (command != null && command.CanExecute(keyBinding.CommandParameter))
+            {
+                command.Execute(keyBinding.CommandParameter);
+            }
+        }
+    }
+
+    private static bool IsModifierKey(Key key)
+    {
+        return key == Key.LeftCtrl || key == Key.LeftAlt || key == Key.LeftShift || key == Key.LWin ||
+               key == Key.RightCtrl || key == Key.RightAlt || key == Key.RightShift || key == Key.RWin;
+    }
+
+    public static void Init(List<KeyBinding> list)
+    {
+        CommandDic.Clear();
+
+        if (list == null) return;
+        KeyBindingCollection = new ObservableCollection<KeyBinding>(list);
+        if (KeyBindingCollection.Count == 0) return;
+
+        AddKeyBindings(KeyBindingCollection);
+        KeyboardHook.Start();
+    }
+
+    private static void AddKeyBindings(IEnumerable<KeyBinding> keyBindings)
+    {
+        foreach (var item in keyBindings)
+        {
+            if (item.Key == Key.None) continue;
+
+            if (item.Modifiers == ModifierKeys.None)
+            {
+                CommandDic[item.Key.ToString()] = item;
+            }
+            else
+            {
+                var keyStr = $"{item.Modifiers.ToString()}, {item.Key.ToString()}";
+                CommandDic[keyStr] = item;
+            }
+        }
+    }
+
+    public static readonly DependencyProperty HostProperty = DependencyProperty.RegisterAttached(
+        "Host", typeof(bool), typeof(GlobalShortcut), new PropertyMetadata(ValueBoxes.FalseBox, OnHostChanged));
+
+    private static void OnHostChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (DesignerHelper.IsInDesignMode) return;
+
+        if (KeyBindingCollection != null)
+        {
+            KeyBindingCollection.CollectionChanged -= KeyBindingCollection_CollectionChanged;
+        }
+        KeyBindingCollection = GetKeyBindings(d);
+        if (KeyBindingCollection != null)
+        {
+            KeyBindingCollection.CollectionChanged += KeyBindingCollection_CollectionChanged;
+        }
+    }
+
+    private static void KeyBindingCollection_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        AddKeyBindings(KeyBindingCollection);
+        KeyboardHook.Start();
+    }
+
+    public static void SetHost(DependencyObject element, bool value)
+        => element.SetValue(HostProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetHost(DependencyObject element)
+        => (bool) element.GetValue(HostProperty);
+
+    public static readonly DependencyProperty KeyBindingsProperty = DependencyProperty.RegisterAttached(
+        "KeyBindings", typeof(ObservableCollection<KeyBinding>), typeof(GlobalShortcut), new PropertyMetadata(new ObservableCollection<KeyBinding>()));
+
+    public static void SetKeyBindings(DependencyObject element, ObservableCollection<KeyBinding> value)
+        => element.SetValue(KeyBindingsProperty, value);
+
+    public static ObservableCollection<KeyBinding> GetKeyBindings(DependencyObject element)
+        => (ObservableCollection<KeyBinding>) element.GetValue(KeyBindingsProperty);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
index bae79906..eb5021ae 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
@@ -6,89 +6,88 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using HandyControl.Tools.Extension;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     包含一些常用的动画辅助方法
+/// </summary>
+public class AnimationHelper
 {
     /// <summary>
-    ///     包含一些常用的动画辅助方法
+    ///     创建一个Thickness动画
     /// </summary>
-    public class AnimationHelper
+    /// <param name="thickness"></param>
+    /// <param name="milliseconds"></param>
+    /// <returns></returns>
+    public static ThicknessAnimation CreateAnimation(Thickness thickness = default, double milliseconds = 200)
     {
-        /// <summary>
-        ///     创建一个Thickness动画
-        /// </summary>
-        /// <param name="thickness"></param>
-        /// <param name="milliseconds"></param>
-        /// <returns></returns>
-        public static ThicknessAnimation CreateAnimation(Thickness thickness = default, double milliseconds = 200)
+        return new(thickness, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
         {
-            return new(thickness, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
-            {
-                EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
-            };
-        }
+            EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
+        };
+    }
 
-        /// <summary>
-        ///     创建一个Double动画
-        /// </summary>
-        /// <param name="toValue"></param>
-        /// <param name="milliseconds"></param>
-        /// <returns></returns>
-        public static DoubleAnimation CreateAnimation(double toValue, double milliseconds = 200)
+    /// <summary>
+    ///     创建一个Double动画
+    /// </summary>
+    /// <param name="toValue"></param>
+    /// <param name="milliseconds"></param>
+    /// <returns></returns>
+    public static DoubleAnimation CreateAnimation(double toValue, double milliseconds = 200)
+    {
+        return new(toValue, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
         {
-            return new(toValue, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
-            {
-                EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
-            };
-        }
+            EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
+        };
+    }
 
-        internal static void DecomposeGeometryStr(string geometryStr, out double[] arr)
+    internal static void DecomposeGeometryStr(string geometryStr, out double[] arr)
+    {
+        var collection = Regex.Matches(geometryStr, RegexPatterns.DigitsPattern);
+        arr = new double[collection.Count];
+        for (var i = 0; i < collection.Count; i++)
         {
-            var collection = Regex.Matches(geometryStr, RegexPatterns.DigitsPattern);
-            arr = new double[collection.Count];
-            for (var i = 0; i < collection.Count; i++)
-            {
-                arr[i] = collection[i].Value.Value<double>();
-            }
-        }
-
-        internal static Geometry ComposeGeometry(string[] strings, double[] arr)
-        {
-            var builder = new StringBuilder(strings[0]);
-            for (var i = 0; i < arr.Length; i++)
-            {
-                var s = strings[i + 1];
-                var n = arr[i];
-                if (!double.IsNaN(n))
-                {
-                    builder.Append(n).Append(s);
-                }
-            }
-
-            return Geometry.Parse(builder.ToString());
-        }
-
-        internal static Geometry InterpolateGeometry(double[] from, double[] to, double progress, string[] strings)
-        {
-            var accumulated = new double[to.Length];
-            for (var i = 0; i < to.Length; i++)
-            {
-                var fromValue = from[i];
-                accumulated[i] = fromValue + (to[i] - fromValue) * progress;
-            }
-
-            return ComposeGeometry(strings, accumulated);
-        }
-
-        internal static double[] InterpolateGeometryValue(double[] from, double[] to, double progress)
-        {
-            var accumulated = new double[to.Length];
-            for (var i = 0; i < to.Length; i++)
-            {
-                var fromValue = from[i];
-                accumulated[i] = fromValue + (to[i] - fromValue) * progress;
-            }
-
-            return accumulated;
+            arr[i] = collection[i].Value.Value<double>();
         }
     }
-}
+
+    internal static Geometry ComposeGeometry(string[] strings, double[] arr)
+    {
+        var builder = new StringBuilder(strings[0]);
+        for (var i = 0; i < arr.Length; i++)
+        {
+            var s = strings[i + 1];
+            var n = arr[i];
+            if (!double.IsNaN(n))
+            {
+                builder.Append(n).Append(s);
+            }
+        }
+
+        return Geometry.Parse(builder.ToString());
+    }
+
+    internal static Geometry InterpolateGeometry(double[] from, double[] to, double progress, string[] strings)
+    {
+        var accumulated = new double[to.Length];
+        for (var i = 0; i < to.Length; i++)
+        {
+            var fromValue = from[i];
+            accumulated[i] = fromValue + (to[i] - fromValue) * progress;
+        }
+
+        return ComposeGeometry(strings, accumulated);
+    }
+
+    internal static double[] InterpolateGeometryValue(double[] from, double[] to, double progress)
+    {
+        var accumulated = new double[to.Length];
+        for (var i = 0; i < to.Length; i++)
+        {
+            var fromValue = from[i];
+            accumulated[i] = fromValue + (to[i] - fromValue) * progress;
+        }
+
+        return accumulated;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
index 599162c6..c07c6510 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
@@ -4,124 +4,123 @@ using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Media.Media3D;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     包含内部使用的一些简单算法
+/// </summary>
+internal class ArithmeticHelper
 {
     /// <summary>
-    ///     包含内部使用的一些简单算法
+    ///     平分一个整数到一个数组中
     /// </summary>
-    internal class ArithmeticHelper
+    /// <param name="num"></param>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    public static int[] DivideInt2Arr(int num, int count)
     {
-        /// <summary>
-        ///     平分一个整数到一个数组中
-        /// </summary>
-        /// <param name="num"></param>
-        /// <param name="count"></param>
-        /// <returns></returns>
-        public static int[] DivideInt2Arr(int num, int count)
+        var arr = new int[count];
+        var div = num / count;
+        var rest = num % count;
+        for (var i = 0; i < count; i++)
         {
-            var arr = new int[count];
-            var div = num / count;
-            var rest = num % count;
-            for (var i = 0; i < count; i++)
-            {
-                arr[i] = div;
-            }
-            for (var i = 0; i < rest; i++)
-            {
-                arr[i] += 1;
-            }
-            return arr;
+            arr[i] = div;
         }
-
-        /// <summary>
-        ///     计算控件在窗口中的可见坐标
-        /// </summary>
-        public static Point CalSafePoint(FrameworkElement element, FrameworkElement showElement, Thickness thickness = default)
+        for (var i = 0; i < rest; i++)
         {
-            if (element == null || showElement == null) return default;
-            var point = element.PointToScreen(new Point(0, 0));
-
-            if (point.X < 0) point.X = 0;
-            if (point.Y < 0) point.Y = 0;
-
-            var maxLeft = SystemParameters.WorkArea.Width -
-                          ((double.IsNaN(showElement.Width) ? showElement.ActualWidth : showElement.Width) +
-                           thickness.Left + thickness.Right);
-            var maxTop = SystemParameters.WorkArea.Height -
-                         ((double.IsNaN(showElement.Height) ? showElement.ActualHeight : showElement.Height) +
-                          thickness.Top + thickness.Bottom);
-            return new Point(maxLeft > point.X ? point.X : maxLeft, maxTop > point.Y ? point.Y : maxTop);
-        }
-
-        /// <summary>
-        ///     获取布局范围框
-        /// </summary>
-        /// <param name="element"></param>
-        /// <returns></returns>
-        public static Rect GetLayoutRect(FrameworkElement element)
-        {
-            var num1 = element.ActualWidth;
-            var num2 = element.ActualHeight;
-            if (element is Image || element is MediaElement)
-                if (element.Parent is Canvas)
-                {
-                    num1 = double.IsNaN(element.Width) ? num1 : element.Width;
-                    num2 = double.IsNaN(element.Height) ? num2 : element.Height;
-                }
-                else
-                {
-                    num1 = element.RenderSize.Width;
-                    num2 = element.RenderSize.Height;
-                }
-            var width = element.Visibility == Visibility.Collapsed ? 0.0 : num1;
-            var height = element.Visibility == Visibility.Collapsed ? 0.0 : num2;
-            var margin = element.Margin;
-            var layoutSlot = LayoutInformation.GetLayoutSlot(element);
-            var x = 0.0;
-            var y = 0.0;
-            x = element.HorizontalAlignment switch
-            {
-                HorizontalAlignment.Left => layoutSlot.Left + margin.Left,
-                HorizontalAlignment.Center => (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 -
-                                              width / 2.0,
-                HorizontalAlignment.Right => layoutSlot.Right - margin.Right - width,
-                HorizontalAlignment.Stretch => Math.Max(layoutSlot.Left + margin.Left,
-                    (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 - width / 2.0),
-                _ => x
-            };
-            y = element.VerticalAlignment switch
-            {
-                VerticalAlignment.Top => layoutSlot.Top + margin.Top,
-                VerticalAlignment.Center => (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 -
-                                            height / 2.0,
-                VerticalAlignment.Bottom => layoutSlot.Bottom - margin.Bottom - height,
-                VerticalAlignment.Stretch => Math.Max(layoutSlot.Top + margin.Top,
-                    (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 - height / 2.0),
-                _ => y
-            };
-            return new Rect(x, y, width, height);
-        }
-
-        /// <summary>
-        ///     计算两点的连线和x轴的夹角
-        /// </summary>
-        /// <param name="center"></param>
-        /// <param name="p"></param>
-        /// <returns></returns>
-        public static double CalAngle(Point center, Point p) => Math.Atan2(p.Y - center.Y, p.X - center.X) * 180 / Math.PI;
-
-        /// <summary>
-        ///     计算法线
-        /// </summary>
-        /// <param name="p0"></param>
-        /// <param name="p1"></param>
-        /// <param name="p2"></param>
-        /// <returns></returns>
-        public static Vector3D CalNormal(Point3D p0, Point3D p1, Point3D p2)
-        {
-            var v0 = new Vector3D(p1.X - p0.X, p1.Y - p0.Y, p1.Z - p0.Z);
-            var v1 = new Vector3D(p2.X - p1.X, p2.Y - p1.Y, p2.Z - p1.Z);
-            return Vector3D.CrossProduct(v0, v1);
+            arr[i] += 1;
         }
+        return arr;
     }
-}
+
+    /// <summary>
+    ///     计算控件在窗口中的可见坐标
+    /// </summary>
+    public static Point CalSafePoint(FrameworkElement element, FrameworkElement showElement, Thickness thickness = default)
+    {
+        if (element == null || showElement == null) return default;
+        var point = element.PointToScreen(new Point(0, 0));
+
+        if (point.X < 0) point.X = 0;
+        if (point.Y < 0) point.Y = 0;
+
+        var maxLeft = SystemParameters.WorkArea.Width -
+                      ((double.IsNaN(showElement.Width) ? showElement.ActualWidth : showElement.Width) +
+                       thickness.Left + thickness.Right);
+        var maxTop = SystemParameters.WorkArea.Height -
+                     ((double.IsNaN(showElement.Height) ? showElement.ActualHeight : showElement.Height) +
+                      thickness.Top + thickness.Bottom);
+        return new Point(maxLeft > point.X ? point.X : maxLeft, maxTop > point.Y ? point.Y : maxTop);
+    }
+
+    /// <summary>
+    ///     获取布局范围框
+    /// </summary>
+    /// <param name="element"></param>
+    /// <returns></returns>
+    public static Rect GetLayoutRect(FrameworkElement element)
+    {
+        var num1 = element.ActualWidth;
+        var num2 = element.ActualHeight;
+        if (element is Image || element is MediaElement)
+            if (element.Parent is Canvas)
+            {
+                num1 = double.IsNaN(element.Width) ? num1 : element.Width;
+                num2 = double.IsNaN(element.Height) ? num2 : element.Height;
+            }
+            else
+            {
+                num1 = element.RenderSize.Width;
+                num2 = element.RenderSize.Height;
+            }
+        var width = element.Visibility == Visibility.Collapsed ? 0.0 : num1;
+        var height = element.Visibility == Visibility.Collapsed ? 0.0 : num2;
+        var margin = element.Margin;
+        var layoutSlot = LayoutInformation.GetLayoutSlot(element);
+        var x = 0.0;
+        var y = 0.0;
+        x = element.HorizontalAlignment switch
+        {
+            HorizontalAlignment.Left => layoutSlot.Left + margin.Left,
+            HorizontalAlignment.Center => (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 -
+                                          width / 2.0,
+            HorizontalAlignment.Right => layoutSlot.Right - margin.Right - width,
+            HorizontalAlignment.Stretch => Math.Max(layoutSlot.Left + margin.Left,
+                (layoutSlot.Left + margin.Left + layoutSlot.Right - margin.Right) / 2.0 - width / 2.0),
+            _ => x
+        };
+        y = element.VerticalAlignment switch
+        {
+            VerticalAlignment.Top => layoutSlot.Top + margin.Top,
+            VerticalAlignment.Center => (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 -
+                                        height / 2.0,
+            VerticalAlignment.Bottom => layoutSlot.Bottom - margin.Bottom - height,
+            VerticalAlignment.Stretch => Math.Max(layoutSlot.Top + margin.Top,
+                (layoutSlot.Top + margin.Top + layoutSlot.Bottom - margin.Bottom) / 2.0 - height / 2.0),
+            _ => y
+        };
+        return new Rect(x, y, width, height);
+    }
+
+    /// <summary>
+    ///     计算两点的连线和x轴的夹角
+    /// </summary>
+    /// <param name="center"></param>
+    /// <param name="p"></param>
+    /// <returns></returns>
+    public static double CalAngle(Point center, Point p) => Math.Atan2(p.Y - center.Y, p.X - center.X) * 180 / Math.PI;
+
+    /// <summary>
+    ///     计算法线
+    /// </summary>
+    /// <param name="p0"></param>
+    /// <param name="p1"></param>
+    /// <param name="p2"></param>
+    /// <returns></returns>
+    public static Vector3D CalNormal(Point3D p0, Point3D p1, Point3D p2)
+    {
+        var v0 = new Vector3D(p1.X - p0.X, p1.Y - p0.Y, p1.Z - p0.Z);
+        var v1 = new Vector3D(p2.X - p1.X, p2.Y - p1.Y, p2.Z - p1.Z);
+        return Vector3D.CrossProduct(v0, v1);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
index 5a2936bb..fe560ad8 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
@@ -2,30 +2,29 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 
-namespace HandyControl.Tools.Helper
+namespace HandyControl.Tools.Helper;
+
+public class BindingHelper
 {
-    public class BindingHelper
+    public static string GetString(object source, string path)
     {
-        public static string GetString(object source, string path)
+        if (string.IsNullOrEmpty(path))
         {
-            if (string.IsNullOrEmpty(path))
-            {
-                return source == null ? string.Empty : source.ToString();
-            }
-
-            var tempObj = new DependencyObject();
-
-            var binding = new Binding(path)
-            {
-                Mode = BindingMode.OneTime,
-                Source = source
-            };
-
-            BindingOperations.SetBinding(tempObj, TextSearch.TextProperty, binding);
-            var result = (string) tempObj.GetValue(TextSearch.TextProperty);
-
-            BindingOperations.ClearBinding(tempObj, TextSearch.TextProperty);
-            return result;
+            return source == null ? string.Empty : source.ToString();
         }
+
+        var tempObj = new DependencyObject();
+
+        var binding = new Binding(path)
+        {
+            Mode = BindingMode.OneTime,
+            Source = source
+        };
+
+        BindingOperations.SetBinding(tempObj, TextSearch.TextProperty, binding);
+        var result = (string) tempObj.GetValue(TextSearch.TextProperty);
+
+        BindingOperations.ClearBinding(tempObj, TextSearch.TextProperty);
+        return result;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
index c0bd59dd..22739088 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
@@ -1,20 +1,19 @@
 using System;
 using System.Windows.Media;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class ColorHelper
 {
-    public class ColorHelper
+    private const int Win32RedShift = 0;
+    private const int Win32GreenShift = 8;
+    private const int Win32BlueShift = 16;
+
+    public static int ToWin32(Color c) => c.R << Win32RedShift | c.G << Win32GreenShift | c.B << Win32BlueShift;
+
+    public static Color ToColor(uint c)
     {
-        private const int Win32RedShift = 0;
-        private const int Win32GreenShift = 8;
-        private const int Win32BlueShift = 16;
-
-        public static int ToWin32(Color c) => c.R << Win32RedShift | c.G << Win32GreenShift | c.B << Win32BlueShift;
-
-        public static Color ToColor(uint c)
-        {
-            var bytes = BitConverter.GetBytes(c);
-            return Color.FromArgb(bytes[3], bytes[2], bytes[1], bytes[0]);
-        }
+        var bytes = BitConverter.GetBytes(c);
+        return Color.FromArgb(bytes[3], bytes[2], bytes[1], bytes[0]);
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
index 50945976..adacda15 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
@@ -11,78 +11,77 @@ using System.Windows.Navigation;
 using HandyControl.Data;
 using HandyControl.Properties.Langs;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class ConfigHelper : INotifyPropertyChanged
 {
-    public class ConfigHelper : INotifyPropertyChanged
+    private ConfigHelper()
     {
-        private ConfigHelper()
+
+    }
+
+    public static ConfigHelper Instance = new Lazy<ConfigHelper>(() => new ConfigHelper()).Value;
+
+    private XmlLanguage _lang = XmlLanguage.GetLanguage("zh-cn");
+
+    public XmlLanguage Lang
+    {
+        get => _lang;
+        set
         {
-
-        }
-
-        public static ConfigHelper Instance = new Lazy<ConfigHelper>(() => new ConfigHelper()).Value;
-
-        private XmlLanguage _lang = XmlLanguage.GetLanguage("zh-cn");
-
-        public XmlLanguage Lang
-        {
-            get => _lang;
-            set
+            if (!_lang.IetfLanguageTag.Equals(value.IetfLanguageTag))
             {
-                if (!_lang.IetfLanguageTag.Equals(value.IetfLanguageTag))
-                {
-                    _lang = value;
-                    OnPropertyChanged(nameof(Lang));
-                }
+                _lang = value;
+                OnPropertyChanged(nameof(Lang));
             }
         }
+    }
 
-        public void SetLang(string lang)
-        {
-            LangProvider.Culture = new CultureInfo(lang);
-            Application.Current.Dispatcher.Thread.CurrentUICulture = new CultureInfo(lang);
-            Lang = XmlLanguage.GetLanguage(lang);
-        }
+    public void SetLang(string lang)
+    {
+        LangProvider.Culture = new CultureInfo(lang);
+        Application.Current.Dispatcher.Thread.CurrentUICulture = new CultureInfo(lang);
+        Lang = XmlLanguage.GetLanguage(lang);
+    }
 
-        public void SetConfig(HandyControlConfig config)
-        {
-            SetLang(config.Lang);
-            SetTimelineFrameRate(config.TimelineFrameRate);
-        }
+    public void SetConfig(HandyControlConfig config)
+    {
+        SetLang(config.Lang);
+        SetTimelineFrameRate(config.TimelineFrameRate);
+    }
 
-        public void SetTimelineFrameRate(int rate) =>
-            Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline), new FrameworkPropertyMetadata(rate));
+    public void SetTimelineFrameRate(int rate) =>
+        Timeline.DesiredFrameRateProperty.OverrideMetadata(typeof(Timeline), new FrameworkPropertyMetadata(rate));
 
-        public void SetWindowDefaultStyle(object resourceKey = null)
-        {
-            var metadata = resourceKey == null
-                ? new FrameworkPropertyMetadata(Application.Current.FindResource(typeof(Window)))
-                : new FrameworkPropertyMetadata(Application.Current.FindResource(resourceKey));
+    public void SetWindowDefaultStyle(object resourceKey = null)
+    {
+        var metadata = resourceKey == null
+            ? new FrameworkPropertyMetadata(Application.Current.FindResource(typeof(Window)))
+            : new FrameworkPropertyMetadata(Application.Current.FindResource(resourceKey));
 
-            FrameworkElement.StyleProperty.OverrideMetadata(typeof(Window), metadata);
-        }
+        FrameworkElement.StyleProperty.OverrideMetadata(typeof(Window), metadata);
+    }
 
-        public void SetNavigationWindowDefaultStyle(object resourceKey = null)
-        {
-            var metadata = resourceKey == null
-                ? new FrameworkPropertyMetadata(Application.Current.FindResource(typeof(NavigationWindow)))
-                : new FrameworkPropertyMetadata(Application.Current.FindResource(resourceKey));
+    public void SetNavigationWindowDefaultStyle(object resourceKey = null)
+    {
+        var metadata = resourceKey == null
+            ? new FrameworkPropertyMetadata(Application.Current.FindResource(typeof(NavigationWindow)))
+            : new FrameworkPropertyMetadata(Application.Current.FindResource(resourceKey));
 
-            FrameworkElement.StyleProperty.OverrideMetadata(typeof(NavigationWindow), metadata);
-        }
+        FrameworkElement.StyleProperty.OverrideMetadata(typeof(NavigationWindow), metadata);
+    }
 
-        public event PropertyChangedEventHandler PropertyChanged;
+    public event PropertyChangedEventHandler PropertyChanged;
 
 #if NET40
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+    protected virtual void OnPropertyChanged(string propertyName)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
 #else
         protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 #endif
-    }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
index 0223ca41..66348bf2 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
@@ -1,22 +1,21 @@
 using System.ComponentModel;
 using System.Windows;
 
-namespace HandyControl.Tools
-{
-    public class DesignerHelper
-    {
-        private static bool? _isInDesignMode;
+namespace HandyControl.Tools;
 
-        public static bool IsInDesignMode
+public class DesignerHelper
+{
+    private static bool? _isInDesignMode;
+
+    public static bool IsInDesignMode
+    {
+        get
         {
-            get
+            if (!_isInDesignMode.HasValue)
             {
-                if (!_isInDesignMode.HasValue)
-                {
-                    _isInDesignMode = (bool) DependencyPropertyDescriptor.FromProperty(DesignerProperties.IsInDesignModeProperty, typeof(FrameworkElement)).Metadata.DefaultValue;
-                }
-                return _isInDesignMode.Value;
+                _isInDesignMode = (bool) DependencyPropertyDescriptor.FromProperty(DesignerProperties.IsInDesignModeProperty, typeof(FrameworkElement)).Metadata.DefaultValue;
             }
+            return _isInDesignMode.Value;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
index 5f7f96b3..c6a7a96e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
@@ -4,101 +4,100 @@ using System.Windows.Media;
 using HandyControl.Expression.Drawing;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+internal static class DpiHelper
 {
-    internal static class DpiHelper
+    private const double LogicalDpi = 96.0;
+
+    [ThreadStatic]
+    private static Matrix _transformToDip;
+
+    static DpiHelper()
     {
-        private const double LogicalDpi = 96.0;
-
-        [ThreadStatic]
-        private static Matrix _transformToDip;
-
-        static DpiHelper()
+        var dC = InteropMethods.GetDC(IntPtr.Zero);
+        if (dC != IntPtr.Zero)
         {
-            var dC = InteropMethods.GetDC(IntPtr.Zero);
-            if (dC != IntPtr.Zero)
-            {
-                // 沿着屏幕宽度每逻辑英寸的像素数。在具有多个显示器的系统中，这个值对所有显示器都是相同的
-                const int logicPixelsX = 88;
-                // 沿着屏幕高度每逻辑英寸的像素数
-                const int logicPixelsY = 90;
-                DeviceDpiX = InteropMethods.GetDeviceCaps(dC, logicPixelsX);
-                DeviceDpiY = InteropMethods.GetDeviceCaps(dC, logicPixelsY);
-                InteropMethods.ReleaseDC(IntPtr.Zero, dC);
-            }
-            else
-            {
-                DeviceDpiX = LogicalDpi;
-                DeviceDpiY = LogicalDpi;
-            }
-
-            var identity = Matrix.Identity;
-            var identity2 = Matrix.Identity;
-            identity.Scale(DeviceDpiX / LogicalDpi, DeviceDpiY / LogicalDpi);
-            identity2.Scale(LogicalDpi / DeviceDpiX, LogicalDpi / DeviceDpiY);
-            TransformFromDevice = new MatrixTransform(identity2);
-            TransformFromDevice.Freeze();
-            TransformToDevice = new MatrixTransform(identity);
-            TransformToDevice.Freeze();
+            // 沿着屏幕宽度每逻辑英寸的像素数。在具有多个显示器的系统中，这个值对所有显示器都是相同的
+            const int logicPixelsX = 88;
+            // 沿着屏幕高度每逻辑英寸的像素数
+            const int logicPixelsY = 90;
+            DeviceDpiX = InteropMethods.GetDeviceCaps(dC, logicPixelsX);
+            DeviceDpiY = InteropMethods.GetDeviceCaps(dC, logicPixelsY);
+            InteropMethods.ReleaseDC(IntPtr.Zero, dC);
+        }
+        else
+        {
+            DeviceDpiX = LogicalDpi;
+            DeviceDpiY = LogicalDpi;
         }
 
-        public static MatrixTransform TransformFromDevice { get; }
-
-        public static MatrixTransform TransformToDevice { get; }
-
-        public static double DeviceDpiX { get; }
-
-        public static double DeviceDpiY { get; }
-
-        public static double LogicalToDeviceUnitsScalingFactorX => TransformToDevice.Matrix.M11;
-
-        public static double LogicalToDeviceUnitsScalingFactorY => TransformToDevice.Matrix.M22;
-
-        public static Point DevicePixelsToLogical(Point devicePoint, double dpiScaleX, double dpiScaleY)
-        {
-            _transformToDip = Matrix.Identity;
-            _transformToDip.Scale(1d / dpiScaleX, 1d / dpiScaleY);
-            return _transformToDip.Transform(devicePoint);
-        }
-
-        public static Size DeviceSizeToLogical(Size deviceSize, double dpiScaleX, double dpiScaleY)
-        {
-            var pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height), dpiScaleX, dpiScaleY);
-            return new Size(pt.X, pt.Y);
-        }
-
-        public static Rect LogicalToDeviceUnits(this Rect logicalRect)
-        {
-            var result = logicalRect;
-            result.Transform(TransformToDevice.Matrix);
-            return result;
-        }
-
-        public static Rect DeviceToLogicalUnits(this Rect deviceRect)
-        {
-            var result = deviceRect;
-            result.Transform(TransformFromDevice.Matrix);
-            return result;
-        }
-
-        public static double RoundLayoutValue(double value, double dpiScale)
-        {
-            double newValue;
-
-            if (!MathHelper.AreClose(dpiScale, 1.0))
-            {
-                newValue = Math.Round(value * dpiScale) / dpiScale;
-                if (double.IsNaN(newValue) || double.IsInfinity(newValue) || MathHelper.AreClose(newValue, double.MaxValue))
-                {
-                    newValue = value;
-                }
-            }
-            else
-            {
-                newValue = Math.Round(value);
-            }
-
-            return newValue;
-        }
+        var identity = Matrix.Identity;
+        var identity2 = Matrix.Identity;
+        identity.Scale(DeviceDpiX / LogicalDpi, DeviceDpiY / LogicalDpi);
+        identity2.Scale(LogicalDpi / DeviceDpiX, LogicalDpi / DeviceDpiY);
+        TransformFromDevice = new MatrixTransform(identity2);
+        TransformFromDevice.Freeze();
+        TransformToDevice = new MatrixTransform(identity);
+        TransformToDevice.Freeze();
     }
-}
+
+    public static MatrixTransform TransformFromDevice { get; }
+
+    public static MatrixTransform TransformToDevice { get; }
+
+    public static double DeviceDpiX { get; }
+
+    public static double DeviceDpiY { get; }
+
+    public static double LogicalToDeviceUnitsScalingFactorX => TransformToDevice.Matrix.M11;
+
+    public static double LogicalToDeviceUnitsScalingFactorY => TransformToDevice.Matrix.M22;
+
+    public static Point DevicePixelsToLogical(Point devicePoint, double dpiScaleX, double dpiScaleY)
+    {
+        _transformToDip = Matrix.Identity;
+        _transformToDip.Scale(1d / dpiScaleX, 1d / dpiScaleY);
+        return _transformToDip.Transform(devicePoint);
+    }
+
+    public static Size DeviceSizeToLogical(Size deviceSize, double dpiScaleX, double dpiScaleY)
+    {
+        var pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height), dpiScaleX, dpiScaleY);
+        return new Size(pt.X, pt.Y);
+    }
+
+    public static Rect LogicalToDeviceUnits(this Rect logicalRect)
+    {
+        var result = logicalRect;
+        result.Transform(TransformToDevice.Matrix);
+        return result;
+    }
+
+    public static Rect DeviceToLogicalUnits(this Rect deviceRect)
+    {
+        var result = deviceRect;
+        result.Transform(TransformFromDevice.Matrix);
+        return result;
+    }
+
+    public static double RoundLayoutValue(double value, double dpiScale)
+    {
+        double newValue;
+
+        if (!MathHelper.AreClose(dpiScale, 1.0))
+        {
+            newValue = Math.Round(value * dpiScale) / dpiScale;
+            if (double.IsNaN(newValue) || double.IsInfinity(newValue) || MathHelper.AreClose(newValue, double.MaxValue))
+            {
+                newValue = value;
+            }
+        }
+        else
+        {
+            newValue = Math.Round(value);
+        }
+
+        return newValue;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
index c216c20a..21d1e7e7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
@@ -5,273 +5,272 @@ using System.Windows;
 using System.Windows.Interop;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Controls
+namespace HandyControl.Controls;
+
+/// <summary>
+/// 用来使窗口变得全屏的辅助类
+/// 采用设置窗口位置和尺寸，确保盖住整个屏幕的方式来实现全屏
+/// 目前已知需要满足的条件是：窗口盖住整个屏幕、窗口没有WS_THICKFRAME样式、窗口不能有标题栏且最大化
+/// </summary>
+internal static class FullScreenHelper
 {
     /// <summary>
-    /// 用来使窗口变得全屏的辅助类
-    /// 采用设置窗口位置和尺寸，确保盖住整个屏幕的方式来实现全屏
-    /// 目前已知需要满足的条件是：窗口盖住整个屏幕、窗口没有WS_THICKFRAME样式、窗口不能有标题栏且最大化
+    /// 用于记录窗口全屏前位置的附加属性
     /// </summary>
-    internal static class FullScreenHelper
+    private static readonly DependencyProperty BeforeFullScreenWindowPlacementProperty =
+        DependencyProperty.RegisterAttached("BeforeFullScreenWindowPlacement",
+            typeof(InteropValues.WINDOWPLACEMENT?), typeof(FullScreenHelper));
+
+    /// <summary>
+    /// 用于记录窗口全屏前样式的附加属性
+    /// </summary>
+    private static readonly DependencyProperty BeforeFullScreenWindowStyleProperty =
+        DependencyProperty.RegisterAttached("BeforeFullScreenWindowStyle",
+            typeof(InteropValues.WindowStyles?), typeof(FullScreenHelper));
+
+    /// <summary>
+    /// 开始进入全屏模式
+    /// 进入全屏模式后，窗口可通过 API 方式（也可以用 Win + Shift + Left/Right）移动，调整大小，但会根据目标矩形寻找显示器重新调整到全屏状态。
+    /// 进入全屏后，不要修改样式等窗口属性，在退出时，会恢复到进入前的状态
+    /// 进入全屏模式后会禁用 DWM 过渡动画
+    /// </summary>
+    public static void StartFullScreen(System.Windows.Window window)
     {
-        /// <summary>
-        /// 用于记录窗口全屏前位置的附加属性
-        /// </summary>
-        private static readonly DependencyProperty BeforeFullScreenWindowPlacementProperty =
-            DependencyProperty.RegisterAttached("BeforeFullScreenWindowPlacement",
-                typeof(InteropValues.WINDOWPLACEMENT?), typeof(FullScreenHelper));
-
-        /// <summary>
-        /// 用于记录窗口全屏前样式的附加属性
-        /// </summary>
-        private static readonly DependencyProperty BeforeFullScreenWindowStyleProperty =
-            DependencyProperty.RegisterAttached("BeforeFullScreenWindowStyle",
-                typeof(InteropValues.WindowStyles?), typeof(FullScreenHelper));
-
-        /// <summary>
-        /// 开始进入全屏模式
-        /// 进入全屏模式后，窗口可通过 API 方式（也可以用 Win + Shift + Left/Right）移动，调整大小，但会根据目标矩形寻找显示器重新调整到全屏状态。
-        /// 进入全屏后，不要修改样式等窗口属性，在退出时，会恢复到进入前的状态
-        /// 进入全屏模式后会禁用 DWM 过渡动画
-        /// </summary>
-        public static void StartFullScreen(System.Windows.Window window)
+        if (window == null)
         {
-            if (window == null)
+            throw new ArgumentNullException(nameof(window), $"{nameof(window)} 不能为 null");
+        }
+
+        //确保不在全屏模式
+        if (window.GetValue(BeforeFullScreenWindowPlacementProperty) == null &&
+            window.GetValue(BeforeFullScreenWindowStyleProperty) == null)
+        {
+            var hwnd = new WindowInteropHelper(window).EnsureHandle();
+            var hwndSource = HwndSource.FromHwnd(hwnd);
+
+            //获取当前窗口的位置大小状态并保存
+            var placement = InteropMethods.GetWindowPlacement(hwnd);
+            window.SetValue(BeforeFullScreenWindowPlacementProperty, placement);
+
+            //修改窗口样式
+            var style = (InteropValues.WindowStyles) InteropMethods.GetWindowLongPtr(hwnd, InteropValues.GWL_STYLE);
+            window.SetValue(BeforeFullScreenWindowStyleProperty, style);
+            //将窗口恢复到还原模式，在有标题栏的情况下最大化模式下无法全屏,
+            //这里采用还原，不修改标题栏的方式
+            //在退出全屏时，窗口原有的状态会恢复
+            //去掉WS_THICKFRAME，在有该样式的情况下不能全屏
+            //去掉WS_MAXIMIZEBOX，禁用最大化，如果最大化会退出全屏
+            //去掉WS_MAXIMIZE，使窗口变成还原状态，不使用ShowWindow(hwnd, ShowWindowCommands.SW_RESTORE)，避免看到窗口变成还原状态这一过程（也避免影响窗口的Visible状态）
+            style &= ~(InteropValues.WindowStyles.WS_THICKFRAME | InteropValues.WindowStyles.WS_MAXIMIZEBOX | InteropValues.WindowStyles.WS_MAXIMIZE);
+            InteropMethods.SetWindowLong(hwnd, InteropValues.GWL_STYLE, (IntPtr) style);
+
+            //禁用 DWM 过渡动画 忽略返回值，若DWM关闭不做处理
+            InteropMethods.DwmSetWindowAttribute(hwnd, InteropValues.DwmWindowAttribute.DWMWA_TRANSITIONS_FORCEDISABLED, 1,
+                sizeof(int));
+
+            //添加Hook，在窗口尺寸位置等要发生变化时，确保全屏
+            hwndSource.AddHook(KeepFullScreenHook);
+
+            if (InteropMethods.GetWindowRect(hwnd, out var rect))
             {
-                throw new ArgumentNullException(nameof(window), $"{nameof(window)} 不能为 null");
+                //不能用 placement 的坐标，placement是工作区坐标，不是屏幕坐标。
+
+                //使用窗口当前的矩形调用下设置窗口位置和尺寸的方法，让Hook来进行调整窗口位置和尺寸到全屏模式
+                InteropMethods.SetWindowPos(hwnd, (IntPtr) InteropValues.HWND_TOP, rect.Left, rect.Top, rect.Width,
+                    rect.Height, (int) InteropValues.WindowPositionFlags.SWP_NOZORDER);
+            }
+        }
+    }
+
+    /// <summary>
+    /// 退出全屏模式
+    /// 窗口会回到进入全屏模式时保存的状态
+    /// 退出全屏模式后会重新启用 DWM 过渡动画
+    /// </summary>
+    public static void EndFullScreen(System.Windows.Window window)
+    {
+        if (window == null)
+        {
+            throw new ArgumentNullException(nameof(window), $"{nameof(window)} 不能为 null");
+        }
+
+        //确保在全屏模式并获取之前保存的状态
+        if (window.GetValue(BeforeFullScreenWindowPlacementProperty) is InteropValues.WINDOWPLACEMENT placement
+            && window.GetValue(BeforeFullScreenWindowStyleProperty) is InteropValues.WindowStyles style)
+        {
+            var hwnd = new WindowInteropHelper(window).Handle;
+
+            if (hwnd == IntPtr.Zero)
+            {
+                // 句柄为 0 只有两种情况：
+                //  1. 虽然窗口已进入全屏，但窗口已被关闭；
+                //  2. 窗口初始化前，在还没有调用 StartFullScreen 的前提下就调用了此方法。
+                // 所以，直接 return 就好。
+                return;
             }
 
-            //确保不在全屏模式
-            if (window.GetValue(BeforeFullScreenWindowPlacementProperty) == null &&
-                window.GetValue(BeforeFullScreenWindowStyleProperty) == null)
+
+            var hwndSource = HwndSource.FromHwnd(hwnd);
+
+            //去除hook
+            hwndSource.RemoveHook(KeepFullScreenHook);
+
+            //恢复保存的状态
+            //不要改变Style里的WS_MAXIMIZE，否则会使窗口变成最大化状态，但是尺寸不对
+            //也不要设置回Style里的WS_MINIMIZE,否则会导致窗口最小化按钮显示成还原按钮
+            InteropMethods.SetWindowLong(hwnd, InteropValues.GWL_STYLE,
+                (IntPtr) (style & ~(InteropValues.WindowStyles.WS_MAXIMIZE | InteropValues.WindowStyles.WS_MINIMIZE)));
+
+            if ((style & InteropValues.WindowStyles.WS_MINIMIZE) != 0)
             {
-                var hwnd = new WindowInteropHelper(window).EnsureHandle();
-                var hwndSource = HwndSource.FromHwnd(hwnd);
+                //如果窗口进入全屏前是最小化的，这里不让窗口恢复到之前的最小化状态，而是到还原的状态。
+                //大多数情况下，都不期望在退出全屏的时候，恢复到最小化。
+                placement.showCmd = InteropValues.SW.RESTORE;
+            }
 
-                //获取当前窗口的位置大小状态并保存
-                var placement = InteropMethods.GetWindowPlacement(hwnd);
-                window.SetValue(BeforeFullScreenWindowPlacementProperty, placement);
+            if ((style & InteropValues.WindowStyles.WS_MAXIMIZE) != 0)
+            {
+                //提前调用 ShowWindow 使窗口恢复最大化，若通过 SetWindowPlacement 最大化会导致闪烁，只靠其恢复 RestoreBounds.
+                InteropMethods.ShowWindow(hwnd, InteropValues.SW.MAXIMIZE);
+            }
 
-                //修改窗口样式
-                var style = (InteropValues.WindowStyles) InteropMethods.GetWindowLongPtr(hwnd, InteropValues.GWL_STYLE);
-                window.SetValue(BeforeFullScreenWindowStyleProperty, style);
-                //将窗口恢复到还原模式，在有标题栏的情况下最大化模式下无法全屏,
-                //这里采用还原，不修改标题栏的方式
-                //在退出全屏时，窗口原有的状态会恢复
-                //去掉WS_THICKFRAME，在有该样式的情况下不能全屏
-                //去掉WS_MAXIMIZEBOX，禁用最大化，如果最大化会退出全屏
-                //去掉WS_MAXIMIZE，使窗口变成还原状态，不使用ShowWindow(hwnd, ShowWindowCommands.SW_RESTORE)，避免看到窗口变成还原状态这一过程（也避免影响窗口的Visible状态）
-                style &= ~(InteropValues.WindowStyles.WS_THICKFRAME | InteropValues.WindowStyles.WS_MAXIMIZEBOX | InteropValues.WindowStyles.WS_MAXIMIZE);
-                InteropMethods.SetWindowLong(hwnd, InteropValues.GWL_STYLE, (IntPtr) style);
-
-                //禁用 DWM 过渡动画 忽略返回值，若DWM关闭不做处理
-                InteropMethods.DwmSetWindowAttribute(hwnd, InteropValues.DwmWindowAttribute.DWMWA_TRANSITIONS_FORCEDISABLED, 1,
-                    sizeof(int));
-
-                //添加Hook，在窗口尺寸位置等要发生变化时，确保全屏
-                hwndSource.AddHook(KeepFullScreenHook);
+            InteropMethods.SetWindowPlacement(hwnd, ref placement);
 
+            if ((style & InteropValues.WindowStyles.WS_MAXIMIZE) ==
+                0) //如果窗口是最大化就不要修改WPF属性，否则会破坏RestoreBounds，且WPF窗口自身在最大化时，不会修改 Left Top Width Height 属性
+            {
                 if (InteropMethods.GetWindowRect(hwnd, out var rect))
                 {
                     //不能用 placement 的坐标，placement是工作区坐标，不是屏幕坐标。
 
-                    //使用窗口当前的矩形调用下设置窗口位置和尺寸的方法，让Hook来进行调整窗口位置和尺寸到全屏模式
-                    InteropMethods.SetWindowPos(hwnd, (IntPtr) InteropValues.HWND_TOP, rect.Left, rect.Top, rect.Width,
-                        rect.Height, (int) InteropValues.WindowPositionFlags.SWP_NOZORDER);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 退出全屏模式
-        /// 窗口会回到进入全屏模式时保存的状态
-        /// 退出全屏模式后会重新启用 DWM 过渡动画
-        /// </summary>
-        public static void EndFullScreen(System.Windows.Window window)
-        {
-            if (window == null)
-            {
-                throw new ArgumentNullException(nameof(window), $"{nameof(window)} 不能为 null");
-            }
-
-            //确保在全屏模式并获取之前保存的状态
-            if (window.GetValue(BeforeFullScreenWindowPlacementProperty) is InteropValues.WINDOWPLACEMENT placement
-                && window.GetValue(BeforeFullScreenWindowStyleProperty) is InteropValues.WindowStyles style)
-            {
-                var hwnd = new WindowInteropHelper(window).Handle;
-
-                if (hwnd == IntPtr.Zero)
-                {
-                    // 句柄为 0 只有两种情况：
-                    //  1. 虽然窗口已进入全屏，但窗口已被关闭；
-                    //  2. 窗口初始化前，在还没有调用 StartFullScreen 的前提下就调用了此方法。
-                    // 所以，直接 return 就好。
-                    return;
-                }
-
-
-                var hwndSource = HwndSource.FromHwnd(hwnd);
-
-                //去除hook
-                hwndSource.RemoveHook(KeepFullScreenHook);
-
-                //恢复保存的状态
-                //不要改变Style里的WS_MAXIMIZE，否则会使窗口变成最大化状态，但是尺寸不对
-                //也不要设置回Style里的WS_MINIMIZE,否则会导致窗口最小化按钮显示成还原按钮
-                InteropMethods.SetWindowLong(hwnd, InteropValues.GWL_STYLE,
-                    (IntPtr) (style & ~(InteropValues.WindowStyles.WS_MAXIMIZE | InteropValues.WindowStyles.WS_MINIMIZE)));
-
-                if ((style & InteropValues.WindowStyles.WS_MINIMIZE) != 0)
-                {
-                    //如果窗口进入全屏前是最小化的，这里不让窗口恢复到之前的最小化状态，而是到还原的状态。
-                    //大多数情况下，都不期望在退出全屏的时候，恢复到最小化。
-                    placement.showCmd = InteropValues.SW.RESTORE;
-                }
-
-                if ((style & InteropValues.WindowStyles.WS_MAXIMIZE) != 0)
-                {
-                    //提前调用 ShowWindow 使窗口恢复最大化，若通过 SetWindowPlacement 最大化会导致闪烁，只靠其恢复 RestoreBounds.
-                    InteropMethods.ShowWindow(hwnd, InteropValues.SW.MAXIMIZE);
-                }
-
-                InteropMethods.SetWindowPlacement(hwnd, ref placement);
-
-                if ((style & InteropValues.WindowStyles.WS_MAXIMIZE) ==
-                    0) //如果窗口是最大化就不要修改WPF属性，否则会破坏RestoreBounds，且WPF窗口自身在最大化时，不会修改 Left Top Width Height 属性
-                {
-                    if (InteropMethods.GetWindowRect(hwnd, out var rect))
-                    {
-                        //不能用 placement 的坐标，placement是工作区坐标，不是屏幕坐标。
-
-                        //确保窗口的 WPF 属性与 Win32 位置一致
-                        var logicalPos =
-                            hwndSource.CompositionTarget.TransformFromDevice.Transform(
-                                new Point(rect.Left, rect.Top));
-                        var logicalSize =
-                            hwndSource.CompositionTarget.TransformFromDevice.Transform(
-                                new Point(rect.Width, rect.Height));
-                        window.Left = logicalPos.X;
-                        window.Top = logicalPos.Y;
-                        window.Width = logicalSize.X;
-                        window.Height = logicalSize.Y;
-                    }
-                }
-
-                //重新启用 DWM 过渡动画 忽略返回值，若DWM关闭不做处理
-                InteropMethods.DwmSetWindowAttribute(hwnd, InteropValues.DwmWindowAttribute.DWMWA_TRANSITIONS_FORCEDISABLED, 0,
-                    sizeof(int));
-
-                //删除保存的状态
-                window.ClearValue(BeforeFullScreenWindowPlacementProperty);
-                window.ClearValue(BeforeFullScreenWindowStyleProperty);
-            }
-        }
-
-        /// <summary>
-        /// 确保窗口全屏的Hook
-        /// 使用HandleProcessCorruptedStateExceptions，防止访问内存过程中因为一些致命异常导致程序崩溃
-        /// </summary>
-        [HandleProcessCorruptedStateExceptions]
-        private static IntPtr KeepFullScreenHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            //处理WM_WINDOWPOSCHANGING消息
-            const int WINDOWPOSCHANGING = 0x0046;
-            if (msg == WINDOWPOSCHANGING)
-            {
-                try
-                {
-                    //得到WINDOWPOS结构体
-                    var pos = (InteropValues.WindowPosition) Marshal.PtrToStructure(lParam, typeof(InteropValues.WindowPosition));
-
-                    if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOMOVE) != 0 &&
-                        (pos.Flags & InteropValues.WindowPositionFlags.SWP_NOSIZE) != 0)
-                    {
-                        //既然你既不改变位置，也不改变尺寸，我就不管了...
-                        return IntPtr.Zero;
-                    }
-
-                    if (InteropMethods.IsIconic(hwnd))
-                    {
-                        // 如果在全屏期间最小化了窗口，那么忽略后续的位置调整。
-                        // 否则按后续逻辑，会根据窗口在 -32000 的位置，计算出错误的目标位置，然后就跳到主屏了。
-                        return IntPtr.Zero;
-                    }
-
-                    //获取窗口现在的矩形，下面用来参考计算目标矩形
-                    if (InteropMethods.GetWindowRect(hwnd, out var rect))
-                    {
-                        var targetRect = rect; //窗口想要变化的目标矩形
-
-                        if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOMOVE) == 0)
-                        {
-                            //需要移动
-                            targetRect.Left = pos.X;
-                            targetRect.Top = pos.Y;
-                        }
-
-                        if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOSIZE) == 0)
-                        {
-                            //要改变尺寸
-                            targetRect.Right = targetRect.Left + pos.Width;
-                            targetRect.Bottom = targetRect.Top + pos.Height;
-                        }
-                        else
-                        {
-                            //不改变尺寸
-                            targetRect.Right = targetRect.Left + rect.Width;
-                            targetRect.Bottom = targetRect.Top + rect.Height;
-                        }
-
-                        //使用目标矩形获取显示器信息
-                        var monitor = InteropMethods.MonitorFromRect(ref targetRect, InteropValues.MONITOR_DEFAULTTOPRIMARY);
-                        var info = new InteropValues.MONITORINFO();
-                        info.cbSize = (uint) Marshal.SizeOf(info);
-                        if (InteropMethods.GetMonitorInfo(monitor, ref info))
-                        {
-                            //基于显示器信息设置窗口尺寸位置
-                            pos.X = info.rcMonitor.Left;
-                            pos.Y = info.rcMonitor.Top;
-                            pos.Width = info.rcMonitor.Right - info.rcMonitor.Left;
-                            pos.Height = info.rcMonitor.Bottom - info.rcMonitor.Top;
-                            pos.Flags &= ~(InteropValues.WindowPositionFlags.SWP_NOSIZE | InteropValues.WindowPositionFlags.SWP_NOMOVE |
-                                           InteropValues.WindowPositionFlags.SWP_NOREDRAW);
-                            pos.Flags |= InteropValues.WindowPositionFlags.SWP_NOCOPYBITS;
-
-                            if (rect == info.rcMonitor)
-                            {
-                                var hwndSource = HwndSource.FromHwnd(hwnd);
-                                if (hwndSource?.RootVisual is Window window)
-                                {
-                                    //确保窗口的 WPF 属性与 Win32 位置一致，防止有逗比全屏后改 WPF 的属性，发生一些诡异的行为
-                                    //下面这样做其实不太好，会再次触发 WM_WINDOWPOSCHANGING 来着.....但是又没有其他时机了
-                                    // WM_WINDOWPOSCHANGED 不能用 
-                                    //（例如：在进入全屏后，修改 Left 属性，会进入 WM_WINDOWPOSCHANGING，然后在这里将消息里的结构体中的 Left 改回，
-                                    // 使对 Left 的修改无效，那么将不会进入 WM_WINDOWPOSCHANGED，窗口尺寸正常，但窗口的 Left 属性值错误。）
-                                    var logicalPos =
-                                        hwndSource.CompositionTarget.TransformFromDevice.Transform(
-                                            new Point(pos.X, pos.Y));
-                                    var logicalSize =
-                                        hwndSource.CompositionTarget.TransformFromDevice.Transform(
-                                            new Point(pos.Width, pos.Height));
-                                    window.Left = logicalPos.X;
-                                    window.Top = logicalPos.Y;
-                                    window.Width = logicalSize.X;
-                                    window.Height = logicalSize.Y;
-                                }
-                            }
-
-                            //将修改后的结构体拷贝回去
-                            Marshal.StructureToPtr(pos, lParam, false);
-                        }
-                    }
-                }
-                catch
-                {
-                    // 这里也不需要日志啥的，只是为了防止上面有逗比逻辑，在消息循环里面炸了
+                    //确保窗口的 WPF 属性与 Win32 位置一致
+                    var logicalPos =
+                        hwndSource.CompositionTarget.TransformFromDevice.Transform(
+                            new Point(rect.Left, rect.Top));
+                    var logicalSize =
+                        hwndSource.CompositionTarget.TransformFromDevice.Transform(
+                            new Point(rect.Width, rect.Height));
+                    window.Left = logicalPos.X;
+                    window.Top = logicalPos.Y;
+                    window.Width = logicalSize.X;
+                    window.Height = logicalSize.Y;
                 }
             }
 
-            return IntPtr.Zero;
+            //重新启用 DWM 过渡动画 忽略返回值，若DWM关闭不做处理
+            InteropMethods.DwmSetWindowAttribute(hwnd, InteropValues.DwmWindowAttribute.DWMWA_TRANSITIONS_FORCEDISABLED, 0,
+                sizeof(int));
+
+            //删除保存的状态
+            window.ClearValue(BeforeFullScreenWindowPlacementProperty);
+            window.ClearValue(BeforeFullScreenWindowStyleProperty);
         }
     }
-}
+
+    /// <summary>
+    /// 确保窗口全屏的Hook
+    /// 使用HandleProcessCorruptedStateExceptions，防止访问内存过程中因为一些致命异常导致程序崩溃
+    /// </summary>
+    [HandleProcessCorruptedStateExceptions]
+    private static IntPtr KeepFullScreenHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        //处理WM_WINDOWPOSCHANGING消息
+        const int WINDOWPOSCHANGING = 0x0046;
+        if (msg == WINDOWPOSCHANGING)
+        {
+            try
+            {
+                //得到WINDOWPOS结构体
+                var pos = (InteropValues.WindowPosition) Marshal.PtrToStructure(lParam, typeof(InteropValues.WindowPosition));
+
+                if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOMOVE) != 0 &&
+                    (pos.Flags & InteropValues.WindowPositionFlags.SWP_NOSIZE) != 0)
+                {
+                    //既然你既不改变位置，也不改变尺寸，我就不管了...
+                    return IntPtr.Zero;
+                }
+
+                if (InteropMethods.IsIconic(hwnd))
+                {
+                    // 如果在全屏期间最小化了窗口，那么忽略后续的位置调整。
+                    // 否则按后续逻辑，会根据窗口在 -32000 的位置，计算出错误的目标位置，然后就跳到主屏了。
+                    return IntPtr.Zero;
+                }
+
+                //获取窗口现在的矩形，下面用来参考计算目标矩形
+                if (InteropMethods.GetWindowRect(hwnd, out var rect))
+                {
+                    var targetRect = rect; //窗口想要变化的目标矩形
+
+                    if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOMOVE) == 0)
+                    {
+                        //需要移动
+                        targetRect.Left = pos.X;
+                        targetRect.Top = pos.Y;
+                    }
+
+                    if ((pos.Flags & InteropValues.WindowPositionFlags.SWP_NOSIZE) == 0)
+                    {
+                        //要改变尺寸
+                        targetRect.Right = targetRect.Left + pos.Width;
+                        targetRect.Bottom = targetRect.Top + pos.Height;
+                    }
+                    else
+                    {
+                        //不改变尺寸
+                        targetRect.Right = targetRect.Left + rect.Width;
+                        targetRect.Bottom = targetRect.Top + rect.Height;
+                    }
+
+                    //使用目标矩形获取显示器信息
+                    var monitor = InteropMethods.MonitorFromRect(ref targetRect, InteropValues.MONITOR_DEFAULTTOPRIMARY);
+                    var info = new InteropValues.MONITORINFO();
+                    info.cbSize = (uint) Marshal.SizeOf(info);
+                    if (InteropMethods.GetMonitorInfo(monitor, ref info))
+                    {
+                        //基于显示器信息设置窗口尺寸位置
+                        pos.X = info.rcMonitor.Left;
+                        pos.Y = info.rcMonitor.Top;
+                        pos.Width = info.rcMonitor.Right - info.rcMonitor.Left;
+                        pos.Height = info.rcMonitor.Bottom - info.rcMonitor.Top;
+                        pos.Flags &= ~(InteropValues.WindowPositionFlags.SWP_NOSIZE | InteropValues.WindowPositionFlags.SWP_NOMOVE |
+                                       InteropValues.WindowPositionFlags.SWP_NOREDRAW);
+                        pos.Flags |= InteropValues.WindowPositionFlags.SWP_NOCOPYBITS;
+
+                        if (rect == info.rcMonitor)
+                        {
+                            var hwndSource = HwndSource.FromHwnd(hwnd);
+                            if (hwndSource?.RootVisual is Window window)
+                            {
+                                //确保窗口的 WPF 属性与 Win32 位置一致，防止有逗比全屏后改 WPF 的属性，发生一些诡异的行为
+                                //下面这样做其实不太好，会再次触发 WM_WINDOWPOSCHANGING 来着.....但是又没有其他时机了
+                                // WM_WINDOWPOSCHANGED 不能用 
+                                //（例如：在进入全屏后，修改 Left 属性，会进入 WM_WINDOWPOSCHANGING，然后在这里将消息里的结构体中的 Left 改回，
+                                // 使对 Left 的修改无效，那么将不会进入 WM_WINDOWPOSCHANGED，窗口尺寸正常，但窗口的 Left 属性值错误。）
+                                var logicalPos =
+                                    hwndSource.CompositionTarget.TransformFromDevice.Transform(
+                                        new Point(pos.X, pos.Y));
+                                var logicalSize =
+                                    hwndSource.CompositionTarget.TransformFromDevice.Transform(
+                                        new Point(pos.Width, pos.Height));
+                                window.Left = logicalPos.X;
+                                window.Top = logicalPos.Y;
+                                window.Width = logicalSize.X;
+                                window.Height = logicalSize.Y;
+                            }
+                        }
+
+                        //将修改后的结构体拷贝回去
+                        Marshal.StructureToPtr(pos, lParam, false);
+                    }
+                }
+            }
+            catch
+            {
+                // 这里也不需要日志啥的，只是为了防止上面有逗比逻辑，在消息循环里面炸了
+            }
+        }
+
+        return IntPtr.Zero;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
index 31351071..2deb6d7e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
@@ -8,290 +8,289 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+[SuppressMessage("ReSharper", "ArrangeRedundantParentheses")]
+[SuppressMessage("ReSharper", "IntVariableOverflowInUncheckedContext")]
+internal static class IconHelper
 {
-    [SuppressMessage("ReSharper", "ArrangeRedundantParentheses")]
-    [SuppressMessage("ReSharper", "IntVariableOverflowInUncheckedContext")]
-    internal static class IconHelper
+    private static Size SmallIconSize;
+
+    private static Size IconSize;
+
+    private static int SystemBitDepth;
+
+    [SecurityCritical, SecuritySafeCritical]
+    public static void GetIconHandlesFromImageSource(ImageSource image, out IconHandle largeIconHandle, out IconHandle smallIconHandle)
     {
-        private static Size SmallIconSize;
+        EnsureSystemMetrics();
+        largeIconHandle = CreateIconHandleFromImageSource(image, IconSize);
+        smallIconHandle = CreateIconHandleFromImageSource(image, SmallIconSize);
+    }
 
-        private static Size IconSize;
+    [SecurityCritical]
+    public static IconHandle CreateIconHandleFromImageSource(ImageSource image, Size size)
+    {
+        EnsureSystemMetrics();
 
-        private static int SystemBitDepth;
+        var asGoodAsItGets = false;
 
-        [SecurityCritical, SecuritySafeCritical]
-        public static void GetIconHandlesFromImageSource(ImageSource image, out IconHandle largeIconHandle, out IconHandle smallIconHandle)
+        var bf = image as BitmapFrame;
+        if (bf?.Decoder?.Frames != null)
         {
-            EnsureSystemMetrics();
-            largeIconHandle = CreateIconHandleFromImageSource(image, IconSize);
-            smallIconHandle = CreateIconHandleFromImageSource(image, SmallIconSize);
+            bf = GetBestMatch(bf.Decoder.Frames, size);
+
+            asGoodAsItGets = bf.Decoder is IconBitmapDecoder || bf.PixelWidth == (int) size.Width && bf.PixelHeight == (int) size.Height;
+
+            image = bf;
         }
 
-        [SecurityCritical]
-        public static IconHandle CreateIconHandleFromImageSource(ImageSource image, Size size)
+        if (!asGoodAsItGets)
         {
-            EnsureSystemMetrics();
-
-            var asGoodAsItGets = false;
-
-            var bf = image as BitmapFrame;
-            if (bf?.Decoder?.Frames != null)
-            {
-                bf = GetBestMatch(bf.Decoder.Frames, size);
-
-                asGoodAsItGets = bf.Decoder is IconBitmapDecoder || bf.PixelWidth == (int) size.Width && bf.PixelHeight == (int) size.Height;
-
-                image = bf;
-            }
-
-            if (!asGoodAsItGets)
-            {
-                bf = BitmapFrame.Create(GenerateBitmapSource(image, size));
-            }
-
-            return CreateIconHandleFromBitmapFrame(bf);
+            bf = BitmapFrame.Create(GenerateBitmapSource(image, size));
         }
 
-        [SecurityCritical]
-        private static IconHandle CreateIconHandleFromBitmapFrame(BitmapFrame sourceBitmapFrame)
+        return CreateIconHandleFromBitmapFrame(bf);
+    }
+
+    [SecurityCritical]
+    private static IconHandle CreateIconHandleFromBitmapFrame(BitmapFrame sourceBitmapFrame)
+    {
+        BitmapSource bitmapSource = sourceBitmapFrame;
+
+        if (bitmapSource.Format != PixelFormats.Bgra32 && bitmapSource.Format != PixelFormats.Pbgra32)
         {
-            BitmapSource bitmapSource = sourceBitmapFrame;
-
-            if (bitmapSource.Format != PixelFormats.Bgra32 && bitmapSource.Format != PixelFormats.Pbgra32)
-            {
-                bitmapSource = new FormatConvertedBitmap(bitmapSource, PixelFormats.Bgra32, null, 0.0);
-            }
-
-            var w = bitmapSource.PixelWidth;
-            var h = bitmapSource.PixelHeight;
-            var bpp = bitmapSource.Format.BitsPerPixel;
-            var stride = (bpp * w + 31) / 32 * 4;
-            var sizeCopyPixels = stride * h;
-            var xor = new byte[sizeCopyPixels];
-            bitmapSource.CopyPixels(xor, stride, 0);
-
-            return CreateIconCursor(xor, w, h, 0, 0, true);
+            bitmapSource = new FormatConvertedBitmap(bitmapSource, PixelFormats.Bgra32, null, 0.0);
         }
 
-        [SecurityCritical]
-        internal static IconHandle CreateIconCursor(byte[] colorArray, int width, int height, int xHotspot, int yHotspot, bool isIcon)
+        var w = bitmapSource.PixelWidth;
+        var h = bitmapSource.PixelHeight;
+        var bpp = bitmapSource.Format.BitsPerPixel;
+        var stride = (bpp * w + 31) / 32 * 4;
+        var sizeCopyPixels = stride * h;
+        var xor = new byte[sizeCopyPixels];
+        bitmapSource.CopyPixels(xor, stride, 0);
+
+        return CreateIconCursor(xor, w, h, 0, 0, true);
+    }
+
+    [SecurityCritical]
+    internal static IconHandle CreateIconCursor(byte[] colorArray, int width, int height, int xHotspot, int yHotspot, bool isIcon)
+    {
+        BitmapHandle colorBitmap = null;
+        BitmapHandle maskBitmap = null;
+
+        try
         {
-            BitmapHandle colorBitmap = null;
-            BitmapHandle maskBitmap = null;
-
-            try
+            var bi = new InteropValues.BITMAPINFO(width, -height, 32)
             {
-                var bi = new InteropValues.BITMAPINFO(width, -height, 32)
-                {
-                    biCompression = InteropValues.BI_RGB
-                };
+                biCompression = InteropValues.BI_RGB
+            };
 
-                var bits = IntPtr.Zero;
-                colorBitmap = InteropMethods.CreateDIBSection(new HandleRef(null, IntPtr.Zero), ref bi, InteropValues.DIB_RGB_COLORS, ref bits, null, 0);
+            var bits = IntPtr.Zero;
+            colorBitmap = InteropMethods.CreateDIBSection(new HandleRef(null, IntPtr.Zero), ref bi, InteropValues.DIB_RGB_COLORS, ref bits, null, 0);
 
-                if (colorBitmap.IsInvalid || bits == IntPtr.Zero)
-                {
-                    return IconHandle.GetInvalidIcon();
-                }
-
-                Marshal.Copy(colorArray, 0, bits, colorArray.Length);
-                var maskArray = GenerateMaskArray(width, height, colorArray);
-
-                maskBitmap = InteropMethods.CreateBitmap(width, height, 1, 1, maskArray);
-                if (maskBitmap.IsInvalid)
-                {
-                    return IconHandle.GetInvalidIcon();
-                }
-
-                var iconInfo = new InteropValues.ICONINFO
-                {
-                    fIcon = isIcon,
-                    xHotspot = xHotspot,
-                    yHotspot = yHotspot,
-                    hbmMask = maskBitmap,
-                    hbmColor = colorBitmap
-                };
-
-                return InteropMethods.CreateIconIndirect(iconInfo);
+            if (colorBitmap.IsInvalid || bits == IntPtr.Zero)
+            {
+                return IconHandle.GetInvalidIcon();
             }
-            finally
+
+            Marshal.Copy(colorArray, 0, bits, colorArray.Length);
+            var maskArray = GenerateMaskArray(width, height, colorArray);
+
+            maskBitmap = InteropMethods.CreateBitmap(width, height, 1, 1, maskArray);
+            if (maskBitmap.IsInvalid)
             {
-                colorBitmap?.Dispose();
-                maskBitmap?.Dispose();
+                return IconHandle.GetInvalidIcon();
+            }
+
+            var iconInfo = new InteropValues.ICONINFO
+            {
+                fIcon = isIcon,
+                xHotspot = xHotspot,
+                yHotspot = yHotspot,
+                hbmMask = maskBitmap,
+                hbmColor = colorBitmap
+            };
+
+            return InteropMethods.CreateIconIndirect(iconInfo);
+        }
+        finally
+        {
+            colorBitmap?.Dispose();
+            maskBitmap?.Dispose();
+        }
+    }
+
+    private static byte[] GenerateMaskArray(int width, int height, byte[] colorArray)
+    {
+        var nCount = width * height;
+        var bytesPerScanLine = AlignToBytes(width, 2) / 8;
+        var bitsMask = new byte[bytesPerScanLine * height];
+
+        for (var i = 0; i < nCount; i++)
+        {
+            var hPos = i % width;
+            var vPos = i / width;
+            var byteIndex = hPos / 8;
+            var offsetBit = (byte) (0x80 >> (hPos % 8));
+
+            if (colorArray[i * 4 + 3] == 0x00)
+            {
+                bitsMask[byteIndex + bytesPerScanLine * vPos] |= offsetBit;
+            }
+            else
+            {
+                bitsMask[byteIndex + bytesPerScanLine * vPos] &= (byte) ~offsetBit;
+            }
+
+            if (hPos == width - 1 && width == 8)
+            {
+                bitsMask[1 + bytesPerScanLine * vPos] = 0xff;
             }
         }
 
-        private static byte[] GenerateMaskArray(int width, int height, byte[] colorArray)
+        return bitsMask;
+    }
+
+    internal static int AlignToBytes(double original, int nBytesCount)
+    {
+        var nBitsCount = 8 << (nBytesCount - 1);
+        return ((int) Math.Ceiling(original) + (nBitsCount - 1)) / nBitsCount * nBitsCount;
+    }
+
+    private static BitmapSource GenerateBitmapSource(ImageSource img, Size renderSize)
+    {
+        var drawingDimensions = new Rect(0, 0, renderSize.Width, renderSize.Height);
+
+        var renderRatio = renderSize.Width / renderSize.Height;
+        var aspectRatio = img.Width / img.Height;
+
+        if (img.Width <= renderSize.Width && img.Height <= renderSize.Height)
         {
-            var nCount = width * height;
-            var bytesPerScanLine = AlignToBytes(width, 2) / 8;
-            var bitsMask = new byte[bytesPerScanLine * height];
-
-            for (var i = 0; i < nCount; i++)
-            {
-                var hPos = i % width;
-                var vPos = i / width;
-                var byteIndex = hPos / 8;
-                var offsetBit = (byte) (0x80 >> (hPos % 8));
-
-                if (colorArray[i * 4 + 3] == 0x00)
-                {
-                    bitsMask[byteIndex + bytesPerScanLine * vPos] |= offsetBit;
-                }
-                else
-                {
-                    bitsMask[byteIndex + bytesPerScanLine * vPos] &= (byte) ~offsetBit;
-                }
-
-                if (hPos == width - 1 && width == 8)
-                {
-                    bitsMask[1 + bytesPerScanLine * vPos] = 0xff;
-                }
-            }
-
-            return bitsMask;
+            drawingDimensions = new Rect((renderSize.Width - img.Width) / 2, (renderSize.Height - img.Height) / 2, img.Width, img.Height);
+        }
+        else if (renderRatio > aspectRatio)
+        {
+            var scaledRenderWidth = (img.Width / img.Height) * renderSize.Width;
+            drawingDimensions = new Rect((renderSize.Width - scaledRenderWidth) / 2, 0, scaledRenderWidth, renderSize.Height);
+        }
+        else if (renderRatio < aspectRatio)
+        {
+            var scaledRenderHeight = img.Height / img.Width * renderSize.Height;
+            drawingDimensions = new Rect(0, (renderSize.Height - scaledRenderHeight) / 2, renderSize.Width, scaledRenderHeight);
         }
 
-        internal static int AlignToBytes(double original, int nBytesCount)
+        var dv = new DrawingVisual();
+        var dc = dv.RenderOpen();
+        dc.DrawImage(img, drawingDimensions);
+        dc.Close();
+
+        var bmp = new RenderTargetBitmap((int) renderSize.Width, (int) renderSize.Height, 96, 96, PixelFormats.Pbgra32);
+        bmp.Render(dv);
+
+        return bmp;
+    }
+
+    private static BitmapFrame GetBestMatch(ReadOnlyCollection<BitmapFrame> frames, Size size)
+    {
+        var bestScore = int.MaxValue;
+        var bestBpp = 0;
+        var bestIndex = 0;
+
+        var isBitmapIconDecoder = frames[0].Decoder is IconBitmapDecoder;
+
+        for (var i = 0; i < frames.Count && bestScore != 0; ++i)
         {
-            var nBitsCount = 8 << (nBytesCount - 1);
-            return ((int) Math.Ceiling(original) + (nBitsCount - 1)) / nBitsCount * nBitsCount;
-        }
+            var currentIconBitDepth = isBitmapIconDecoder ? frames[i].Thumbnail.Format.BitsPerPixel : frames[i].Format.BitsPerPixel;
 
-        private static BitmapSource GenerateBitmapSource(ImageSource img, Size renderSize)
-        {
-            var drawingDimensions = new Rect(0, 0, renderSize.Width, renderSize.Height);
-
-            var renderRatio = renderSize.Width / renderSize.Height;
-            var aspectRatio = img.Width / img.Height;
-
-            if (img.Width <= renderSize.Width && img.Height <= renderSize.Height)
+            if (currentIconBitDepth == 0)
             {
-                drawingDimensions = new Rect((renderSize.Width - img.Width) / 2, (renderSize.Height - img.Height) / 2, img.Width, img.Height);
-            }
-            else if (renderRatio > aspectRatio)
-            {
-                var scaledRenderWidth = (img.Width / img.Height) * renderSize.Width;
-                drawingDimensions = new Rect((renderSize.Width - scaledRenderWidth) / 2, 0, scaledRenderWidth, renderSize.Height);
-            }
-            else if (renderRatio < aspectRatio)
-            {
-                var scaledRenderHeight = img.Height / img.Width * renderSize.Height;
-                drawingDimensions = new Rect(0, (renderSize.Height - scaledRenderHeight) / 2, renderSize.Width, scaledRenderHeight);
+                currentIconBitDepth = 8;
             }
 
-            var dv = new DrawingVisual();
-            var dc = dv.RenderOpen();
-            dc.DrawImage(img, drawingDimensions);
-            dc.Close();
-
-            var bmp = new RenderTargetBitmap((int) renderSize.Width, (int) renderSize.Height, 96, 96, PixelFormats.Pbgra32);
-            bmp.Render(dv);
-
-            return bmp;
-        }
-
-        private static BitmapFrame GetBestMatch(ReadOnlyCollection<BitmapFrame> frames, Size size)
-        {
-            var bestScore = int.MaxValue;
-            var bestBpp = 0;
-            var bestIndex = 0;
-
-            var isBitmapIconDecoder = frames[0].Decoder is IconBitmapDecoder;
-
-            for (var i = 0; i < frames.Count && bestScore != 0; ++i)
+            var score = MatchImage(frames[i], size, currentIconBitDepth);
+            if (score < bestScore)
             {
-                var currentIconBitDepth = isBitmapIconDecoder ? frames[i].Thumbnail.Format.BitsPerPixel : frames[i].Format.BitsPerPixel;
-
-                if (currentIconBitDepth == 0)
-                {
-                    currentIconBitDepth = 8;
-                }
-
-                var score = MatchImage(frames[i], size, currentIconBitDepth);
-                if (score < bestScore)
+                bestIndex = i;
+                bestBpp = currentIconBitDepth;
+                bestScore = score;
+            }
+            else if (score == bestScore)
+            {
+                if (bestBpp < currentIconBitDepth)
                 {
                     bestIndex = i;
                     bestBpp = currentIconBitDepth;
-                    bestScore = score;
-                }
-                else if (score == bestScore)
-                {
-                    if (bestBpp < currentIconBitDepth)
-                    {
-                        bestIndex = i;
-                        bestBpp = currentIconBitDepth;
-                    }
                 }
             }
-
-            return frames[bestIndex];
         }
 
-        private static int MatchImage(BitmapFrame frame, Size size, int bpp)
-        {
-            var score = 2 * MyAbs(bpp, SystemBitDepth, false) +
-                        MyAbs(frame.PixelWidth, (int) size.Width, true) +
-                        MyAbs(frame.PixelHeight, (int) size.Height, true);
+        return frames[bestIndex];
+    }
 
-            return score;
+    private static int MatchImage(BitmapFrame frame, Size size, int bpp)
+    {
+        var score = 2 * MyAbs(bpp, SystemBitDepth, false) +
+                    MyAbs(frame.PixelWidth, (int) size.Width, true) +
+                    MyAbs(frame.PixelHeight, (int) size.Height, true);
+
+        return score;
+    }
+
+    private static int MyAbs(int valueHave, int valueWant, bool fPunish)
+    {
+        var diff = (valueHave - valueWant);
+
+        if (diff < 0)
+        {
+            diff = (fPunish ? -2 : -1) * diff;
         }
 
-        private static int MyAbs(int valueHave, int valueWant, bool fPunish)
-        {
-            var diff = (valueHave - valueWant);
+        return diff;
+    }
 
-            if (diff < 0)
+    [SecurityCritical, SecuritySafeCritical]
+    private static void EnsureSystemMetrics()
+    {
+        if (SystemBitDepth == 0)
+        {
+            var hdcDesktop = new HandleRef(null, InteropMethods.GetDC(new HandleRef()));
+            try
             {
-                diff = (fPunish ? -2 : -1) * diff;
+                var sysBitDepth = InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.BITSPIXEL);
+                sysBitDepth *= InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.PLANES);
+
+                if (sysBitDepth == 8)
+                {
+                    sysBitDepth = 4;
+                }
+
+                var cxSmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXSMICON);
+                var cySmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYSMICON);
+                var cxIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXICON);
+                var cyIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYICON);
+
+                SmallIconSize = new Size(cxSmallIcon, cySmallIcon);
+                IconSize = new Size(cxIcon, cyIcon);
+                SystemBitDepth = sysBitDepth;
             }
-
-            return diff;
-        }
-
-        [SecurityCritical, SecuritySafeCritical]
-        private static void EnsureSystemMetrics()
-        {
-            if (SystemBitDepth == 0)
+            finally
             {
-                var hdcDesktop = new HandleRef(null, InteropMethods.GetDC(new HandleRef()));
-                try
-                {
-                    var sysBitDepth = InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.BITSPIXEL);
-                    sysBitDepth *= InteropMethods.GetDeviceCaps(hdcDesktop, InteropValues.PLANES);
-
-                    if (sysBitDepth == 8)
-                    {
-                        sysBitDepth = 4;
-                    }
-
-                    var cxSmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXSMICON);
-                    var cySmallIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYSMICON);
-                    var cxIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CXICON);
-                    var cyIcon = InteropMethods.GetSystemMetrics(InteropValues.SM.CYICON);
-
-                    SmallIconSize = new Size(cxSmallIcon, cySmallIcon);
-                    IconSize = new Size(cxIcon, cyIcon);
-                    SystemBitDepth = sysBitDepth;
-                }
-                finally
-                {
-                    InteropMethods.ReleaseDC(new HandleRef(), hdcDesktop);
-                }
+                InteropMethods.ReleaseDC(new HandleRef(), hdcDesktop);
             }
         }
-
-        [SecurityCritical, SecuritySafeCritical]
-        public static void GetDefaultIconHandles(out IconHandle largeIconHandle, out IconHandle smallIconHandle)
-        {
-            largeIconHandle = null;
-            smallIconHandle = null;
-
-            SecurityHelper.DemandUIWindowPermission();
-
-            var iconModuleFile = InteropMethods.GetModuleFileName(new HandleRef());
-            InteropMethods.ExtractIconEx(iconModuleFile, 0, out largeIconHandle, out smallIconHandle, 1);
-        }
     }
-}
+
+    [SecurityCritical, SecuritySafeCritical]
+    public static void GetDefaultIconHandles(out IconHandle largeIconHandle, out IconHandle smallIconHandle)
+    {
+        largeIconHandle = null;
+        smallIconHandle = null;
+
+        SecurityHelper.DemandUIWindowPermission();
+
+        var iconModuleFile = InteropMethods.GetModuleFileName(new HandleRef());
+        InteropMethods.ExtractIconEx(iconModuleFile, 0, out largeIconHandle, out smallIconHandle, 1);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
index 9672d8ae..afee1272 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
@@ -2,148 +2,147 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     输入层点击帮助类
+/// </summary>
+public static class InputClickHelper
 {
+    private static readonly DependencyProperty InputInfoProperty = DependencyProperty.RegisterAttached(
+        "InputInfo", typeof(InputInfo), typeof(InputClickHelper), new PropertyMetadata(default(InputInfo)));
+
+    private static void SetInputInfo(DependencyObject element, InputInfo value) => element.SetValue(InputInfoProperty, value);
+
+    private static InputInfo GetInputInfo(DependencyObject element) => (InputInfo) element.GetValue(InputInfoProperty);
+
     /// <summary>
-    ///     输入层点击帮助类
+    ///     将 MouseDown MouseMove MouseUp 封装为点击事件
     /// </summary>
-    public static class InputClickHelper
+    /// <param name="element">要被附加的元素</param>
+    /// <param name="clickEventHandler">点击的事件</param>
+    /// <param name="dragStarted">因为拖动而结束点击时触发</param>
+    public static void AttachMouseDownMoveUpToClick(UIElement element, EventHandler clickEventHandler,
+        EventHandler dragStarted = null)
     {
-        private static readonly DependencyProperty InputInfoProperty = DependencyProperty.RegisterAttached(
-            "InputInfo", typeof(InputInfo), typeof(InputClickHelper), new PropertyMetadata(default(InputInfo)));
+        var inputInfo = GetOrCreateInputInfo(element);
+        inputInfo.ClickEventHandler += clickEventHandler;
 
-        private static void SetInputInfo(DependencyObject element, InputInfo value) => element.SetValue(InputInfoProperty, value);
+        inputInfo.DragStarted += dragStarted;
 
-        private static InputInfo GetInputInfo(DependencyObject element) => (InputInfo) element.GetValue(InputInfoProperty);
+        element.MouseDown -= Element_MouseDown;
+        element.MouseDown += Element_MouseDown;
+        element.MouseMove -= Element_MouseMove;
+        element.MouseMove += Element_MouseMove;
+        element.MouseUp -= Element_MouseUp;
+        element.MouseUp += Element_MouseUp;
+        element.LostMouseCapture -= Element_LostMouseCapture;
+        element.LostMouseCapture += Element_LostMouseCapture;
+    }
 
-        /// <summary>
-        ///     将 MouseDown MouseMove MouseUp 封装为点击事件
-        /// </summary>
-        /// <param name="element">要被附加的元素</param>
-        /// <param name="clickEventHandler">点击的事件</param>
-        /// <param name="dragStarted">因为拖动而结束点击时触发</param>
-        public static void AttachMouseDownMoveUpToClick(UIElement element, EventHandler clickEventHandler,
-            EventHandler dragStarted = null)
+    /// <summary>
+    ///     去掉对 <paramref name="element" /> 的点击时间的监听
+    /// </summary>
+    /// <param name="element"></param>
+    /// <param name="clickEventHandler">点击的事件</param>
+    /// <param name="dragStarted">因为拖动而结束点击时触发的事件</param>
+    public static void DetachMouseDownMoveUpToClick(UIElement element, EventHandler clickEventHandler,
+        EventHandler dragStarted = null)
+    {
+        var inputInfo = GetInputInfo(element);
+        if (inputInfo == null) return;
+
+        inputInfo.ClickEventHandler -= clickEventHandler;
+        inputInfo.DragStarted -= dragStarted;
+
+        if (inputInfo.IsEmpty())
         {
-            var inputInfo = GetOrCreateInputInfo(element);
-            inputInfo.ClickEventHandler += clickEventHandler;
-
-            inputInfo.DragStarted += dragStarted;
-
+            element.ClearValue(InputInfoProperty);
             element.MouseDown -= Element_MouseDown;
-            element.MouseDown += Element_MouseDown;
             element.MouseMove -= Element_MouseMove;
-            element.MouseMove += Element_MouseMove;
             element.MouseUp -= Element_MouseUp;
-            element.MouseUp += Element_MouseUp;
             element.LostMouseCapture -= Element_LostMouseCapture;
-            element.LostMouseCapture += Element_LostMouseCapture;
-        }
-
-        /// <summary>
-        ///     去掉对 <paramref name="element" /> 的点击时间的监听
-        /// </summary>
-        /// <param name="element"></param>
-        /// <param name="clickEventHandler">点击的事件</param>
-        /// <param name="dragStarted">因为拖动而结束点击时触发的事件</param>
-        public static void DetachMouseDownMoveUpToClick(UIElement element, EventHandler clickEventHandler,
-            EventHandler dragStarted = null)
-        {
-            var inputInfo = GetInputInfo(element);
-            if (inputInfo == null) return;
-
-            inputInfo.ClickEventHandler -= clickEventHandler;
-            inputInfo.DragStarted -= dragStarted;
-
-            if (inputInfo.IsEmpty())
-            {
-                element.ClearValue(InputInfoProperty);
-                element.MouseDown -= Element_MouseDown;
-                element.MouseMove -= Element_MouseMove;
-                element.MouseUp -= Element_MouseUp;
-                element.LostMouseCapture -= Element_LostMouseCapture;
-            }
-        }
-
-        private static void Element_LostMouseCapture(object sender, MouseEventArgs e)
-        {
-            var element = (UIElement) sender;
-            GetInputInfo(element)?.LostCapture();
-        }
-
-        private static void Element_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            var element = (UIElement) sender;
-            GetInputInfo(element)?.Up(e.GetPosition(element));
-        }
-
-        private static void Element_MouseMove(object sender, MouseEventArgs e)
-        {
-            var element = (UIElement) sender;
-            GetInputInfo(element)?.Move(e.GetPosition(element));
-        }
-
-        private static void Element_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var element = (UIElement) sender;
-            GetInputInfo(element)?.Down(e.GetPosition(element));
-        }
-
-        private static InputInfo GetOrCreateInputInfo(UIElement element)
-        {
-            var inputInfo = GetInputInfo(element);
-            if (inputInfo == null)
-            {
-                inputInfo = new InputInfo();
-                SetInputInfo(element, inputInfo);
-            }
-
-            return inputInfo;
-        }
-
-        private class InputInfo
-        {
-            private const double ToleranceSquared = 0.01;
-
-            private Point _downedPosition;
-
-            private bool _isClick;
-
-            public event EventHandler ClickEventHandler;
-
-            public event EventHandler DragStarted;
-
-            public void Down(Point position)
-            {
-                _downedPosition = position;
-                _isClick = true;
-            }
-
-            public void Move(Point position)
-            {
-                if (!_isClick) return;
-
-                if ((position - _downedPosition).LengthSquared > ToleranceSquared)
-                {
-                    _isClick = false;
-                    DragStarted?.Invoke(null, EventArgs.Empty);
-                }
-            }
-
-            public void Up(Point position)
-            {
-                _isClick = _isClick && (position - _downedPosition).LengthSquared <= ToleranceSquared;
-
-                if (!_isClick) return;
-
-                ClickEventHandler?.Invoke(null, EventArgs.Empty);
-
-                _isClick = false;
-            }
-
-            public void LostCapture() => _isClick = false;
-
-            public bool IsEmpty() => ClickEventHandler is null && DragStarted is null;
         }
     }
-}
+
+    private static void Element_LostMouseCapture(object sender, MouseEventArgs e)
+    {
+        var element = (UIElement) sender;
+        GetInputInfo(element)?.LostCapture();
+    }
+
+    private static void Element_MouseUp(object sender, MouseButtonEventArgs e)
+    {
+        var element = (UIElement) sender;
+        GetInputInfo(element)?.Up(e.GetPosition(element));
+    }
+
+    private static void Element_MouseMove(object sender, MouseEventArgs e)
+    {
+        var element = (UIElement) sender;
+        GetInputInfo(element)?.Move(e.GetPosition(element));
+    }
+
+    private static void Element_MouseDown(object sender, MouseButtonEventArgs e)
+    {
+        var element = (UIElement) sender;
+        GetInputInfo(element)?.Down(e.GetPosition(element));
+    }
+
+    private static InputInfo GetOrCreateInputInfo(UIElement element)
+    {
+        var inputInfo = GetInputInfo(element);
+        if (inputInfo == null)
+        {
+            inputInfo = new InputInfo();
+            SetInputInfo(element, inputInfo);
+        }
+
+        return inputInfo;
+    }
+
+    private class InputInfo
+    {
+        private const double ToleranceSquared = 0.01;
+
+        private Point _downedPosition;
+
+        private bool _isClick;
+
+        public event EventHandler ClickEventHandler;
+
+        public event EventHandler DragStarted;
+
+        public void Down(Point position)
+        {
+            _downedPosition = position;
+            _isClick = true;
+        }
+
+        public void Move(Point position)
+        {
+            if (!_isClick) return;
+
+            if ((position - _downedPosition).LengthSquared > ToleranceSquared)
+            {
+                _isClick = false;
+                DragStarted?.Invoke(null, EventArgs.Empty);
+            }
+        }
+
+        public void Up(Point position)
+        {
+            _isClick = _isClick && (position - _downedPosition).LengthSquared <= ToleranceSquared;
+
+            if (!_isClick) return;
+
+            ClickEventHandler?.Invoke(null, EventArgs.Empty);
+
+            _isClick = false;
+        }
+
+        public void LostCapture() => _isClick = false;
+
+        public bool IsEmpty() => ClickEventHandler is null && DragStarted is null;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
index be63404b..8a17a56e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
@@ -3,83 +3,82 @@ using System.Reflection;
 using System.Windows;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     资源帮助类
+/// </summary>
+public class ResourceHelper
 {
+    private static ResourceDictionary _theme;
+
     /// <summary>
-    ///     资源帮助类
+    ///     获取资源
     /// </summary>
-    public class ResourceHelper
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public static T GetResource<T>(string key)
     {
-        private static ResourceDictionary _theme;
-
-        /// <summary>
-        ///     获取资源
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public static T GetResource<T>(string key)
+        if (Application.Current.TryFindResource(key) is T resource)
         {
-            if (Application.Current.TryFindResource(key) is T resource)
-            {
-                return resource;
-            }
-
-            return default;
+            return resource;
         }
 
-        internal static T GetResourceInternal<T>(string key)
-        {
-            if (GetTheme()[key] is T resource)
-            {
-                return resource;
-            }
+        return default;
+    }
 
-            return default;
+    internal static T GetResourceInternal<T>(string key)
+    {
+        if (GetTheme()[key] is T resource)
+        {
+            return resource;
         }
 
-        /// <summary>
-        ///     获取皮肤
-        /// </summary>
-        public static ResourceDictionary GetSkin(Assembly assembly, string themePath, SkinType skin)
+        return default;
+    }
+
+    /// <summary>
+    ///     获取皮肤
+    /// </summary>
+    public static ResourceDictionary GetSkin(Assembly assembly, string themePath, SkinType skin)
+    {
+        try
         {
-            try
+            var uri = new Uri($"pack://application:,,,/{assembly.GetName().Name};component/{themePath}/Skin{skin}.xaml");
+            return new ResourceDictionary
             {
-                var uri = new Uri($"pack://application:,,,/{assembly.GetName().Name};component/{themePath}/Skin{skin}.xaml");
-                return new ResourceDictionary
-                {
-                    Source = uri
-                };
-            }
-            catch
-            {
-                return new ResourceDictionary
-                {
-                    Source = new Uri($"pack://application:,,,/{assembly.GetName().Name};component/{themePath}/Skin{SkinType.Default}.xaml")
-                };
-            }
+                Source = uri
+            };
         }
-
-        /// <summary>
-        ///     get HandyControl skin
-        /// </summary>
-        /// <param name="skin"></param>
-        /// <returns></returns>
-        public static ResourceDictionary GetSkin(SkinType skin) => new()
+        catch
         {
-            Source = new Uri($"pack://application:,,,/HandyControl;component/Themes/Skin{skin}.xaml")
-        };
-
-        /// <summary>
-        ///     get HandyControl theme
-        /// </summary>
-        public static ResourceDictionary GetTheme() => _theme ??= GetStandaloneTheme();
-
-        public static ResourceDictionary GetStandaloneTheme()
-        {
-            return new()
+            return new ResourceDictionary
             {
-                Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
+                Source = new Uri($"pack://application:,,,/{assembly.GetName().Name};component/{themePath}/Skin{SkinType.Default}.xaml")
             };
         }
     }
-}
+
+    /// <summary>
+    ///     get HandyControl skin
+    /// </summary>
+    /// <param name="skin"></param>
+    /// <returns></returns>
+    public static ResourceDictionary GetSkin(SkinType skin) => new()
+    {
+        Source = new Uri($"pack://application:,,,/HandyControl;component/Themes/Skin{skin}.xaml")
+    };
+
+    /// <summary>
+    ///     get HandyControl theme
+    /// </summary>
+    public static ResourceDictionary GetTheme() => _theme ??= GetStandaloneTheme();
+
+    public static ResourceDictionary GetStandaloneTheme()
+    {
+        return new()
+        {
+            Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
index fc7ae801..7863351d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
@@ -4,82 +4,81 @@ using System.Runtime.InteropServices;
 using System.Windows;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+internal class ScreenHelper
 {
-    internal class ScreenHelper
+    internal static void FindMaximumSingleMonitorRectangle(Rect windowRect, out Rect screenSubRect, out Rect monitorRect)
     {
-        internal static void FindMaximumSingleMonitorRectangle(Rect windowRect, out Rect screenSubRect, out Rect monitorRect)
-        {
-            var windowRect2 = new InteropValues.RECT(windowRect);
-            FindMaximumSingleMonitorRectangle(windowRect2, out var rect, out var rect2);
-            screenSubRect = new Rect(rect.Position, rect.Size);
-            monitorRect = new Rect(rect2.Position, rect2.Size);
-        }
+        var windowRect2 = new InteropValues.RECT(windowRect);
+        FindMaximumSingleMonitorRectangle(windowRect2, out var rect, out var rect2);
+        screenSubRect = new Rect(rect.Position, rect.Size);
+        monitorRect = new Rect(rect2.Position, rect2.Size);
+    }
 
-        private static void FindMaximumSingleMonitorRectangle(InteropValues.RECT windowRect, out InteropValues.RECT screenSubRect, out InteropValues.RECT monitorRect)
-        {
-            var rects = new List<InteropValues.RECT>();
-            InteropMethods.EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero,
-                delegate (IntPtr hMonitor, IntPtr hdcMonitor, ref InteropValues.RECT rect, IntPtr lpData)
-                {
-                    var monitorInfo = default(InteropValues.MONITORINFO);
-                    monitorInfo.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
-                    InteropMethods.GetMonitorInfo(hMonitor, ref monitorInfo);
-                    rects.Add(monitorInfo.rcWork);
-                    return true;
-                }, IntPtr.Zero);
-
-            var num = 0L;
-
-            screenSubRect = new InteropValues.RECT
+    private static void FindMaximumSingleMonitorRectangle(InteropValues.RECT windowRect, out InteropValues.RECT screenSubRect, out InteropValues.RECT monitorRect)
+    {
+        var rects = new List<InteropValues.RECT>();
+        InteropMethods.EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero,
+            delegate (IntPtr hMonitor, IntPtr hdcMonitor, ref InteropValues.RECT rect, IntPtr lpData)
             {
-                Left = 0,
-                Right = 0,
-                Top = 0,
-                Bottom = 0
-            };
-
-            monitorRect = new InteropValues.RECT
-            {
-                Left = 0,
-                Right = 0,
-                Top = 0,
-                Bottom = 0
-            };
-
-            foreach (var current in rects)
-            {
-                var rect = current;
-                InteropMethods.IntersectRect(out var rECT2, ref rect, ref windowRect);
-                var num2 = (long) (rECT2.Width * rECT2.Height);
-                if (num2 > num)
-                {
-                    screenSubRect = rECT2;
-                    monitorRect = current;
-                    num = num2;
-                }
-            }
-        }
-
-        internal static void FindMonitorRectsFromPoint(Point point, out Rect monitorRect, out Rect workAreaRect)
-        {
-            var intPtr = InteropMethods.MonitorFromPoint(new InteropValues.POINT
-            {
-                X = (int) point.X,
-                Y = (int) point.Y
-            }, 2);
-
-            monitorRect = new Rect(0.0, 0.0, 0.0, 0.0);
-            workAreaRect = new Rect(0.0, 0.0, 0.0, 0.0);
-
-            if (intPtr != IntPtr.Zero)
-            {
-                InteropValues.MONITORINFO monitorInfo = default;
+                var monitorInfo = default(InteropValues.MONITORINFO);
                 monitorInfo.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
-                InteropMethods.GetMonitorInfo(intPtr, ref monitorInfo);
-                monitorRect = new Rect(monitorInfo.rcMonitor.Position, monitorInfo.rcMonitor.Size);
-                workAreaRect = new Rect(monitorInfo.rcWork.Position, monitorInfo.rcWork.Size);
+                InteropMethods.GetMonitorInfo(hMonitor, ref monitorInfo);
+                rects.Add(monitorInfo.rcWork);
+                return true;
+            }, IntPtr.Zero);
+
+        var num = 0L;
+
+        screenSubRect = new InteropValues.RECT
+        {
+            Left = 0,
+            Right = 0,
+            Top = 0,
+            Bottom = 0
+        };
+
+        monitorRect = new InteropValues.RECT
+        {
+            Left = 0,
+            Right = 0,
+            Top = 0,
+            Bottom = 0
+        };
+
+        foreach (var current in rects)
+        {
+            var rect = current;
+            InteropMethods.IntersectRect(out var rECT2, ref rect, ref windowRect);
+            var num2 = (long) (rECT2.Width * rECT2.Height);
+            if (num2 > num)
+            {
+                screenSubRect = rECT2;
+                monitorRect = current;
+                num = num2;
             }
         }
     }
-}
+
+    internal static void FindMonitorRectsFromPoint(Point point, out Rect monitorRect, out Rect workAreaRect)
+    {
+        var intPtr = InteropMethods.MonitorFromPoint(new InteropValues.POINT
+        {
+            X = (int) point.X,
+            Y = (int) point.Y
+        }, 2);
+
+        monitorRect = new Rect(0.0, 0.0, 0.0, 0.0);
+        workAreaRect = new Rect(0.0, 0.0, 0.0, 0.0);
+
+        if (intPtr != IntPtr.Zero)
+        {
+            InteropValues.MONITORINFO monitorInfo = default;
+            monitorInfo.cbSize = (uint) Marshal.SizeOf(typeof(InteropValues.MONITORINFO));
+            InteropMethods.GetMonitorInfo(intPtr, ref monitorInfo);
+            monitorRect = new Rect(monitorInfo.rcMonitor.Position, monitorInfo.rcMonitor.Size);
+            workAreaRect = new Rect(monitorInfo.rcWork.Position, monitorInfo.rcWork.Size);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
index 1b8deb4d..3de2bca3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
@@ -2,18 +2,17 @@
 using System.Security;
 using System.Security.Permissions;
 
-namespace HandyControl.Tools
-{
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal class SecurityHelper
-    {
-        private static UIPermission _allWindowsUIPermission;
+namespace HandyControl.Tools;
 
-        [SecurityCritical]
-        internal static void DemandUIWindowPermission()
-        {
-            _allWindowsUIPermission ??= new UIPermission(UIPermissionWindow.AllWindows);
-            _allWindowsUIPermission.Demand();
-        }
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+internal class SecurityHelper
+{
+    private static UIPermission _allWindowsUIPermission;
+
+    [SecurityCritical]
+    internal static void DemandUIWindowPermission()
+    {
+        _allWindowsUIPermission ??= new UIPermission(UIPermissionWindow.AllWindows);
+        _allWindowsUIPermission.Demand();
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
index ebb1c1b1..4c4bdc88 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
@@ -3,40 +3,39 @@ using System.Linq;
 using System.Windows.Media;
 using HandyControl.Controls;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     该类可以为可视化元素提供单开的功能
+/// </summary>
+public class SingleOpenHelper
 {
+    private static readonly Dictionary<string, ISingleOpen> OpenDic = new();
+
     /// <summary>
-    ///     该类可以为可视化元素提供单开的功能
+    ///     根据指定的类型创建实例
     /// </summary>
-    public class SingleOpenHelper
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static T CreateControl<T>() where T : Visual, ISingleOpen, new()
     {
-        private static readonly Dictionary<string, ISingleOpen> OpenDic = new();
+        var typeStr = typeof(T).FullName;
 
-        /// <summary>
-        ///     根据指定的类型创建实例
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static T CreateControl<T>() where T : Visual, ISingleOpen, new()
+        if (string.IsNullOrEmpty(typeStr)) return default;
+
+        var temp = new T();
+        if (!OpenDic.Keys.Contains(typeStr))
         {
-            var typeStr = typeof(T).FullName;
-
-            if (string.IsNullOrEmpty(typeStr)) return default;
-
-            var temp = new T();
-            if (!OpenDic.Keys.Contains(typeStr))
-            {
-                OpenDic.Add(typeStr, temp);
-                return temp;
-            }
-            var currentCtl = OpenDic[typeStr];
-            if (currentCtl.CanDispose)
-            {
-                currentCtl.Dispose();
-                OpenDic[typeStr] = temp;
-                return temp;
-            }
-            return default;
+            OpenDic.Add(typeStr, temp);
+            return temp;
         }
+        var currentCtl = OpenDic[typeStr];
+        if (currentCtl.CanDispose)
+        {
+            currentCtl.Dispose();
+            OpenDic[typeStr] = temp;
+            return temp;
+        }
+        return default;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
index a2349722..7222cde7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
@@ -3,27 +3,26 @@ using HandyControl.Data;
 using HandyControl.Tools.Interop;
 using Microsoft.Win32;
 
-namespace HandyControl.Tools.Helper
+namespace HandyControl.Tools.Helper;
+
+internal class SystemHelper
 {
-    internal class SystemHelper
+    public static SystemVersionInfo GetSystemVersionInfo()
     {
-        public static SystemVersionInfo GetSystemVersionInfo()
-        {
-            var osv = new InteropValues.RTL_OSVERSIONINFOEX();
-            osv.dwOSVersionInfoSize = (uint) Marshal.SizeOf(osv);
-            InteropMethods.Gdip.RtlGetVersion(out osv);
-            return new SystemVersionInfo((int) osv.dwMajorVersion, (int) osv.dwMinorVersion, (int) osv.dwBuildNumber);
-        }
-
-        private const string SkinTypeRegistryKeyName = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
-
-        private const string SkinTypeRegistryValueName = "AppsUseLightTheme";
-
-        public static bool DetermineIfInLightThemeMode()
-        {
-            var value = Registry.GetValue(SkinTypeRegistryKeyName, SkinTypeRegistryValueName, "0");
-
-            return value != null && value.ToString() != "0";
-        }
+        var osv = new InteropValues.RTL_OSVERSIONINFOEX();
+        osv.dwOSVersionInfoSize = (uint) Marshal.SizeOf(osv);
+        InteropMethods.Gdip.RtlGetVersion(out osv);
+        return new SystemVersionInfo((int) osv.dwMajorVersion, (int) osv.dwMinorVersion, (int) osv.dwBuildNumber);
     }
-}
+
+    private const string SkinTypeRegistryKeyName = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
+
+    private const string SkinTypeRegistryValueName = "AppsUseLightTheme";
+
+    public static bool DetermineIfInLightThemeMode()
+    {
+        var value = Registry.GetValue(SkinTypeRegistryKeyName, SkinTypeRegistryValueName, "0");
+
+        return value != null && value.ToString() != "0";
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
index a1ef12a8..cd6f37f1 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
@@ -2,19 +2,19 @@
 using System.Windows;
 using System.Windows.Media;
 
-namespace HandyControl.Tools.Helper
+namespace HandyControl.Tools.Helper;
+
+internal class TextHelper
 {
-    internal class TextHelper
+    public static FormattedText CreateFormattedText(string text, FlowDirection flowDirection, Typeface typeface, double fontSize)
     {
-        public static FormattedText CreateFormattedText(string text, FlowDirection flowDirection, Typeface typeface, double fontSize)
-        {
 #if NET40 || NET45 || NET451 || NET452 || NET46 || NET461
-            var formattedText = new FormattedText(
-                text,
-                CultureInfo.CurrentUICulture,
-                flowDirection,
-                typeface,
-                fontSize, Brushes.Black);
+        var formattedText = new FormattedText(
+            text,
+            CultureInfo.CurrentUICulture,
+            flowDirection,
+            typeface,
+            fontSize, Brushes.Black);
 #else
             var formattedText = new FormattedText(
                 text,
@@ -24,7 +24,6 @@ namespace HandyControl.Tools.Helper
                 fontSize, Brushes.Black, DpiHelper.DeviceDpiX);
 #endif
 
-            return formattedText;
-        }
+        return formattedText;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
index 6e06838a..7790f82e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
@@ -16,218 +16,217 @@
 using System;
 using System.Globalization;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+internal class TokenizerHelper
 {
-    internal class TokenizerHelper
+    private char _quoteChar;
+
+    private char _argSeparator;
+
+    private string _str;
+
+    private int _strLen;
+
+    private int _charIndex;
+
+    private int _currentTokenIndex;
+
+    private int _currentTokenLength;
+
+    public bool FoundSeparator { get; private set; }
+
+    public TokenizerHelper(string str, IFormatProvider formatProvider)
     {
-        private char _quoteChar;
+        var numberSeparator = GetNumericListSeparator(formatProvider);
+        Initialize(str, '\'', numberSeparator);
+    }
 
-        private char _argSeparator;
+    private void Initialize(string str, char quoteChar, char separator)
+    {
+        _str = str;
+        _strLen = str?.Length ?? 0;
+        _currentTokenIndex = -1;
+        _quoteChar = quoteChar;
+        _argSeparator = separator;
 
-        private string _str;
-
-        private int _strLen;
-
-        private int _charIndex;
-
-        private int _currentTokenIndex;
-
-        private int _currentTokenLength;
-
-        public bool FoundSeparator { get; private set; }
-
-        public TokenizerHelper(string str, IFormatProvider formatProvider)
+        // immediately forward past any whitespace so
+        // NextToken() logic always starts on the first
+        // character of the next token.
+        while (_charIndex < _strLen)
         {
-            var numberSeparator = GetNumericListSeparator(formatProvider);
-            Initialize(str, '\'', numberSeparator);
+            if (!char.IsWhiteSpace(_str, _charIndex))
+            {
+                break;
+            }
+
+            ++_charIndex;
+        }
+    }
+
+    public string GetCurrentToken() =>
+        _currentTokenIndex < 0 ? null : _str.Substring(_currentTokenIndex, _currentTokenLength);
+
+    internal bool NextToken() => NextToken(false);
+
+    public bool NextToken(bool allowQuotedToken) => NextToken(allowQuotedToken, _argSeparator);
+
+    public bool NextToken(bool allowQuotedToken, char separator)
+    {
+        _currentTokenIndex = -1; // reset the currentTokenIndex
+        FoundSeparator = false; // reset
+
+        // If we're at end of the string, just return false.
+        if (_charIndex >= _strLen)
+        {
+            return false;
         }
 
-        private void Initialize(string str, char quoteChar, char separator)
+        var currentChar = _str[_charIndex];
+
+        // setup the quoteCount
+        var quoteCount = 0;
+
+        // If we are allowing a quoted token and this token begins with a quote,
+        // set up the quote count and skip the initial quote
+        if (allowQuotedToken &&
+            currentChar == _quoteChar)
         {
-            _str = str;
-            _strLen = str?.Length ?? 0;
-            _currentTokenIndex = -1;
-            _quoteChar = quoteChar;
-            _argSeparator = separator;
-
-            // immediately forward past any whitespace so
-            // NextToken() logic always starts on the first
-            // character of the next token.
-            while (_charIndex < _strLen)
-            {
-                if (!char.IsWhiteSpace(_str, _charIndex))
-                {
-                    break;
-                }
-
-                ++_charIndex;
-            }
+            quoteCount++; // increment quote count
+            ++_charIndex; // move to next character
         }
 
-        public string GetCurrentToken() =>
-            _currentTokenIndex < 0 ? null : _str.Substring(_currentTokenIndex, _currentTokenLength);
+        var newTokenIndex = _charIndex;
+        var newTokenLength = 0;
 
-        internal bool NextToken() => NextToken(false);
-
-        public bool NextToken(bool allowQuotedToken) => NextToken(allowQuotedToken, _argSeparator);
-
-        public bool NextToken(bool allowQuotedToken, char separator)
+        // loop until hit end of string or hit a , or whitespace
+        // if at end of string ust return false.
+        while (_charIndex < _strLen)
         {
-            _currentTokenIndex = -1; // reset the currentTokenIndex
-            FoundSeparator = false; // reset
+            currentChar = _str[_charIndex];
 
-            // If we're at end of the string, just return false.
-            if (_charIndex >= _strLen)
-            {
-                return false;
-            }
-
-            var currentChar = _str[_charIndex];
-
-            // setup the quoteCount
-            var quoteCount = 0;
-
-            // If we are allowing a quoted token and this token begins with a quote,
-            // set up the quote count and skip the initial quote
-            if (allowQuotedToken &&
-                currentChar == _quoteChar)
-            {
-                quoteCount++; // increment quote count
-                ++_charIndex; // move to next character
-            }
-
-            var newTokenIndex = _charIndex;
-            var newTokenLength = 0;
-
-            // loop until hit end of string or hit a , or whitespace
-            // if at end of string ust return false.
-            while (_charIndex < _strLen)
-            {
-                currentChar = _str[_charIndex];
-
-                // if have a QuoteCount and this is a quote
-                // decrement the quoteCount
-                if (quoteCount > 0)
-                {
-                    // if anything but a quoteChar we move on
-                    if (currentChar == _quoteChar)
-                    {
-                        --quoteCount;
-
-                        // if at zero which it always should for now
-                        // break out of the loop
-                        if (0 == quoteCount)
-                        {
-                            ++_charIndex; // move past the quote
-                            break;
-                        }
-                    }
-                }
-                else if (char.IsWhiteSpace(currentChar) || currentChar == separator)
-                {
-                    if (currentChar == separator)
-                    {
-                        FoundSeparator = true;
-                    }
-                    break;
-                }
-
-                ++_charIndex;
-                ++newTokenLength;
-            }
-
-            // if quoteCount isn't zero we hit the end of the string
-            // before the ending quote
+            // if have a QuoteCount and this is a quote
+            // decrement the quoteCount
             if (quoteCount > 0)
             {
-                throw new InvalidOperationException("TokenizerHelperMissingEndQuote");
+                // if anything but a quoteChar we move on
+                if (currentChar == _quoteChar)
+                {
+                    --quoteCount;
+
+                    // if at zero which it always should for now
+                    // break out of the loop
+                    if (0 == quoteCount)
+                    {
+                        ++_charIndex; // move past the quote
+                        break;
+                    }
+                }
             }
-
-            ScanToNextToken(separator); // move so at the start of the nextToken for next call
-
-            // finally made it, update the _currentToken values
-            _currentTokenIndex = newTokenIndex;
-            _currentTokenLength = newTokenLength;
-
-            if (_currentTokenLength < 1)
+            else if (char.IsWhiteSpace(currentChar) || currentChar == separator)
             {
-                throw new InvalidOperationException("TokenizerHelperEmptyToken");
-            }
-
-            return true;
-        }
-
-        private void ScanToNextToken(char separator)
-        {
-            // if already at end of the string don't bother
-            if (_charIndex >= _strLen) return;
-
-            var currentChar = _str[_charIndex];
-
-            // check that the currentChar is a space or the separator.  If not
-            // we have an error. this can happen in the quote case
-            // that the char after the quotes string isn't a char.
-            if (currentChar != separator && !char.IsWhiteSpace(currentChar))
-            {
-                throw new InvalidOperationException("TokenizerHelperExtraDataEncountered");
-            }
-
-            // loop until hit a character that isn't
-            // an argument separator or whitespace.
-            // !!!Todo: if more than one argSet throw an exception
-            var argSepCount = 0;
-            while (_charIndex < _strLen)
-            {
-                currentChar = _str[_charIndex];
-
                 if (currentChar == separator)
                 {
                     FoundSeparator = true;
-                    ++argSepCount;
-                    _charIndex++;
-
-                    if (argSepCount > 1)
-                    {
-                        throw new InvalidOperationException("TokenizerHelperEmptyToken");
-                    }
-                }
-                else if (char.IsWhiteSpace(currentChar))
-                {
-                    ++_charIndex;
-                }
-                else
-                {
-                    break;
                 }
+                break;
             }
 
-            // if there was a separatorChar then we shouldn't be
-            // at the end of string or means there was a separator
-            // but there isn't an arg
+            ++_charIndex;
+            ++newTokenLength;
+        }
 
-            if (argSepCount > 0 && _charIndex >= _strLen)
+        // if quoteCount isn't zero we hit the end of the string
+        // before the ending quote
+        if (quoteCount > 0)
+        {
+            throw new InvalidOperationException("TokenizerHelperMissingEndQuote");
+        }
+
+        ScanToNextToken(separator); // move so at the start of the nextToken for next call
+
+        // finally made it, update the _currentToken values
+        _currentTokenIndex = newTokenIndex;
+        _currentTokenLength = newTokenLength;
+
+        if (_currentTokenLength < 1)
+        {
+            throw new InvalidOperationException("TokenizerHelperEmptyToken");
+        }
+
+        return true;
+    }
+
+    private void ScanToNextToken(char separator)
+    {
+        // if already at end of the string don't bother
+        if (_charIndex >= _strLen) return;
+
+        var currentChar = _str[_charIndex];
+
+        // check that the currentChar is a space or the separator.  If not
+        // we have an error. this can happen in the quote case
+        // that the char after the quotes string isn't a char.
+        if (currentChar != separator && !char.IsWhiteSpace(currentChar))
+        {
+            throw new InvalidOperationException("TokenizerHelperExtraDataEncountered");
+        }
+
+        // loop until hit a character that isn't
+        // an argument separator or whitespace.
+        // !!!Todo: if more than one argSet throw an exception
+        var argSepCount = 0;
+        while (_charIndex < _strLen)
+        {
+            currentChar = _str[_charIndex];
+
+            if (currentChar == separator)
             {
-                throw new InvalidOperationException("TokenizerHelperEmptyToken");
+                FoundSeparator = true;
+                ++argSepCount;
+                _charIndex++;
+
+                if (argSepCount > 1)
+                {
+                    throw new InvalidOperationException("TokenizerHelperEmptyToken");
+                }
+            }
+            else if (char.IsWhiteSpace(currentChar))
+            {
+                ++_charIndex;
+            }
+            else
+            {
+                break;
             }
         }
 
-        internal static char GetNumericListSeparator(IFormatProvider provider)
+        // if there was a separatorChar then we shouldn't be
+        // at the end of string or means there was a separator
+        // but there isn't an arg
+
+        if (argSepCount > 0 && _charIndex >= _strLen)
         {
-            var numericSeparator = ',';
-
-            // Get the NumberFormatInfo out of the provider, if possible
-            // If the IFormatProvider doesn't not contain a NumberFormatInfo, then
-            // this method returns the current culture's NumberFormatInfo.
-            var numberFormat = NumberFormatInfo.GetInstance(provider);
-
-            // Is the decimal separator is the same as the list separator?
-            // If so, we use the ";".
-            if (numberFormat.NumberDecimalSeparator.Length > 0 && numericSeparator == numberFormat.NumberDecimalSeparator[0])
-            {
-                numericSeparator = ';';
-            }
-
-            return numericSeparator;
+            throw new InvalidOperationException("TokenizerHelperEmptyToken");
         }
     }
-}
+
+    internal static char GetNumericListSeparator(IFormatProvider provider)
+    {
+        var numericSeparator = ',';
+
+        // Get the NumberFormatInfo out of the provider, if possible
+        // If the IFormatProvider doesn't not contain a NumberFormatInfo, then
+        // this method returns the current culture's NumberFormatInfo.
+        var numberFormat = NumberFormatInfo.GetInstance(provider);
+
+        // Is the decimal separator is the same as the list separator?
+        // If so, we use the ";".
+        if (numberFormat.NumberDecimalSeparator.Length > 0 && numericSeparator == numberFormat.NumberDecimalSeparator[0])
+        {
+            numericSeparator = ';';
+        }
+
+        return numericSeparator;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
index ae24727f..e3b96334 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
@@ -6,68 +6,67 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools.Helper
+namespace HandyControl.Tools.Helper;
+
+internal class TouchDragMoveWindowHelper
 {
-    internal class TouchDragMoveWindowHelper
+    private const int MaxMoveSpeed = 60;
+
+    public TouchDragMoveWindowHelper(Window window)
     {
-        private const int MaxMoveSpeed = 60;
-
-        public TouchDragMoveWindowHelper(Window window)
-        {
-            _window = window;
-        }
-
-        public void Start()
-        {
-            var window = _window;
-
-            window.PreviewMouseMove += Window_PreviewMouseMove;
-            window.PreviewMouseUp += Window_PreviewMouseUp;
-            window.LostMouseCapture += Window_LostMouseCapture;
-        }
-
-        public void Stop()
-        {
-            var window = _window;
-
-            window.PreviewMouseMove -= Window_PreviewMouseMove;
-            window.PreviewMouseUp -= Window_PreviewMouseUp;
-            window.LostMouseCapture -= Window_LostMouseCapture;
-        }
-
-        private readonly Window _window;
-
-        private InteropValues.POINT? _lastPoint;
-
-        private void Window_LostMouseCapture(object sender, MouseEventArgs e) => Stop();
-
-        private void Window_PreviewMouseUp(object sender, MouseButtonEventArgs e) => Stop();
-
-        private void Window_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            InteropMethods.GetCursorPos(out var lpPoint);
-
-            if (_lastPoint == null)
-            {
-                _lastPoint = lpPoint;
-                _window.CaptureMouse();
-            }
-
-            var dx = lpPoint.X - _lastPoint.Value.X;
-            var dy = lpPoint.Y - _lastPoint.Value.Y;
-
-            if (Math.Abs(dx) < MaxMoveSpeed && Math.Abs(dy) < MaxMoveSpeed)
-            {
-                var handle = new WindowInteropHelper(_window).Handle;
-
-                InteropMethods.GetWindowRect(handle, out var lpRect);
-
-                InteropMethods.SetWindowPos(handle, IntPtr.Zero, lpRect.Left + dx, lpRect.Top + dy, 0, 0,
-                    (int) (InteropValues.WindowPositionFlags.SWP_NOSIZE |
-                           InteropValues.WindowPositionFlags.SWP_NOZORDER));
-            }
-
-            _lastPoint = lpPoint;
-        }
+        _window = window;
     }
-}
+
+    public void Start()
+    {
+        var window = _window;
+
+        window.PreviewMouseMove += Window_PreviewMouseMove;
+        window.PreviewMouseUp += Window_PreviewMouseUp;
+        window.LostMouseCapture += Window_LostMouseCapture;
+    }
+
+    public void Stop()
+    {
+        var window = _window;
+
+        window.PreviewMouseMove -= Window_PreviewMouseMove;
+        window.PreviewMouseUp -= Window_PreviewMouseUp;
+        window.LostMouseCapture -= Window_LostMouseCapture;
+    }
+
+    private readonly Window _window;
+
+    private InteropValues.POINT? _lastPoint;
+
+    private void Window_LostMouseCapture(object sender, MouseEventArgs e) => Stop();
+
+    private void Window_PreviewMouseUp(object sender, MouseButtonEventArgs e) => Stop();
+
+    private void Window_PreviewMouseMove(object sender, MouseEventArgs e)
+    {
+        InteropMethods.GetCursorPos(out var lpPoint);
+
+        if (_lastPoint == null)
+        {
+            _lastPoint = lpPoint;
+            _window.CaptureMouse();
+        }
+
+        var dx = lpPoint.X - _lastPoint.Value.X;
+        var dy = lpPoint.Y - _lastPoint.Value.Y;
+
+        if (Math.Abs(dx) < MaxMoveSpeed && Math.Abs(dy) < MaxMoveSpeed)
+        {
+            var handle = new WindowInteropHelper(_window).Handle;
+
+            InteropMethods.GetWindowRect(handle, out var lpRect);
+
+            InteropMethods.SetWindowPos(handle, IntPtr.Zero, lpRect.Left + dx, lpRect.Top + dy, 0, 0,
+                (int) (InteropValues.WindowPositionFlags.SWP_NOSIZE |
+                       InteropValues.WindowPositionFlags.SWP_NOZORDER));
+        }
+
+        _lastPoint = lpPoint;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
index af86c119..1a076162 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
@@ -1,107 +1,106 @@
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     验证帮助类
+/// </summary>
+public class ValidateHelper
 {
     /// <summary>
-    ///     验证帮助类
+    ///     是否在浮点数范围内
     /// </summary>
-    public class ValidateHelper
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfDouble(object value)
     {
-        /// <summary>
-        ///     是否在浮点数范围内
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfDouble(object value)
-        {
-            var v = (double) value;
-            return !(double.IsNaN(v) || double.IsInfinity(v));
-        }
-
-        /// <summary>
-        ///     是否在正浮点数范围内
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfPosDouble(object value)
-        {
-            var v = (double) value;
-            return !(double.IsNaN(v) || double.IsInfinity(v)) && v > 0;
-        }
-
-        /// <summary>
-        ///     是否在正浮点数范围内（包括0）
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfPosDoubleIncludeZero(object value)
-        {
-            var v = (double) value;
-            return !(double.IsNaN(v) || double.IsInfinity(v)) && v >= 0;
-        }
-
-        /// <summary>
-        ///     是否在负浮点数范围内
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfNegDouble(object value)
-        {
-            var v = (double) value;
-            return !(double.IsNaN(v) || double.IsInfinity(v)) && v < 0;
-        }
-
-        /// <summary>
-        ///     是否在负浮点数范围内（包括0）
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfNegDoubleIncludeZero(object value)
-        {
-            var v = (double) value;
-            return !(double.IsNaN(v) || double.IsInfinity(v)) && v <= 0;
-        }
-
-        /// <summary>
-        ///     是否在正整数范围内
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfPosInt(object value)
-        {
-            var v = (int) value;
-            return v > 0;
-        }
-
-        /// <summary>
-        ///     是否在正整数范围内（包括0）
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfPosIntIncludeZero(object value)
-        {
-            var v = (int) value;
-            return v >= 0;
-        }
-
-        /// <summary>
-        ///     是否在负整数范围内
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfNegInt(object value)
-        {
-            var v = (int) value;
-            return v < 0;
-        }
-
-        /// <summary>
-        ///     是否在负整数范围内（包括0）
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool IsInRangeOfNegIntIncludeZero(object value)
-        {
-            var v = (int) value;
-            return v <= 0;
-        }
+        var v = (double) value;
+        return !(double.IsNaN(v) || double.IsInfinity(v));
     }
-}
+
+    /// <summary>
+    ///     是否在正浮点数范围内
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfPosDouble(object value)
+    {
+        var v = (double) value;
+        return !(double.IsNaN(v) || double.IsInfinity(v)) && v > 0;
+    }
+
+    /// <summary>
+    ///     是否在正浮点数范围内（包括0）
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfPosDoubleIncludeZero(object value)
+    {
+        var v = (double) value;
+        return !(double.IsNaN(v) || double.IsInfinity(v)) && v >= 0;
+    }
+
+    /// <summary>
+    ///     是否在负浮点数范围内
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfNegDouble(object value)
+    {
+        var v = (double) value;
+        return !(double.IsNaN(v) || double.IsInfinity(v)) && v < 0;
+    }
+
+    /// <summary>
+    ///     是否在负浮点数范围内（包括0）
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfNegDoubleIncludeZero(object value)
+    {
+        var v = (double) value;
+        return !(double.IsNaN(v) || double.IsInfinity(v)) && v <= 0;
+    }
+
+    /// <summary>
+    ///     是否在正整数范围内
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfPosInt(object value)
+    {
+        var v = (int) value;
+        return v > 0;
+    }
+
+    /// <summary>
+    ///     是否在正整数范围内（包括0）
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfPosIntIncludeZero(object value)
+    {
+        var v = (int) value;
+        return v >= 0;
+    }
+
+    /// <summary>
+    ///     是否在负整数范围内
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfNegInt(object value)
+    {
+        var v = (int) value;
+        return v < 0;
+    }
+
+    /// <summary>
+    ///     是否在负整数范围内（包括0）
+    /// </summary>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public static bool IsInRangeOfNegIntIncludeZero(object value)
+    {
+        var v = (int) value;
+        return v <= 0;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
index 01d914d3..0c9cab6b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
@@ -5,73 +5,72 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public static class VisualHelper
 {
-    public static class VisualHelper
+    internal static VisualStateGroup TryGetVisualStateGroup(DependencyObject d, string groupName)
     {
-        internal static VisualStateGroup TryGetVisualStateGroup(DependencyObject d, string groupName)
-        {
-            var root = GetImplementationRoot(d);
-            if (root == null) return null;
+        var root = GetImplementationRoot(d);
+        if (root == null) return null;
 
-            return VisualStateManager
-                .GetVisualStateGroups(root)?
-                .OfType<VisualStateGroup>()
-                .FirstOrDefault(group => string.CompareOrdinal(groupName, group.Name) == 0);
-        }
-
-        internal static FrameworkElement GetImplementationRoot(DependencyObject d) =>
-            1 == VisualTreeHelper.GetChildrenCount(d)
-                ? VisualTreeHelper.GetChild(d, 0) as FrameworkElement
-                : null;
-
-        public static T GetChild<T>(DependencyObject d) where T : DependencyObject
-        {
-            if (d == null) return default;
-            if (d is T t) return t;
-
-            for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
-            {
-                var child = VisualTreeHelper.GetChild(d, i);
-
-                var result = GetChild<T>(child);
-                if (result != null) return result;
-            }
-
-            return default;
-        }
-
-        public static T GetParent<T>(DependencyObject d) where T : DependencyObject =>
-            d switch
-            {
-                null => default,
-                T t => t,
-                Window _ => null,
-                _ => GetParent<T>(VisualTreeHelper.GetParent(d))
-            };
-
-        public static IntPtr GetHandle(this Visual visual) => (PresentationSource.FromVisual(visual) as HwndSource)?.Handle ?? IntPtr.Zero;
-
-        internal static void HitTestVisibleElements(Visual visual, HitTestResultCallback resultCallback, HitTestParameters parameters) =>
-            VisualTreeHelper.HitTest(visual, ExcludeNonVisualElements, resultCallback, parameters);
-
-        private static HitTestFilterBehavior ExcludeNonVisualElements(DependencyObject potentialHitTestTarget)
-        {
-            if (!(potentialHitTestTarget is Visual)) return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
-
-            if (!(potentialHitTestTarget is UIElement uIElement) || uIElement.IsVisible && uIElement.IsEnabled)
-                return HitTestFilterBehavior.Continue;
-
-            return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
-        }
-
-        internal static bool ModifyStyle(IntPtr hWnd, int styleToRemove, int styleToAdd)
-        {
-            var windowLong = InteropMethods.GetWindowLong(hWnd, InteropValues.GWL.STYLE);
-            var num = (windowLong & ~styleToRemove) | styleToAdd;
-            if (num == windowLong) return false;
-            InteropMethods.SetWindowLong(hWnd, InteropValues.GWL.STYLE, num);
-            return true;
-        }
+        return VisualStateManager
+            .GetVisualStateGroups(root)?
+            .OfType<VisualStateGroup>()
+            .FirstOrDefault(group => string.CompareOrdinal(groupName, group.Name) == 0);
     }
-}
+
+    internal static FrameworkElement GetImplementationRoot(DependencyObject d) =>
+        1 == VisualTreeHelper.GetChildrenCount(d)
+            ? VisualTreeHelper.GetChild(d, 0) as FrameworkElement
+            : null;
+
+    public static T GetChild<T>(DependencyObject d) where T : DependencyObject
+    {
+        if (d == null) return default;
+        if (d is T t) return t;
+
+        for (var i = 0; i < VisualTreeHelper.GetChildrenCount(d); i++)
+        {
+            var child = VisualTreeHelper.GetChild(d, i);
+
+            var result = GetChild<T>(child);
+            if (result != null) return result;
+        }
+
+        return default;
+    }
+
+    public static T GetParent<T>(DependencyObject d) where T : DependencyObject =>
+        d switch
+        {
+            null => default,
+            T t => t,
+            Window _ => null,
+            _ => GetParent<T>(VisualTreeHelper.GetParent(d))
+        };
+
+    public static IntPtr GetHandle(this Visual visual) => (PresentationSource.FromVisual(visual) as HwndSource)?.Handle ?? IntPtr.Zero;
+
+    internal static void HitTestVisibleElements(Visual visual, HitTestResultCallback resultCallback, HitTestParameters parameters) =>
+        VisualTreeHelper.HitTest(visual, ExcludeNonVisualElements, resultCallback, parameters);
+
+    private static HitTestFilterBehavior ExcludeNonVisualElements(DependencyObject potentialHitTestTarget)
+    {
+        if (!(potentialHitTestTarget is Visual)) return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
+
+        if (!(potentialHitTestTarget is UIElement uIElement) || uIElement.IsVisible && uIElement.IsEnabled)
+            return HitTestFilterBehavior.Continue;
+
+        return HitTestFilterBehavior.ContinueSkipSelfAndChildren;
+    }
+
+    internal static bool ModifyStyle(IntPtr hWnd, int styleToRemove, int styleToAdd)
+    {
+        var windowLong = InteropMethods.GetWindowLong(hWnd, InteropValues.GWL.STYLE);
+        var num = (windowLong & ~styleToRemove) | styleToAdd;
+        if (num == windowLong) return false;
+        InteropMethods.SetWindowLong(hWnd, InteropValues.GWL.STYLE, num);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index 2d155bb4..9f18001f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -12,133 +12,133 @@ using HandyControl.Tools.Helper;
 using HandyControl.Tools.Interop;
 using Window = System.Windows.Window;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public static class WindowHelper
 {
-    public static class WindowHelper
+    /// <summary>
+    ///     获取当前应用中处于激活的一个窗口
+    /// </summary>
+    /// <returns></returns>
+    public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
+
+    private static readonly BitArray _cacheValid = new((int) InteropValues.CacheSlot.NumSlots);
+
+    private static bool _setDpiX = true;
+
+    private static bool _dpiInitialized;
+
+    private static readonly object _dpiLock = new();
+
+    private static int _dpi;
+
+    internal static int Dpi
     {
-        /// <summary>
-        ///     获取当前应用中处于激活的一个窗口
-        /// </summary>
-        /// <returns></returns>
-        public static Window GetActiveWindow() => Application.Current.Windows.OfType<Window>().SingleOrDefault(x => x.IsActive);
-
-        private static readonly BitArray _cacheValid = new((int) InteropValues.CacheSlot.NumSlots);
-
-        private static bool _setDpiX = true;
-
-        private static bool _dpiInitialized;
-
-        private static readonly object _dpiLock = new();
-
-        private static int _dpi;
-
-        internal static int Dpi
+        [SecurityCritical, SecuritySafeCritical]
+        get
         {
-            [SecurityCritical, SecuritySafeCritical]
-            get
+            if (!_dpiInitialized)
             {
-                if (!_dpiInitialized)
+                lock (_dpiLock)
                 {
-                    lock (_dpiLock)
+                    if (!_dpiInitialized)
                     {
-                        if (!_dpiInitialized)
+                        var desktopWnd = new HandleRef(null, IntPtr.Zero);
+
+                        // Win32Exception will get the Win32 error code so we don't have to
+                        var dc = InteropMethods.GetDC(desktopWnd);
+
+                        // Detecting error case from unmanaged call, required by PREsharp to throw a Win32Exception
+                        if (dc == IntPtr.Zero)
                         {
-                            var desktopWnd = new HandleRef(null, IntPtr.Zero);
+                            throw new Win32Exception();
+                        }
 
-                            // Win32Exception will get the Win32 error code so we don't have to
-                            var dc = InteropMethods.GetDC(desktopWnd);
-
-                            // Detecting error case from unmanaged call, required by PREsharp to throw a Win32Exception
-                            if (dc == IntPtr.Zero)
-                            {
-                                throw new Win32Exception();
-                            }
-
-                            try
-                            {
-                                _dpi = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSY);
-                                _dpiInitialized = true;
-                            }
-                            finally
-                            {
-                                InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
-                            }
+                        try
+                        {
+                            _dpi = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSY);
+                            _dpiInitialized = true;
+                        }
+                        finally
+                        {
+                            InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
                         }
                     }
                 }
-                return _dpi;
             }
+            return _dpi;
         }
+    }
 
-        private static int _dpiX;
+    private static int _dpiX;
 
-        internal static int DpiX
+    internal static int DpiX
+    {
+        [SecurityCritical, SecuritySafeCritical]
+        get
         {
-            [SecurityCritical, SecuritySafeCritical]
-            get
-            {
-                if (_setDpiX)
-                {
-                    lock (_cacheValid)
-                    {
-                        if (_setDpiX)
-                        {
-                            _setDpiX = false;
-                            var desktopWnd = new HandleRef(null, IntPtr.Zero);
-                            var dc = InteropMethods.GetDC(desktopWnd);
-                            if (dc == IntPtr.Zero)
-                            {
-                                throw new Win32Exception();
-                            }
-                            try
-                            {
-                                _dpiX = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSX);
-                                _cacheValid[(int) InteropValues.CacheSlot.DpiX] = true;
-                            }
-                            finally
-                            {
-                                InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
-                            }
-                        }
-                    }
-                }
-
-                return _dpiX;
-            }
-        }
-
-        private static Thickness _windowResizeBorderThickness;
-
-        internal static Thickness WindowResizeBorderThickness
-        {
-            [SecurityCritical]
-            get
+            if (_setDpiX)
             {
                 lock (_cacheValid)
                 {
-                    while (!_cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness])
+                    if (_setDpiX)
                     {
-                        _cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness] = true;
-
-                        var frameSize = new Size(InteropMethods.GetSystemMetrics(InteropValues.SM.CXSIZEFRAME), InteropMethods.GetSystemMetrics(InteropValues.SM.CYSIZEFRAME));
-                        var frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize, DpiX / 96.0, Dpi / 96.0);
-
-                        _windowResizeBorderThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height, frameSizeInDips.Width, frameSizeInDips.Height);
+                        _setDpiX = false;
+                        var desktopWnd = new HandleRef(null, IntPtr.Zero);
+                        var dc = InteropMethods.GetDC(desktopWnd);
+                        if (dc == IntPtr.Zero)
+                        {
+                            throw new Win32Exception();
+                        }
+                        try
+                        {
+                            _dpiX = InteropMethods.GetDeviceCaps(new HandleRef(null, dc), InteropValues.LOGPIXELSX);
+                            _cacheValid[(int) InteropValues.CacheSlot.DpiX] = true;
+                        }
+                        finally
+                        {
+                            InteropMethods.ReleaseDC(desktopWnd, new HandleRef(null, dc));
+                        }
                     }
                 }
-
-                return _windowResizeBorderThickness;
             }
-        }
 
-        public static Thickness WindowMaximizedPadding
+            return _dpiX;
+        }
+    }
+
+    private static Thickness _windowResizeBorderThickness;
+
+    internal static Thickness WindowResizeBorderThickness
+    {
+        [SecurityCritical]
+        get
         {
-            get
+            lock (_cacheValid)
             {
-                InteropValues.APPBARDATA appBarData = default;
-                var autoHide = InteropMethods.SHAppBarMessage(4, ref appBarData) != 0;
+                while (!_cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness])
+                {
+                    _cacheValid[(int) InteropValues.CacheSlot.WindowResizeBorderThickness] = true;
+
+                    var frameSize = new Size(InteropMethods.GetSystemMetrics(InteropValues.SM.CXSIZEFRAME), InteropMethods.GetSystemMetrics(InteropValues.SM.CYSIZEFRAME));
+                    var frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize, DpiX / 96.0, Dpi / 96.0);
+
+                    _windowResizeBorderThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height, frameSizeInDips.Width, frameSizeInDips.Height);
+                }
+            }
+
+            return _windowResizeBorderThickness;
+        }
+    }
+
+    public static Thickness WindowMaximizedPadding
+    {
+        get
+        {
+            InteropValues.APPBARDATA appBarData = default;
+            var autoHide = InteropMethods.SHAppBarMessage(4, ref appBarData) != 0;
 #if NET40
-                return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -8 : 0));
+            return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -8 : 0));
 #elif NETCOREAPP
                 var hdc = InteropMethods.GetDC(IntPtr.Zero);
                 var scale = InteropMethods.GetDeviceCaps(hdc, InteropValues.DESKTOPVERTRES) / (float) InteropMethods.GetDeviceCaps(hdc, InteropValues.VERTRES);
@@ -147,59 +147,58 @@ namespace HandyControl.Tools
 #else
                 return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -4 : 4));
 #endif
-            }
         }
-
-        public static IntPtr CreateHandle() => new WindowInteropHelper(new Window()).EnsureHandle();
-
-        public static IntPtr GetHandle(this Window window) => new WindowInteropHelper(window).EnsureHandle();
-
-        public static HwndSource GetHwndSource(this Window window) => HwndSource.FromHwnd(window.GetHandle());
-
-        /// <summary>
-        ///     让窗口激活作为前台最上层窗口
-        /// </summary>
-        /// <param name="window"></param>
-        public static void SetWindowToForeground(Window window)
-        {
-            // [WPF 让窗口激活作为前台最上层窗口的方法 - lindexi - 博客园](https://www.cnblogs.com/lindexi/p/12749671.html)
-            var interopHelper = new WindowInteropHelper(window);
-            var thisWindowThreadId = InteropMethods.GetWindowThreadProcessId(interopHelper.Handle, out _);
-            var currentForegroundWindow = InteropMethods.GetForegroundWindow();
-            var currentForegroundWindowThreadId = InteropMethods.GetWindowThreadProcessId(currentForegroundWindow, out _);
-
-            // [c# - Bring a window to the front in WPF - Stack Overflow](https://stackoverflow.com/questions/257587/bring-a-window-to-the-front-in-wpf )
-            // [SetForegroundWindow的正确用法 - 子坞 - 博客园](https://www.cnblogs.com/ziwuge/archive/2012/01/06/2315342.html )
-            /*
-               　　1.得到窗口句柄FindWindow 
-            　　　　2.切换键盘输入焦点AttachThreadInput 
-            　　　　3.显示窗口ShowWindow(有些窗口被最小化/隐藏了) 
-            　　　　4.更改窗口的Z Order，SetWindowPos使之最上，为了不影响后续窗口的Z Order,改完之后，再还原 
-            　　　　5.最后SetForegroundWindow 
-             */
-
-            InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, true);
-
-            window.Show();
-            window.Activate();
-            // 去掉和其他线程的输入链接
-            InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, false);
-
-            // 用于踢掉其他的在上层的窗口
-            if (window.Topmost != true)
-            {
-                window.Topmost = true;
-                window.Topmost = false;
-            }
-        }
-
-        /// <summary>
-        ///     开始使用触摸拖动窗口，在触摸抬起后自动结束
-        /// </summary>
-        public static void TouchDragMove(this Window window) => new TouchDragMoveWindowHelper(window).Start();
-
-        public static void StartFullScreen(this Window window) => FullScreenHelper.StartFullScreen(window);
-
-        public static void EndFullScreen(this Window window) => FullScreenHelper.EndFullScreen(window);
     }
-}
+
+    public static IntPtr CreateHandle() => new WindowInteropHelper(new Window()).EnsureHandle();
+
+    public static IntPtr GetHandle(this Window window) => new WindowInteropHelper(window).EnsureHandle();
+
+    public static HwndSource GetHwndSource(this Window window) => HwndSource.FromHwnd(window.GetHandle());
+
+    /// <summary>
+    ///     让窗口激活作为前台最上层窗口
+    /// </summary>
+    /// <param name="window"></param>
+    public static void SetWindowToForeground(Window window)
+    {
+        // [WPF 让窗口激活作为前台最上层窗口的方法 - lindexi - 博客园](https://www.cnblogs.com/lindexi/p/12749671.html)
+        var interopHelper = new WindowInteropHelper(window);
+        var thisWindowThreadId = InteropMethods.GetWindowThreadProcessId(interopHelper.Handle, out _);
+        var currentForegroundWindow = InteropMethods.GetForegroundWindow();
+        var currentForegroundWindowThreadId = InteropMethods.GetWindowThreadProcessId(currentForegroundWindow, out _);
+
+        // [c# - Bring a window to the front in WPF - Stack Overflow](https://stackoverflow.com/questions/257587/bring-a-window-to-the-front-in-wpf )
+        // [SetForegroundWindow的正确用法 - 子坞 - 博客园](https://www.cnblogs.com/ziwuge/archive/2012/01/06/2315342.html )
+        /*
+             1.得到窗口句柄FindWindow 
+            2.切换键盘输入焦点AttachThreadInput 
+            3.显示窗口ShowWindow(有些窗口被最小化/隐藏了) 
+            4.更改窗口的Z Order，SetWindowPos使之最上，为了不影响后续窗口的Z Order,改完之后，再还原 
+            5.最后SetForegroundWindow 
+         */
+
+        InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, true);
+
+        window.Show();
+        window.Activate();
+        // 去掉和其他线程的输入链接
+        InteropMethods.AttachThreadInput(currentForegroundWindowThreadId, thisWindowThreadId, false);
+
+        // 用于踢掉其他的在上层的窗口
+        if (window.Topmost != true)
+        {
+            window.Topmost = true;
+            window.Topmost = false;
+        }
+    }
+
+    /// <summary>
+    ///     开始使用触摸拖动窗口，在触摸抬起后自动结束
+    /// </summary>
+    public static void TouchDragMove(this Window window) => new TouchDragMoveWindowHelper(window).Start();
+
+    public static void StartFullScreen(this Window window) => FullScreenHelper.StartFullScreen(window);
+
+    public static void EndFullScreen(this Window window) => FullScreenHelper.EndFullScreen(window);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
index ca85415b..5979fb3b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
@@ -2,56 +2,55 @@
 using System.Windows.Interop;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class ClipboardHook
 {
-    public class ClipboardHook
+    public static event Action ContentChanged;
+
+    private static HwndSource HWndSource;
+
+    private static IntPtr HookId = IntPtr.Zero;
+
+    private static int Count;
+
+    public static void Start()
     {
-        public static event Action ContentChanged;
-
-        private static HwndSource HWndSource;
-
-        private static IntPtr HookId = IntPtr.Zero;
-
-        private static int Count;
-
-        public static void Start()
+        if (HookId == IntPtr.Zero)
         {
-            if (HookId == IntPtr.Zero)
+            HookId = WindowHelper.CreateHandle();
+            HWndSource = HwndSource.FromHwnd(HookId);
+            if (HWndSource != null)
             {
-                HookId = WindowHelper.CreateHandle();
-                HWndSource = HwndSource.FromHwnd(HookId);
-                if (HWndSource != null)
-                {
-                    HWndSource.AddHook(WinProc);
-                    InteropMethods.AddClipboardFormatListener(HookId);
-                }
-            }
-
-            if (HookId != IntPtr.Zero)
-            {
-                Count++;
+                HWndSource.AddHook(WinProc);
+                InteropMethods.AddClipboardFormatListener(HookId);
             }
         }
 
-        public static void Stop()
+        if (HookId != IntPtr.Zero)
         {
-            Count--;
-            if (Count < 1)
-            {
-                HWndSource.RemoveHook(WinProc);
-                InteropMethods.RemoveClipboardFormatListener(HookId);
-
-                HookId = IntPtr.Zero;
-            }
-        }
-
-        private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
-        {
-            if (msg == InteropValues.WM_CLIPBOARDUPDATE)
-            {
-                ContentChanged?.Invoke();
-            }
-            return IntPtr.Zero;
+            Count++;
         }
     }
-}
+
+    public static void Stop()
+    {
+        Count--;
+        if (Count < 1)
+        {
+            HWndSource.RemoveHook(WinProc);
+            InteropMethods.RemoveClipboardFormatListener(HookId);
+
+            HookId = IntPtr.Zero;
+        }
+    }
+
+    private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+    {
+        if (msg == InteropValues.WM_CLIPBOARDUPDATE)
+        {
+            ContentChanged?.Invoke();
+        }
+        return IntPtr.Zero;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
index 18ea9bcc..40a1bcd4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -4,102 +4,101 @@ using System.Runtime.InteropServices;
 using HandyControl.Data;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class KeyboardHook
 {
-    public class KeyboardHook
+    public static event EventHandler<KeyboardHookEventArgs> KeyDown;
+
+    public static event EventHandler<KeyboardHookEventArgs> KeyUp;
+
+    private static IntPtr HookId = IntPtr.Zero;
+
+    private static readonly InteropValues.HookProc Proc = HookCallback;
+
+    private static int VirtualKey;
+
+    private static readonly IntPtr KeyDownIntPtr = (IntPtr) InteropValues.WM_KEYDOWN;
+
+    private static readonly IntPtr KeyUpIntPtr = (IntPtr) InteropValues.WM_KEYUP;
+
+    private static readonly IntPtr SyskeyDownIntPtr = (IntPtr) InteropValues.WM_SYSKEYDOWN;
+
+    private static readonly IntPtr SyskeyUpIntPtr = (IntPtr) InteropValues.WM_SYSKEYUP;
+
+    private static int Count;
+
+    public static void Start()
     {
-        public static event EventHandler<KeyboardHookEventArgs> KeyDown;
-
-        public static event EventHandler<KeyboardHookEventArgs> KeyUp;
-
-        private static IntPtr HookId = IntPtr.Zero;
-
-        private static readonly InteropValues.HookProc Proc = HookCallback;
-
-        private static int VirtualKey;
-
-        private static readonly IntPtr KeyDownIntPtr = (IntPtr) InteropValues.WM_KEYDOWN;
-
-        private static readonly IntPtr KeyUpIntPtr = (IntPtr) InteropValues.WM_KEYUP;
-
-        private static readonly IntPtr SyskeyDownIntPtr = (IntPtr) InteropValues.WM_SYSKEYDOWN;
-
-        private static readonly IntPtr SyskeyUpIntPtr = (IntPtr) InteropValues.WM_SYSKEYUP;
-
-        private static int Count;
-
-        public static void Start()
+        if (HookId == IntPtr.Zero)
         {
-            if (HookId == IntPtr.Zero)
-            {
-                HookId = SetHook(Proc);
-            }
-
-            if (HookId != IntPtr.Zero)
-            {
-                Count++;
-            }
+            HookId = SetHook(Proc);
         }
 
-        public static void Stop()
+        if (HookId != IntPtr.Zero)
         {
-            Count--;
-            if (Count < 1)
-            {
-                InteropMethods.UnhookWindowsHookEx(HookId);
-                HookId = IntPtr.Zero;
-            }
-        }
-
-        private static IntPtr SetHook(InteropValues.HookProc proc)
-        {
-            using var curProcess = Process.GetCurrentProcess();
-            using var curModule = curProcess.MainModule;
-
-            if (curModule != null)
-            {
-                return InteropMethods.SetWindowsHookEx((int) InteropValues.HookType.WH_KEYBOARD_LL, proc,
-                    InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
-            }
-            return IntPtr.Zero;
-        }
-
-        private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
-        {
-            if (nCode >= 0)
-            {
-                if (wParam == KeyDownIntPtr)
-                {
-                    var virtualKey = Marshal.ReadInt32(lParam);
-                    if (VirtualKey != virtualKey)
-                    {
-                        VirtualKey = virtualKey;
-                        KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
-                    }
-                }
-                else if (wParam == SyskeyDownIntPtr)
-                {
-                    var virtualKey = Marshal.ReadInt32(lParam);
-                    if (VirtualKey != virtualKey)
-                    {
-                        VirtualKey = virtualKey;
-                        KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
-                    }
-                }
-                else if (wParam == KeyUpIntPtr)
-                {
-                    var virtualKey = Marshal.ReadInt32(lParam);
-                    VirtualKey = -1;
-                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
-                }
-                else if (wParam == SyskeyUpIntPtr)
-                {
-                    var virtualKey = Marshal.ReadInt32(lParam);
-                    VirtualKey = -1;
-                    KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
-                }
-            }
-            return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+            Count++;
         }
     }
-}
+
+    public static void Stop()
+    {
+        Count--;
+        if (Count < 1)
+        {
+            InteropMethods.UnhookWindowsHookEx(HookId);
+            HookId = IntPtr.Zero;
+        }
+    }
+
+    private static IntPtr SetHook(InteropValues.HookProc proc)
+    {
+        using var curProcess = Process.GetCurrentProcess();
+        using var curModule = curProcess.MainModule;
+
+        if (curModule != null)
+        {
+            return InteropMethods.SetWindowsHookEx((int) InteropValues.HookType.WH_KEYBOARD_LL, proc,
+                InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
+        }
+        return IntPtr.Zero;
+    }
+
+    private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
+    {
+        if (nCode >= 0)
+        {
+            if (wParam == KeyDownIntPtr)
+            {
+                var virtualKey = Marshal.ReadInt32(lParam);
+                if (VirtualKey != virtualKey)
+                {
+                    VirtualKey = virtualKey;
+                    KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
+                }
+            }
+            else if (wParam == SyskeyDownIntPtr)
+            {
+                var virtualKey = Marshal.ReadInt32(lParam);
+                if (VirtualKey != virtualKey)
+                {
+                    VirtualKey = virtualKey;
+                    KeyDown?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
+                }
+            }
+            else if (wParam == KeyUpIntPtr)
+            {
+                var virtualKey = Marshal.ReadInt32(lParam);
+                VirtualKey = -1;
+                KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, false));
+            }
+            else if (wParam == SyskeyUpIntPtr)
+            {
+                var virtualKey = Marshal.ReadInt32(lParam);
+                VirtualKey = -1;
+                KeyUp?.Invoke(null, new KeyboardHookEventArgs(virtualKey, true));
+            }
+        }
+        return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
index 8710d622..caf5ad10 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
@@ -4,65 +4,64 @@ using System.Runtime.InteropServices;
 using HandyControl.Data;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+internal class MouseHook
 {
-    internal class MouseHook
+    public static event EventHandler<MouseHookEventArgs> StatusChanged;
+
+    private static IntPtr HookId = IntPtr.Zero;
+
+    private static readonly InteropValues.HookProc Proc = HookCallback;
+
+    private static int Count;
+
+    public static void Start()
     {
-        public static event EventHandler<MouseHookEventArgs> StatusChanged;
-
-        private static IntPtr HookId = IntPtr.Zero;
-
-        private static readonly InteropValues.HookProc Proc = HookCallback;
-
-        private static int Count;
-
-        public static void Start()
+        if (HookId == IntPtr.Zero)
         {
-            if (HookId == IntPtr.Zero)
-            {
-                HookId = SetHook(Proc);
-            }
-
-            if (HookId != IntPtr.Zero)
-            {
-                Count++;
-            }
+            HookId = SetHook(Proc);
         }
 
-        public static void Stop()
+        if (HookId != IntPtr.Zero)
         {
-            Count--;
-            if (Count < 1)
-            {
-                InteropMethods.UnhookWindowsHookEx(HookId);
-                HookId = IntPtr.Zero;
-            }
-        }
-
-        private static IntPtr SetHook(InteropValues.HookProc proc)
-        {
-            using var curProcess = Process.GetCurrentProcess();
-            using var curModule = curProcess.MainModule;
-
-            if (curModule != null)
-            {
-                return InteropMethods.SetWindowsHookEx((int) InteropValues.HookType.WH_MOUSE_LL, proc,
-                    InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
-            }
-            return IntPtr.Zero;
-        }
-
-        private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
-        {
-            if (nCode < 0) return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
-            var hookStruct = (InteropValues.MOUSEHOOKSTRUCT) Marshal.PtrToStructure(lParam, typeof(InteropValues.MOUSEHOOKSTRUCT));
-            StatusChanged?.Invoke(null, new MouseHookEventArgs
-            {
-                MessageType = (MouseHookMessageType) wParam,
-                Point = new InteropValues.POINT(hookStruct.pt.X, hookStruct.pt.Y)
-            });
-
-            return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+            Count++;
         }
     }
-}
+
+    public static void Stop()
+    {
+        Count--;
+        if (Count < 1)
+        {
+            InteropMethods.UnhookWindowsHookEx(HookId);
+            HookId = IntPtr.Zero;
+        }
+    }
+
+    private static IntPtr SetHook(InteropValues.HookProc proc)
+    {
+        using var curProcess = Process.GetCurrentProcess();
+        using var curModule = curProcess.MainModule;
+
+        if (curModule != null)
+        {
+            return InteropMethods.SetWindowsHookEx((int) InteropValues.HookType.WH_MOUSE_LL, proc,
+                InteropMethods.GetModuleHandle(curModule.ModuleName), 0);
+        }
+        return IntPtr.Zero;
+    }
+
+    private static IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
+    {
+        if (nCode < 0) return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+        var hookStruct = (InteropValues.MOUSEHOOKSTRUCT) Marshal.PtrToStructure(lParam, typeof(InteropValues.MOUSEHOOKSTRUCT));
+        StatusChanged?.Invoke(null, new MouseHookEventArgs
+        {
+            MessageType = (MouseHookMessageType) wParam,
+            Point = new InteropValues.POINT(hookStruct.pt.X, hookStruct.pt.Y)
+        });
+
+        return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
index a0a2e8d1..6ce5ada3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
@@ -4,50 +4,49 @@ using System.Windows;
 using System.Windows.Interop;
 using HandyControl.Tools.Interop;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class SystemMenuHook
 {
-    public class SystemMenuHook
+    private static readonly Dictionary<int, HwndSource> DataDic = new();
+
+    public static event Action<int> Click;
+
+    public static void Insert(int index, int id, string text, Window window)
     {
-        private static readonly Dictionary<int, HwndSource> DataDic = new();
-
-        public static event Action<int> Click;
-
-        public static void Insert(int index, int id, string text, Window window)
+        var hookId = window.GetHandle();
+        var source = HwndSource.FromHwnd(hookId);
+        if (source != null)
         {
-            var hookId = window.GetHandle();
-            var source = HwndSource.FromHwnd(hookId);
-            if (source != null)
-            {
-                DataDic[id] = source;
-                InteropMethods.InsertMenu(InteropMethods.GetSystemMenu(hookId, false), index, InteropValues.MF_BYPOSITION, id, text);
-                source.AddHook(WinProc);
-            }
-        }
-
-        public static void InsertSeperator(int index, Window window) => InteropMethods.InsertMenu(
-            InteropMethods.GetSystemMenu(window.GetHandle(), false), index,
-            InteropValues.MF_BYPOSITION | InteropValues.MF_SEPARATOR, 0, "");
-
-        public static void Remove(int id)
-        {
-            if (DataDic.TryGetValue(id, out var data))
-            {
-                data.RemoveHook(WinProc);
-                DataDic.Remove(id);
-            }
-        }
-
-        private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
-        {
-            if (msg == InteropValues.WM_SYSCOMMAND)
-            {
-                var id = wparam.ToInt32();
-                if (DataDic.ContainsKey(id))
-                {
-                    Click?.Invoke(id);
-                }
-            }
-            return IntPtr.Zero;
+            DataDic[id] = source;
+            InteropMethods.InsertMenu(InteropMethods.GetSystemMenu(hookId, false), index, InteropValues.MF_BYPOSITION, id, text);
+            source.AddHook(WinProc);
         }
     }
-}
+
+    public static void InsertSeperator(int index, Window window) => InteropMethods.InsertMenu(
+        InteropMethods.GetSystemMenu(window.GetHandle(), false), index,
+        InteropValues.MF_BYPOSITION | InteropValues.MF_SEPARATOR, 0, "");
+
+    public static void Remove(int id)
+    {
+        if (DataDic.TryGetValue(id, out var data))
+        {
+            data.RemoveHook(WinProc);
+            DataDic.Remove(id);
+        }
+    }
+
+    private static IntPtr WinProc(IntPtr hwnd, int msg, IntPtr wparam, IntPtr lparam, ref bool handled)
+    {
+        if (msg == InteropValues.WM_SYSCOMMAND)
+        {
+            var id = wparam.ToInt32();
+            if (DataDic.ContainsKey(id))
+            {
+                Click?.Invoke(id);
+            }
+        }
+        return IntPtr.Zero;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
index 411c075c..9dbe38f8 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
@@ -4,42 +4,41 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Security;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+internal sealed class BitmapHandle : WpfSafeHandle
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    internal sealed class BitmapHandle : WpfSafeHandle
+    [SecurityCritical]
+    private BitmapHandle() : this(true)
     {
-        [SecurityCritical]
-        private BitmapHandle() : this(true)
-        {
-            //请不要删除此构造函数，否则当使用自定义ico文件时会报错
-        }
-
-        [SecurityCritical]
-        private BitmapHandle(bool ownsHandle) : base(ownsHandle, CommonHandles.GDI)
-        {
-        }
-
-        [SecurityCritical]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            return InteropMethods.DeleteObject(handle);
-        }
-
-        [SecurityCritical]
-        internal HandleRef MakeHandleRef(object obj)
-        {
-            return new(obj, handle);
-        }
-
-        [SecurityCritical]
-        internal static BitmapHandle CreateFromHandle(IntPtr hbitmap, bool ownsHandle = true)
-        {
-            return new(ownsHandle)
-            {
-                handle = hbitmap,
-            };
-        }
+        //请不要删除此构造函数，否则当使用自定义ico文件时会报错
     }
-}
+
+    [SecurityCritical]
+    private BitmapHandle(bool ownsHandle) : base(ownsHandle, CommonHandles.GDI)
+    {
+    }
+
+    [SecurityCritical]
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        return InteropMethods.DeleteObject(handle);
+    }
+
+    [SecurityCritical]
+    internal HandleRef MakeHandleRef(object obj)
+    {
+        return new(obj, handle);
+    }
+
+    [SecurityCritical]
+    internal static BitmapHandle CreateFromHandle(IntPtr hbitmap, bool ownsHandle = true)
+    {
+        return new(ownsHandle)
+        {
+            handle = hbitmap,
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
index ad178b03..89439f50 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
@@ -1,16 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+internal static class CommonHandles
 {
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal static class CommonHandles
-    {
-        public static readonly int Icon = HandleCollector.RegisterType(nameof(Icon), 20, 500);
+    public static readonly int Icon = HandleCollector.RegisterType(nameof(Icon), 20, 500);
 
-        public static readonly int HDC = HandleCollector.RegisterType(nameof(HDC), 100, 2);
+    public static readonly int HDC = HandleCollector.RegisterType(nameof(HDC), 100, 2);
 
-        public static readonly int GDI = HandleCollector.RegisterType(nameof(GDI), 50, 500);
+    public static readonly int GDI = HandleCollector.RegisterType(nameof(GDI), 50, 500);
 
-        public static readonly int Kernel = HandleCollector.RegisterType(nameof(Kernel), 0, 1000);
-    }
-}
+    public static readonly int Kernel = HandleCollector.RegisterType(nameof(Kernel), 0, 1000);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
index 7c17ce52..481f4de4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
@@ -3,130 +3,129 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal static class HandleCollector
 {
-    internal static class HandleCollector
+    private static HandleType[] HandleTypes;
+    private static int HandleTypeCount;
+
+    private static readonly object HandleMutex = new();
+
+    internal static IntPtr Add(IntPtr handle, int type)
     {
-        private static HandleType[] HandleTypes;
-        private static int HandleTypeCount;
+        HandleTypes[type - 1].Add();
+        return handle;
+    }
 
-        private static readonly object HandleMutex = new();
+    [System.Security.SecuritySafeCritical]
+    internal static SafeHandle Add(SafeHandle handle, int type)
+    {
+        HandleTypes[type - 1].Add();
+        return handle;
+    }
 
-        internal static IntPtr Add(IntPtr handle, int type)
+    internal static void Add(int type)
+    {
+        HandleTypes[type - 1].Add();
+    }
+
+    internal static int RegisterType(string typeName, int expense, int initialThreshold)
+    {
+        lock (HandleMutex)
         {
-            HandleTypes[type - 1].Add();
-            return handle;
-        }
-
-        [System.Security.SecuritySafeCritical]
-        internal static SafeHandle Add(SafeHandle handle, int type)
-        {
-            HandleTypes[type - 1].Add();
-            return handle;
-        }
-
-        internal static void Add(int type)
-        {
-            HandleTypes[type - 1].Add();
-        }
-
-        internal static int RegisterType(string typeName, int expense, int initialThreshold)
-        {
-            lock (HandleMutex)
+            if (HandleTypeCount == 0 || HandleTypeCount == HandleTypes.Length)
             {
-                if (HandleTypeCount == 0 || HandleTypeCount == HandleTypes.Length)
+                HandleType[] newTypes = new HandleType[HandleTypeCount + 10];
+                if (HandleTypes != null)
                 {
-                    HandleType[] newTypes = new HandleType[HandleTypeCount + 10];
-                    if (HandleTypes != null)
-                    {
-                        Array.Copy(HandleTypes, 0, newTypes, 0, HandleTypeCount);
-                    }
-                    HandleTypes = newTypes;
+                    Array.Copy(HandleTypes, 0, newTypes, 0, HandleTypeCount);
                 }
-
-                HandleTypes[HandleTypeCount++] = new HandleType(expense, initialThreshold);
-                return HandleTypeCount;
-            }
-        }
-
-        internal static IntPtr Remove(IntPtr handle, int type)
-        {
-            HandleTypes[type - 1].Remove();
-            return handle;
-        }
-
-        [System.Security.SecuritySafeCritical]
-        internal static SafeHandle Remove(SafeHandle handle, int type)
-        {
-            HandleTypes[type - 1].Remove();
-            return handle;
-        }
-
-        internal static void Remove(int type)
-        {
-            HandleTypes[type - 1].Remove();
-        }
-
-        private class HandleType
-        {
-            private readonly int _initialThreshHold;
-            private int _threshHold;
-            private int _handleCount;
-            private readonly int _deltaPercent;
-
-            internal HandleType(int expense, int initialThreshHold)
-            {
-                _initialThreshHold = initialThreshHold;
-                _threshHold = initialThreshHold;
-                _deltaPercent = 100 - expense;
+                HandleTypes = newTypes;
             }
 
-            internal void Add()
+            HandleTypes[HandleTypeCount++] = new HandleType(expense, initialThreshold);
+            return HandleTypeCount;
+        }
+    }
+
+    internal static IntPtr Remove(IntPtr handle, int type)
+    {
+        HandleTypes[type - 1].Remove();
+        return handle;
+    }
+
+    [System.Security.SecuritySafeCritical]
+    internal static SafeHandle Remove(SafeHandle handle, int type)
+    {
+        HandleTypes[type - 1].Remove();
+        return handle;
+    }
+
+    internal static void Remove(int type)
+    {
+        HandleTypes[type - 1].Remove();
+    }
+
+    private class HandleType
+    {
+        private readonly int _initialThreshHold;
+        private int _threshHold;
+        private int _handleCount;
+        private readonly int _deltaPercent;
+
+        internal HandleType(int expense, int initialThreshHold)
+        {
+            _initialThreshHold = initialThreshHold;
+            _threshHold = initialThreshHold;
+            _deltaPercent = 100 - expense;
+        }
+
+        internal void Add()
+        {
+            lock (this)
             {
-                lock (this)
+                _handleCount++;
+                var performCollect = NeedCollection();
+
+                if (!performCollect)
                 {
-                    _handleCount++;
-                    var performCollect = NeedCollection();
-
-                    if (!performCollect)
-                    {
-                        return;
-                    }
+                    return;
                 }
-
-                GC.Collect();
-
-                var sleep = (100 - _deltaPercent) / 4;
-                System.Threading.Thread.Sleep(sleep);
             }
 
-            private bool NeedCollection()
+            GC.Collect();
+
+            var sleep = (100 - _deltaPercent) / 4;
+            System.Threading.Thread.Sleep(sleep);
+        }
+
+        private bool NeedCollection()
+        {
+
+            if (_handleCount > _threshHold)
             {
-
-                if (_handleCount > _threshHold)
-                {
-                    _threshHold = _handleCount + _handleCount * _deltaPercent / 100;
-                    return true;
-                }
-
-                var oldThreshHold = 100 * _threshHold / (100 + _deltaPercent);
-                if (oldThreshHold >= _initialThreshHold && _handleCount < (int) (oldThreshHold * .9F))
-                {
-                    _threshHold = oldThreshHold;
-                }
-
-                return false;
+                _threshHold = _handleCount + _handleCount * _deltaPercent / 100;
+                return true;
             }
 
-            internal void Remove()
+            var oldThreshHold = 100 * _threshHold / (100 + _deltaPercent);
+            if (oldThreshHold >= _initialThreshHold && _handleCount < (int) (oldThreshHold * .9F))
             {
-                lock (this)
-                {
-                    _handleCount--;
+                _threshHold = oldThreshHold;
+            }
 
-                    _handleCount = Math.Max(0, _handleCount);
-                }
+            return false;
+        }
+
+        internal void Remove()
+        {
+            lock (this)
+            {
+                _handleCount--;
+
+                _handleCount = Math.Max(0, _handleCount);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
index 08a19a6e..8018dcec 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
@@ -2,32 +2,31 @@
 using System.Runtime.ConstrainedExecution;
 using System.Security;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal sealed class IconHandle : WpfSafeHandle
 {
-    internal sealed class IconHandle : WpfSafeHandle
+    [SecurityCritical]
+    private IconHandle() : base(true, CommonHandles.Icon)
     {
-        [SecurityCritical]
-        private IconHandle() : base(true, CommonHandles.Icon)
-        {
-        }
-
-        [SecurityCritical]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            return InteropMethods.DestroyIcon(handle);
-        }
-
-        [SecurityCritical, SecuritySafeCritical]
-        internal static IconHandle GetInvalidIcon()
-        {
-            return new();
-        }
-
-        [SecurityCritical]
-        internal IntPtr CriticalGetHandle()
-        {
-            return handle;
-        }
     }
-}
+
+    [SecurityCritical]
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        return InteropMethods.DestroyIcon(handle);
+    }
+
+    [SecurityCritical, SecuritySafeCritical]
+    internal static IconHandle GetInvalidIcon()
+    {
+        return new();
+    }
+
+    [SecurityCritical]
+    internal IntPtr CriticalGetHandle()
+    {
+        return handle;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
index 6aa05d77..b4cb71e1 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
@@ -4,47 +4,46 @@ using System.Security;
 using System.Security.Permissions;
 using Microsoft.Win32.SafeHandles;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal sealed class SafeFileMappingHandle : SafeHandleZeroOrMinusOneIsInvalid
 {
-    internal sealed class SafeFileMappingHandle : SafeHandleZeroOrMinusOneIsInvalid
+    [SecurityCritical]
+    internal SafeFileMappingHandle(IntPtr handle) : base(false)
     {
-        [SecurityCritical]
-        internal SafeFileMappingHandle(IntPtr handle) : base(false)
-        {
-            SetHandle(handle);
-        }
+        SetHandle(handle);
+    }
 
+    [SecurityCritical, SecuritySafeCritical]
+    internal SafeFileMappingHandle() : base(true)
+    {
+    }
+
+    public override bool IsInvalid
+    {
         [SecurityCritical, SecuritySafeCritical]
-        internal SafeFileMappingHandle() : base(true)
-        {
-        }
+        get => handle == IntPtr.Zero;
+    }
 
-        public override bool IsInvalid
+    [SecurityCritical, SecuritySafeCritical]
+    protected override bool ReleaseHandle()
+    {
+        new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Assert();
+        try
         {
-            [SecurityCritical, SecuritySafeCritical]
-            get => handle == IntPtr.Zero;
+            return CloseHandleNoThrow(new HandleRef(null, handle));
         }
-
-        [SecurityCritical, SecuritySafeCritical]
-        protected override bool ReleaseHandle()
+        finally
         {
-            new SecurityPermission(SecurityPermissionFlag.UnmanagedCode).Assert();
-            try
-            {
-                return CloseHandleNoThrow(new HandleRef(null, handle));
-            }
-            finally
-            {
-                CodeAccessPermission.RevertAssert();
-            }
-        }
-
-        [SecurityCritical]
-        public static bool CloseHandleNoThrow(HandleRef handle)
-        {
-            HandleCollector.Remove((IntPtr) handle, CommonHandles.Kernel);
-            var result = InteropMethods.IntCloseHandle(handle);
-            return result;
+            CodeAccessPermission.RevertAssert();
         }
     }
-}
+
+    [SecurityCritical]
+    public static bool CloseHandleNoThrow(HandleRef handle)
+    {
+        HandleCollector.Remove((IntPtr) handle, CommonHandles.Kernel);
+        var result = InteropMethods.IntCloseHandle(handle);
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
index 487751c8..ca9a81e8 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
@@ -1,24 +1,23 @@
 using System.Security;
 using Microsoft.Win32.SafeHandles;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal abstract class WpfSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
 {
-    internal abstract class WpfSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
+    private readonly int _collectorId;
+
+    [SecurityCritical]
+    protected WpfSafeHandle(bool ownsHandle, int collectorId) : base(ownsHandle)
     {
-        private readonly int _collectorId;
-
-        [SecurityCritical]
-        protected WpfSafeHandle(bool ownsHandle, int collectorId) : base(ownsHandle)
-        {
-            HandleCollector.Add(collectorId);
-            _collectorId = collectorId;
-        }
-
-        [SecurityCritical, SecuritySafeCritical]
-        protected override void Dispose(bool disposing)
-        {
-            HandleCollector.Remove(_collectorId);
-            base.Dispose(disposing);
-        }
+        HandleCollector.Add(collectorId);
+        _collectorId = collectorId;
     }
-}
+
+    [SecurityCritical, SecuritySafeCritical]
+    protected override void Dispose(bool disposing)
+    {
+        HandleCollector.Remove(_collectorId);
+        base.Dispose(disposing);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index f34b9b72..5291d3d8 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -11,738 +11,737 @@ using System.Security.Permissions;
 using System.Text;
 using System.Threading;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal class InteropMethods
 {
-    internal class InteropMethods
+    #region common
+
+    internal const int E_FAIL = unchecked((int) 0x80004005);
+
+    internal static readonly IntPtr HRGN_NONE = new(-1);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+    [ResourceExposure(ResourceScope.None)]
+    internal static extern int RegisterWindowMessage(string msg);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
+        int dwSize, out int lpNumberOfBytesRead);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
+    internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.RECT lpBuffer,
+        int dwSize, out int lpNumberOfBytesRead);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
+    internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TRAYDATA lpBuffer,
+        int dwSize, out int lpNumberOfBytesRead);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+    internal static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern bool AttachThreadInput(in uint currentForegroundWindowThreadId,
+        in uint thisWindowThreadId, bool isAttach);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern IntPtr GetForegroundWindow();
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
+        [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize,
+        InteropValues.AllocationType flAllocationType, InteropValues.MemoryProtection flProtect);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern int CloseHandle(IntPtr hObject);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, InteropValues.FreeType dwFreeType);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    internal static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    internal static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass,
+        string lpszWindow);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern bool GetWindowRect(IntPtr hwnd, out InteropValues.RECT lpRect);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+    internal static extern bool GetCursorPos(out InteropValues.POINT pt);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr GetDesktopWindow();
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool AddClipboardFormatListener(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern bool EnableMenuItem(IntPtr hMenu, int UIDEnabledItem, int uEnable);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
+
+    [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = "DestroyMenu", CharSet = CharSet.Auto)]
+    [ResourceExposure(ResourceScope.None)]
+    internal static extern bool IntDestroyMenu(HandleRef hMenu);
+
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, EntryPoint = nameof(GetDC),
+        CharSet = CharSet.Auto)]
+    internal static extern IntPtr IntGetDC(HandleRef hWnd);
+
+    [SecurityCritical]
+    internal static IntPtr GetDC(HandleRef hWnd)
     {
-        #region common
+        var hDc = IntGetDC(hWnd);
+        if (hDc == IntPtr.Zero) throw new Win32Exception();
 
-        internal const int E_FAIL = unchecked((int) 0x80004005);
+        return HandleCollector.Add(hDc, CommonHandles.HDC);
+    }
 
-        internal static readonly IntPtr HRGN_NONE = new(-1);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = nameof(ReleaseDC), CharSet = CharSet.Auto)]
+    internal static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
 
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        [ResourceExposure(ResourceScope.None)]
-        internal static extern int RegisterWindowMessage(string msg);
+    [SecurityCritical]
+    internal static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
+    {
+        HandleCollector.Remove((IntPtr) hDC, CommonHandles.HDC);
+        return IntReleaseDC(hWnd, hDC);
+    }
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TBBUTTON lpBuffer,
-            int dwSize, out int lpNumberOfBytesRead);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
+    internal static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
-        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.RECT lpBuffer,
-            int dwSize, out int lpNumberOfBytesRead);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern int GetSystemMetrics(InteropValues.SM nIndex);
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true)]
-        internal static extern bool ReadProcessMemory(IntPtr hProcess, IntPtr lpBaseAddress, out InteropValues.TRAYDATA lpBuffer,
-            int dwSize, out int lpNumberOfBytesRead);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32, EntryPoint = nameof(DestroyIcon), CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern bool IntDestroyIcon(IntPtr hIcon);
 
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        internal static extern uint SendMessage(IntPtr hWnd, uint Msg, uint wParam, IntPtr lParam);
+    [SecurityCritical]
+    internal static bool DestroyIcon(IntPtr hIcon)
+    {
+        var result = IntDestroyIcon(hIcon);
+        return result;
+    }
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Gdi32, EntryPoint = nameof(DeleteObject), CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern bool IntDeleteObject(IntPtr hObject);
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool AttachThreadInput(in uint currentForegroundWindowThreadId,
-            in uint thisWindowThreadId, bool isAttach);
+    [SecurityCritical]
+    internal static bool DeleteObject(IntPtr hObject)
+    {
+        var result = IntDeleteObject(hObject);
+        return result;
+    }
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern IntPtr GetForegroundWindow();
+    [SecurityCritical]
+    internal static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
+        ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset)
+    {
+        hSection ??= new SafeFileMappingHandle(IntPtr.Zero);
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern IntPtr OpenProcess(InteropValues.ProcessAccess dwDesiredAccess,
-            [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwProcessId);
+        var hBitmap = PrivateCreateDIBSection(hdc, ref bitmapInfo, iUsage, ref ppvBits, hSection, dwOffset);
+        return hBitmap;
+    }
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern IntPtr VirtualAllocEx(IntPtr hProcess, IntPtr lpAddress, int dwSize,
-            InteropValues.AllocationType flAllocationType, InteropValues.MemoryProtection flProtect);
+    [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern bool IntCloseHandle(HandleRef handle);
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern int CloseHandle(IntPtr hObject);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+        EntryPoint = nameof(CreateDIBSection))]
+    private static extern BitmapHandle PrivateCreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
+        ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset);
 
-        [DllImport(InteropValues.ExternDll.Kernel32, SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool VirtualFreeEx(IntPtr hProcess, IntPtr lpAddress, int dwSize, InteropValues.FreeType dwFreeType);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+        EntryPoint = nameof(CreateIconIndirect))]
+    private static extern IconHandle PrivateCreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
+        InteropValues.ICONINFO iconInfo);
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        internal static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
+    [SecurityCritical]
+    internal static IconHandle CreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
+        InteropValues.ICONINFO iconInfo)
+    {
+        var hIcon = PrivateCreateIconIndirect(iconInfo);
+        return hIcon;
+    }
 
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        internal static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfter, string lpszClass,
-            string lpszWindow);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
+        EntryPoint = nameof(CreateBitmap))]
+    private static extern BitmapHandle PrivateCreateBitmap(int width, int height, int planes, int bitsPerPixel,
+        byte[] lpvBits);
 
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern bool GetWindowRect(IntPtr hwnd, out InteropValues.RECT lpRect);
+    [SecurityCritical]
+    internal static BitmapHandle CreateBitmap(int width, int height, int planes, int bitsPerPixel, byte[] lpvBits)
+    {
+        var hBitmap = PrivateCreateBitmap(width, height, planes, bitsPerPixel, lpvBits);
+        return hBitmap;
+    }
 
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        internal static extern bool GetCursorPos(out InteropValues.POINT pt);
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "GetModuleFileName", CharSet = CharSet.Unicode,
+        SetLastError = true)]
+    private static extern int IntGetModuleFileName(HandleRef hModule, StringBuilder buffer, int length);
 
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr GetDesktopWindow();
-
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool AddClipboardFormatListener(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool RemoveClipboardFormatListener(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern bool EnableMenuItem(IntPtr hMenu, int UIDEnabledItem, int uEnable);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern bool InsertMenu(IntPtr hMenu, int wPosition, int wFlags, int wIDNewItem, string lpNewItem);
-
-        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = "DestroyMenu", CharSet = CharSet.Auto)]
-        [ResourceExposure(ResourceScope.None)]
-        internal static extern bool IntDestroyMenu(HandleRef hMenu);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, EntryPoint = nameof(GetDC),
-            CharSet = CharSet.Auto)]
-        internal static extern IntPtr IntGetDC(HandleRef hWnd);
-
-        [SecurityCritical]
-        internal static IntPtr GetDC(HandleRef hWnd)
+    [SecurityCritical]
+    internal static string GetModuleFileName(HandleRef hModule)
+    {
+        var buffer = new StringBuilder(InteropValues.Win32Constant.MAX_PATH);
+        while (true)
         {
-            var hDc = IntGetDC(hWnd);
-            if (hDc == IntPtr.Zero) throw new Win32Exception();
+            var size = IntGetModuleFileName(hModule, buffer, buffer.Capacity);
+            if (size == 0) throw new Win32Exception();
 
-            return HandleCollector.Add(hDc, CommonHandles.HDC);
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, EntryPoint = nameof(ReleaseDC), CharSet = CharSet.Auto)]
-        internal static extern int IntReleaseDC(HandleRef hWnd, HandleRef hDC);
-
-        [SecurityCritical]
-        internal static int ReleaseDC(HandleRef hWnd, HandleRef hDC)
-        {
-            HandleCollector.Remove((IntPtr) hDC, CommonHandles.HDC);
-            return IntReleaseDC(hWnd, hDC);
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        internal static extern int GetDeviceCaps(HandleRef hDC, int nIndex);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern int GetSystemMetrics(InteropValues.SM nIndex);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32, EntryPoint = nameof(DestroyIcon), CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern bool IntDestroyIcon(IntPtr hIcon);
-
-        [SecurityCritical]
-        internal static bool DestroyIcon(IntPtr hIcon)
-        {
-            var result = IntDestroyIcon(hIcon);
-            return result;
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Gdi32, EntryPoint = nameof(DeleteObject), CharSet = CharSet.Auto, SetLastError = true)]
-        private static extern bool IntDeleteObject(IntPtr hObject);
-
-        [SecurityCritical]
-        internal static bool DeleteObject(IntPtr hObject)
-        {
-            var result = IntDeleteObject(hObject);
-            return result;
-        }
-
-        [SecurityCritical]
-        internal static BitmapHandle CreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
-            ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset)
-        {
-            hSection ??= new SafeFileMappingHandle(IntPtr.Zero);
-
-            var hBitmap = PrivateCreateDIBSection(hdc, ref bitmapInfo, iUsage, ref ppvBits, hSection, dwOffset);
-            return hBitmap;
-        }
-
-        [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "CloseHandle", CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern bool IntCloseHandle(HandleRef handle);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
-            EntryPoint = nameof(CreateDIBSection))]
-        private static extern BitmapHandle PrivateCreateDIBSection(HandleRef hdc, ref InteropValues.BITMAPINFO bitmapInfo, int iUsage,
-            ref IntPtr ppvBits, SafeFileMappingHandle hSection, int dwOffset);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
-            EntryPoint = nameof(CreateIconIndirect))]
-        private static extern IconHandle PrivateCreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
-            InteropValues.ICONINFO iconInfo);
-
-        [SecurityCritical]
-        internal static IconHandle CreateIconIndirect([In] [MarshalAs(UnmanagedType.LPStruct)]
-            InteropValues.ICONINFO iconInfo)
-        {
-            var hIcon = PrivateCreateIconIndirect(iconInfo);
-            return hIcon;
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto,
-            EntryPoint = nameof(CreateBitmap))]
-        private static extern BitmapHandle PrivateCreateBitmap(int width, int height, int planes, int bitsPerPixel,
-            byte[] lpvBits);
-
-        [SecurityCritical]
-        internal static BitmapHandle CreateBitmap(int width, int height, int planes, int bitsPerPixel, byte[] lpvBits)
-        {
-            var hBitmap = PrivateCreateBitmap(width, height, planes, bitsPerPixel, lpvBits);
-            return hBitmap;
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Kernel32, EntryPoint = "GetModuleFileName", CharSet = CharSet.Unicode,
-            SetLastError = true)]
-        private static extern int IntGetModuleFileName(HandleRef hModule, StringBuilder buffer, int length);
-
-        [SecurityCritical]
-        internal static string GetModuleFileName(HandleRef hModule)
-        {
-            var buffer = new StringBuilder(InteropValues.Win32Constant.MAX_PATH);
-            while (true)
+            if (size == buffer.Capacity)
             {
-                var size = IntGetModuleFileName(hModule, buffer, buffer.Capacity);
-                if (size == 0) throw new Win32Exception();
-
-                if (size == buffer.Capacity)
-                {
-                    buffer.EnsureCapacity(buffer.Capacity * 2);
-                    continue;
-                }
-
-                return buffer.ToString();
-            }
-        }
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto, BestFitMapping = false, ThrowOnUnmappableChar = true)]
-        internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge,
-            out IconHandle phiconSmall, int nIcons);
-
-        [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto)]
-        internal static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
-
-        [SecurityCritical]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
-        internal static extern IntPtr CreateWindowEx(
-            int dwExStyle,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
-            [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
-            int dwStyle,
-            int x,
-            int y,
-            int nWidth,
-            int nHeight,
-            IntPtr hWndParent,
-            IntPtr hMenu,
-            IntPtr hInstance,
-            IntPtr lpParam);
-
-        [SecurityCritical]
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
-        internal static extern short RegisterClass(InteropValues.WNDCLASS4ICON wc);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        internal static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        internal static extern bool SetForegroundWindow(IntPtr hWnd);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(InteropValues.ExternDll.Kernel32, CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr GetModuleHandle(string lpModuleName);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern bool UnhookWindowsHookEx(IntPtr hhk);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern IntPtr SetWindowsHookEx(int idHook, InteropValues.HookProc lpfn, IntPtr hMod, uint dwThreadId);
-
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        internal static extern IntPtr GetWindowDC(IntPtr window);
-
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
-        internal static extern uint GetPixel(IntPtr dc, int x, int y);
-
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        internal static extern int ReleaseDC(IntPtr window, IntPtr dc);
-
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
-        internal static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
-        internal static extern IntPtr GetDC(IntPtr ptr);
-
-        [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool GetWindowPlacement(IntPtr hwnd, InteropValues.WINDOWPLACEMENT lpwndpl);
-
-        internal static InteropValues.WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
-        {
-            InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = InteropValues.WINDOWPLACEMENT.Default;
-            if (GetWindowPlacement(hwnd, wINDOWPLACEMENT))
-            {
-                return wINDOWPLACEMENT;
-            }
-            throw new Win32Exception(Marshal.GetLastWin32Error());
-        }
-
-        internal static int GetXLParam(int lParam) => LoWord(lParam);
-
-        internal static int GetYLParam(int lParam) => HiWord(lParam);
-
-        internal static int HiWord(int value) => (short) (value >> 16);
-
-        internal static int LoWord(int value) => (short) (value & 65535);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr MonitorFromWindow(IntPtr handle, int flags);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool EnumThreadWindows(uint dwThreadId, InteropValues.EnumWindowsProc lpfn, IntPtr lParam);
-
-        [DllImport(InteropValues.ExternDll.Gdi32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool DeleteDC(IntPtr hdc);
-
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
-        internal static extern IntPtr CreateCompatibleDC(IntPtr hdc);
-
-        [DllImport(InteropValues.ExternDll.Gdi32, ExactSpelling = true, SetLastError = true)]
-        internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern IntPtr SendMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr MonitorFromPoint(InteropValues.POINT pt, int flags);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr GetWindow(IntPtr hwnd, int nCmd);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IsWindowVisible(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IsIconic(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IsZoomed(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, ExactSpelling = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, int flags);
-
-        internal static System.Windows.Point GetCursorPos()
-        {
-            var result = default(System.Windows.Point);
-            if (GetCursorPos(out var point))
-            {
-                result.X = point.X;
-                result.Y = point.Y;
-            }
-            return result;
-        }
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
-
-        internal static int GetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex) => GetWindowLong(hWnd, (int) nIndex);
-
-        internal static IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong) => IntPtr.Size == 4
-            ? SetWindowLongPtr32(hWnd, nIndex, dwNewLong)
-            : SetWindowLongPtr64(hWnd, nIndex, dwNewLong);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLong")]
-        internal static extern IntPtr SetWindowLongPtr32(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLongPtr")]
-        internal static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
-        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
-        private static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
-
-        internal static IntPtr SetWindowLongPtr(IntPtr hWnd, InteropValues.GWLP nIndex, IntPtr dwNewLong)
-        {
-            if (IntPtr.Size == 8)
-            {
-                return SetWindowLongPtr(hWnd, (int) nIndex, dwNewLong);
-            }
-            return new IntPtr(SetWindowLong(hWnd, (int) nIndex, dwNewLong.ToInt32()));
-        }
-
-        internal static int SetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex, int dwNewLong) => SetWindowLong(hWnd, (int) nIndex, dwNewLong);
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
-        internal static extern ushort RegisterClass(ref InteropValues.WNDCLASS lpWndClass);
-
-        [DllImport(InteropValues.ExternDll.Kernel32)]
-        internal static extern uint GetCurrentThreadId();
-
-        [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
-        internal static extern IntPtr CreateWindowEx(int dwExStyle, IntPtr classAtom, string lpWindowName, int dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool DestroyWindow(IntPtr hwnd);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool UnregisterClass(IntPtr classAtom, IntPtr hInstance);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool UpdateLayeredWindow(IntPtr hwnd, IntPtr hdcDest, ref InteropValues.POINT pptDest, ref InteropValues.SIZE psize, IntPtr hdcSrc, ref InteropValues.POINT pptSrc, uint crKey, [In] ref InteropValues.BLENDFUNCTION pblend, uint dwFlags);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, InteropValues.RedrawWindowFlags flags);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip, InteropValues.EnumMonitorsDelegate lpfnEnum, IntPtr dwData);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool IntersectRect(out InteropValues.RECT lprcDst, [In] ref InteropValues.RECT lprcSrc1, [In] ref InteropValues.RECT lprcSrc2);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool GetMonitorInfo(IntPtr hMonitor, ref InteropValues.MONITORINFO monitorInfo);
-
-        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true)]
-        [ResourceExposure(ResourceScope.None)]
-        public static extern IntPtr MonitorFromRect(ref InteropValues.RECT rect, int flags);
-
-        [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
-        internal static extern IntPtr CreateDIBSection(IntPtr hdc, ref InteropValues.BITMAPINFO pbmi, uint iUsage, out IntPtr ppvBits, IntPtr hSection, uint dwOffset);
-
-        [DllImport(InteropValues.ExternDll.MsImg)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool AlphaBlend(IntPtr hdcDest, int xoriginDest, int yoriginDest, int wDest, int hDest, IntPtr hdcSrc, int xoriginSrc, int yoriginSrc, int wSrc, int hSrc, InteropValues.BLENDFUNCTION pfn);
-
-        internal static int GET_SC_WPARAM(IntPtr wParam) => (int) wParam & 65520;
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        internal static extern IntPtr ChildWindowFromPointEx(IntPtr hwndParent, InteropValues.POINT pt, int uFlags);
-
-        [DllImport(InteropValues.ExternDll.Gdi32)]
-        internal static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int width, int height);
-
-        [DllImport(InteropValues.ExternDll.Gdi32)]
-        internal static extern bool BitBlt(IntPtr hDC, int x, int y, int nWidth, int nHeight, IntPtr hSrcDC, int xSrc, int ySrc, int dwRop);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        [ResourceExposure(ResourceScope.None)]
-        internal static extern bool EnableWindow(IntPtr hWnd, bool enable);
-
-        [DllImport(InteropValues.ExternDll.User32)]
-        public static extern bool ShowWindow(IntPtr hwnd, InteropValues.SW nCmdShow);
-
-        [ReflectionPermission(SecurityAction.Assert, Unrestricted = true), SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)]
-        internal static object PtrToStructure(IntPtr lparam, Type cls) => Marshal.PtrToStructure(lparam, cls);
-
-        [ReflectionPermission(SecurityAction.Assert, Unrestricted = true),
-         SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)]
-        internal static void PtrToStructure(IntPtr lparam, object data) => Marshal.PtrToStructure(lparam, data);
-
-        [DllImport(InteropValues.ExternDll.Shell32, CallingConvention = CallingConvention.StdCall)]
-        internal static extern uint SHAppBarMessage(int dwMessage, ref InteropValues.APPBARDATA pData);
-
-        [SecurityCritical]
-        [DllImport(InteropValues.ExternDll.DwmApi, EntryPoint = "DwmGetColorizationColor", PreserveSig = true)]
-        internal static extern int DwmGetColorizationColor(out uint pcrColorization, out bool pfOpaqueBlend);
-
-        [DllImport(InteropValues.ExternDll.DwmApi, ExactSpelling = true, SetLastError = true)]
-        internal static extern int DwmSetWindowAttribute(IntPtr hwnd, InteropValues.DwmWindowAttribute dwAttribute,
-            in int pvAttribute, uint cbAttribute);
-
-        [DllImport(InteropValues.ExternDll.User32, EntryPoint = "GetWindowLong")]
-        private static extern IntPtr GetWindowLongPtr32(IntPtr hWnd, int nIndex);
-
-        [DllImport(InteropValues.ExternDll.User32, EntryPoint = "GetWindowLongPtr")]
-        private static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex);
-
-        internal static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex) =>
-            IntPtr.Size == 8 ? GetWindowLongPtr64(hWnd, nIndex) : GetWindowLongPtr32(hWnd, nIndex);
-
-        [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        [ResourceExposure(ResourceScope.None)]
-        internal static extern bool SetWindowPlacement(IntPtr hWnd, [In] ref InteropValues.WINDOWPLACEMENT placement);
-
-        #endregion
-
-        internal class Gdip
-        {
-            private const string ThreadDataSlotName = "system.drawing.threaddata";
-
-            private static IntPtr InitToken;
-
-            private static bool Initialized => InitToken != IntPtr.Zero;
-
-            internal const int
-                Ok = 0,
-                GenericError = 1,
-                InvalidParameter = 2,
-                OutOfMemory = 3,
-                ObjectBusy = 4,
-                InsufficientBuffer = 5,
-                NotImplemented = 6,
-                Win32Error = 7,
-                WrongState = 8,
-                Aborted = 9,
-                FileNotFound = 10,
-                ValueOverflow = 11,
-                AccessDenied = 12,
-                UnknownImageFormat = 13,
-                FontFamilyNotFound = 14,
-                FontStyleNotFound = 15,
-                NotTrueTypeFont = 16,
-                UnsupportedGdiplusVersion = 17,
-                GdiplusNotInitialized = 18,
-                PropertyNotFound = 19,
-                PropertyNotSupported = 20,
-                E_UNEXPECTED = unchecked((int) 0x8000FFFF);
-
-            static Gdip()
-            {
-                Initialize();
+                buffer.EnsureCapacity(buffer.Capacity * 2);
+                continue;
             }
 
-            [StructLayout(LayoutKind.Sequential)]
-            private struct StartupInput
-            {
-                private int GdiplusVersion;
-
-                private readonly IntPtr DebugEventCallback;
-
-                private bool SuppressBackgroundThread;
-
-                private bool SuppressExternalCodecs;
-
-                public static StartupInput GetDefault()
-                {
-                    var result = new StartupInput
-                    {
-                        GdiplusVersion = 1,
-                        SuppressBackgroundThread = false,
-                        SuppressExternalCodecs = false
-                    };
-                    return result;
-                }
-            }
-
-            [StructLayout(LayoutKind.Sequential)]
-            private readonly struct StartupOutput
-            {
-                private readonly IntPtr hook;
-
-                private readonly IntPtr unhook;
-            }
-
-            [ResourceExposure(ResourceScope.None)]
-            [ResourceConsumption(ResourceScope.AppDomain, ResourceScope.AppDomain)]
-            [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
-            private static void Initialize()
-            {
-                var input = StartupInput.GetDefault();
-
-                var status = GdiplusStartup(out InitToken, ref input, out _);
-
-                if (status != Ok)
-                {
-                    throw StatusException(status);
-                }
-
-                var currentDomain = AppDomain.CurrentDomain;
-                currentDomain.ProcessExit += OnProcessExit;
-
-                if (!currentDomain.IsDefaultAppDomain())
-                {
-                    currentDomain.DomainUnload += OnProcessExit;
-                }
-            }
-
-            [PrePrepareMethod]
-            [ResourceExposure(ResourceScope.AppDomain)]
-            [ResourceConsumption(ResourceScope.AppDomain)]
-            private static void OnProcessExit(object sender, EventArgs e) => Shutdown();
-
-            [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
-            [ResourceExposure(ResourceScope.AppDomain)]
-            [ResourceConsumption(ResourceScope.AppDomain)]
-            private static void Shutdown()
-            {
-                if (Initialized)
-                {
-                    ClearThreadData();
-                    // unhook our shutdown handlers as we do not need to shut down more than once
-                    var currentDomain = AppDomain.CurrentDomain;
-                    currentDomain.ProcessExit -= OnProcessExit;
-                    if (!currentDomain.IsDefaultAppDomain())
-                    {
-                        currentDomain.DomainUnload -= OnProcessExit;
-                    }
-                }
-            }
-
-            [MethodImpl(MethodImplOptions.NoInlining)]
-            private static void ClearThreadData()
-            {
-                var slot = Thread.GetNamedDataSlot(ThreadDataSlotName);
-                Thread.SetData(slot, null);
-            }
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipImageGetFrameDimensionsCount(HandleRef image, out int count);
-
-            internal static Exception StatusException(int status)
-            {
-                return status switch
-                {
-                    GenericError => new ExternalException("GdiplusGenericError"),
-                    InvalidParameter => new ArgumentException("GdiplusInvalidParameter"),
-                    OutOfMemory => new OutOfMemoryException("GdiplusOutOfMemory"),
-                    ObjectBusy => new InvalidOperationException("GdiplusObjectBusy"),
-                    InsufficientBuffer => new OutOfMemoryException("GdiplusInsufficientBuffer"),
-                    NotImplemented => new NotImplementedException("GdiplusNotImplemented"),
-                    Win32Error => new ExternalException("GdiplusGenericError"),
-                    WrongState => new InvalidOperationException("GdiplusWrongState"),
-                    Aborted => new ExternalException("GdiplusAborted"),
-                    FileNotFound => new FileNotFoundException("GdiplusFileNotFound"),
-                    ValueOverflow => new OverflowException("GdiplusOverflow"),
-                    AccessDenied => new ExternalException("GdiplusAccessDenied"),
-                    UnknownImageFormat => new ArgumentException("GdiplusUnknownImageFormat"),
-                    PropertyNotFound => new ArgumentException("GdiplusPropertyNotFoundError"),
-                    PropertyNotSupported => new ArgumentException("GdiplusPropertyNotSupportedError"),
-                    FontFamilyNotFound => new ArgumentException("GdiplusFontFamilyNotFound"),
-                    FontStyleNotFound => new ArgumentException("GdiplusFontStyleNotFound"),
-                    NotTrueTypeFont => new ArgumentException("GdiplusNotTrueTypeFont_NoName"),
-                    UnsupportedGdiplusVersion => new ExternalException("GdiplusUnsupportedGdiplusVersion"),
-                    GdiplusNotInitialized => new ExternalException("GdiplusNotInitialized"),
-                    _ => new ExternalException("GdiplusUnknown")
-                };
-            }
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipImageGetFrameDimensionsList(HandleRef image, IntPtr buffer, int count);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipImageGetFrameCount(HandleRef image, ref Guid dimensionId, int[] count);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetPropertyItemSize(HandleRef image, int propid, out int size);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetPropertyItem(HandleRef image, int propid, int size, IntPtr buffer);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.Machine)]
-            internal static extern int GdipCreateHBITMAPFromBitmap(HandleRef nativeBitmap, out IntPtr hbitmap, int argbBackground);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipImageSelectActiveFrame(HandleRef image, ref Guid dimensionId, int frameIndex);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.Machine)]
-            internal static extern int GdipCreateBitmapFromFile(string filename, out IntPtr bitmap);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipImageForceValidation(HandleRef image);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, EntryPoint = "GdipDisposeImage", CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            private static extern int IntGdipDisposeImage(HandleRef image);
-
-            internal static int GdipDisposeImage(HandleRef image)
-            {
-                if (!Initialized) return Ok;
-                var result = IntGdipDisposeImage(image);
-                return result;
-            }
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.Process)]
-            private static extern int GdiplusStartup(out IntPtr token, ref StartupInput input, out StartupOutput output);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetImageRawFormat(HandleRef image, ref Guid format);
-
-            [DllImport(InteropValues.ExternDll.User32)]
-            internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref InteropValues.WINCOMPATTRDATA data);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.Machine)]
-            internal static extern int GdipCreateBitmapFromStream(InteropValues.IStream stream, out IntPtr bitmap);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.Machine)]
-            internal static extern int GdipCreateBitmapFromHBITMAP(HandleRef hbitmap, HandleRef hpalette, out IntPtr bitmap);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetImageEncodersSize(out int numEncoders, out int size);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetImageDecodersSize(out int numDecoders, out int size);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetImageDecoders(int numDecoders, int size, IntPtr decoders);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipGetImageEncoders(int numEncoders, int size, IntPtr encoders);
-
-            [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-            [ResourceExposure(ResourceScope.None)]
-            internal static extern int GdipSaveImageToStream(HandleRef image, InteropValues.IStream stream, ref Guid classId, HandleRef encoderParams);
-
-            [DllImport(InteropValues.ExternDll.NTdll)]
-            internal static extern int RtlGetVersion(out InteropValues.RTL_OSVERSIONINFOEX lpVersionInformation);
-
+            return buffer.ToString();
         }
     }
-}
+
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto, BestFitMapping = false, ThrowOnUnmappableChar = true)]
+    internal static extern int ExtractIconEx(string szExeFileName, int nIconIndex, out IconHandle phiconLarge,
+        out IconHandle phiconSmall, int nIcons);
+
+    [DllImport(InteropValues.ExternDll.Shell32, CharSet = CharSet.Auto)]
+    internal static extern int Shell_NotifyIcon(int message, InteropValues.NOTIFYICONDATA pnid);
+
+    [SecurityCritical]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
+    internal static extern IntPtr CreateWindowEx(
+        int dwExStyle,
+        [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
+        [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
+        int dwStyle,
+        int x,
+        int y,
+        int nWidth,
+        int nHeight,
+        IntPtr hWndParent,
+        IntPtr hMenu,
+        IntPtr hInstance,
+        IntPtr lpParam);
+
+    [SecurityCritical]
+    [SuppressUnmanagedCodeSecurity]
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true, BestFitMapping = false)]
+    internal static extern short RegisterClass(InteropValues.WNDCLASS4ICON wc);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+    internal static extern IntPtr DefWindowProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+    [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
+    internal static extern bool SetForegroundWindow(IntPtr hWnd);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern IntPtr CallNextHookEx(IntPtr hhk, int nCode, IntPtr wParam, IntPtr lParam);
+
+    [DllImport(InteropValues.ExternDll.Kernel32, CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern IntPtr GetModuleHandle(string lpModuleName);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern bool UnhookWindowsHookEx(IntPtr hhk);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern IntPtr SetWindowsHookEx(int idHook, InteropValues.HookProc lpfn, IntPtr hMod, uint dwThreadId);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    internal static extern IntPtr GetWindowDC(IntPtr window);
+
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+    internal static extern uint GetPixel(IntPtr dc, int x, int y);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    internal static extern int ReleaseDC(IntPtr window, IntPtr dc);
+
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Auto)]
+    internal static extern int GetDeviceCaps(IntPtr hdc, int nIndex);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto)]
+    internal static extern IntPtr GetDC(IntPtr ptr);
+
+    [DllImport(InteropValues.ExternDll.User32, SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool GetWindowPlacement(IntPtr hwnd, InteropValues.WINDOWPLACEMENT lpwndpl);
+
+    internal static InteropValues.WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
+    {
+        InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = InteropValues.WINDOWPLACEMENT.Default;
+        if (GetWindowPlacement(hwnd, wINDOWPLACEMENT))
+        {
+            return wINDOWPLACEMENT;
+        }
+        throw new Win32Exception(Marshal.GetLastWin32Error());
+    }
+
+    internal static int GetXLParam(int lParam) => LoWord(lParam);
+
+    internal static int GetYLParam(int lParam) => HiWord(lParam);
+
+    internal static int HiWord(int value) => (short) (value >> 16);
+
+    internal static int LoWord(int value) => (short) (value & 65535);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr MonitorFromWindow(IntPtr handle, int flags);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool EnumThreadWindows(uint dwThreadId, InteropValues.EnumWindowsProc lpfn, IntPtr lParam);
+
+    [DllImport(InteropValues.ExternDll.Gdi32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool DeleteDC(IntPtr hdc);
+
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+    internal static extern IntPtr CreateCompatibleDC(IntPtr hdc);
+
+    [DllImport(InteropValues.ExternDll.Gdi32, ExactSpelling = true, SetLastError = true)]
+    internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
+    internal static extern IntPtr SendMessage(IntPtr hWnd, int nMsg, IntPtr wParam, IntPtr lParam);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr MonitorFromPoint(InteropValues.POINT pt, int flags);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr GetWindow(IntPtr hwnd, int nCmd);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IsWindowVisible(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IsIconic(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IsZoomed(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, ExactSpelling = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, int flags);
+
+    internal static System.Windows.Point GetCursorPos()
+    {
+        var result = default(System.Windows.Point);
+        if (GetCursorPos(out var point))
+        {
+            result.X = point.X;
+            result.Y = point.Y;
+        }
+        return result;
+    }
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+    internal static int GetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex) => GetWindowLong(hWnd, (int) nIndex);
+
+    internal static IntPtr SetWindowLong(IntPtr hWnd, int nIndex, IntPtr dwNewLong) => IntPtr.Size == 4
+        ? SetWindowLongPtr32(hWnd, nIndex, dwNewLong)
+        : SetWindowLongPtr64(hWnd, nIndex, dwNewLong);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLong")]
+    internal static extern IntPtr SetWindowLongPtr32(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Auto, EntryPoint = "SetWindowLongPtr")]
+    internal static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+    private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+    private static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+    internal static IntPtr SetWindowLongPtr(IntPtr hWnd, InteropValues.GWLP nIndex, IntPtr dwNewLong)
+    {
+        if (IntPtr.Size == 8)
+        {
+            return SetWindowLongPtr(hWnd, (int) nIndex, dwNewLong);
+        }
+        return new IntPtr(SetWindowLong(hWnd, (int) nIndex, dwNewLong.ToInt32()));
+    }
+
+    internal static int SetWindowLong(IntPtr hWnd, InteropValues.GWL nIndex, int dwNewLong) => SetWindowLong(hWnd, (int) nIndex, dwNewLong);
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode)]
+    internal static extern ushort RegisterClass(ref InteropValues.WNDCLASS lpWndClass);
+
+    [DllImport(InteropValues.ExternDll.Kernel32)]
+    internal static extern uint GetCurrentThreadId();
+
+    [DllImport(InteropValues.ExternDll.User32, CharSet = CharSet.Unicode, SetLastError = true)]
+    internal static extern IntPtr CreateWindowEx(int dwExStyle, IntPtr classAtom, string lpWindowName, int dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool DestroyWindow(IntPtr hwnd);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool UnregisterClass(IntPtr classAtom, IntPtr hInstance);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool UpdateLayeredWindow(IntPtr hwnd, IntPtr hdcDest, ref InteropValues.POINT pptDest, ref InteropValues.SIZE psize, IntPtr hdcSrc, ref InteropValues.POINT pptSrc, uint crKey, [In] ref InteropValues.BLENDFUNCTION pblend, uint dwFlags);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern bool RedrawWindow(IntPtr hWnd, IntPtr lprcUpdate, IntPtr hrgnUpdate, InteropValues.RedrawWindowFlags flags);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool EnumDisplayMonitors(IntPtr hdc, IntPtr lprcClip, InteropValues.EnumMonitorsDelegate lpfnEnum, IntPtr dwData);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool IntersectRect(out InteropValues.RECT lprcDst, [In] ref InteropValues.RECT lprcSrc1, [In] ref InteropValues.RECT lprcSrc2);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool GetMonitorInfo(IntPtr hMonitor, ref InteropValues.MONITORINFO monitorInfo);
+
+    [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true)]
+    [ResourceExposure(ResourceScope.None)]
+    public static extern IntPtr MonitorFromRect(ref InteropValues.RECT rect, int flags);
+
+    [DllImport(InteropValues.ExternDll.Gdi32, SetLastError = true)]
+    internal static extern IntPtr CreateDIBSection(IntPtr hdc, ref InteropValues.BITMAPINFO pbmi, uint iUsage, out IntPtr ppvBits, IntPtr hSection, uint dwOffset);
+
+    [DllImport(InteropValues.ExternDll.MsImg)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool AlphaBlend(IntPtr hdcDest, int xoriginDest, int yoriginDest, int wDest, int hDest, IntPtr hdcSrc, int xoriginSrc, int yoriginSrc, int wSrc, int hSrc, InteropValues.BLENDFUNCTION pfn);
+
+    internal static int GET_SC_WPARAM(IntPtr wParam) => (int) wParam & 65520;
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    internal static extern IntPtr ChildWindowFromPointEx(IntPtr hwndParent, InteropValues.POINT pt, int uFlags);
+
+    [DllImport(InteropValues.ExternDll.Gdi32)]
+    internal static extern IntPtr CreateCompatibleBitmap(IntPtr hDC, int width, int height);
+
+    [DllImport(InteropValues.ExternDll.Gdi32)]
+    internal static extern bool BitBlt(IntPtr hDC, int x, int y, int nWidth, int nHeight, IntPtr hSrcDC, int xSrc, int ySrc, int dwRop);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    [ResourceExposure(ResourceScope.None)]
+    internal static extern bool EnableWindow(IntPtr hWnd, bool enable);
+
+    [DllImport(InteropValues.ExternDll.User32)]
+    public static extern bool ShowWindow(IntPtr hwnd, InteropValues.SW nCmdShow);
+
+    [ReflectionPermission(SecurityAction.Assert, Unrestricted = true), SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)]
+    internal static object PtrToStructure(IntPtr lparam, Type cls) => Marshal.PtrToStructure(lparam, cls);
+
+    [ReflectionPermission(SecurityAction.Assert, Unrestricted = true),
+     SecurityPermission(SecurityAction.Assert, Flags = SecurityPermissionFlag.UnmanagedCode)]
+    internal static void PtrToStructure(IntPtr lparam, object data) => Marshal.PtrToStructure(lparam, data);
+
+    [DllImport(InteropValues.ExternDll.Shell32, CallingConvention = CallingConvention.StdCall)]
+    internal static extern uint SHAppBarMessage(int dwMessage, ref InteropValues.APPBARDATA pData);
+
+    [SecurityCritical]
+    [DllImport(InteropValues.ExternDll.DwmApi, EntryPoint = "DwmGetColorizationColor", PreserveSig = true)]
+    internal static extern int DwmGetColorizationColor(out uint pcrColorization, out bool pfOpaqueBlend);
+
+    [DllImport(InteropValues.ExternDll.DwmApi, ExactSpelling = true, SetLastError = true)]
+    internal static extern int DwmSetWindowAttribute(IntPtr hwnd, InteropValues.DwmWindowAttribute dwAttribute,
+        in int pvAttribute, uint cbAttribute);
+
+    [DllImport(InteropValues.ExternDll.User32, EntryPoint = "GetWindowLong")]
+    private static extern IntPtr GetWindowLongPtr32(IntPtr hWnd, int nIndex);
+
+    [DllImport(InteropValues.ExternDll.User32, EntryPoint = "GetWindowLongPtr")]
+    private static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, int nIndex);
+
+    internal static IntPtr GetWindowLongPtr(IntPtr hWnd, int nIndex) =>
+        IntPtr.Size == 8 ? GetWindowLongPtr64(hWnd, nIndex) : GetWindowLongPtr32(hWnd, nIndex);
+
+    [DllImport(InteropValues.ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
+    [ResourceExposure(ResourceScope.None)]
+    internal static extern bool SetWindowPlacement(IntPtr hWnd, [In] ref InteropValues.WINDOWPLACEMENT placement);
+
+    #endregion
+
+    internal class Gdip
+    {
+        private const string ThreadDataSlotName = "system.drawing.threaddata";
+
+        private static IntPtr InitToken;
+
+        private static bool Initialized => InitToken != IntPtr.Zero;
+
+        internal const int
+            Ok = 0,
+            GenericError = 1,
+            InvalidParameter = 2,
+            OutOfMemory = 3,
+            ObjectBusy = 4,
+            InsufficientBuffer = 5,
+            NotImplemented = 6,
+            Win32Error = 7,
+            WrongState = 8,
+            Aborted = 9,
+            FileNotFound = 10,
+            ValueOverflow = 11,
+            AccessDenied = 12,
+            UnknownImageFormat = 13,
+            FontFamilyNotFound = 14,
+            FontStyleNotFound = 15,
+            NotTrueTypeFont = 16,
+            UnsupportedGdiplusVersion = 17,
+            GdiplusNotInitialized = 18,
+            PropertyNotFound = 19,
+            PropertyNotSupported = 20,
+            E_UNEXPECTED = unchecked((int) 0x8000FFFF);
+
+        static Gdip()
+        {
+            Initialize();
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct StartupInput
+        {
+            private int GdiplusVersion;
+
+            private readonly IntPtr DebugEventCallback;
+
+            private bool SuppressBackgroundThread;
+
+            private bool SuppressExternalCodecs;
+
+            public static StartupInput GetDefault()
+            {
+                var result = new StartupInput
+                {
+                    GdiplusVersion = 1,
+                    SuppressBackgroundThread = false,
+                    SuppressExternalCodecs = false
+                };
+                return result;
+            }
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private readonly struct StartupOutput
+        {
+            private readonly IntPtr hook;
+
+            private readonly IntPtr unhook;
+        }
+
+        [ResourceExposure(ResourceScope.None)]
+        [ResourceConsumption(ResourceScope.AppDomain, ResourceScope.AppDomain)]
+        [SuppressMessage("Microsoft.Performance", "CA1804:RemoveUnusedLocals")]
+        private static void Initialize()
+        {
+            var input = StartupInput.GetDefault();
+
+            var status = GdiplusStartup(out InitToken, ref input, out _);
+
+            if (status != Ok)
+            {
+                throw StatusException(status);
+            }
+
+            var currentDomain = AppDomain.CurrentDomain;
+            currentDomain.ProcessExit += OnProcessExit;
+
+            if (!currentDomain.IsDefaultAppDomain())
+            {
+                currentDomain.DomainUnload += OnProcessExit;
+            }
+        }
+
+        [PrePrepareMethod]
+        [ResourceExposure(ResourceScope.AppDomain)]
+        [ResourceConsumption(ResourceScope.AppDomain)]
+        private static void OnProcessExit(object sender, EventArgs e) => Shutdown();
+
+        [SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
+        [ResourceExposure(ResourceScope.AppDomain)]
+        [ResourceConsumption(ResourceScope.AppDomain)]
+        private static void Shutdown()
+        {
+            if (Initialized)
+            {
+                ClearThreadData();
+                // unhook our shutdown handlers as we do not need to shut down more than once
+                var currentDomain = AppDomain.CurrentDomain;
+                currentDomain.ProcessExit -= OnProcessExit;
+                if (!currentDomain.IsDefaultAppDomain())
+                {
+                    currentDomain.DomainUnload -= OnProcessExit;
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void ClearThreadData()
+        {
+            var slot = Thread.GetNamedDataSlot(ThreadDataSlotName);
+            Thread.SetData(slot, null);
+        }
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipImageGetFrameDimensionsCount(HandleRef image, out int count);
+
+        internal static Exception StatusException(int status)
+        {
+            return status switch
+            {
+                GenericError => new ExternalException("GdiplusGenericError"),
+                InvalidParameter => new ArgumentException("GdiplusInvalidParameter"),
+                OutOfMemory => new OutOfMemoryException("GdiplusOutOfMemory"),
+                ObjectBusy => new InvalidOperationException("GdiplusObjectBusy"),
+                InsufficientBuffer => new OutOfMemoryException("GdiplusInsufficientBuffer"),
+                NotImplemented => new NotImplementedException("GdiplusNotImplemented"),
+                Win32Error => new ExternalException("GdiplusGenericError"),
+                WrongState => new InvalidOperationException("GdiplusWrongState"),
+                Aborted => new ExternalException("GdiplusAborted"),
+                FileNotFound => new FileNotFoundException("GdiplusFileNotFound"),
+                ValueOverflow => new OverflowException("GdiplusOverflow"),
+                AccessDenied => new ExternalException("GdiplusAccessDenied"),
+                UnknownImageFormat => new ArgumentException("GdiplusUnknownImageFormat"),
+                PropertyNotFound => new ArgumentException("GdiplusPropertyNotFoundError"),
+                PropertyNotSupported => new ArgumentException("GdiplusPropertyNotSupportedError"),
+                FontFamilyNotFound => new ArgumentException("GdiplusFontFamilyNotFound"),
+                FontStyleNotFound => new ArgumentException("GdiplusFontStyleNotFound"),
+                NotTrueTypeFont => new ArgumentException("GdiplusNotTrueTypeFont_NoName"),
+                UnsupportedGdiplusVersion => new ExternalException("GdiplusUnsupportedGdiplusVersion"),
+                GdiplusNotInitialized => new ExternalException("GdiplusNotInitialized"),
+                _ => new ExternalException("GdiplusUnknown")
+            };
+        }
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipImageGetFrameDimensionsList(HandleRef image, IntPtr buffer, int count);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipImageGetFrameCount(HandleRef image, ref Guid dimensionId, int[] count);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetPropertyItemSize(HandleRef image, int propid, out int size);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetPropertyItem(HandleRef image, int propid, int size, IntPtr buffer);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.Machine)]
+        internal static extern int GdipCreateHBITMAPFromBitmap(HandleRef nativeBitmap, out IntPtr hbitmap, int argbBackground);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipImageSelectActiveFrame(HandleRef image, ref Guid dimensionId, int frameIndex);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.Machine)]
+        internal static extern int GdipCreateBitmapFromFile(string filename, out IntPtr bitmap);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipImageForceValidation(HandleRef image);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, EntryPoint = "GdipDisposeImage", CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        private static extern int IntGdipDisposeImage(HandleRef image);
+
+        internal static int GdipDisposeImage(HandleRef image)
+        {
+            if (!Initialized) return Ok;
+            var result = IntGdipDisposeImage(image);
+            return result;
+        }
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.Process)]
+        private static extern int GdiplusStartup(out IntPtr token, ref StartupInput input, out StartupOutput output);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetImageRawFormat(HandleRef image, ref Guid format);
+
+        [DllImport(InteropValues.ExternDll.User32)]
+        internal static extern int SetWindowCompositionAttribute(IntPtr hwnd, ref InteropValues.WINCOMPATTRDATA data);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.Machine)]
+        internal static extern int GdipCreateBitmapFromStream(InteropValues.IStream stream, out IntPtr bitmap);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.Machine)]
+        internal static extern int GdipCreateBitmapFromHBITMAP(HandleRef hbitmap, HandleRef hpalette, out IntPtr bitmap);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetImageEncodersSize(out int numEncoders, out int size);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetImageDecodersSize(out int numDecoders, out int size);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetImageDecoders(int numDecoders, int size, IntPtr decoders);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipGetImageEncoders(int numEncoders, int size, IntPtr encoders);
+
+        [DllImport(InteropValues.ExternDll.GdiPlus, SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
+        [ResourceExposure(ResourceScope.None)]
+        internal static extern int GdipSaveImageToStream(HandleRef image, InteropValues.IStream stream, ref Guid classId, HandleRef encoderParams);
+
+        [DllImport(InteropValues.ExternDll.NTdll)]
+        internal static extern int RtlGetVersion(out InteropValues.RTL_OSVERSIONINFOEX lpVersionInformation);
+
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index 25be788e..e2495a21 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -5,1188 +5,1187 @@ using System.Runtime.InteropServices;
 using System.Security;
 using System.Windows;
 
-namespace HandyControl.Tools.Interop
+namespace HandyControl.Tools.Interop;
+
+internal class InteropValues
 {
-    internal class InteropValues
+    internal static class ExternDll
     {
-        internal static class ExternDll
+        public const string
+            User32 = "user32.dll",
+            Gdi32 = "gdi32.dll",
+            GdiPlus = "gdiplus.dll",
+            Kernel32 = "kernel32.dll",
+            Shell32 = "shell32.dll",
+            MsImg = "msimg32.dll",
+            NTdll = "ntdll.dll",
+            DwmApi = "dwmapi.dll";
+    }
+
+    internal delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
+
+    internal delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
+
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal delegate bool EnumMonitorsDelegate(IntPtr hMonitor, IntPtr hdcMonitor, ref RECT lprcMonitor, IntPtr dwData);
+
+    internal delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
+
+    internal const int
+        BITSPIXEL = 12,
+        PLANES = 14,
+        BI_RGB = 0,
+        DIB_RGB_COLORS = 0,
+        E_FAIL = unchecked((int) 0x80004005),
+        HWND_TOP = 0,
+        GWL_STYLE = -16,
+        NIF_MESSAGE = 0x00000001,
+        NIF_ICON = 0x00000002,
+        NIF_TIP = 0x00000004,
+        NIF_INFO = 0x00000010,
+        NIM_ADD = 0x00000000,
+        NIM_MODIFY = 0x00000001,
+        NIM_DELETE = 0x00000002,
+        NIIF_NONE = 0x00000000,
+        NIIF_INFO = 0x00000001,
+        NIIF_WARNING = 0x00000002,
+        NIIF_ERROR = 0x00000003,
+        WM_ACTIVATE = 0x0006,
+        WM_QUIT = 0x0012,
+        WM_GETMINMAXINFO = 0x0024,
+        WM_WINDOWPOSCHANGING = 0x0046,
+        WM_WINDOWPOSCHANGED = 0x0047,
+        WM_SETICON = 0x0080,
+        WM_NCCREATE = 0x0081,
+        WM_NCDESTROY = 0x0082,
+        WM_NCHITTEST = 0x0084,
+        WM_NCACTIVATE = 0x0086,
+        WM_NCRBUTTONDOWN = 0x00A4,
+        WM_NCRBUTTONUP = 0x00A5,
+        WM_NCRBUTTONDBLCLK = 0x00A6,
+        WM_NCUAHDRAWCAPTION = 0x00AE,
+        WM_NCUAHDRAWFRAME = 0x00AF,
+        WM_KEYDOWN = 0x0100,
+        WM_KEYUP = 0x0101,
+        WM_SYSKEYDOWN = 0x0104,
+        WM_SYSKEYUP = 0x0105,
+        WM_SYSCOMMAND = 0x112,
+        WM_MOUSEMOVE = 0x0200,
+        WM_LBUTTONUP = 0x0202,
+        WM_LBUTTONDBLCLK = 0x0203,
+        WM_RBUTTONUP = 0x0205,
+        WM_ENTERSIZEMOVE = 0x0231,
+        WM_EXITSIZEMOVE = 0x0232,
+        WM_CLIPBOARDUPDATE = 0x031D,
+        WM_USER = 0x0400,
+        WS_VISIBLE = 0x10000000,
+        MF_BYCOMMAND = 0x00000000,
+        MF_BYPOSITION = 0x400,
+        MF_GRAYED = 0x00000001,
+        MF_SEPARATOR = 0x800,
+        TB_GETBUTTON = WM_USER + 23,
+        TB_BUTTONCOUNT = WM_USER + 24,
+        TB_GETITEMRECT = WM_USER + 29,
+        VERTRES = 10,
+        DESKTOPVERTRES = 117,
+        LOGPIXELSX = 88,
+        LOGPIXELSY = 90,
+        SC_CLOSE = 0xF060,
+        SC_SIZE = 0xF000,
+        SC_MOVE = 0xF010,
+        SC_MINIMIZE = 0xF020,
+        SC_MAXIMIZE = 0xF030,
+        SC_RESTORE = 0xF120,
+        SRCCOPY = 0x00CC0020,
+        MONITOR_DEFAULTTOPRIMARY = 0x00000001,
+        MONITOR_DEFAULTTONEAREST = 0x00000002;
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    internal class NOTIFYICONDATA
+    {
+        public int cbSize = Marshal.SizeOf(typeof(NOTIFYICONDATA));
+        public IntPtr hWnd;
+        public int uID;
+        public int uFlags;
+        public int uCallbackMessage;
+        public IntPtr hIcon;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+        public string szTip = string.Empty;
+        public int dwState = 0x01;
+        public int dwStateMask = 0x01;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+        public string szInfo = string.Empty;
+        public int uTimeoutOrVersion;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+        public string szInfoTitle = string.Empty;
+        public int dwInfoFlags;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    internal struct TBBUTTON
+    {
+        public int iBitmap;
+        public int idCommand;
+        public IntPtr fsStateStylePadding;
+        public IntPtr dwData;
+        public IntPtr iString;
+    }
+
+    [Flags]
+    internal enum AllocationType
+    {
+        Commit = 0x1000,
+        Reserve = 0x2000,
+        Decommit = 0x4000,
+        Release = 0x8000,
+        Reset = 0x80000,
+        Physical = 0x400000,
+        TopDown = 0x100000,
+        WriteWatch = 0x200000,
+        LargePages = 0x20000000
+    }
+
+    [Flags]
+    internal enum MemoryProtection
+    {
+        Execute = 0x10,
+        ExecuteRead = 0x20,
+        ExecuteReadWrite = 0x40,
+        ExecuteWriteCopy = 0x80,
+        NoAccess = 0x01,
+        ReadOnly = 0x02,
+        ReadWrite = 0x04,
+        WriteCopy = 0x08,
+        GuardModifierflag = 0x100,
+        NoCacheModifierflag = 0x200,
+        WriteCombineModifierflag = 0x400
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct TRAYDATA
+    {
+        public IntPtr hwnd;
+        public uint uID;
+        public uint uCallbackMessage;
+        public uint bReserved0;
+        public uint bReserved1;
+        public IntPtr hIcon;
+    }
+
+    [Flags]
+    internal enum FreeType
+    {
+        Decommit = 0x4000,
+        Release = 0x8000,
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct POINT
+    {
+        public int X;
+        public int Y;
+
+        public POINT(int x, int y)
         {
-            public const string
-                User32 = "user32.dll",
-                Gdi32 = "gdi32.dll",
-                GdiPlus = "gdiplus.dll",
-                Kernel32 = "kernel32.dll",
-                Shell32 = "shell32.dll",
-                MsImg = "msimg32.dll",
-                NTdll = "ntdll.dll",
-                DwmApi = "dwmapi.dll";
-        }
-
-        internal delegate IntPtr HookProc(int code, IntPtr wParam, IntPtr lParam);
-
-        internal delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal delegate bool EnumMonitorsDelegate(IntPtr hMonitor, IntPtr hdcMonitor, ref RECT lprcMonitor, IntPtr dwData);
-
-        internal delegate bool EnumWindowsProc(IntPtr hWnd, IntPtr lParam);
-
-        internal const int
-            BITSPIXEL = 12,
-            PLANES = 14,
-            BI_RGB = 0,
-            DIB_RGB_COLORS = 0,
-            E_FAIL = unchecked((int) 0x80004005),
-            HWND_TOP = 0,
-            GWL_STYLE = -16,
-            NIF_MESSAGE = 0x00000001,
-            NIF_ICON = 0x00000002,
-            NIF_TIP = 0x00000004,
-            NIF_INFO = 0x00000010,
-            NIM_ADD = 0x00000000,
-            NIM_MODIFY = 0x00000001,
-            NIM_DELETE = 0x00000002,
-            NIIF_NONE = 0x00000000,
-            NIIF_INFO = 0x00000001,
-            NIIF_WARNING = 0x00000002,
-            NIIF_ERROR = 0x00000003,
-            WM_ACTIVATE = 0x0006,
-            WM_QUIT = 0x0012,
-            WM_GETMINMAXINFO = 0x0024,
-            WM_WINDOWPOSCHANGING = 0x0046,
-            WM_WINDOWPOSCHANGED = 0x0047,
-            WM_SETICON = 0x0080,
-            WM_NCCREATE = 0x0081,
-            WM_NCDESTROY = 0x0082,
-            WM_NCHITTEST = 0x0084,
-            WM_NCACTIVATE = 0x0086,
-            WM_NCRBUTTONDOWN = 0x00A4,
-            WM_NCRBUTTONUP = 0x00A5,
-            WM_NCRBUTTONDBLCLK = 0x00A6,
-            WM_NCUAHDRAWCAPTION = 0x00AE,
-            WM_NCUAHDRAWFRAME = 0x00AF,
-            WM_KEYDOWN = 0x0100,
-            WM_KEYUP = 0x0101,
-            WM_SYSKEYDOWN = 0x0104,
-            WM_SYSKEYUP = 0x0105,
-            WM_SYSCOMMAND = 0x112,
-            WM_MOUSEMOVE = 0x0200,
-            WM_LBUTTONUP = 0x0202,
-            WM_LBUTTONDBLCLK = 0x0203,
-            WM_RBUTTONUP = 0x0205,
-            WM_ENTERSIZEMOVE = 0x0231,
-            WM_EXITSIZEMOVE = 0x0232,
-            WM_CLIPBOARDUPDATE = 0x031D,
-            WM_USER = 0x0400,
-            WS_VISIBLE = 0x10000000,
-            MF_BYCOMMAND = 0x00000000,
-            MF_BYPOSITION = 0x400,
-            MF_GRAYED = 0x00000001,
-            MF_SEPARATOR = 0x800,
-            TB_GETBUTTON = WM_USER + 23,
-            TB_BUTTONCOUNT = WM_USER + 24,
-            TB_GETITEMRECT = WM_USER + 29,
-            VERTRES = 10,
-            DESKTOPVERTRES = 117,
-            LOGPIXELSX = 88,
-            LOGPIXELSY = 90,
-            SC_CLOSE = 0xF060,
-            SC_SIZE = 0xF000,
-            SC_MOVE = 0xF010,
-            SC_MINIMIZE = 0xF020,
-            SC_MAXIMIZE = 0xF030,
-            SC_RESTORE = 0xF120,
-            SRCCOPY = 0x00CC0020,
-            MONITOR_DEFAULTTOPRIMARY = 0x00000001,
-            MONITOR_DEFAULTTONEAREST = 0x00000002;
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        internal class NOTIFYICONDATA
-        {
-            public int cbSize = Marshal.SizeOf(typeof(NOTIFYICONDATA));
-            public IntPtr hWnd;
-            public int uID;
-            public int uFlags;
-            public int uCallbackMessage;
-            public IntPtr hIcon;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-            public string szTip = string.Empty;
-            public int dwState = 0x01;
-            public int dwStateMask = 0x01;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-            public string szInfo = string.Empty;
-            public int uTimeoutOrVersion;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-            public string szInfoTitle = string.Empty;
-            public int dwInfoFlags;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        internal struct TBBUTTON
-        {
-            public int iBitmap;
-            public int idCommand;
-            public IntPtr fsStateStylePadding;
-            public IntPtr dwData;
-            public IntPtr iString;
-        }
-
-        [Flags]
-        internal enum AllocationType
-        {
-            Commit = 0x1000,
-            Reserve = 0x2000,
-            Decommit = 0x4000,
-            Release = 0x8000,
-            Reset = 0x80000,
-            Physical = 0x400000,
-            TopDown = 0x100000,
-            WriteWatch = 0x200000,
-            LargePages = 0x20000000
-        }
-
-        [Flags]
-        internal enum MemoryProtection
-        {
-            Execute = 0x10,
-            ExecuteRead = 0x20,
-            ExecuteReadWrite = 0x40,
-            ExecuteWriteCopy = 0x80,
-            NoAccess = 0x01,
-            ReadOnly = 0x02,
-            ReadWrite = 0x04,
-            WriteCopy = 0x08,
-            GuardModifierflag = 0x100,
-            NoCacheModifierflag = 0x200,
-            WriteCombineModifierflag = 0x400
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct TRAYDATA
-        {
-            public IntPtr hwnd;
-            public uint uID;
-            public uint uCallbackMessage;
-            public uint bReserved0;
-            public uint bReserved1;
-            public IntPtr hIcon;
-        }
-
-        [Flags]
-        internal enum FreeType
-        {
-            Decommit = 0x4000,
-            Release = 0x8000,
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct POINT
-        {
-            public int X;
-            public int Y;
-
-            public POINT(int x, int y)
-            {
-                X = x;
-                Y = y;
-            }
-        }
-
-        internal enum HookType
-        {
-            WH_KEYBOARD_LL = 13,
-            WH_MOUSE_LL = 14
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct MOUSEHOOKSTRUCT
-        {
-            public POINT pt;
-            public IntPtr hwnd;
-            public uint wHitTestCode;
-            public IntPtr dwExtraInfo;
-        }
-
-        [Flags]
-        internal enum ProcessAccess
-        {
-            AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
-            CreateThread = 0x2,
-            DuplicateHandle = 0x40,
-            QueryInformation = 0x400,
-            SetInformation = 0x200,
-            Terminate = 0x1,
-            VMOperation = 0x8,
-            VMRead = 0x10,
-            VMWrite = 0x20,
-            Synchronize = 0x100000
-        }
-
-        [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        internal struct RECT
-        {
-            public int Left;
-            public int Top;
-            public int Right;
-            public int Bottom;
-
-            public RECT(int left, int top, int right, int bottom)
-            {
-                Left = left;
-                Top = top;
-                Right = right;
-                Bottom = bottom;
-            }
-
-            public RECT(Rect rect)
-            {
-                Left = (int) rect.Left;
-                Top = (int) rect.Top;
-                Right = (int) rect.Right;
-                Bottom = (int) rect.Bottom;
-            }
-
-            public Point Position => new(Left, Top);
-            public Size Size => new(Width, Height);
-
-            public int Height
-            {
-                get => Bottom - Top;
-                set => Bottom = Top + value;
-            }
-
-            public int Width
-            {
-                get => Right - Left;
-                set => Right = Left + value;
-            }
-
-            public bool Equals(RECT other)
-            {
-                return Left == other.Left && Right == other.Right && Top == other.Top && Bottom == other.Bottom;
-            }
-
-            public override bool Equals(object obj)
-            {
-                return obj is RECT rectangle && Equals(rectangle);
-            }
-
-            public static bool operator ==(RECT left, RECT right)
-            {
-                return left.Equals(right);
-            }
-
-            public static bool operator !=(RECT left, RECT right)
-            {
-                return !(left == right);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = Left;
-                    hashCode = (hashCode * 397) ^ Top;
-                    hashCode = (hashCode * 397) ^ Right;
-                    hashCode = (hashCode * 397) ^ Bottom;
-                    return hashCode;
-                }
-            }
-        }
-
-        internal struct BLENDFUNCTION
-        {
-            public byte BlendOp;
-            public byte BlendFlags;
-            public byte SourceConstantAlpha;
-            public byte AlphaFormat;
-        }
-
-        internal enum GWL
-        {
-            STYLE = -16,
-            EXSTYLE = -20
-        }
-
-        internal enum GWLP
-        {
-            WNDPROC = -4,
-            HINSTANCE = -6,
-            HWNDPARENT = -8,
-            USERDATA = -21,
-            ID = -12
-        }
-
-        internal struct BITMAPINFOHEADER
-        {
-            internal uint biSize;
-            internal int biWidth;
-            internal int biHeight;
-            internal ushort biPlanes;
-            internal ushort biBitCount;
-            internal uint biCompression;
-            internal uint biSizeImage;
-            internal int biXPelsPerMeter;
-            internal int biYPelsPerMeter;
-            internal uint biClrUsed;
-            internal uint biClrImportant;
-        }
-
-        [Flags]
-        internal enum RedrawWindowFlags : uint
-        {
-            Invalidate = 1u,
-            InternalPaint = 2u,
-            Erase = 4u,
-            Validate = 8u,
-            NoInternalPaint = 16u,
-            NoErase = 32u,
-            NoChildren = 64u,
-            AllChildren = 128u,
-            UpdateNow = 256u,
-            EraseNow = 512u,
-            Frame = 1024u,
-            NoFrame = 2048u
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal class WINDOWPOS
-        {
-            public IntPtr hwnd;
-            public IntPtr hwndInsertAfter;
-            public int x;
-            public int y;
-            public int cx;
-            public int cy;
-            public uint flags;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WINDOWPLACEMENT
-        {
-            public int length;
-            public int flags;
-            public SW showCmd;
-            public POINT ptMinPosition;
-            public POINT ptMaxPosition;
-            public RECT rcNormalPosition;
-
-            /// <summary>
-            /// Gets the default (empty) value.
-            /// </summary>
-            public static WINDOWPLACEMENT Default
-            {
-                get
-                {
-                    WINDOWPLACEMENT result = new WINDOWPLACEMENT();
-                    result.length = Marshal.SizeOf(result);
-                    return result;
-                }
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        internal struct SIZE
-        {
-            [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
-            public int cx;
-            [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
-            public int cy;
-        }
-
-        internal struct MONITORINFO
-        {
-            public uint cbSize;
-            public RECT rcMonitor;
-            public RECT rcWork;
-            public uint dwFlags;
-        }
-
-        internal enum SM
-        {
-            CXSCREEN = 0,
-            CYSCREEN = 1,
-            CXVSCROLL = 2,
-            CYHSCROLL = 3,
-            CYCAPTION = 4,
-            CXBORDER = 5,
-            CYBORDER = 6,
-            CXFIXEDFRAME = 7,
-            CYFIXEDFRAME = 8,
-            CYVTHUMB = 9,
-            CXHTHUMB = 10,
-            CXICON = 11,
-            CYICON = 12,
-            CXCURSOR = 13,
-            CYCURSOR = 14,
-            CYMENU = 15,
-            CXFULLSCREEN = 16,
-            CYFULLSCREEN = 17,
-            CYKANJIWINDOW = 18,
-            MOUSEPRESENT = 19,
-            CYVSCROLL = 20,
-            CXHSCROLL = 21,
-            DEBUG = 22,
-            SWAPBUTTON = 23,
-            CXMIN = 28,
-            CYMIN = 29,
-            CXSIZE = 30,
-            CYSIZE = 31,
-            CXFRAME = 32,
-            CXSIZEFRAME = CXFRAME,
-            CYFRAME = 33,
-            CYSIZEFRAME = CYFRAME,
-            CXMINTRACK = 34,
-            CYMINTRACK = 35,
-            CXDOUBLECLK = 36,
-            CYDOUBLECLK = 37,
-            CXICONSPACING = 38,
-            CYICONSPACING = 39,
-            MENUDROPALIGNMENT = 40,
-            PENWINDOWS = 41,
-            DBCSENABLED = 42,
-            CMOUSEBUTTONS = 43,
-            SECURE = 44,
-            CXEDGE = 45,
-            CYEDGE = 46,
-            CXMINSPACING = 47,
-            CYMINSPACING = 48,
-            CXSMICON = 49,
-            CYSMICON = 50,
-            CYSMCAPTION = 51,
-            CXSMSIZE = 52,
-            CYSMSIZE = 53,
-            CXMENUSIZE = 54,
-            CYMENUSIZE = 55,
-            ARRANGE = 56,
-            CXMINIMIZED = 57,
-            CYMINIMIZED = 58,
-            CXMAXTRACK = 59,
-            CYMAXTRACK = 60,
-            CXMAXIMIZED = 61,
-            CYMAXIMIZED = 62,
-            NETWORK = 63,
-            CLEANBOOT = 67,
-            CXDRAG = 68,
-            CYDRAG = 69,
-            SHOWSOUNDS = 70,
-            CXMENUCHECK = 71,
-            CYMENUCHECK = 72,
-            SLOWMACHINE = 73,
-            MIDEASTENABLED = 74,
-            MOUSEWHEELPRESENT = 75,
-            XVIRTUALSCREEN = 76,
-            YVIRTUALSCREEN = 77,
-            CXVIRTUALSCREEN = 78,
-            CYVIRTUALSCREEN = 79,
-            CMONITORS = 80,
-            SAMEDISPLAYFORMAT = 81,
-            IMMENABLED = 82,
-            CXFOCUSBORDER = 83,
-            CYFOCUSBORDER = 84,
-            TABLETPC = 86,
-            MEDIACENTER = 87,
-            REMOTESESSION = 0x1000,
-            REMOTECONTROL = 0x2001
-        }
-
-        internal enum CacheSlot
-        {
-            DpiX,
-
-            FocusBorderWidth,
-            FocusBorderHeight,
-            HighContrast,
-            MouseVanish,
-
-            DropShadow,
-            FlatMenu,
-            WorkAreaInternal,
-            WorkArea,
-
-            IconMetrics,
-
-            KeyboardCues,
-            KeyboardDelay,
-            KeyboardPreference,
-            KeyboardSpeed,
-            SnapToDefaultButton,
-            WheelScrollLines,
-            MouseHoverTime,
-            MouseHoverHeight,
-            MouseHoverWidth,
-
-            MenuDropAlignment,
-            MenuFade,
-            MenuShowDelay,
-
-            ComboBoxAnimation,
-            ClientAreaAnimation,
-            CursorShadow,
-            GradientCaptions,
-            HotTracking,
-            ListBoxSmoothScrolling,
-            MenuAnimation,
-            SelectionFade,
-            StylusHotTracking,
-            ToolTipAnimation,
-            ToolTipFade,
-            UIEffects,
-
-            MinimizeAnimation,
-            Border,
-            CaretWidth,
-            ForegroundFlashCount,
-            DragFullWindows,
-            NonClientMetrics,
-
-            ThinHorizontalBorderHeight,
-            ThinVerticalBorderWidth,
-            CursorWidth,
-            CursorHeight,
-            ThickHorizontalBorderHeight,
-            ThickVerticalBorderWidth,
-            MinimumHorizontalDragDistance,
-            MinimumVerticalDragDistance,
-            FixedFrameHorizontalBorderHeight,
-            FixedFrameVerticalBorderWidth,
-            FocusHorizontalBorderHeight,
-            FocusVerticalBorderWidth,
-            FullPrimaryScreenWidth,
-            FullPrimaryScreenHeight,
-            HorizontalScrollBarButtonWidth,
-            HorizontalScrollBarHeight,
-            HorizontalScrollBarThumbWidth,
-            IconWidth,
-            IconHeight,
-            IconGridWidth,
-            IconGridHeight,
-            MaximizedPrimaryScreenWidth,
-            MaximizedPrimaryScreenHeight,
-            MaximumWindowTrackWidth,
-            MaximumWindowTrackHeight,
-            MenuCheckmarkWidth,
-            MenuCheckmarkHeight,
-            MenuButtonWidth,
-            MenuButtonHeight,
-            MinimumWindowWidth,
-            MinimumWindowHeight,
-            MinimizedWindowWidth,
-            MinimizedWindowHeight,
-            MinimizedGridWidth,
-            MinimizedGridHeight,
-            MinimumWindowTrackWidth,
-            MinimumWindowTrackHeight,
-            PrimaryScreenWidth,
-            PrimaryScreenHeight,
-            WindowCaptionButtonWidth,
-            WindowCaptionButtonHeight,
-            ResizeFrameHorizontalBorderHeight,
-            ResizeFrameVerticalBorderWidth,
-            SmallIconWidth,
-            SmallIconHeight,
-            SmallWindowCaptionButtonWidth,
-            SmallWindowCaptionButtonHeight,
-            VirtualScreenWidth,
-            VirtualScreenHeight,
-            VerticalScrollBarWidth,
-            VerticalScrollBarButtonHeight,
-            WindowCaptionHeight,
-            KanjiWindowHeight,
-            MenuBarHeight,
-            VerticalScrollBarThumbHeight,
-            IsImmEnabled,
-            IsMediaCenter,
-            IsMenuDropRightAligned,
-            IsMiddleEastEnabled,
-            IsMousePresent,
-            IsMouseWheelPresent,
-            IsPenWindows,
-            IsRemotelyControlled,
-            IsRemoteSession,
-            ShowSounds,
-            IsSlowMachine,
-            SwapButtons,
-            IsTabletPC,
-            VirtualScreenLeft,
-            VirtualScreenTop,
-
-            PowerLineStatus,
-
-            IsGlassEnabled,
-            UxThemeName,
-            UxThemeColor,
-            WindowCornerRadius,
-            WindowGlassColor,
-            WindowGlassBrush,
-            WindowNonClientFrameThickness,
-            WindowResizeBorderThickness,
-
-            NumSlots
-        }
-
-        internal static class Win32Constant
-        {
-            internal const int MAX_PATH = 260;
-            internal const int INFOTIPSIZE = 1024;
-            internal const int TRUE = 1;
-            internal const int FALSE = 0;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct WNDCLASS
-        {
-            public uint style;
-            public Delegate lpfnWndProc;
-            public int cbClsExtra;
-            public int cbWndExtra;
-            public IntPtr hInstance;
-            public IntPtr hIcon;
-            public IntPtr hCursor;
-            public IntPtr hbrBackground;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string lpszMenuName;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string lpszClassName;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        internal class WNDCLASS4ICON
-        {
-            public int style;
-            public WndProc lpfnWndProc;
-            public int cbClsExtra;
-            public int cbWndExtra;
-            public IntPtr hInstance;
-            public IntPtr hIcon;
-            public IntPtr hCursor;
-            public IntPtr hbrBackground;
-            public string lpszMenuName;
-            public string lpszClassName;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 2)]
-        internal struct BITMAPINFO
-        {
-            public int biSize;
-
-            public int biWidth;
-
-            public int biHeight;
-
-            public short biPlanes;
-
-            public short biBitCount;
-
-            public int biCompression;
-
-            public int biSizeImage;
-
-            public int biXPelsPerMeter;
-
-            public int biYPelsPerMeter;
-
-            public int biClrUsed;
-
-            public int biClrImportant;
-
-            public BITMAPINFO(int width, int height, short bpp)
-            {
-                biSize = SizeOf();
-                biWidth = width;
-                biHeight = height;
-                biPlanes = 1;
-                biBitCount = bpp;
-                biCompression = 0;
-                biSizeImage = 0;
-                biXPelsPerMeter = 0;
-                biYPelsPerMeter = 0;
-                biClrUsed = 0;
-                biClrImportant = 0;
-            }
-
-            [SecuritySafeCritical]
-            private static int SizeOf()
-            {
-                return Marshal.SizeOf(typeof(BITMAPINFO));
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal class ICONINFO
-        {
-            public bool fIcon = false;
-            public int xHotspot = 0;
-            public int yHotspot = 0;
-            public BitmapHandle hbmMask = null;
-            public BitmapHandle hbmColor = null;
-        }
-
-        internal enum WINDOWCOMPOSITIONATTRIB
-        {
-            WCA_ACCENT_POLICY = 19
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WINCOMPATTRDATA
-        {
-            public WINDOWCOMPOSITIONATTRIB Attribute;
-            public IntPtr Data;
-            public int DataSize;
-        }
-
-        internal enum ACCENTSTATE
-        {
-            ACCENT_DISABLED = 0,
-            ACCENT_ENABLE_GRADIENT = 1,
-            ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
-            ACCENT_ENABLE_BLURBEHIND = 3,
-            ACCENT_ENABLE_ACRYLICBLURBEHIND = 4,
-            ACCENT_INVALID_STATE = 5
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct ACCENTPOLICY
-        {
-            public ACCENTSTATE AccentState;
-            public int AccentFlags;
-            public uint GradientColor;
-            public int AnimationId;
-        }
-
-        [ComImport, Guid("0000000C-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        internal interface IStream
-        {
-            int Read([In] IntPtr buf, [In] int len);
-
-            int Write([In] IntPtr buf, [In] int len);
-
-            [return: MarshalAs(UnmanagedType.I8)]
-            long Seek([In, MarshalAs(UnmanagedType.I8)] long dlibMove, [In] int dwOrigin);
-
-            void SetSize([In, MarshalAs(UnmanagedType.I8)] long libNewSize);
-
-            [return: MarshalAs(UnmanagedType.I8)]
-            long CopyTo([In, MarshalAs(UnmanagedType.Interface)] IStream pstm, [In, MarshalAs(UnmanagedType.I8)] long cb, [Out, MarshalAs(UnmanagedType.LPArray)] long[] pcbRead);
-
-            void Commit([In] int grfCommitFlags);
-
-            void Revert();
-
-            void LockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
-
-            void UnlockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
-
-            void Stat([In] IntPtr pStatstg, [In] int grfStatFlag);
-
-            [return: MarshalAs(UnmanagedType.Interface)]
-            IStream Clone();
-        }
-
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        internal class StreamConsts
-        {
-            public const int LOCK_WRITE = 0x1;
-            public const int LOCK_EXCLUSIVE = 0x2;
-            public const int LOCK_ONLYONCE = 0x4;
-            public const int STATFLAG_DEFAULT = 0x0;
-            public const int STATFLAG_NONAME = 0x1;
-            public const int STATFLAG_NOOPEN = 0x2;
-            public const int STGC_DEFAULT = 0x0;
-            public const int STGC_OVERWRITE = 0x1;
-            public const int STGC_ONLYIFCURRENT = 0x2;
-            public const int STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 0x4;
-            public const int STREAM_SEEK_SET = 0x0;
-            public const int STREAM_SEEK_CUR = 0x1;
-            public const int STREAM_SEEK_END = 0x2;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 8)]
-        internal class ImageCodecInfoPrivate
-        {
-            [MarshalAs(UnmanagedType.Struct)]
-            public Guid Clsid;
-            [MarshalAs(UnmanagedType.Struct)]
-            public Guid FormatID;
-
-            public IntPtr CodecName = IntPtr.Zero;
-            public IntPtr DllName = IntPtr.Zero;
-            public IntPtr FormatDescription = IntPtr.Zero;
-            public IntPtr FilenameExtension = IntPtr.Zero;
-            public IntPtr MimeType = IntPtr.Zero;
-
-            public int Flags;
-            public int Version;
-            public int SigCount;
-            public int SigSize;
-
-            public IntPtr SigPattern = IntPtr.Zero;
-            public IntPtr SigMask = IntPtr.Zero;
-        }
-
-        internal class ComStreamFromDataStream : IStream
-        {
-            protected Stream DataStream;
-
-            // to support seeking ahead of the stream length...
-            private long _virtualPosition = -1;
-
-            internal ComStreamFromDataStream(Stream dataStream)
-            {
-                this.DataStream = dataStream ?? throw new ArgumentNullException(nameof(dataStream));
-            }
-
-            private void ActualizeVirtualPosition()
-            {
-                if (_virtualPosition == -1) return;
-
-                if (_virtualPosition > DataStream.Length)
-                    DataStream.SetLength(_virtualPosition);
-
-                DataStream.Position = _virtualPosition;
-
-                _virtualPosition = -1;
-            }
-
-            public virtual IStream Clone()
-            {
-                NotImplemented();
-                return null;
-            }
-
-            public virtual void Commit(int grfCommitFlags)
-            {
-                DataStream.Flush();
-                ActualizeVirtualPosition();
-            }
-
-            public virtual long CopyTo(IStream pstm, long cb, long[] pcbRead)
-            {
-                const int bufsize = 4096; // one page
-                var buffer = Marshal.AllocHGlobal(bufsize);
-                if (buffer == IntPtr.Zero) throw new OutOfMemoryException();
-                long written = 0;
-
-                try
-                {
-                    while (written < cb)
-                    {
-                        var toRead = bufsize;
-                        if (written + toRead > cb) toRead = (int) (cb - written);
-                        var read = Read(buffer, toRead);
-                        if (read == 0) break;
-                        if (pstm.Write(buffer, read) != read)
-                        {
-                            throw EFail("Wrote an incorrect number of bytes");
-                        }
-                        written += read;
-                    }
-                }
-                finally
-                {
-                    Marshal.FreeHGlobal(buffer);
-                }
-                if (pcbRead != null && pcbRead.Length > 0)
-                {
-                    pcbRead[0] = written;
-                }
-
-                return written;
-            }
-
-            public virtual Stream GetDataStream() => DataStream;
-
-            public virtual void LockRegion(long libOffset, long cb, int dwLockType)
-            {
-            }
-
-            protected static ExternalException EFail(string msg) => throw new ExternalException(msg, E_FAIL);
-
-            protected static void NotImplemented() => throw new NotImplementedException();
-
-            public virtual int Read(IntPtr buf, int length)
-            {
-                var buffer = new byte[length];
-                var count = Read(buffer, length);
-                Marshal.Copy(buffer, 0, buf, length);
-                return count;
-            }
-
-            public virtual int Read(byte[] buffer, int length)
-            {
-                ActualizeVirtualPosition();
-                return DataStream.Read(buffer, 0, length);
-            }
-
-            public virtual void Revert() => NotImplemented();
-
-            public virtual long Seek(long offset, int origin)
-            {
-                var pos = _virtualPosition;
-                if (_virtualPosition == -1)
-                {
-                    pos = DataStream.Position;
-                }
-                var len = DataStream.Length;
-
-                switch (origin)
-                {
-                    case StreamConsts.STREAM_SEEK_SET:
-                        if (offset <= len)
-                        {
-                            DataStream.Position = offset;
-                            _virtualPosition = -1;
-                        }
-                        else
-                        {
-                            _virtualPosition = offset;
-                        }
-                        break;
-                    case StreamConsts.STREAM_SEEK_END:
-                        if (offset <= 0)
-                        {
-                            DataStream.Position = len + offset;
-                            _virtualPosition = -1;
-                        }
-                        else
-                        {
-                            _virtualPosition = len + offset;
-                        }
-                        break;
-                    case StreamConsts.STREAM_SEEK_CUR:
-                        if (offset + pos <= len)
-                        {
-                            DataStream.Position = pos + offset;
-                            _virtualPosition = -1;
-                        }
-                        else
-                        {
-                            _virtualPosition = offset + pos;
-                        }
-                        break;
-                }
-
-                return _virtualPosition != -1 ? _virtualPosition : DataStream.Position;
-            }
-
-            public virtual void SetSize(long value) => DataStream.SetLength(value);
-
-            public virtual void Stat(IntPtr pstatstg, int grfStatFlag) => NotImplemented();
-
-            public virtual void UnlockRegion(long libOffset, long cb, int dwLockType)
-            {
-            }
-
-            public virtual int Write(IntPtr buf, int length)
-            {
-                var buffer = new byte[length];
-                Marshal.Copy(buf, buffer, 0, length);
-                return Write(buffer, length);
-            }
-
-            public virtual int Write(byte[] buffer, int length)
-            {
-                ActualizeVirtualPosition();
-                DataStream.Write(buffer, 0, length);
-                return length;
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal class MINMAXINFO
-        {
-            public POINT ptReserved;
-            public POINT ptMaxSize;
-            public POINT ptMaxPosition;
-            public POINT ptMinTrackSize;
-            public POINT ptMaxTrackSize;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct APPBARDATA
-        {
-            public int cbSize;
-            public IntPtr hWnd;
-            public uint uCallbackMessage;
-            public uint uEdge;
-            public RECT rc;
-            public int lParam;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct RTL_OSVERSIONINFOEX
-        {
-            internal uint dwOSVersionInfoSize;
-            internal uint dwMajorVersion;
-            internal uint dwMinorVersion;
-            internal uint dwBuildNumber;
-            internal uint dwPlatformId;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-            internal string szCSDVersion;
-        }
-
-        [Flags]
-        internal enum WindowPositionFlags
-        {
-            /// <summary>
-            ///     If the calling thread and the thread that owns the window are attached to different input queues, the system posts
-            ///     the request to the thread that owns the window. This prevents the calling thread from blocking its execution while
-            ///     other threads process the request.
-            /// </summary>
-            SWP_ASYNCWINDOWPOS = 0x4000,
-
-            /// <summary>
-            ///     Prevents generation of the WM_SYNCPAINT message.
-            /// </summary>
-            SWP_DEFERERASE = 0x2000,
-
-            /// <summary>
-            ///     Draws a frame (defined in the window's class description) around the window.
-            /// </summary>
-            SWP_DRAWFRAME = 0x0020,
-
-            /// <summary>
-            ///     Applies new frame styles set using the SetWindowLong function. Sends a WM_NCCALCSIZE message to the window, even if
-            ///     the window's size is not being changed. If this flag is not specified, WM_NCCALCSIZE is sent only when the window's
-            ///     size is being changed.
-            /// </summary>
-            SWP_FRAMECHANGED = 0x0020,
-
-            /// <summary>
-            ///     Hides the window.
-            /// </summary>
-            SWP_HIDEWINDOW = 0x0080,
-
-            /// <summary>
-            ///     Does not activate the window. If this flag is not set, the window is activated and moved to the top of either the
-            ///     topmost or non-topmost group (depending on the setting of the hWndInsertAfter parameter).
-            /// </summary>
-            SWP_NOACTIVATE = 0x0010,
-
-            /// <summary>
-            ///     Discards the entire contents of the client area. If this flag is not specified, the valid contents of the client
-            ///     area are saved and copied back into the client area after the window is sized or repositioned.
-            /// </summary>
-            SWP_NOCOPYBITS = 0x0100,
-
-            /// <summary>
-            ///     Retains the current position (ignores X and Y parameters).
-            /// </summary>
-            SWP_NOMOVE = 0x0002,
-
-            /// <summary>
-            ///     Does not change the owner window's position in the Z order.
-            /// </summary>
-            SWP_NOOWNERZORDER = 0x0200,
-
-            /// <summary>
-            ///     Does not redraw changes. If this flag is set, no repainting of any kind occurs. This applies to the client area,
-            ///     the nonclient area (including the title bar and scroll bars), and any part of the parent window uncovered as a
-            ///     result of the window being moved. When this flag is set, the application must explicitly invalidate or redraw any
-            ///     parts of the window and parent window that need redrawing.
-            /// </summary>
-            SWP_NOREDRAW = 0x0008,
-
-            /// <summary>
-            ///     Same as the SWP_NOOWNERZORDER flag.
-            /// </summary>
-            SWP_NOREPOSITION = 0x0200,
-
-            /// <summary>
-            ///     Prevents the window from receiving the WM_WINDOWPOSCHANGING message.
-            /// </summary>
-            SWP_NOSENDCHANGING = 0x0400,
-
-            /// <summary>
-            ///     Retains the current size (ignores the cx and cy parameters).
-            /// </summary>
-            SWP_NOSIZE = 0x0001,
-
-            /// <summary>
-            ///     Retains the current Z order (ignores the hWndInsertAfter parameter).
-            /// </summary>
-            SWP_NOZORDER = 0x0004,
-
-            /// <summary>
-            ///     Displays the window.
-            /// </summary>
-            SWP_SHOWWINDOW = 0x0040
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        internal struct WindowPosition
-        {
-            public IntPtr Hwnd;
-            public IntPtr HwndZOrderInsertAfter;
-            public int X;
-            public int Y;
-            public int Width;
-            public int Height;
-            public WindowPositionFlags Flags;
-        }
-
-        [Flags]
-        internal enum DwmWindowAttribute : uint
-        {
-            DWMWA_NCRENDERING_ENABLED = 1,
-            DWMWA_NCRENDERING_POLICY,
-            DWMWA_TRANSITIONS_FORCEDISABLED,
-            DWMWA_ALLOW_NCPAINT,
-            DWMWA_CAPTION_BUTTON_BOUNDS,
-            DWMWA_NONCLIENT_RTL_LAYOUT,
-            DWMWA_FORCE_ICONIC_REPRESENTATION,
-            DWMWA_FLIP3D_POLICY,
-            DWMWA_EXTENDED_FRAME_BOUNDS,
-            DWMWA_HAS_ICONIC_BITMAP,
-            DWMWA_DISALLOW_PEEK,
-            DWMWA_EXCLUDED_FROM_PEEK,
-            DWMWA_LAST
-        }
-
-        [Flags]
-        internal enum WindowStyles
-        {
-            /// <summary>
-            ///     The window is initially maximized.
-            /// </summary>
-            WS_MAXIMIZE = 0x01000000,
-
-            /// <summary>
-            ///     The window has a maximize button. Cannot be combined with the WS_EX_CONTEXTHELP style. The WS_SYSMENU style must
-            ///     also be specified.
-            /// </summary>
-            WS_MAXIMIZEBOX = 0x00010000,
-
-            /// <summary>
-            ///     The window is initially minimized. Same as the WS_ICONIC style.
-            /// </summary>
-            WS_MINIMIZE = 0x20000000,
-
-            /// <summary>
-            ///     The window has a sizing border. Same as the WS_SIZEBOX style.
-            /// </summary>
-            WS_THICKFRAME = 0x00040000,
-        }
-
-        /// <summary>
-        /// ShowWindow options
-        /// </summary>
-        internal enum SW
-        {
-            HIDE = 0,
-            SHOWNORMAL = 1,
-            NORMAL = 1,
-            SHOWMINIMIZED = 2,
-            SHOWMAXIMIZED = 3,
-            MAXIMIZE = 3,
-            SHOWNOACTIVATE = 4,
-            SHOW = 5,
-            MINIMIZE = 6,
-            SHOWMINNOACTIVE = 7,
-            SHOWNA = 8,
-            RESTORE = 9,
-            SHOWDEFAULT = 10,
-            FORCEMINIMIZE = 11,
+            X = x;
+            Y = y;
         }
     }
-}
+
+    internal enum HookType
+    {
+        WH_KEYBOARD_LL = 13,
+        WH_MOUSE_LL = 14
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MOUSEHOOKSTRUCT
+    {
+        public POINT pt;
+        public IntPtr hwnd;
+        public uint wHitTestCode;
+        public IntPtr dwExtraInfo;
+    }
+
+    [Flags]
+    internal enum ProcessAccess
+    {
+        AllAccess = CreateThread | DuplicateHandle | QueryInformation | SetInformation | Terminate | VMOperation | VMRead | VMWrite | Synchronize,
+        CreateThread = 0x2,
+        DuplicateHandle = 0x40,
+        QueryInformation = 0x400,
+        SetInformation = 0x200,
+        Terminate = 0x1,
+        VMOperation = 0x8,
+        VMRead = 0x10,
+        VMWrite = 0x20,
+        Synchronize = 0x100000
+    }
+
+    [Serializable, StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    internal struct RECT
+    {
+        public int Left;
+        public int Top;
+        public int Right;
+        public int Bottom;
+
+        public RECT(int left, int top, int right, int bottom)
+        {
+            Left = left;
+            Top = top;
+            Right = right;
+            Bottom = bottom;
+        }
+
+        public RECT(Rect rect)
+        {
+            Left = (int) rect.Left;
+            Top = (int) rect.Top;
+            Right = (int) rect.Right;
+            Bottom = (int) rect.Bottom;
+        }
+
+        public Point Position => new(Left, Top);
+        public Size Size => new(Width, Height);
+
+        public int Height
+        {
+            get => Bottom - Top;
+            set => Bottom = Top + value;
+        }
+
+        public int Width
+        {
+            get => Right - Left;
+            set => Right = Left + value;
+        }
+
+        public bool Equals(RECT other)
+        {
+            return Left == other.Left && Right == other.Right && Top == other.Top && Bottom == other.Bottom;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return obj is RECT rectangle && Equals(rectangle);
+        }
+
+        public static bool operator ==(RECT left, RECT right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(RECT left, RECT right)
+        {
+            return !(left == right);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                var hashCode = Left;
+                hashCode = (hashCode * 397) ^ Top;
+                hashCode = (hashCode * 397) ^ Right;
+                hashCode = (hashCode * 397) ^ Bottom;
+                return hashCode;
+            }
+        }
+    }
+
+    internal struct BLENDFUNCTION
+    {
+        public byte BlendOp;
+        public byte BlendFlags;
+        public byte SourceConstantAlpha;
+        public byte AlphaFormat;
+    }
+
+    internal enum GWL
+    {
+        STYLE = -16,
+        EXSTYLE = -20
+    }
+
+    internal enum GWLP
+    {
+        WNDPROC = -4,
+        HINSTANCE = -6,
+        HWNDPARENT = -8,
+        USERDATA = -21,
+        ID = -12
+    }
+
+    internal struct BITMAPINFOHEADER
+    {
+        internal uint biSize;
+        internal int biWidth;
+        internal int biHeight;
+        internal ushort biPlanes;
+        internal ushort biBitCount;
+        internal uint biCompression;
+        internal uint biSizeImage;
+        internal int biXPelsPerMeter;
+        internal int biYPelsPerMeter;
+        internal uint biClrUsed;
+        internal uint biClrImportant;
+    }
+
+    [Flags]
+    internal enum RedrawWindowFlags : uint
+    {
+        Invalidate = 1u,
+        InternalPaint = 2u,
+        Erase = 4u,
+        Validate = 8u,
+        NoInternalPaint = 16u,
+        NoErase = 32u,
+        NoChildren = 64u,
+        AllChildren = 128u,
+        UpdateNow = 256u,
+        EraseNow = 512u,
+        Frame = 1024u,
+        NoFrame = 2048u
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class WINDOWPOS
+    {
+        public IntPtr hwnd;
+        public IntPtr hwndInsertAfter;
+        public int x;
+        public int y;
+        public int cx;
+        public int cy;
+        public uint flags;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WINDOWPLACEMENT
+    {
+        public int length;
+        public int flags;
+        public SW showCmd;
+        public POINT ptMinPosition;
+        public POINT ptMaxPosition;
+        public RECT rcNormalPosition;
+
+        /// <summary>
+        /// Gets the default (empty) value.
+        /// </summary>
+        public static WINDOWPLACEMENT Default
+        {
+            get
+            {
+                WINDOWPLACEMENT result = new WINDOWPLACEMENT();
+                result.length = Marshal.SizeOf(result);
+                return result;
+            }
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal struct SIZE
+    {
+        [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
+        public int cx;
+        [ComAliasName("Microsoft.VisualStudio.OLE.Interop.LONG")]
+        public int cy;
+    }
+
+    internal struct MONITORINFO
+    {
+        public uint cbSize;
+        public RECT rcMonitor;
+        public RECT rcWork;
+        public uint dwFlags;
+    }
+
+    internal enum SM
+    {
+        CXSCREEN = 0,
+        CYSCREEN = 1,
+        CXVSCROLL = 2,
+        CYHSCROLL = 3,
+        CYCAPTION = 4,
+        CXBORDER = 5,
+        CYBORDER = 6,
+        CXFIXEDFRAME = 7,
+        CYFIXEDFRAME = 8,
+        CYVTHUMB = 9,
+        CXHTHUMB = 10,
+        CXICON = 11,
+        CYICON = 12,
+        CXCURSOR = 13,
+        CYCURSOR = 14,
+        CYMENU = 15,
+        CXFULLSCREEN = 16,
+        CYFULLSCREEN = 17,
+        CYKANJIWINDOW = 18,
+        MOUSEPRESENT = 19,
+        CYVSCROLL = 20,
+        CXHSCROLL = 21,
+        DEBUG = 22,
+        SWAPBUTTON = 23,
+        CXMIN = 28,
+        CYMIN = 29,
+        CXSIZE = 30,
+        CYSIZE = 31,
+        CXFRAME = 32,
+        CXSIZEFRAME = CXFRAME,
+        CYFRAME = 33,
+        CYSIZEFRAME = CYFRAME,
+        CXMINTRACK = 34,
+        CYMINTRACK = 35,
+        CXDOUBLECLK = 36,
+        CYDOUBLECLK = 37,
+        CXICONSPACING = 38,
+        CYICONSPACING = 39,
+        MENUDROPALIGNMENT = 40,
+        PENWINDOWS = 41,
+        DBCSENABLED = 42,
+        CMOUSEBUTTONS = 43,
+        SECURE = 44,
+        CXEDGE = 45,
+        CYEDGE = 46,
+        CXMINSPACING = 47,
+        CYMINSPACING = 48,
+        CXSMICON = 49,
+        CYSMICON = 50,
+        CYSMCAPTION = 51,
+        CXSMSIZE = 52,
+        CYSMSIZE = 53,
+        CXMENUSIZE = 54,
+        CYMENUSIZE = 55,
+        ARRANGE = 56,
+        CXMINIMIZED = 57,
+        CYMINIMIZED = 58,
+        CXMAXTRACK = 59,
+        CYMAXTRACK = 60,
+        CXMAXIMIZED = 61,
+        CYMAXIMIZED = 62,
+        NETWORK = 63,
+        CLEANBOOT = 67,
+        CXDRAG = 68,
+        CYDRAG = 69,
+        SHOWSOUNDS = 70,
+        CXMENUCHECK = 71,
+        CYMENUCHECK = 72,
+        SLOWMACHINE = 73,
+        MIDEASTENABLED = 74,
+        MOUSEWHEELPRESENT = 75,
+        XVIRTUALSCREEN = 76,
+        YVIRTUALSCREEN = 77,
+        CXVIRTUALSCREEN = 78,
+        CYVIRTUALSCREEN = 79,
+        CMONITORS = 80,
+        SAMEDISPLAYFORMAT = 81,
+        IMMENABLED = 82,
+        CXFOCUSBORDER = 83,
+        CYFOCUSBORDER = 84,
+        TABLETPC = 86,
+        MEDIACENTER = 87,
+        REMOTESESSION = 0x1000,
+        REMOTECONTROL = 0x2001
+    }
+
+    internal enum CacheSlot
+    {
+        DpiX,
+
+        FocusBorderWidth,
+        FocusBorderHeight,
+        HighContrast,
+        MouseVanish,
+
+        DropShadow,
+        FlatMenu,
+        WorkAreaInternal,
+        WorkArea,
+
+        IconMetrics,
+
+        KeyboardCues,
+        KeyboardDelay,
+        KeyboardPreference,
+        KeyboardSpeed,
+        SnapToDefaultButton,
+        WheelScrollLines,
+        MouseHoverTime,
+        MouseHoverHeight,
+        MouseHoverWidth,
+
+        MenuDropAlignment,
+        MenuFade,
+        MenuShowDelay,
+
+        ComboBoxAnimation,
+        ClientAreaAnimation,
+        CursorShadow,
+        GradientCaptions,
+        HotTracking,
+        ListBoxSmoothScrolling,
+        MenuAnimation,
+        SelectionFade,
+        StylusHotTracking,
+        ToolTipAnimation,
+        ToolTipFade,
+        UIEffects,
+
+        MinimizeAnimation,
+        Border,
+        CaretWidth,
+        ForegroundFlashCount,
+        DragFullWindows,
+        NonClientMetrics,
+
+        ThinHorizontalBorderHeight,
+        ThinVerticalBorderWidth,
+        CursorWidth,
+        CursorHeight,
+        ThickHorizontalBorderHeight,
+        ThickVerticalBorderWidth,
+        MinimumHorizontalDragDistance,
+        MinimumVerticalDragDistance,
+        FixedFrameHorizontalBorderHeight,
+        FixedFrameVerticalBorderWidth,
+        FocusHorizontalBorderHeight,
+        FocusVerticalBorderWidth,
+        FullPrimaryScreenWidth,
+        FullPrimaryScreenHeight,
+        HorizontalScrollBarButtonWidth,
+        HorizontalScrollBarHeight,
+        HorizontalScrollBarThumbWidth,
+        IconWidth,
+        IconHeight,
+        IconGridWidth,
+        IconGridHeight,
+        MaximizedPrimaryScreenWidth,
+        MaximizedPrimaryScreenHeight,
+        MaximumWindowTrackWidth,
+        MaximumWindowTrackHeight,
+        MenuCheckmarkWidth,
+        MenuCheckmarkHeight,
+        MenuButtonWidth,
+        MenuButtonHeight,
+        MinimumWindowWidth,
+        MinimumWindowHeight,
+        MinimizedWindowWidth,
+        MinimizedWindowHeight,
+        MinimizedGridWidth,
+        MinimizedGridHeight,
+        MinimumWindowTrackWidth,
+        MinimumWindowTrackHeight,
+        PrimaryScreenWidth,
+        PrimaryScreenHeight,
+        WindowCaptionButtonWidth,
+        WindowCaptionButtonHeight,
+        ResizeFrameHorizontalBorderHeight,
+        ResizeFrameVerticalBorderWidth,
+        SmallIconWidth,
+        SmallIconHeight,
+        SmallWindowCaptionButtonWidth,
+        SmallWindowCaptionButtonHeight,
+        VirtualScreenWidth,
+        VirtualScreenHeight,
+        VerticalScrollBarWidth,
+        VerticalScrollBarButtonHeight,
+        WindowCaptionHeight,
+        KanjiWindowHeight,
+        MenuBarHeight,
+        VerticalScrollBarThumbHeight,
+        IsImmEnabled,
+        IsMediaCenter,
+        IsMenuDropRightAligned,
+        IsMiddleEastEnabled,
+        IsMousePresent,
+        IsMouseWheelPresent,
+        IsPenWindows,
+        IsRemotelyControlled,
+        IsRemoteSession,
+        ShowSounds,
+        IsSlowMachine,
+        SwapButtons,
+        IsTabletPC,
+        VirtualScreenLeft,
+        VirtualScreenTop,
+
+        PowerLineStatus,
+
+        IsGlassEnabled,
+        UxThemeName,
+        UxThemeColor,
+        WindowCornerRadius,
+        WindowGlassColor,
+        WindowGlassBrush,
+        WindowNonClientFrameThickness,
+        WindowResizeBorderThickness,
+
+        NumSlots
+    }
+
+    internal static class Win32Constant
+    {
+        internal const int MAX_PATH = 260;
+        internal const int INFOTIPSIZE = 1024;
+        internal const int TRUE = 1;
+        internal const int FALSE = 0;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct WNDCLASS
+    {
+        public uint style;
+        public Delegate lpfnWndProc;
+        public int cbClsExtra;
+        public int cbWndExtra;
+        public IntPtr hInstance;
+        public IntPtr hIcon;
+        public IntPtr hCursor;
+        public IntPtr hbrBackground;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszMenuName;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszClassName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    internal class WNDCLASS4ICON
+    {
+        public int style;
+        public WndProc lpfnWndProc;
+        public int cbClsExtra;
+        public int cbWndExtra;
+        public IntPtr hInstance;
+        public IntPtr hIcon;
+        public IntPtr hCursor;
+        public IntPtr hbrBackground;
+        public string lpszMenuName;
+        public string lpszClassName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 2)]
+    internal struct BITMAPINFO
+    {
+        public int biSize;
+
+        public int biWidth;
+
+        public int biHeight;
+
+        public short biPlanes;
+
+        public short biBitCount;
+
+        public int biCompression;
+
+        public int biSizeImage;
+
+        public int biXPelsPerMeter;
+
+        public int biYPelsPerMeter;
+
+        public int biClrUsed;
+
+        public int biClrImportant;
+
+        public BITMAPINFO(int width, int height, short bpp)
+        {
+            biSize = SizeOf();
+            biWidth = width;
+            biHeight = height;
+            biPlanes = 1;
+            biBitCount = bpp;
+            biCompression = 0;
+            biSizeImage = 0;
+            biXPelsPerMeter = 0;
+            biYPelsPerMeter = 0;
+            biClrUsed = 0;
+            biClrImportant = 0;
+        }
+
+        [SecuritySafeCritical]
+        private static int SizeOf()
+        {
+            return Marshal.SizeOf(typeof(BITMAPINFO));
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class ICONINFO
+    {
+        public bool fIcon = false;
+        public int xHotspot = 0;
+        public int yHotspot = 0;
+        public BitmapHandle hbmMask = null;
+        public BitmapHandle hbmColor = null;
+    }
+
+    internal enum WINDOWCOMPOSITIONATTRIB
+    {
+        WCA_ACCENT_POLICY = 19
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WINCOMPATTRDATA
+    {
+        public WINDOWCOMPOSITIONATTRIB Attribute;
+        public IntPtr Data;
+        public int DataSize;
+    }
+
+    internal enum ACCENTSTATE
+    {
+        ACCENT_DISABLED = 0,
+        ACCENT_ENABLE_GRADIENT = 1,
+        ACCENT_ENABLE_TRANSPARENTGRADIENT = 2,
+        ACCENT_ENABLE_BLURBEHIND = 3,
+        ACCENT_ENABLE_ACRYLICBLURBEHIND = 4,
+        ACCENT_INVALID_STATE = 5
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct ACCENTPOLICY
+    {
+        public ACCENTSTATE AccentState;
+        public int AccentFlags;
+        public uint GradientColor;
+        public int AnimationId;
+    }
+
+    [ComImport, Guid("0000000C-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    internal interface IStream
+    {
+        int Read([In] IntPtr buf, [In] int len);
+
+        int Write([In] IntPtr buf, [In] int len);
+
+        [return: MarshalAs(UnmanagedType.I8)]
+        long Seek([In, MarshalAs(UnmanagedType.I8)] long dlibMove, [In] int dwOrigin);
+
+        void SetSize([In, MarshalAs(UnmanagedType.I8)] long libNewSize);
+
+        [return: MarshalAs(UnmanagedType.I8)]
+        long CopyTo([In, MarshalAs(UnmanagedType.Interface)] IStream pstm, [In, MarshalAs(UnmanagedType.I8)] long cb, [Out, MarshalAs(UnmanagedType.LPArray)] long[] pcbRead);
+
+        void Commit([In] int grfCommitFlags);
+
+        void Revert();
+
+        void LockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
+
+        void UnlockRegion([In, MarshalAs(UnmanagedType.I8)] long libOffset, [In, MarshalAs(UnmanagedType.I8)] long cb, [In] int dwLockType);
+
+        void Stat([In] IntPtr pStatstg, [In] int grfStatFlag);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        IStream Clone();
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    internal class StreamConsts
+    {
+        public const int LOCK_WRITE = 0x1;
+        public const int LOCK_EXCLUSIVE = 0x2;
+        public const int LOCK_ONLYONCE = 0x4;
+        public const int STATFLAG_DEFAULT = 0x0;
+        public const int STATFLAG_NONAME = 0x1;
+        public const int STATFLAG_NOOPEN = 0x2;
+        public const int STGC_DEFAULT = 0x0;
+        public const int STGC_OVERWRITE = 0x1;
+        public const int STGC_ONLYIFCURRENT = 0x2;
+        public const int STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 0x4;
+        public const int STREAM_SEEK_SET = 0x0;
+        public const int STREAM_SEEK_CUR = 0x1;
+        public const int STREAM_SEEK_END = 0x2;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 8)]
+    internal class ImageCodecInfoPrivate
+    {
+        [MarshalAs(UnmanagedType.Struct)]
+        public Guid Clsid;
+        [MarshalAs(UnmanagedType.Struct)]
+        public Guid FormatID;
+
+        public IntPtr CodecName = IntPtr.Zero;
+        public IntPtr DllName = IntPtr.Zero;
+        public IntPtr FormatDescription = IntPtr.Zero;
+        public IntPtr FilenameExtension = IntPtr.Zero;
+        public IntPtr MimeType = IntPtr.Zero;
+
+        public int Flags;
+        public int Version;
+        public int SigCount;
+        public int SigSize;
+
+        public IntPtr SigPattern = IntPtr.Zero;
+        public IntPtr SigMask = IntPtr.Zero;
+    }
+
+    internal class ComStreamFromDataStream : IStream
+    {
+        protected Stream DataStream;
+
+        // to support seeking ahead of the stream length...
+        private long _virtualPosition = -1;
+
+        internal ComStreamFromDataStream(Stream dataStream)
+        {
+            this.DataStream = dataStream ?? throw new ArgumentNullException(nameof(dataStream));
+        }
+
+        private void ActualizeVirtualPosition()
+        {
+            if (_virtualPosition == -1) return;
+
+            if (_virtualPosition > DataStream.Length)
+                DataStream.SetLength(_virtualPosition);
+
+            DataStream.Position = _virtualPosition;
+
+            _virtualPosition = -1;
+        }
+
+        public virtual IStream Clone()
+        {
+            NotImplemented();
+            return null;
+        }
+
+        public virtual void Commit(int grfCommitFlags)
+        {
+            DataStream.Flush();
+            ActualizeVirtualPosition();
+        }
+
+        public virtual long CopyTo(IStream pstm, long cb, long[] pcbRead)
+        {
+            const int bufsize = 4096; // one page
+            var buffer = Marshal.AllocHGlobal(bufsize);
+            if (buffer == IntPtr.Zero) throw new OutOfMemoryException();
+            long written = 0;
+
+            try
+            {
+                while (written < cb)
+                {
+                    var toRead = bufsize;
+                    if (written + toRead > cb) toRead = (int) (cb - written);
+                    var read = Read(buffer, toRead);
+                    if (read == 0) break;
+                    if (pstm.Write(buffer, read) != read)
+                    {
+                        throw EFail("Wrote an incorrect number of bytes");
+                    }
+                    written += read;
+                }
+            }
+            finally
+            {
+                Marshal.FreeHGlobal(buffer);
+            }
+            if (pcbRead != null && pcbRead.Length > 0)
+            {
+                pcbRead[0] = written;
+            }
+
+            return written;
+        }
+
+        public virtual Stream GetDataStream() => DataStream;
+
+        public virtual void LockRegion(long libOffset, long cb, int dwLockType)
+        {
+        }
+
+        protected static ExternalException EFail(string msg) => throw new ExternalException(msg, E_FAIL);
+
+        protected static void NotImplemented() => throw new NotImplementedException();
+
+        public virtual int Read(IntPtr buf, int length)
+        {
+            var buffer = new byte[length];
+            var count = Read(buffer, length);
+            Marshal.Copy(buffer, 0, buf, length);
+            return count;
+        }
+
+        public virtual int Read(byte[] buffer, int length)
+        {
+            ActualizeVirtualPosition();
+            return DataStream.Read(buffer, 0, length);
+        }
+
+        public virtual void Revert() => NotImplemented();
+
+        public virtual long Seek(long offset, int origin)
+        {
+            var pos = _virtualPosition;
+            if (_virtualPosition == -1)
+            {
+                pos = DataStream.Position;
+            }
+            var len = DataStream.Length;
+
+            switch (origin)
+            {
+                case StreamConsts.STREAM_SEEK_SET:
+                    if (offset <= len)
+                    {
+                        DataStream.Position = offset;
+                        _virtualPosition = -1;
+                    }
+                    else
+                    {
+                        _virtualPosition = offset;
+                    }
+                    break;
+                case StreamConsts.STREAM_SEEK_END:
+                    if (offset <= 0)
+                    {
+                        DataStream.Position = len + offset;
+                        _virtualPosition = -1;
+                    }
+                    else
+                    {
+                        _virtualPosition = len + offset;
+                    }
+                    break;
+                case StreamConsts.STREAM_SEEK_CUR:
+                    if (offset + pos <= len)
+                    {
+                        DataStream.Position = pos + offset;
+                        _virtualPosition = -1;
+                    }
+                    else
+                    {
+                        _virtualPosition = offset + pos;
+                    }
+                    break;
+            }
+
+            return _virtualPosition != -1 ? _virtualPosition : DataStream.Position;
+        }
+
+        public virtual void SetSize(long value) => DataStream.SetLength(value);
+
+        public virtual void Stat(IntPtr pstatstg, int grfStatFlag) => NotImplemented();
+
+        public virtual void UnlockRegion(long libOffset, long cb, int dwLockType)
+        {
+        }
+
+        public virtual int Write(IntPtr buf, int length)
+        {
+            var buffer = new byte[length];
+            Marshal.Copy(buf, buffer, 0, length);
+            return Write(buffer, length);
+        }
+
+        public virtual int Write(byte[] buffer, int length)
+        {
+            ActualizeVirtualPosition();
+            DataStream.Write(buffer, 0, length);
+            return length;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class MINMAXINFO
+    {
+        public POINT ptReserved;
+        public POINT ptMaxSize;
+        public POINT ptMaxPosition;
+        public POINT ptMinTrackSize;
+        public POINT ptMaxTrackSize;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct APPBARDATA
+    {
+        public int cbSize;
+        public IntPtr hWnd;
+        public uint uCallbackMessage;
+        public uint uEdge;
+        public RECT rc;
+        public int lParam;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct RTL_OSVERSIONINFOEX
+    {
+        internal uint dwOSVersionInfoSize;
+        internal uint dwMajorVersion;
+        internal uint dwMinorVersion;
+        internal uint dwBuildNumber;
+        internal uint dwPlatformId;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+        internal string szCSDVersion;
+    }
+
+    [Flags]
+    internal enum WindowPositionFlags
+    {
+        /// <summary>
+        ///     If the calling thread and the thread that owns the window are attached to different input queues, the system posts
+        ///     the request to the thread that owns the window. This prevents the calling thread from blocking its execution while
+        ///     other threads process the request.
+        /// </summary>
+        SWP_ASYNCWINDOWPOS = 0x4000,
+
+        /// <summary>
+        ///     Prevents generation of the WM_SYNCPAINT message.
+        /// </summary>
+        SWP_DEFERERASE = 0x2000,
+
+        /// <summary>
+        ///     Draws a frame (defined in the window's class description) around the window.
+        /// </summary>
+        SWP_DRAWFRAME = 0x0020,
+
+        /// <summary>
+        ///     Applies new frame styles set using the SetWindowLong function. Sends a WM_NCCALCSIZE message to the window, even if
+        ///     the window's size is not being changed. If this flag is not specified, WM_NCCALCSIZE is sent only when the window's
+        ///     size is being changed.
+        /// </summary>
+        SWP_FRAMECHANGED = 0x0020,
+
+        /// <summary>
+        ///     Hides the window.
+        /// </summary>
+        SWP_HIDEWINDOW = 0x0080,
+
+        /// <summary>
+        ///     Does not activate the window. If this flag is not set, the window is activated and moved to the top of either the
+        ///     topmost or non-topmost group (depending on the setting of the hWndInsertAfter parameter).
+        /// </summary>
+        SWP_NOACTIVATE = 0x0010,
+
+        /// <summary>
+        ///     Discards the entire contents of the client area. If this flag is not specified, the valid contents of the client
+        ///     area are saved and copied back into the client area after the window is sized or repositioned.
+        /// </summary>
+        SWP_NOCOPYBITS = 0x0100,
+
+        /// <summary>
+        ///     Retains the current position (ignores X and Y parameters).
+        /// </summary>
+        SWP_NOMOVE = 0x0002,
+
+        /// <summary>
+        ///     Does not change the owner window's position in the Z order.
+        /// </summary>
+        SWP_NOOWNERZORDER = 0x0200,
+
+        /// <summary>
+        ///     Does not redraw changes. If this flag is set, no repainting of any kind occurs. This applies to the client area,
+        ///     the nonclient area (including the title bar and scroll bars), and any part of the parent window uncovered as a
+        ///     result of the window being moved. When this flag is set, the application must explicitly invalidate or redraw any
+        ///     parts of the window and parent window that need redrawing.
+        /// </summary>
+        SWP_NOREDRAW = 0x0008,
+
+        /// <summary>
+        ///     Same as the SWP_NOOWNERZORDER flag.
+        /// </summary>
+        SWP_NOREPOSITION = 0x0200,
+
+        /// <summary>
+        ///     Prevents the window from receiving the WM_WINDOWPOSCHANGING message.
+        /// </summary>
+        SWP_NOSENDCHANGING = 0x0400,
+
+        /// <summary>
+        ///     Retains the current size (ignores the cx and cy parameters).
+        /// </summary>
+        SWP_NOSIZE = 0x0001,
+
+        /// <summary>
+        ///     Retains the current Z order (ignores the hWndInsertAfter parameter).
+        /// </summary>
+        SWP_NOZORDER = 0x0004,
+
+        /// <summary>
+        ///     Displays the window.
+        /// </summary>
+        SWP_SHOWWINDOW = 0x0040
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WindowPosition
+    {
+        public IntPtr Hwnd;
+        public IntPtr HwndZOrderInsertAfter;
+        public int X;
+        public int Y;
+        public int Width;
+        public int Height;
+        public WindowPositionFlags Flags;
+    }
+
+    [Flags]
+    internal enum DwmWindowAttribute : uint
+    {
+        DWMWA_NCRENDERING_ENABLED = 1,
+        DWMWA_NCRENDERING_POLICY,
+        DWMWA_TRANSITIONS_FORCEDISABLED,
+        DWMWA_ALLOW_NCPAINT,
+        DWMWA_CAPTION_BUTTON_BOUNDS,
+        DWMWA_NONCLIENT_RTL_LAYOUT,
+        DWMWA_FORCE_ICONIC_REPRESENTATION,
+        DWMWA_FLIP3D_POLICY,
+        DWMWA_EXTENDED_FRAME_BOUNDS,
+        DWMWA_HAS_ICONIC_BITMAP,
+        DWMWA_DISALLOW_PEEK,
+        DWMWA_EXCLUDED_FROM_PEEK,
+        DWMWA_LAST
+    }
+
+    [Flags]
+    internal enum WindowStyles
+    {
+        /// <summary>
+        ///     The window is initially maximized.
+        /// </summary>
+        WS_MAXIMIZE = 0x01000000,
+
+        /// <summary>
+        ///     The window has a maximize button. Cannot be combined with the WS_EX_CONTEXTHELP style. The WS_SYSMENU style must
+        ///     also be specified.
+        /// </summary>
+        WS_MAXIMIZEBOX = 0x00010000,
+
+        /// <summary>
+        ///     The window is initially minimized. Same as the WS_ICONIC style.
+        /// </summary>
+        WS_MINIMIZE = 0x20000000,
+
+        /// <summary>
+        ///     The window has a sizing border. Same as the WS_SIZEBOX style.
+        /// </summary>
+        WS_THICKFRAME = 0x00040000,
+    }
+
+    /// <summary>
+    /// ShowWindow options
+    /// </summary>
+    internal enum SW
+    {
+        HIDE = 0,
+        SHOWNORMAL = 1,
+        NORMAL = 1,
+        SHOWMINIMIZED = 2,
+        SHOWMAXIMIZED = 3,
+        MAXIMIZE = 3,
+        SHOWNOACTIVATE = 4,
+        SHOW = 5,
+        MINIMIZE = 6,
+        SHOWMINNOACTIVE = 7,
+        SHOWNA = 8,
+        RESTORE = 9,
+        SHOWDEFAULT = 10,
+        FORCEMINIMIZE = 11,
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs b/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
index 0c1c4321..6b8ff981 100644
--- a/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
+++ b/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
@@ -2,96 +2,95 @@
 using System.Text.RegularExpressions;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     包含一些正则验证操作
+/// </summary>
+public static class RegexJudgment
 {
+    private static readonly RegexPatterns RegexPatterns = new();
+
     /// <summary>
-    ///     包含一些正则验证操作
+    ///     判断字符串格式是否符合某种要求
     /// </summary>
-    public static class RegexJudgment
+    /// <param name="str">需要判断的字符串</param>
+    /// <param name="pattern">正则表达式</param>
+    /// <returns></returns>
+    public static bool IsKindOf(this string str, string pattern)
     {
-        private static readonly RegexPatterns RegexPatterns = new();
-
-        /// <summary>
-        ///     判断字符串格式是否符合某种要求
-        /// </summary>
-        /// <param name="str">需要判断的字符串</param>
-        /// <param name="pattern">正则表达式</param>
-        /// <returns></returns>
-        public static bool IsKindOf(this string str, string pattern)
-        {
-            return Regex.IsMatch(str, pattern);
-        }
-
-        /// <summary>
-        ///     判断字符串是否满足指定的格式
-        /// </summary>
-        /// <param name="text">需要判断的字符串</param>
-        /// <param name="textType">指定格式的文本</param>
-        /// <returns></returns>
-        public static bool IsKindOf(this string text, TextType textType)
-        {
-            if (textType == TextType.Common) return true;
-            return Regex.IsMatch(text,
-                RegexPatterns.GetValue(Enum.GetName(typeof(TextType), textType) + "Pattern").ToString());
-        }
-
-        /// <summary>
-        ///     判断字符串格式是否为电子邮件
-        /// </summary>
-        /// <param name="email">需要判断的Email字符串</param>
-        /// <returns>方法返回布尔值</returns>
-        public static bool IsEmail(this string email)
-        {
-            return Regex.IsMatch(email, RegexPatterns.MailPattern);
-        }
-
-        /// <summary>
-        ///     判断字符串格式是否为指定类型的IP地址
-        /// </summary>
-        /// <param name="ip">需要判断的IP字符串</param>
-        /// <param name="ipType">指定的IP类型</param>
-        /// <returns>方法返回布尔值</returns>
-        public static bool IsIp(this string ip, IpType ipType)
-        {
-            return ipType switch
-            {
-                IpType.A => Regex.IsMatch(ip, RegexPatterns.IpAPattern),
-                IpType.B => Regex.IsMatch(ip, RegexPatterns.IpBPattern),
-                IpType.C => Regex.IsMatch(ip, RegexPatterns.IpCPattern),
-                IpType.D => Regex.IsMatch(ip, RegexPatterns.IpDPattern),
-                IpType.E => Regex.IsMatch(ip, RegexPatterns.IpEPattern),
-                _ => false
-            };
-        }
-
-        /// <summary>
-        ///     判断字符串格式是否为IP地址
-        /// </summary>
-        /// <param name="ip">需要判断的IP字符串</param>
-        /// <returns>方法返回布尔值</returns>
-        public static bool IsIp(this string ip)
-        {
-            return Regex.IsMatch(ip, RegexPatterns.IpPattern);
-        }
-
-        /// <summary>
-        ///     判断字符串格式是否为单个汉字
-        /// </summary>
-        /// <param name="str">需要判断的单个汉字字符串</param>
-        /// <returns>方法返回布尔值</returns>
-        public static bool IsChinese(this string str)
-        {
-            return Regex.IsMatch(str, RegexPatterns.ChinesePattern);
-        }
-
-        /// <summary>
-        ///     判断字符串格式是否为url
-        /// </summary>
-        /// <param name="str">需要判断的url字符串</param>
-        /// <returns>方法返回布尔值</returns>
-        public static bool IsUrl(this string str)
-        {
-            return Regex.IsMatch(str, RegexPatterns.UrlPattern);
-        }
+        return Regex.IsMatch(str, pattern);
     }
-}
+
+    /// <summary>
+    ///     判断字符串是否满足指定的格式
+    /// </summary>
+    /// <param name="text">需要判断的字符串</param>
+    /// <param name="textType">指定格式的文本</param>
+    /// <returns></returns>
+    public static bool IsKindOf(this string text, TextType textType)
+    {
+        if (textType == TextType.Common) return true;
+        return Regex.IsMatch(text,
+            RegexPatterns.GetValue(Enum.GetName(typeof(TextType), textType) + "Pattern").ToString());
+    }
+
+    /// <summary>
+    ///     判断字符串格式是否为电子邮件
+    /// </summary>
+    /// <param name="email">需要判断的Email字符串</param>
+    /// <returns>方法返回布尔值</returns>
+    public static bool IsEmail(this string email)
+    {
+        return Regex.IsMatch(email, RegexPatterns.MailPattern);
+    }
+
+    /// <summary>
+    ///     判断字符串格式是否为指定类型的IP地址
+    /// </summary>
+    /// <param name="ip">需要判断的IP字符串</param>
+    /// <param name="ipType">指定的IP类型</param>
+    /// <returns>方法返回布尔值</returns>
+    public static bool IsIp(this string ip, IpType ipType)
+    {
+        return ipType switch
+        {
+            IpType.A => Regex.IsMatch(ip, RegexPatterns.IpAPattern),
+            IpType.B => Regex.IsMatch(ip, RegexPatterns.IpBPattern),
+            IpType.C => Regex.IsMatch(ip, RegexPatterns.IpCPattern),
+            IpType.D => Regex.IsMatch(ip, RegexPatterns.IpDPattern),
+            IpType.E => Regex.IsMatch(ip, RegexPatterns.IpEPattern),
+            _ => false
+        };
+    }
+
+    /// <summary>
+    ///     判断字符串格式是否为IP地址
+    /// </summary>
+    /// <param name="ip">需要判断的IP字符串</param>
+    /// <returns>方法返回布尔值</returns>
+    public static bool IsIp(this string ip)
+    {
+        return Regex.IsMatch(ip, RegexPatterns.IpPattern);
+    }
+
+    /// <summary>
+    ///     判断字符串格式是否为单个汉字
+    /// </summary>
+    /// <param name="str">需要判断的单个汉字字符串</param>
+    /// <returns>方法返回布尔值</returns>
+    public static bool IsChinese(this string str)
+    {
+        return Regex.IsMatch(str, RegexPatterns.ChinesePattern);
+    }
+
+    /// <summary>
+    ///     判断字符串格式是否为url
+    /// </summary>
+    /// <param name="str">需要判断的url字符串</param>
+    /// <returns>方法返回布尔值</returns>
+    public static bool IsUrl(this string str)
+    {
+        return Regex.IsMatch(str, RegexPatterns.UrlPattern);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs b/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
index 9b105780..194f6228 100644
--- a/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
+++ b/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
@@ -1,151 +1,150 @@
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+/// <summary>
+///     包含一些正则验证所需要的字符串
+/// </summary>
+public sealed class RegexPatterns
 {
     /// <summary>
-    ///     包含一些正则验证所需要的字符串
+    ///     邮件正则匹配表达式
     /// </summary>
-    public sealed class RegexPatterns
-    {
-        /// <summary>
-        ///     邮件正则匹配表达式
-        /// </summary>
-        public const string MailPattern =
-            @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
+    public const string MailPattern =
+        @"^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
 
-        /// <summary>
-        ///     手机号正则匹配表达式
-        /// </summary>
-        public const string PhonePattern = @"^((13[0-9])|(15[^4,\d])|(18[0,5-9]))\d{8}$";
+    /// <summary>
+    ///     手机号正则匹配表达式
+    /// </summary>
+    public const string PhonePattern = @"^((13[0-9])|(15[^4,\d])|(18[0,5-9]))\d{8}$";
 
-        /// <summary>
-        ///     IP正则匹配
-        /// </summary>
-        public const string IpPattern =
-            @"^(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     IP正则匹配
+    /// </summary>
+    public const string IpPattern =
+        @"^(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     A类IP正则匹配
-        /// </summary>
-        public const string IpAPattern =
-            @"^(12[0-6]|1[0-1]\d|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     A类IP正则匹配
+    /// </summary>
+    public const string IpAPattern =
+        @"^(12[0-6]|1[0-1]\d|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     B类IP正则匹配
-        /// </summary>
-        public const string IpBPattern =
-            @"^(19[0-1]|12[8-9]|1[3-8]\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     B类IP正则匹配
+    /// </summary>
+    public const string IpBPattern =
+        @"^(19[0-1]|12[8-9]|1[3-8]\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     C类IP正则匹配
-        /// </summary>
-        public const string IpCPattern =
-            @"^(19[2-9]|22[0-3]|2[0-1]\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     C类IP正则匹配
+    /// </summary>
+    public const string IpCPattern =
+        @"^(19[2-9]|22[0-3]|2[0-1]\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     D类IP正则匹配
-        /// </summary>
-        public const string IpDPattern =
-            @"^(22[4-9]|23\d\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     D类IP正则匹配
+    /// </summary>
+    public const string IpDPattern =
+        @"^(22[4-9]|23\d\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     E类IP正则匹配
-        /// </summary>
-        public const string IpEPattern =
-            @"^(25[0-5]|24\d\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
-            + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
+    /// <summary>
+    ///     E类IP正则匹配
+    /// </summary>
+    public const string IpEPattern =
+        @"^(25[0-5]|24\d\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)\."
+        + @"(25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)$";
 
-        /// <summary>
-        ///     汉字正则匹配
-        /// </summary>
-        public const string ChinesePattern = @"^[\u4e00-\u9fa5]$";
+    /// <summary>
+    ///     汉字正则匹配
+    /// </summary>
+    public const string ChinesePattern = @"^[\u4e00-\u9fa5]$";
 
-        /// <summary>
-        ///     Url正则匹配
-        /// </summary>
-        public const string UrlPattern =
-            @"((http|ftp|https)://)(([a-zA-Z0-9\._-]+\.[a-zA-Z]{2,6})|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,4})*(/[a-zA-Z0-9\&%_\./-~-]*)?";
+    /// <summary>
+    ///     Url正则匹配
+    /// </summary>
+    public const string UrlPattern =
+        @"((http|ftp|https)://)(([a-zA-Z0-9\._-]+\.[a-zA-Z]{2,6})|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,4})*(/[a-zA-Z0-9\&%_\./-~-]*)?";
 
-        /// <summary>
-        ///     数字正则匹配
-        /// </summary>
-        public const string NumberPattern = @"^\d+$";
+    /// <summary>
+    ///     数字正则匹配
+    /// </summary>
+    public const string NumberPattern = @"^\d+$";
 
-        /// <summary>
-        ///     计算性质数字正则匹配
-        /// </summary>
-        public const string DigitsPattern = @"[+-]?\d*\.?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?";
+    /// <summary>
+    ///     计算性质数字正则匹配
+    /// </summary>
+    public const string DigitsPattern = @"[+-]?\d*\.?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?";
 
-        /// <summary>
-        ///     正整数正则匹配
-        /// </summary>
-        public const string PIntPattern = @"^[1-9]\d*$";
+    /// <summary>
+    ///     正整数正则匹配
+    /// </summary>
+    public const string PIntPattern = @"^[1-9]\d*$";
 
-        /// <summary>
-        ///     负整数正则匹配
-        /// </summary>
-        public const string NIntPattern = @"^-[1-9]\d*$ ";
+    /// <summary>
+    ///     负整数正则匹配
+    /// </summary>
+    public const string NIntPattern = @"^-[1-9]\d*$ ";
 
-        /// <summary>
-        ///     整数正则匹配
-        /// </summary>
-        public const string IntPattern = @"^-?[1-9]\d*|0$";
+    /// <summary>
+    ///     整数正则匹配
+    /// </summary>
+    public const string IntPattern = @"^-?[1-9]\d*|0$";
 
-        /// <summary>
-        ///     非负整数正则匹配
-        /// </summary>
-        public const string NnIntPattern = @"^[1-9]\d*|0$";
+    /// <summary>
+    ///     非负整数正则匹配
+    /// </summary>
+    public const string NnIntPattern = @"^[1-9]\d*|0$";
 
-        /// <summary>
-        ///     非正整数正则匹配
-        /// </summary>
-        public const string NpIntPattern = @"^-[1-9]\d*|0$";
+    /// <summary>
+    ///     非正整数正则匹配
+    /// </summary>
+    public const string NpIntPattern = @"^-[1-9]\d*|0$";
 
-        /// <summary>
-        ///     正浮点数正则匹配
-        /// </summary>
-        public const string PDoublePattern = @"^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$";
+    /// <summary>
+    ///     正浮点数正则匹配
+    /// </summary>
+    public const string PDoublePattern = @"^[1-9]\d*\.\d*|0\.\d*[1-9]\d*$";
 
-        /// <summary>
-        ///     负浮点数正则匹配
-        /// </summary>
-        public const string NDoublePattern = @"^-([1-9]\d*\.\d*|0\.\d*[1-9]\d*)$";
+    /// <summary>
+    ///     负浮点数正则匹配
+    /// </summary>
+    public const string NDoublePattern = @"^-([1-9]\d*\.\d*|0\.\d*[1-9]\d*)$";
 
-        /// <summary>
-        ///     浮点数正则匹配
-        /// </summary>
-        public const string DoublePattern = @"^-?([1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0)$";
+    /// <summary>
+    ///     浮点数正则匹配
+    /// </summary>
+    public const string DoublePattern = @"^-?([1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0)$";
 
-        /// <summary>
-        ///     非负浮点数正则匹配
-        /// </summary>
-        public const string NnDoublePattern = @"^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$";
+    /// <summary>
+    ///     非负浮点数正则匹配
+    /// </summary>
+    public const string NnDoublePattern = @"^[1-9]\d*\.\d*|0\.\d*[1-9]\d*|0?\.0+|0$";
 
-        /// <summary>
-        ///     非正浮点数正则匹配
-        /// </summary>
-        public const string NpDoublePattern = @"^(-([1-9]\d*\.\d*|0\.\d*[1-9]\d*))|0?\.0+|0$";
+    /// <summary>
+    ///     非正浮点数正则匹配
+    /// </summary>
+    public const string NpDoublePattern = @"^(-([1-9]\d*\.\d*|0\.\d*[1-9]\d*))|0?\.0+|0$";
 
-        /// <summary>
-        ///     根据属性名称使用反射来获取值
-        /// </summary>
-        /// <param name="propertyName"></param>
-        /// <returns></returns>
-        public object GetValue(string propertyName) => GetType().GetField(propertyName).GetValue(null);
-    }
-}
+    /// <summary>
+    ///     根据属性名称使用反射来获取值
+    /// </summary>
+    /// <param name="propertyName"></param>
+    /// <returns></returns>
+    public object GetValue(string propertyName) => GetType().GetField(propertyName).GetValue(null);
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
index 82a4a879..a145972f 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
@@ -6,117 +6,116 @@ using System.Windows.Controls.Primitives;
 using HandyControl.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
+namespace HandyControl.Tools;
+
+public class ButtonGroupItemStyleSelector : StyleSelector
 {
-    public class ButtonGroupItemStyleSelector : StyleSelector
+    private static readonly Dictionary<string, Style> StyleDict = new()
     {
-        private static readonly Dictionary<string, Style> StyleDict = new()
+        [ResourceToken.RadioGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemSingle),
+        [ResourceToken.RadioGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalFirst),
+        [ResourceToken.RadioGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalLast),
+        [ResourceToken.RadioGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalFirst),
+        [ResourceToken.RadioGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalLast),
+        [ResourceToken.RadioGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemDefault),
+
+        [ResourceToken.ButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemSingle),
+        [ResourceToken.ButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalFirst),
+        [ResourceToken.ButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalLast),
+        [ResourceToken.ButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalFirst),
+        [ResourceToken.ButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalLast),
+        [ResourceToken.ButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemDefault),
+
+        [ResourceToken.ToggleButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemSingle),
+        [ResourceToken.ToggleButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalFirst),
+        [ResourceToken.ToggleButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalLast),
+        [ResourceToken.ToggleButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalFirst),
+        [ResourceToken.ToggleButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalLast),
+        [ResourceToken.ToggleButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemDefault)
+    };
+
+    public override Style SelectStyle(object item, DependencyObject container)
+    {
+        if (container is ButtonGroup buttonGroup && item is ButtonBase buttonBase)
         {
-            [ResourceToken.RadioGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemSingle),
-            [ResourceToken.RadioGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalFirst),
-            [ResourceToken.RadioGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemHorizontalLast),
-            [ResourceToken.RadioGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalFirst),
-            [ResourceToken.RadioGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemVerticalLast),
-            [ResourceToken.RadioGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.RadioGroupItemDefault),
+            var count = GetVisibleButtonsCount(buttonGroup);
 
-            [ResourceToken.ButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemSingle),
-            [ResourceToken.ButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalFirst),
-            [ResourceToken.ButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemHorizontalLast),
-            [ResourceToken.ButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalFirst),
-            [ResourceToken.ButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemVerticalLast),
-            [ResourceToken.ButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ButtonGroupItemDefault),
-
-            [ResourceToken.ToggleButtonGroupItemSingle] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemSingle),
-            [ResourceToken.ToggleButtonGroupItemHorizontalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalFirst),
-            [ResourceToken.ToggleButtonGroupItemHorizontalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemHorizontalLast),
-            [ResourceToken.ToggleButtonGroupItemVerticalFirst] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalFirst),
-            [ResourceToken.ToggleButtonGroupItemVerticalLast] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemVerticalLast),
-            [ResourceToken.ToggleButtonGroupItemDefault] = ResourceHelper.GetResourceInternal<Style>(ResourceToken.ToggleButtonGroupItemDefault)
-        };
-
-        public override Style SelectStyle(object item, DependencyObject container)
-        {
-            if (container is ButtonGroup buttonGroup && item is ButtonBase buttonBase)
+            switch (buttonBase)
             {
-                var count = GetVisibleButtonsCount(buttonGroup);
-
-                switch (buttonBase)
-                {
-                    case RadioButton: return GetRadioButtonStyle(count, buttonGroup, buttonBase);
-                    case Button: return GetButtonStyle(count, buttonGroup, buttonBase);
-                    case ToggleButton: return GetToggleButtonStyle(count, buttonGroup, buttonBase);
-                }
+                case RadioButton: return GetRadioButtonStyle(count, buttonGroup, buttonBase);
+                case Button: return GetButtonStyle(count, buttonGroup, buttonBase);
+                case ToggleButton: return GetToggleButtonStyle(count, buttonGroup, buttonBase);
             }
-
-            return null;
         }
 
-        private static int GetVisibleButtonsCount(ButtonGroup buttonGroup)
-        {
-            return buttonGroup.Items.OfType<ButtonBase>().Count(button => button.IsVisible);
-        }
-
-        private static Style GetToggleButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
-        {
-            if (count == 1)
-            {
-                return StyleDict[ResourceToken.ToggleButtonGroupItemSingle];
-            }
-
-            var index = buttonGroup.Items.IndexOf(button);
-            return buttonGroup.Orientation == Orientation.Horizontal
-                ? index == 0
-                    ? StyleDict[ResourceToken.ToggleButtonGroupItemHorizontalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.ToggleButtonGroupItemHorizontalLast
-                        : ResourceToken.ToggleButtonGroupItemDefault]
-                : index == 0
-                    ? StyleDict[ResourceToken.ToggleButtonGroupItemVerticalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.ToggleButtonGroupItemVerticalLast
-                        : ResourceToken.ToggleButtonGroupItemDefault];
-        }
-
-        private static Style GetButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
-        {
-            if (count == 1)
-            {
-                return StyleDict[ResourceToken.ButtonGroupItemSingle];
-            }
-
-            var index = buttonGroup.Items.IndexOf(button);
-            return buttonGroup.Orientation == Orientation.Horizontal
-                ? index == 0
-                    ? StyleDict[ResourceToken.ButtonGroupItemHorizontalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.ButtonGroupItemHorizontalLast
-                        : ResourceToken.ButtonGroupItemDefault]
-                : index == 0
-                    ? StyleDict[ResourceToken.ButtonGroupItemVerticalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.ButtonGroupItemVerticalLast
-                        : ResourceToken.ButtonGroupItemDefault];
-        }
-
-        private static Style GetRadioButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
-        {
-            if (count == 1)
-            {
-                return StyleDict[ResourceToken.RadioGroupItemSingle];
-            }
-
-            var index = buttonGroup.Items.IndexOf(button);
-            return buttonGroup.Orientation == Orientation.Horizontal
-                ? index == 0
-                    ? StyleDict[ResourceToken.RadioGroupItemHorizontalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.RadioGroupItemHorizontalLast
-                        : ResourceToken.RadioGroupItemDefault]
-                : index == 0
-                    ? StyleDict[ResourceToken.RadioGroupItemVerticalFirst]
-                    : StyleDict[index == count - 1
-                        ? ResourceToken.RadioGroupItemVerticalLast
-                        : ResourceToken.RadioGroupItemDefault];
-        }
+        return null;
     }
-}
+
+    private static int GetVisibleButtonsCount(ButtonGroup buttonGroup)
+    {
+        return buttonGroup.Items.OfType<ButtonBase>().Count(button => button.IsVisible);
+    }
+
+    private static Style GetToggleButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+    {
+        if (count == 1)
+        {
+            return StyleDict[ResourceToken.ToggleButtonGroupItemSingle];
+        }
+
+        var index = buttonGroup.Items.IndexOf(button);
+        return buttonGroup.Orientation == Orientation.Horizontal
+            ? index == 0
+                ? StyleDict[ResourceToken.ToggleButtonGroupItemHorizontalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.ToggleButtonGroupItemHorizontalLast
+                    : ResourceToken.ToggleButtonGroupItemDefault]
+            : index == 0
+                ? StyleDict[ResourceToken.ToggleButtonGroupItemVerticalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.ToggleButtonGroupItemVerticalLast
+                    : ResourceToken.ToggleButtonGroupItemDefault];
+    }
+
+    private static Style GetButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+    {
+        if (count == 1)
+        {
+            return StyleDict[ResourceToken.ButtonGroupItemSingle];
+        }
+
+        var index = buttonGroup.Items.IndexOf(button);
+        return buttonGroup.Orientation == Orientation.Horizontal
+            ? index == 0
+                ? StyleDict[ResourceToken.ButtonGroupItemHorizontalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.ButtonGroupItemHorizontalLast
+                    : ResourceToken.ButtonGroupItemDefault]
+            : index == 0
+                ? StyleDict[ResourceToken.ButtonGroupItemVerticalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.ButtonGroupItemVerticalLast
+                    : ResourceToken.ButtonGroupItemDefault];
+    }
+
+    private static Style GetRadioButtonStyle(int count, ButtonGroup buttonGroup, ButtonBase button)
+    {
+        if (count == 1)
+        {
+            return StyleDict[ResourceToken.RadioGroupItemSingle];
+        }
+
+        var index = buttonGroup.Items.IndexOf(button);
+        return buttonGroup.Orientation == Orientation.Horizontal
+            ? index == 0
+                ? StyleDict[ResourceToken.RadioGroupItemHorizontalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.RadioGroupItemHorizontalLast
+                    : ResourceToken.RadioGroupItemDefault]
+            : index == 0
+                ? StyleDict[ResourceToken.RadioGroupItemVerticalFirst]
+                : StyleDict[index == count - 1
+                    ? ResourceToken.RadioGroupItemVerticalLast
+                    : ResourceToken.RadioGroupItemDefault];
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
index 6556f73c..6032e79c 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
@@ -2,29 +2,28 @@
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
-{
-    public class ComboBoxItemCapsuleStyleSelector : StyleSelector
-    {
-        public override Style SelectStyle(object item, DependencyObject container)
-        {
-            if (container is ComboBoxItem comboBoxItem && VisualHelper.GetParent<ComboBox>(comboBoxItem) is { } comboBox)
-            {
-                var count = comboBox.Items.Count;
-                if (count == 1)
-                {
-                    return ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleSingle);
-                }
+namespace HandyControl.Tools;
 
-                var index = comboBox.ItemContainerGenerator.IndexFromContainer(comboBoxItem);
-                return index == 0
-                    ? ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleHorizontalFirst)
-                    : ResourceHelper.GetResourceInternal<Style>(index == count - 1
-                        ? ResourceToken.ComboBoxItemCapsuleHorizontalLast
-                        : ResourceToken.ComboBoxItemCapsuleDefault);
+public class ComboBoxItemCapsuleStyleSelector : StyleSelector
+{
+    public override Style SelectStyle(object item, DependencyObject container)
+    {
+        if (container is ComboBoxItem comboBoxItem && VisualHelper.GetParent<ComboBox>(comboBoxItem) is { } comboBox)
+        {
+            var count = comboBox.Items.Count;
+            if (count == 1)
+            {
+                return ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleSingle);
             }
 
-            return null;
+            var index = comboBox.ItemContainerGenerator.IndexFromContainer(comboBoxItem);
+            return index == 0
+                ? ResourceHelper.GetResourceInternal<Style>(ResourceToken.ComboBoxItemCapsuleHorizontalFirst)
+                : ResourceHelper.GetResourceInternal<Style>(index == count - 1
+                    ? ResourceToken.ComboBoxItemCapsuleHorizontalLast
+                    : ResourceToken.ComboBoxItemCapsuleDefault);
         }
+
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
index 2faa96ec..d3a8d644 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
@@ -2,34 +2,33 @@
 using System.Windows.Controls;
 using HandyControl.Data;
 
-namespace HandyControl.Tools
-{
-    public class TabItemCapsuleStyleSelector : StyleSelector
-    {
-        public override Style SelectStyle(object item, DependencyObject container)
-        {
-            if (container is TabItem tabItem && VisualHelper.GetParent<TabControl>(tabItem) is { } tabControl)
-            {
-                var count = tabControl.Items.Count;
-                if (count == 1)
-                {
-                    return ResourceHelper.GetResourceInternal<Style>(ResourceToken.TabItemCapsuleSingle);
-                }
+namespace HandyControl.Tools;
 
-                var index = tabControl.ItemContainerGenerator.IndexFromContainer(tabItem);
-                return index == 0
-                    ? ResourceHelper.GetResourceInternal<Style>(
-                        tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
-                            ? ResourceToken.TabItemCapsuleHorizontalFirst
-                            : ResourceToken.TabItemCapsuleVerticalFirst)
-                    : ResourceHelper.GetResourceInternal<Style>(index == count - 1
-                        ? tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
-                            ? ResourceToken.TabItemCapsuleHorizontalLast
-                            : ResourceToken.TabItemCapsuleVerticalLast
-                        : ResourceToken.TabItemCapsuleDefault);
+public class TabItemCapsuleStyleSelector : StyleSelector
+{
+    public override Style SelectStyle(object item, DependencyObject container)
+    {
+        if (container is TabItem tabItem && VisualHelper.GetParent<TabControl>(tabItem) is { } tabControl)
+        {
+            var count = tabControl.Items.Count;
+            if (count == 1)
+            {
+                return ResourceHelper.GetResourceInternal<Style>(ResourceToken.TabItemCapsuleSingle);
             }
 
-            return null;
+            var index = tabControl.ItemContainerGenerator.IndexFromContainer(tabItem);
+            return index == 0
+                ? ResourceHelper.GetResourceInternal<Style>(
+                    tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
+                        ? ResourceToken.TabItemCapsuleHorizontalFirst
+                        : ResourceToken.TabItemCapsuleVerticalFirst)
+                : ResourceHelper.GetResourceInternal<Style>(index == count - 1
+                    ? tabControl.TabStripPlacement == Dock.Top || tabControl.TabStripPlacement == Dock.Bottom
+                        ? ResourceToken.TabItemCapsuleHorizontalLast
+                        : ResourceToken.TabItemCapsuleVerticalLast
+                    : ResourceToken.TabItemCapsuleDefault);
         }
+
+        return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItem.cs b/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
index be6f003d..3fea4202 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Microsoft.Windows.Shell
-{
-    public abstract class JumpItem
-    {
-        internal JumpItem()
-        {
-        }
+namespace Microsoft.Windows.Shell;
 
-        public string CustomCategory { get; set; }
+public abstract class JumpItem
+{
+    internal JumpItem()
+    {
     }
-}
+
+    public string CustomCategory { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
index 25611435..5e7e68cc 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public enum JumpItemRejectionReason
 {
-    public enum JumpItemRejectionReason
-    {
-        None,
-        InvalidItem,
-        NoRegisteredHandler,
-        RemovedByUser
-    }
-}
+    None,
+    InvalidItem,
+    NoRegisteredHandler,
+    RemovedByUser
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
index 28cafd71..88b1403c 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
@@ -1,32 +1,31 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public sealed class JumpItemsRejectedEventArgs : EventArgs
 {
-    public sealed class JumpItemsRejectedEventArgs : EventArgs
+    public JumpItemsRejectedEventArgs() : this(null, null)
     {
-        public JumpItemsRejectedEventArgs() : this(null, null)
-        {
-        }
-
-        public JumpItemsRejectedEventArgs(IList<JumpItem> rejectedItems, IList<JumpItemRejectionReason> reasons)
-        {
-            if ((rejectedItems == null && reasons != null) || (reasons == null && rejectedItems != null) || (rejectedItems != null && reasons != null && rejectedItems.Count != reasons.Count))
-            {
-                throw new ArgumentException("The counts of rejected items doesn't match the count of reasons.");
-            }
-            if (rejectedItems != null)
-            {
-                this.RejectedItems = new List<JumpItem>(rejectedItems).AsReadOnly();
-                this.RejectionReasons = new List<JumpItemRejectionReason>(reasons).AsReadOnly();
-                return;
-            }
-            this.RejectedItems = new List<JumpItem>().AsReadOnly();
-            this.RejectionReasons = new List<JumpItemRejectionReason>().AsReadOnly();
-        }
-
-        public IList<JumpItem> RejectedItems { get; private set; }
-
-        public IList<JumpItemRejectionReason> RejectionReasons { get; private set; }
     }
-}
+
+    public JumpItemsRejectedEventArgs(IList<JumpItem> rejectedItems, IList<JumpItemRejectionReason> reasons)
+    {
+        if ((rejectedItems == null && reasons != null) || (reasons == null && rejectedItems != null) || (rejectedItems != null && reasons != null && rejectedItems.Count != reasons.Count))
+        {
+            throw new ArgumentException("The counts of rejected items doesn't match the count of reasons.");
+        }
+        if (rejectedItems != null)
+        {
+            this.RejectedItems = new List<JumpItem>(rejectedItems).AsReadOnly();
+            this.RejectionReasons = new List<JumpItemRejectionReason>(reasons).AsReadOnly();
+            return;
+        }
+        this.RejectedItems = new List<JumpItem>().AsReadOnly();
+        this.RejectionReasons = new List<JumpItemRejectionReason>().AsReadOnly();
+    }
+
+    public IList<JumpItem> RejectedItems { get; private set; }
+
+    public IList<JumpItemRejectionReason> RejectionReasons { get; private set; }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
index 4f28c9a3..3fe5b993 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public sealed class JumpItemsRemovedEventArgs : EventArgs
 {
-    public sealed class JumpItemsRemovedEventArgs : EventArgs
+    public JumpItemsRemovedEventArgs() : this(null)
     {
-        public JumpItemsRemovedEventArgs() : this(null)
-        {
-        }
-
-        public JumpItemsRemovedEventArgs(IList<JumpItem> removedItems)
-        {
-            if (removedItems != null)
-            {
-                this.RemovedItems = new List<JumpItem>(removedItems).AsReadOnly();
-                return;
-            }
-            this.RemovedItems = new List<JumpItem>().AsReadOnly();
-        }
-
-        public IList<JumpItem> RemovedItems { get; private set; }
     }
-}
+
+    public JumpItemsRemovedEventArgs(IList<JumpItem> removedItems)
+    {
+        if (removedItems != null)
+        {
+            this.RemovedItems = new List<JumpItem>(removedItems).AsReadOnly();
+            return;
+        }
+        this.RemovedItems = new List<JumpItem>().AsReadOnly();
+    }
+
+    public IList<JumpItem> RemovedItems { get; private set; }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpList.cs b/src/Shared/Microsoft.Windows.Shell/JumpList.cs
index 6086bc21..c0c3d6bf 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpList.cs
@@ -10,741 +10,740 @@ using System.Windows;
 using System.Windows.Markup;
 using Standard;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+[ContentProperty("JumpItems")]
+public sealed class JumpList : ISupportInitialize
 {
-    [ContentProperty("JumpItems")]
-    public sealed class JumpList : ISupportInitialize
+    public static void AddToRecentCategory(string itemPath)
     {
-        public static void AddToRecentCategory(string itemPath)
+        Verify.FileExists(itemPath, "itemPath");
+        itemPath = Path.GetFullPath(itemPath);
+        NativeMethods.SHAddToRecentDocs(itemPath);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static void AddToRecentCategory(JumpPath jumpPath)
+    {
+        Verify.IsNotNull<JumpPath>(jumpPath, "jumpPath");
+        JumpList.AddToRecentCategory(jumpPath.Path);
+    }
+
+    public static void AddToRecentCategory(JumpTask jumpTask)
+    {
+        Verify.IsNotNull<JumpTask>(jumpTask, "jumpTask");
+        if (Utility.IsOSWindows7OrNewer)
         {
-            Verify.FileExists(itemPath, "itemPath");
-            itemPath = Path.GetFullPath(itemPath);
-            NativeMethods.SHAddToRecentDocs(itemPath);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static void AddToRecentCategory(JumpPath jumpPath)
-        {
-            Verify.IsNotNull<JumpPath>(jumpPath, "jumpPath");
-            JumpList.AddToRecentCategory(jumpPath.Path);
-        }
-
-        public static void AddToRecentCategory(JumpTask jumpTask)
-        {
-            Verify.IsNotNull<JumpTask>(jumpTask, "jumpTask");
-            if (Utility.IsOSWindows7OrNewer)
-            {
-                IShellLinkW shellLinkW = JumpList.CreateLinkFromJumpTask(jumpTask, false);
-                try
-                {
-                    if (shellLinkW != null)
-                    {
-                        NativeMethods.SHAddToRecentDocs(shellLinkW);
-                    }
-                }
-                finally
-                {
-                    Utility.SafeRelease<IShellLinkW>(ref shellLinkW);
-                }
-            }
-        }
-
-        public static void SetJumpList(Application application, JumpList value)
-        {
-            Verify.IsNotNull<Application>(application, "application");
-            lock (JumpList.s_lock)
-            {
-                JumpList jumpList;
-                if (JumpList.s_applicationMap.TryGetValue(application, out jumpList) && jumpList != null)
-                {
-                    jumpList._application = null;
-                }
-                JumpList.s_applicationMap[application] = value;
-                if (value != null)
-                {
-                    value._application = application;
-                }
-            }
-            if (value != null)
-            {
-                value.ApplyFromApplication();
-            }
-        }
-
-        public static JumpList GetJumpList(Application application)
-        {
-            Verify.IsNotNull<Application>(application, "application");
-            JumpList result;
-            JumpList.s_applicationMap.TryGetValue(application, out result);
-            return result;
-        }
-
-        public JumpList() : this(null, false, false)
-        {
-            this._initializing = null;
-        }
-
-        public JumpList(IEnumerable<JumpItem> items, bool showFrequent, bool showRecent)
-        {
-            if (items != null)
-            {
-                this._jumpItems = new List<JumpItem>(items);
-            }
-            else
-            {
-                this._jumpItems = new List<JumpItem>();
-            }
-            this.ShowFrequentCategory = showFrequent;
-            this.ShowRecentCategory = showRecent;
-            this._initializing = new bool?(false);
-        }
-
-        public bool ShowFrequentCategory { get; set; }
-
-        public bool ShowRecentCategory { get; set; }
-
-        [SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists")]
-        public List<JumpItem> JumpItems
-        {
-            get
-            {
-                return this._jumpItems;
-            }
-        }
-
-        private bool _IsUnmodified
-        {
-            get
-            {
-                return this._initializing == null && this.JumpItems.Count == 0 && !this.ShowRecentCategory && !this.ShowFrequentCategory;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "BeginInit")]
-        public void BeginInit()
-        {
-            if (!this._IsUnmodified)
-            {
-                throw new InvalidOperationException("Calls to BeginInit cannot be nested.");
-            }
-            this._initializing = new bool?(true);
-        }
-
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "EndInit")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "BeginInit")]
-        public void EndInit()
-        {
-            if (this._initializing != true)
-            {
-                throw new NotSupportedException("Can't call EndInit without first calling BeginInit.");
-            }
-            this._initializing = new bool?(false);
-            this.ApplyFromApplication();
-        }
-
-        private static string _RuntimeId
-        {
-            get
-            {
-                string result;
-                HRESULT hrLeft = NativeMethods.GetCurrentProcessExplicitAppUserModelID(out result);
-                if (hrLeft == HRESULT.E_FAIL)
-                {
-                    hrLeft = HRESULT.S_OK;
-                    result = null;
-                }
-                hrLeft.ThrowIfFailed();
-                return result;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "JumpList")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "EndInit")]
-        public void Apply()
-        {
-            if (this._initializing == true)
-            {
-                throw new InvalidOperationException("The JumpList can't be applied until EndInit has been called.");
-            }
-            this._initializing = new bool?(false);
-            this._ApplyList();
-        }
-
-        private void ApplyFromApplication()
-        {
-            if (this._initializing != true && !this._IsUnmodified)
-            {
-                this._initializing = new bool?(false);
-            }
-            if (this._application == Application.Current && this._initializing == false)
-            {
-                this._ApplyList();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.Verify.IsApartmentState(System.Threading.ApartmentState,System.String)")]
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "JumpLists")]
-        private void _ApplyList()
-        {
-            Verify.IsApartmentState(ApartmentState.STA, "JumpLists can only be effected on STA threads.");
-            if (!Utility.IsOSWindows7OrNewer)
-            {
-                this.RejectEverything();
-                return;
-            }
-            List<JumpItem> jumpItems;
-            List<JumpList._RejectedJumpItemPair> list;
-            List<JumpList._ShellObjectPair> list2;
+            IShellLinkW shellLinkW = JumpList.CreateLinkFromJumpTask(jumpTask, false);
             try
             {
-                this._BuildShellLists(out jumpItems, out list, out list2);
-            }
-            catch (Exception)
-            {
-                this.RejectEverything();
-                return;
-            }
-            this._jumpItems = jumpItems;
-            EventHandler<JumpItemsRejectedEventArgs> jumpItemsRejected = this.JumpItemsRejected;
-            EventHandler<JumpItemsRemovedEventArgs> jumpItemsRemovedByUser = this.JumpItemsRemovedByUser;
-            if (list.Count > 0 && jumpItemsRejected != null)
-            {
-                List<JumpItem> list3 = new List<JumpItem>(list.Count);
-                List<JumpItemRejectionReason> list4 = new List<JumpItemRejectionReason>(list.Count);
-                foreach (JumpList._RejectedJumpItemPair rejectedJumpItemPair in list)
+                if (shellLinkW != null)
                 {
-                    list3.Add(rejectedJumpItemPair.JumpItem);
-                    list4.Add(rejectedJumpItemPair.Reason);
+                    NativeMethods.SHAddToRecentDocs(shellLinkW);
                 }
-                jumpItemsRejected(this, new JumpItemsRejectedEventArgs(list3, list4));
-            }
-            if (list2.Count > 0 && jumpItemsRemovedByUser != null)
-            {
-                List<JumpItem> list5 = new List<JumpItem>(list2.Count);
-                foreach (JumpList._ShellObjectPair shellObjectPair in list2)
-                {
-                    if (shellObjectPair.JumpItem != null)
-                    {
-                        list5.Add(shellObjectPair.JumpItem);
-                    }
-                }
-                if (list5.Count > 0)
-                {
-                    jumpItemsRemovedByUser(this, new JumpItemsRemovedEventArgs(list5));
-                }
-            }
-        }
-
-        private void _BuildShellLists(out List<JumpItem> successList, out List<JumpList._RejectedJumpItemPair> rejectedList, out List<JumpList._ShellObjectPair> removedList)
-        {
-            List<List<JumpList._ShellObjectPair>> list = null;
-            removedList = null;
-            ICustomDestinationList customDestinationList = CLSID.CoCreateInstance<ICustomDestinationList>("77f10cf0-3db5-4966-b520-b7c54fd35ed6");
-            try
-            {
-                string runtimeId = JumpList._RuntimeId;
-                if (!string.IsNullOrEmpty(runtimeId))
-                {
-                    customDestinationList.SetAppID(runtimeId);
-                }
-                Guid guid = new Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9");
-                uint num;
-                IObjectArray shellObjects = (IObjectArray) customDestinationList.BeginList(out num, ref guid);
-                removedList = JumpList.GenerateJumpItems(shellObjects);
-                successList = new List<JumpItem>(this.JumpItems.Count);
-                rejectedList = new List<JumpList._RejectedJumpItemPair>(this.JumpItems.Count);
-                list = new List<List<JumpList._ShellObjectPair>>
-                {
-                    new List<JumpList._ShellObjectPair>()
-                };
-                foreach (JumpItem jumpItem in this.JumpItems)
-                {
-                    if (jumpItem == null)
-                    {
-                        rejectedList.Add(new JumpList._RejectedJumpItemPair
-                        {
-                            JumpItem = jumpItem,
-                            Reason = JumpItemRejectionReason.InvalidItem
-                        });
-                    }
-                    else
-                    {
-                        object obj = null;
-                        try
-                        {
-                            obj = JumpList.GetShellObjectForJumpItem(jumpItem);
-                            if (obj == null)
-                            {
-                                rejectedList.Add(new JumpList._RejectedJumpItemPair
-                                {
-                                    Reason = JumpItemRejectionReason.InvalidItem,
-                                    JumpItem = jumpItem
-                                });
-                            }
-                            else if (JumpList.ListContainsShellObject(removedList, obj))
-                            {
-                                rejectedList.Add(new JumpList._RejectedJumpItemPair
-                                {
-                                    Reason = JumpItemRejectionReason.RemovedByUser,
-                                    JumpItem = jumpItem
-                                });
-                            }
-                            else
-                            {
-                                JumpList._ShellObjectPair item = new JumpList._ShellObjectPair
-                                {
-                                    JumpItem = jumpItem,
-                                    ShellObject = obj
-                                };
-                                if (string.IsNullOrEmpty(jumpItem.CustomCategory))
-                                {
-                                    list[0].Add(item);
-                                }
-                                else
-                                {
-                                    bool flag = false;
-                                    foreach (List<JumpList._ShellObjectPair> list2 in list)
-                                    {
-                                        if (list2.Count > 0 && list2[0].JumpItem.CustomCategory == jumpItem.CustomCategory)
-                                        {
-                                            list2.Add(item);
-                                            flag = true;
-                                            break;
-                                        }
-                                    }
-                                    if (!flag)
-                                    {
-                                        list.Add(new List<JumpList._ShellObjectPair>
-                                        {
-                                            item
-                                        });
-                                    }
-                                }
-                                obj = null;
-                            }
-                        }
-                        finally
-                        {
-                            Utility.SafeRelease<object>(ref obj);
-                        }
-                    }
-                }
-                list.Reverse();
-                if (this.ShowFrequentCategory)
-                {
-                    customDestinationList.AppendKnownCategory(KDC.FREQUENT);
-                }
-                if (this.ShowRecentCategory)
-                {
-                    customDestinationList.AppendKnownCategory(KDC.RECENT);
-                }
-                foreach (List<JumpList._ShellObjectPair> list3 in list)
-                {
-                    if (list3.Count > 0)
-                    {
-                        string customCategory = list3[0].JumpItem.CustomCategory;
-                        JumpList.AddCategory(customDestinationList, customCategory, list3, successList, rejectedList);
-                    }
-                }
-                customDestinationList.CommitList();
-                successList.Reverse();
-            }
-            finally
-            {
-                Utility.SafeRelease<ICustomDestinationList>(ref customDestinationList);
-                if (list != null)
-                {
-                    foreach (List<JumpList._ShellObjectPair> list4 in list)
-                    {
-                        JumpList._ShellObjectPair.ReleaseShellObjects(list4);
-                    }
-                }
-                JumpList._ShellObjectPair.ReleaseShellObjects(removedList);
-            }
-        }
-
-        private static bool ListContainsShellObject(List<JumpList._ShellObjectPair> removedList, object shellObject)
-        {
-            if (removedList.Count == 0)
-            {
-                return false;
-            }
-            IShellItem shellItem = shellObject as IShellItem;
-            if (shellItem != null)
-            {
-                foreach (JumpList._ShellObjectPair shellObjectPair in removedList)
-                {
-                    IShellItem shellItem2 = shellObjectPair.ShellObject as IShellItem;
-                    if (shellItem2 != null && shellItem.Compare(shellItem2, (SICHINT) 805306368u) == 0)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            IShellLinkW shellLinkW = shellObject as IShellLinkW;
-            if (shellLinkW != null)
-            {
-                foreach (JumpList._ShellObjectPair shellObjectPair2 in removedList)
-                {
-                    IShellLinkW shellLinkW2 = shellObjectPair2.ShellObject as IShellLinkW;
-                    if (shellLinkW2 != null)
-                    {
-                        string a = JumpList.ShellLinkToString(shellLinkW2);
-                        string b = JumpList.ShellLinkToString(shellLinkW);
-                        if (a == b)
-                        {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-            return false;
-        }
-
-        private static object GetShellObjectForJumpItem(JumpItem jumpItem)
-        {
-            JumpPath jumpPath = jumpItem as JumpPath;
-            JumpTask jumpTask = jumpItem as JumpTask;
-            if (jumpPath != null)
-            {
-                return JumpList.CreateItemFromJumpPath(jumpPath);
-            }
-            if (jumpTask != null)
-            {
-                return JumpList.CreateLinkFromJumpTask(jumpTask, true);
-            }
-            return null;
-        }
-
-        private static List<JumpList._ShellObjectPair> GenerateJumpItems(IObjectArray shellObjects)
-        {
-            List<JumpList._ShellObjectPair> list = new List<JumpList._ShellObjectPair>();
-            Guid guid = new Guid("00000000-0000-0000-C000-000000000046");
-            uint count = shellObjects.GetCount();
-            for (uint num = 0u; num < count; num += 1u)
-            {
-                object at = shellObjects.GetAt(num, ref guid);
-                JumpItem jumpItem = null;
-                try
-                {
-                    jumpItem = JumpList.GetJumpItemForShellObject(at);
-                }
-                catch (Exception ex)
-                {
-                    if (ex is NullReferenceException || ex is SEHException)
-                    {
-                        throw;
-                    }
-                }
-                list.Add(new JumpList._ShellObjectPair
-                {
-                    ShellObject = at,
-                    JumpItem = jumpItem
-                });
-            }
-            return list;
-        }
-
-        private static void AddCategory(ICustomDestinationList cdl, string category, List<JumpList._ShellObjectPair> jumpItems, List<JumpItem> successList, List<JumpList._RejectedJumpItemPair> rejectionList)
-        {
-            JumpList.AddCategory(cdl, category, jumpItems, successList, rejectionList, true);
-        }
-
-        private static void AddCategory(ICustomDestinationList cdl, string category, List<JumpList._ShellObjectPair> jumpItems, List<JumpItem> successList, List<JumpList._RejectedJumpItemPair> rejectionList, bool isHeterogenous)
-        {
-            IObjectCollection objectCollection = (IObjectCollection) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("2d3468c1-36a7-43b6-ac24-d3f02fd9607a")));
-            foreach (JumpList._ShellObjectPair shellObjectPair in jumpItems)
-            {
-                objectCollection.AddObject(shellObjectPair.ShellObject);
-            }
-            HRESULT hrLeft;
-            if (string.IsNullOrEmpty(category))
-            {
-                hrLeft = cdl.AddUserTasks(objectCollection);
-            }
-            else
-            {
-                hrLeft = cdl.AppendCategory(category, objectCollection);
-            }
-            if (hrLeft.Succeeded)
-            {
-                int num = jumpItems.Count;
-                while (--num >= 0)
-                {
-                    successList.Add(jumpItems[num].JumpItem);
-                }
-                return;
-            }
-            if (isHeterogenous && hrLeft == HRESULT.DESTS_E_NO_MATCHING_ASSOC_HANDLER)
-            {
-                Utility.SafeRelease<IObjectCollection>(ref objectCollection);
-                List<JumpList._ShellObjectPair> list = new List<JumpList._ShellObjectPair>();
-                foreach (JumpList._ShellObjectPair shellObjectPair2 in jumpItems)
-                {
-                    if (shellObjectPair2.JumpItem is JumpPath)
-                    {
-                        rejectionList.Add(new JumpList._RejectedJumpItemPair
-                        {
-                            JumpItem = shellObjectPair2.JumpItem,
-                            Reason = JumpItemRejectionReason.NoRegisteredHandler
-                        });
-                    }
-                    else
-                    {
-                        list.Add(shellObjectPair2);
-                    }
-                }
-                if (list.Count > 0)
-                {
-                    JumpList.AddCategory(cdl, category, list, successList, rejectionList, false);
-                    return;
-                }
-            }
-            else
-            {
-                foreach (JumpList._ShellObjectPair shellObjectPair3 in jumpItems)
-                {
-                    rejectionList.Add(new JumpList._RejectedJumpItemPair
-                    {
-                        JumpItem = shellObjectPair3.JumpItem,
-                        Reason = JumpItemRejectionReason.InvalidItem
-                    });
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        private static IShellLinkW CreateLinkFromJumpTask(JumpTask jumpTask, bool allowSeparators)
-        {
-            if (string.IsNullOrEmpty(jumpTask.Title) && (!allowSeparators || !string.IsNullOrEmpty(jumpTask.CustomCategory)))
-            {
-                return null;
-            }
-            IShellLinkW shellLinkW = (IShellLinkW) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("00021401-0000-0000-C000-000000000046")));
-            IShellLinkW result;
-            try
-            {
-                string path = JumpList._FullName;
-                if (!string.IsNullOrEmpty(jumpTask.ApplicationPath))
-                {
-                    path = jumpTask.ApplicationPath;
-                }
-                shellLinkW.SetPath(path);
-                if (!string.IsNullOrEmpty(jumpTask.WorkingDirectory))
-                {
-                    shellLinkW.SetWorkingDirectory(jumpTask.WorkingDirectory);
-                }
-                if (!string.IsNullOrEmpty(jumpTask.Arguments))
-                {
-                    shellLinkW.SetArguments(jumpTask.Arguments);
-                }
-                if (jumpTask.IconResourceIndex != -1)
-                {
-                    string pszIconPath = JumpList._FullName;
-                    if (!string.IsNullOrEmpty(jumpTask.IconResourcePath))
-                    {
-                        if ((long) jumpTask.IconResourcePath.Length >= 260L)
-                        {
-                            return null;
-                        }
-                        pszIconPath = jumpTask.IconResourcePath;
-                    }
-                    shellLinkW.SetIconLocation(pszIconPath, jumpTask.IconResourceIndex);
-                }
-                if (!string.IsNullOrEmpty(jumpTask.Description))
-                {
-                    shellLinkW.SetDescription(jumpTask.Description);
-                }
-                IPropertyStore propertyStore = (IPropertyStore) shellLinkW;
-                using (PROPVARIANT propvariant = new PROPVARIANT())
-                {
-                    PKEY pkey = default(PKEY);
-                    if (!string.IsNullOrEmpty(jumpTask.Title))
-                    {
-                        propvariant.SetValue(jumpTask.Title);
-                        pkey = PKEY.Title;
-                    }
-                    else
-                    {
-                        propvariant.SetValue(true);
-                        pkey = PKEY.AppUserModel_IsDestListSeparator;
-                    }
-                    propertyStore.SetValue(ref pkey, propvariant);
-                }
-                propertyStore.Commit();
-                IShellLinkW shellLinkW2 = shellLinkW;
-                shellLinkW = null;
-                result = shellLinkW2;
-            }
-            catch (Exception)
-            {
-                result = null;
             }
             finally
             {
                 Utility.SafeRelease<IShellLinkW>(ref shellLinkW);
             }
-            return result;
         }
+    }
 
-        private static IShellItem2 GetShellItemForPath(string path)
+    public static void SetJumpList(Application application, JumpList value)
+    {
+        Verify.IsNotNull<Application>(application, "application");
+        lock (JumpList.s_lock)
         {
-            if (string.IsNullOrEmpty(path))
+            JumpList jumpList;
+            if (JumpList.s_applicationMap.TryGetValue(application, out jumpList) && jumpList != null)
             {
-                return null;
+                jumpList._application = null;
             }
-            Guid guid = new Guid("7e9fb0d3-919f-4307-ab2e-9b1860310c93");
-            object obj;
-            HRESULT hrLeft = NativeMethods.SHCreateItemFromParsingName(path, null, ref guid, out obj);
-            if (hrLeft == (HRESULT) Win32Error.ERROR_FILE_NOT_FOUND || hrLeft == (HRESULT) Win32Error.ERROR_PATH_NOT_FOUND)
+            JumpList.s_applicationMap[application] = value;
+            if (value != null)
+            {
+                value._application = application;
+            }
+        }
+        if (value != null)
+        {
+            value.ApplyFromApplication();
+        }
+    }
+
+    public static JumpList GetJumpList(Application application)
+    {
+        Verify.IsNotNull<Application>(application, "application");
+        JumpList result;
+        JumpList.s_applicationMap.TryGetValue(application, out result);
+        return result;
+    }
+
+    public JumpList() : this(null, false, false)
+    {
+        this._initializing = null;
+    }
+
+    public JumpList(IEnumerable<JumpItem> items, bool showFrequent, bool showRecent)
+    {
+        if (items != null)
+        {
+            this._jumpItems = new List<JumpItem>(items);
+        }
+        else
+        {
+            this._jumpItems = new List<JumpItem>();
+        }
+        this.ShowFrequentCategory = showFrequent;
+        this.ShowRecentCategory = showRecent;
+        this._initializing = new bool?(false);
+    }
+
+    public bool ShowFrequentCategory { get; set; }
+
+    public bool ShowRecentCategory { get; set; }
+
+    [SuppressMessage("Microsoft.Design", "CA1002:DoNotExposeGenericLists")]
+    public List<JumpItem> JumpItems
+    {
+        get
+        {
+            return this._jumpItems;
+        }
+    }
+
+    private bool _IsUnmodified
+    {
+        get
+        {
+            return this._initializing == null && this.JumpItems.Count == 0 && !this.ShowRecentCategory && !this.ShowFrequentCategory;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "BeginInit")]
+    public void BeginInit()
+    {
+        if (!this._IsUnmodified)
+        {
+            throw new InvalidOperationException("Calls to BeginInit cannot be nested.");
+        }
+        this._initializing = new bool?(true);
+    }
+
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "EndInit")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "BeginInit")]
+    public void EndInit()
+    {
+        if (this._initializing != true)
+        {
+            throw new NotSupportedException("Can't call EndInit without first calling BeginInit.");
+        }
+        this._initializing = new bool?(false);
+        this.ApplyFromApplication();
+    }
+
+    private static string _RuntimeId
+    {
+        get
+        {
+            string result;
+            HRESULT hrLeft = NativeMethods.GetCurrentProcessExplicitAppUserModelID(out result);
+            if (hrLeft == HRESULT.E_FAIL)
             {
                 hrLeft = HRESULT.S_OK;
-                obj = null;
+                result = null;
             }
             hrLeft.ThrowIfFailed();
-            return (IShellItem2) obj;
+            return result;
         }
+    }
 
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        private static IShellItem2 CreateItemFromJumpPath(JumpPath jumpPath)
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "JumpList")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "EndInit")]
+    public void Apply()
+    {
+        if (this._initializing == true)
         {
+            throw new InvalidOperationException("The JumpList can't be applied until EndInit has been called.");
+        }
+        this._initializing = new bool?(false);
+        this._ApplyList();
+    }
+
+    private void ApplyFromApplication()
+    {
+        if (this._initializing != true && !this._IsUnmodified)
+        {
+            this._initializing = new bool?(false);
+        }
+        if (this._application == Application.Current && this._initializing == false)
+        {
+            this._ApplyList();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.Verify.IsApartmentState(System.Threading.ApartmentState,System.String)")]
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "JumpLists")]
+    private void _ApplyList()
+    {
+        Verify.IsApartmentState(ApartmentState.STA, "JumpLists can only be effected on STA threads.");
+        if (!Utility.IsOSWindows7OrNewer)
+        {
+            this.RejectEverything();
+            return;
+        }
+        List<JumpItem> jumpItems;
+        List<JumpList._RejectedJumpItemPair> list;
+        List<JumpList._ShellObjectPair> list2;
+        try
+        {
+            this._BuildShellLists(out jumpItems, out list, out list2);
+        }
+        catch (Exception)
+        {
+            this.RejectEverything();
+            return;
+        }
+        this._jumpItems = jumpItems;
+        EventHandler<JumpItemsRejectedEventArgs> jumpItemsRejected = this.JumpItemsRejected;
+        EventHandler<JumpItemsRemovedEventArgs> jumpItemsRemovedByUser = this.JumpItemsRemovedByUser;
+        if (list.Count > 0 && jumpItemsRejected != null)
+        {
+            List<JumpItem> list3 = new List<JumpItem>(list.Count);
+            List<JumpItemRejectionReason> list4 = new List<JumpItemRejectionReason>(list.Count);
+            foreach (JumpList._RejectedJumpItemPair rejectedJumpItemPair in list)
+            {
+                list3.Add(rejectedJumpItemPair.JumpItem);
+                list4.Add(rejectedJumpItemPair.Reason);
+            }
+            jumpItemsRejected(this, new JumpItemsRejectedEventArgs(list3, list4));
+        }
+        if (list2.Count > 0 && jumpItemsRemovedByUser != null)
+        {
+            List<JumpItem> list5 = new List<JumpItem>(list2.Count);
+            foreach (JumpList._ShellObjectPair shellObjectPair in list2)
+            {
+                if (shellObjectPair.JumpItem != null)
+                {
+                    list5.Add(shellObjectPair.JumpItem);
+                }
+            }
+            if (list5.Count > 0)
+            {
+                jumpItemsRemovedByUser(this, new JumpItemsRemovedEventArgs(list5));
+            }
+        }
+    }
+
+    private void _BuildShellLists(out List<JumpItem> successList, out List<JumpList._RejectedJumpItemPair> rejectedList, out List<JumpList._ShellObjectPair> removedList)
+    {
+        List<List<JumpList._ShellObjectPair>> list = null;
+        removedList = null;
+        ICustomDestinationList customDestinationList = CLSID.CoCreateInstance<ICustomDestinationList>("77f10cf0-3db5-4966-b520-b7c54fd35ed6");
+        try
+        {
+            string runtimeId = JumpList._RuntimeId;
+            if (!string.IsNullOrEmpty(runtimeId))
+            {
+                customDestinationList.SetAppID(runtimeId);
+            }
+            Guid guid = new Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9");
+            uint num;
+            IObjectArray shellObjects = (IObjectArray) customDestinationList.BeginList(out num, ref guid);
+            removedList = JumpList.GenerateJumpItems(shellObjects);
+            successList = new List<JumpItem>(this.JumpItems.Count);
+            rejectedList = new List<JumpList._RejectedJumpItemPair>(this.JumpItems.Count);
+            list = new List<List<JumpList._ShellObjectPair>>
+            {
+                new List<JumpList._ShellObjectPair>()
+            };
+            foreach (JumpItem jumpItem in this.JumpItems)
+            {
+                if (jumpItem == null)
+                {
+                    rejectedList.Add(new JumpList._RejectedJumpItemPair
+                    {
+                        JumpItem = jumpItem,
+                        Reason = JumpItemRejectionReason.InvalidItem
+                    });
+                }
+                else
+                {
+                    object obj = null;
+                    try
+                    {
+                        obj = JumpList.GetShellObjectForJumpItem(jumpItem);
+                        if (obj == null)
+                        {
+                            rejectedList.Add(new JumpList._RejectedJumpItemPair
+                            {
+                                Reason = JumpItemRejectionReason.InvalidItem,
+                                JumpItem = jumpItem
+                            });
+                        }
+                        else if (JumpList.ListContainsShellObject(removedList, obj))
+                        {
+                            rejectedList.Add(new JumpList._RejectedJumpItemPair
+                            {
+                                Reason = JumpItemRejectionReason.RemovedByUser,
+                                JumpItem = jumpItem
+                            });
+                        }
+                        else
+                        {
+                            JumpList._ShellObjectPair item = new JumpList._ShellObjectPair
+                            {
+                                JumpItem = jumpItem,
+                                ShellObject = obj
+                            };
+                            if (string.IsNullOrEmpty(jumpItem.CustomCategory))
+                            {
+                                list[0].Add(item);
+                            }
+                            else
+                            {
+                                bool flag = false;
+                                foreach (List<JumpList._ShellObjectPair> list2 in list)
+                                {
+                                    if (list2.Count > 0 && list2[0].JumpItem.CustomCategory == jumpItem.CustomCategory)
+                                    {
+                                        list2.Add(item);
+                                        flag = true;
+                                        break;
+                                    }
+                                }
+                                if (!flag)
+                                {
+                                    list.Add(new List<JumpList._ShellObjectPair>
+                                    {
+                                        item
+                                    });
+                                }
+                            }
+                            obj = null;
+                        }
+                    }
+                    finally
+                    {
+                        Utility.SafeRelease<object>(ref obj);
+                    }
+                }
+            }
+            list.Reverse();
+            if (this.ShowFrequentCategory)
+            {
+                customDestinationList.AppendKnownCategory(KDC.FREQUENT);
+            }
+            if (this.ShowRecentCategory)
+            {
+                customDestinationList.AppendKnownCategory(KDC.RECENT);
+            }
+            foreach (List<JumpList._ShellObjectPair> list3 in list)
+            {
+                if (list3.Count > 0)
+                {
+                    string customCategory = list3[0].JumpItem.CustomCategory;
+                    JumpList.AddCategory(customDestinationList, customCategory, list3, successList, rejectedList);
+                }
+            }
+            customDestinationList.CommitList();
+            successList.Reverse();
+        }
+        finally
+        {
+            Utility.SafeRelease<ICustomDestinationList>(ref customDestinationList);
+            if (list != null)
+            {
+                foreach (List<JumpList._ShellObjectPair> list4 in list)
+                {
+                    JumpList._ShellObjectPair.ReleaseShellObjects(list4);
+                }
+            }
+            JumpList._ShellObjectPair.ReleaseShellObjects(removedList);
+        }
+    }
+
+    private static bool ListContainsShellObject(List<JumpList._ShellObjectPair> removedList, object shellObject)
+    {
+        if (removedList.Count == 0)
+        {
+            return false;
+        }
+        IShellItem shellItem = shellObject as IShellItem;
+        if (shellItem != null)
+        {
+            foreach (JumpList._ShellObjectPair shellObjectPair in removedList)
+            {
+                IShellItem shellItem2 = shellObjectPair.ShellObject as IShellItem;
+                if (shellItem2 != null && shellItem.Compare(shellItem2, (SICHINT) 805306368u) == 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+        IShellLinkW shellLinkW = shellObject as IShellLinkW;
+        if (shellLinkW != null)
+        {
+            foreach (JumpList._ShellObjectPair shellObjectPair2 in removedList)
+            {
+                IShellLinkW shellLinkW2 = shellObjectPair2.ShellObject as IShellLinkW;
+                if (shellLinkW2 != null)
+                {
+                    string a = JumpList.ShellLinkToString(shellLinkW2);
+                    string b = JumpList.ShellLinkToString(shellLinkW);
+                    if (a == b)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        return false;
+    }
+
+    private static object GetShellObjectForJumpItem(JumpItem jumpItem)
+    {
+        JumpPath jumpPath = jumpItem as JumpPath;
+        JumpTask jumpTask = jumpItem as JumpTask;
+        if (jumpPath != null)
+        {
+            return JumpList.CreateItemFromJumpPath(jumpPath);
+        }
+        if (jumpTask != null)
+        {
+            return JumpList.CreateLinkFromJumpTask(jumpTask, true);
+        }
+        return null;
+    }
+
+    private static List<JumpList._ShellObjectPair> GenerateJumpItems(IObjectArray shellObjects)
+    {
+        List<JumpList._ShellObjectPair> list = new List<JumpList._ShellObjectPair>();
+        Guid guid = new Guid("00000000-0000-0000-C000-000000000046");
+        uint count = shellObjects.GetCount();
+        for (uint num = 0u; num < count; num += 1u)
+        {
+            object at = shellObjects.GetAt(num, ref guid);
+            JumpItem jumpItem = null;
             try
             {
-                return JumpList.GetShellItemForPath(Path.GetFullPath(jumpPath.Path));
+                jumpItem = JumpList.GetJumpItemForShellObject(at);
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-            }
-            return null;
-        }
-
-        private static JumpItem GetJumpItemForShellObject(object shellObject)
-        {
-            IShellItem2 shellItem = shellObject as IShellItem2;
-            IShellLinkW shellLinkW = shellObject as IShellLinkW;
-            if (shellItem != null)
-            {
-                return new JumpPath
+                if (ex is NullReferenceException || ex is SEHException)
                 {
-                    Path = shellItem.GetDisplayName((SIGDN) 2147647488u)
-                };
-            }
-            if (shellLinkW != null)
-            {
-                StringBuilder stringBuilder = new StringBuilder(260);
-                shellLinkW.GetPath(stringBuilder, stringBuilder.Capacity, null, SLGP.RAWPATH);
-                StringBuilder stringBuilder2 = new StringBuilder(1024);
-                shellLinkW.GetArguments(stringBuilder2, stringBuilder2.Capacity);
-                StringBuilder stringBuilder3 = new StringBuilder(1024);
-                shellLinkW.GetDescription(stringBuilder3, stringBuilder3.Capacity);
-                StringBuilder stringBuilder4 = new StringBuilder(260);
-                int iconResourceIndex;
-                shellLinkW.GetIconLocation(stringBuilder4, stringBuilder4.Capacity, out iconResourceIndex);
-                StringBuilder stringBuilder5 = new StringBuilder(260);
-                shellLinkW.GetWorkingDirectory(stringBuilder5, stringBuilder5.Capacity);
-                JumpTask jumpTask = new JumpTask
-                {
-                    ApplicationPath = stringBuilder.ToString(),
-                    Arguments = stringBuilder2.ToString(),
-                    Description = stringBuilder3.ToString(),
-                    IconResourceIndex = iconResourceIndex,
-                    IconResourcePath = stringBuilder4.ToString(),
-                    WorkingDirectory = stringBuilder5.ToString()
-                };
-                using (PROPVARIANT propvariant = new PROPVARIANT())
-                {
-                    IPropertyStore propertyStore = (IPropertyStore) shellLinkW;
-                    PKEY title = PKEY.Title;
-                    propertyStore.GetValue(ref title, propvariant);
-                    jumpTask.Title = (propvariant.GetValue() ?? "");
+                    throw;
                 }
-                return jumpTask;
             }
-            return null;
-        }
-
-        private static string ShellLinkToString(IShellLinkW shellLink)
-        {
-            StringBuilder stringBuilder = new StringBuilder(260);
-            shellLink.GetPath(stringBuilder, stringBuilder.Capacity, null, SLGP.RAWPATH);
-            string text = null;
-            using (PROPVARIANT propvariant = new PROPVARIANT())
+            list.Add(new JumpList._ShellObjectPair
             {
-                IPropertyStore propertyStore = (IPropertyStore) shellLink;
-                PKEY title = PKEY.Title;
-                propertyStore.GetValue(ref title, propvariant);
-                text = (propvariant.GetValue() ?? "");
+                ShellObject = at,
+                JumpItem = jumpItem
+            });
+        }
+        return list;
+    }
+
+    private static void AddCategory(ICustomDestinationList cdl, string category, List<JumpList._ShellObjectPair> jumpItems, List<JumpItem> successList, List<JumpList._RejectedJumpItemPair> rejectionList)
+    {
+        JumpList.AddCategory(cdl, category, jumpItems, successList, rejectionList, true);
+    }
+
+    private static void AddCategory(ICustomDestinationList cdl, string category, List<JumpList._ShellObjectPair> jumpItems, List<JumpItem> successList, List<JumpList._RejectedJumpItemPair> rejectionList, bool isHeterogenous)
+    {
+        IObjectCollection objectCollection = (IObjectCollection) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("2d3468c1-36a7-43b6-ac24-d3f02fd9607a")));
+        foreach (JumpList._ShellObjectPair shellObjectPair in jumpItems)
+        {
+            objectCollection.AddObject(shellObjectPair.ShellObject);
+        }
+        HRESULT hrLeft;
+        if (string.IsNullOrEmpty(category))
+        {
+            hrLeft = cdl.AddUserTasks(objectCollection);
+        }
+        else
+        {
+            hrLeft = cdl.AppendCategory(category, objectCollection);
+        }
+        if (hrLeft.Succeeded)
+        {
+            int num = jumpItems.Count;
+            while (--num >= 0)
+            {
+                successList.Add(jumpItems[num].JumpItem);
             }
-            StringBuilder stringBuilder2 = new StringBuilder(1024);
-            shellLink.GetArguments(stringBuilder2, stringBuilder2.Capacity);
-            return stringBuilder.ToString().ToUpperInvariant() + text.ToUpperInvariant() + stringBuilder2.ToString();
+            return;
         }
-
-        private void RejectEverything()
+        if (isHeterogenous && hrLeft == HRESULT.DESTS_E_NO_MATCHING_ASSOC_HANDLER)
         {
-            EventHandler<JumpItemsRejectedEventArgs> jumpItemsRejected = this.JumpItemsRejected;
-            if (jumpItemsRejected == null)
+            Utility.SafeRelease<IObjectCollection>(ref objectCollection);
+            List<JumpList._ShellObjectPair> list = new List<JumpList._ShellObjectPair>();
+            foreach (JumpList._ShellObjectPair shellObjectPair2 in jumpItems)
             {
-                this._jumpItems.Clear();
+                if (shellObjectPair2.JumpItem is JumpPath)
+                {
+                    rejectionList.Add(new JumpList._RejectedJumpItemPair
+                    {
+                        JumpItem = shellObjectPair2.JumpItem,
+                        Reason = JumpItemRejectionReason.NoRegisteredHandler
+                    });
+                }
+                else
+                {
+                    list.Add(shellObjectPair2);
+                }
+            }
+            if (list.Count > 0)
+            {
+                JumpList.AddCategory(cdl, category, list, successList, rejectionList, false);
                 return;
             }
-            if (this._jumpItems.Count > 0)
+        }
+        else
+        {
+            foreach (JumpList._ShellObjectPair shellObjectPair3 in jumpItems)
             {
-                List<JumpItemRejectionReason> list = new List<JumpItemRejectionReason>(this.JumpItems.Count);
-                for (int i = 0; i < this.JumpItems.Count; i++)
+                rejectionList.Add(new JumpList._RejectedJumpItemPair
                 {
-                    list.Add(JumpItemRejectionReason.InvalidItem);
-                }
-                JumpItemsRejectedEventArgs e = new JumpItemsRejectedEventArgs(this.JumpItems, list);
-                this._jumpItems.Clear();
-                jumpItemsRejected(this, e);
+                    JumpItem = shellObjectPair3.JumpItem,
+                    Reason = JumpItemRejectionReason.InvalidItem
+                });
             }
         }
+    }
 
-        public event EventHandler<JumpItemsRejectedEventArgs> JumpItemsRejected;
-
-        public event EventHandler<JumpItemsRemovedEventArgs> JumpItemsRemovedByUser;
-
-        private static readonly object s_lock = new object();
-
-        private static readonly Dictionary<Application, JumpList> s_applicationMap = new Dictionary<Application, JumpList>();
-
-        private Application _application;
-
-        private bool? _initializing;
-
-        private List<JumpItem> _jumpItems;
-
-        private static readonly string _FullName = NativeMethods.GetModuleFileName(IntPtr.Zero);
-
-        private class _RejectedJumpItemPair
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+    private static IShellLinkW CreateLinkFromJumpTask(JumpTask jumpTask, bool allowSeparators)
+    {
+        if (string.IsNullOrEmpty(jumpTask.Title) && (!allowSeparators || !string.IsNullOrEmpty(jumpTask.CustomCategory)))
         {
-            public JumpItem JumpItem { get; set; }
-
-            public JumpItemRejectionReason Reason { get; set; }
+            return null;
         }
-
-        private class _ShellObjectPair
+        IShellLinkW shellLinkW = (IShellLinkW) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid("00021401-0000-0000-C000-000000000046")));
+        IShellLinkW result;
+        try
         {
-            public JumpItem JumpItem { get; set; }
-
-            public object ShellObject { get; set; }
-
-            public static void ReleaseShellObjects(List<JumpList._ShellObjectPair> list)
+            string path = JumpList._FullName;
+            if (!string.IsNullOrEmpty(jumpTask.ApplicationPath))
             {
-                if (list != null)
+                path = jumpTask.ApplicationPath;
+            }
+            shellLinkW.SetPath(path);
+            if (!string.IsNullOrEmpty(jumpTask.WorkingDirectory))
+            {
+                shellLinkW.SetWorkingDirectory(jumpTask.WorkingDirectory);
+            }
+            if (!string.IsNullOrEmpty(jumpTask.Arguments))
+            {
+                shellLinkW.SetArguments(jumpTask.Arguments);
+            }
+            if (jumpTask.IconResourceIndex != -1)
+            {
+                string pszIconPath = JumpList._FullName;
+                if (!string.IsNullOrEmpty(jumpTask.IconResourcePath))
                 {
-                    foreach (JumpList._ShellObjectPair shellObjectPair in list)
+                    if ((long) jumpTask.IconResourcePath.Length >= 260L)
                     {
-                        object shellObject = shellObjectPair.ShellObject;
-                        shellObjectPair.ShellObject = null;
-                        Utility.SafeRelease<object>(ref shellObject);
+                        return null;
                     }
+                    pszIconPath = jumpTask.IconResourcePath;
+                }
+                shellLinkW.SetIconLocation(pszIconPath, jumpTask.IconResourceIndex);
+            }
+            if (!string.IsNullOrEmpty(jumpTask.Description))
+            {
+                shellLinkW.SetDescription(jumpTask.Description);
+            }
+            IPropertyStore propertyStore = (IPropertyStore) shellLinkW;
+            using (PROPVARIANT propvariant = new PROPVARIANT())
+            {
+                PKEY pkey = default(PKEY);
+                if (!string.IsNullOrEmpty(jumpTask.Title))
+                {
+                    propvariant.SetValue(jumpTask.Title);
+                    pkey = PKEY.Title;
+                }
+                else
+                {
+                    propvariant.SetValue(true);
+                    pkey = PKEY.AppUserModel_IsDestListSeparator;
+                }
+                propertyStore.SetValue(ref pkey, propvariant);
+            }
+            propertyStore.Commit();
+            IShellLinkW shellLinkW2 = shellLinkW;
+            shellLinkW = null;
+            result = shellLinkW2;
+        }
+        catch (Exception)
+        {
+            result = null;
+        }
+        finally
+        {
+            Utility.SafeRelease<IShellLinkW>(ref shellLinkW);
+        }
+        return result;
+    }
+
+    private static IShellItem2 GetShellItemForPath(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+        {
+            return null;
+        }
+        Guid guid = new Guid("7e9fb0d3-919f-4307-ab2e-9b1860310c93");
+        object obj;
+        HRESULT hrLeft = NativeMethods.SHCreateItemFromParsingName(path, null, ref guid, out obj);
+        if (hrLeft == (HRESULT) Win32Error.ERROR_FILE_NOT_FOUND || hrLeft == (HRESULT) Win32Error.ERROR_PATH_NOT_FOUND)
+        {
+            hrLeft = HRESULT.S_OK;
+            obj = null;
+        }
+        hrLeft.ThrowIfFailed();
+        return (IShellItem2) obj;
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+    private static IShellItem2 CreateItemFromJumpPath(JumpPath jumpPath)
+    {
+        try
+        {
+            return JumpList.GetShellItemForPath(Path.GetFullPath(jumpPath.Path));
+        }
+        catch (Exception)
+        {
+        }
+        return null;
+    }
+
+    private static JumpItem GetJumpItemForShellObject(object shellObject)
+    {
+        IShellItem2 shellItem = shellObject as IShellItem2;
+        IShellLinkW shellLinkW = shellObject as IShellLinkW;
+        if (shellItem != null)
+        {
+            return new JumpPath
+            {
+                Path = shellItem.GetDisplayName((SIGDN) 2147647488u)
+            };
+        }
+        if (shellLinkW != null)
+        {
+            StringBuilder stringBuilder = new StringBuilder(260);
+            shellLinkW.GetPath(stringBuilder, stringBuilder.Capacity, null, SLGP.RAWPATH);
+            StringBuilder stringBuilder2 = new StringBuilder(1024);
+            shellLinkW.GetArguments(stringBuilder2, stringBuilder2.Capacity);
+            StringBuilder stringBuilder3 = new StringBuilder(1024);
+            shellLinkW.GetDescription(stringBuilder3, stringBuilder3.Capacity);
+            StringBuilder stringBuilder4 = new StringBuilder(260);
+            int iconResourceIndex;
+            shellLinkW.GetIconLocation(stringBuilder4, stringBuilder4.Capacity, out iconResourceIndex);
+            StringBuilder stringBuilder5 = new StringBuilder(260);
+            shellLinkW.GetWorkingDirectory(stringBuilder5, stringBuilder5.Capacity);
+            JumpTask jumpTask = new JumpTask
+            {
+                ApplicationPath = stringBuilder.ToString(),
+                Arguments = stringBuilder2.ToString(),
+                Description = stringBuilder3.ToString(),
+                IconResourceIndex = iconResourceIndex,
+                IconResourcePath = stringBuilder4.ToString(),
+                WorkingDirectory = stringBuilder5.ToString()
+            };
+            using (PROPVARIANT propvariant = new PROPVARIANT())
+            {
+                IPropertyStore propertyStore = (IPropertyStore) shellLinkW;
+                PKEY title = PKEY.Title;
+                propertyStore.GetValue(ref title, propvariant);
+                jumpTask.Title = (propvariant.GetValue() ?? "");
+            }
+            return jumpTask;
+        }
+        return null;
+    }
+
+    private static string ShellLinkToString(IShellLinkW shellLink)
+    {
+        StringBuilder stringBuilder = new StringBuilder(260);
+        shellLink.GetPath(stringBuilder, stringBuilder.Capacity, null, SLGP.RAWPATH);
+        string text = null;
+        using (PROPVARIANT propvariant = new PROPVARIANT())
+        {
+            IPropertyStore propertyStore = (IPropertyStore) shellLink;
+            PKEY title = PKEY.Title;
+            propertyStore.GetValue(ref title, propvariant);
+            text = (propvariant.GetValue() ?? "");
+        }
+        StringBuilder stringBuilder2 = new StringBuilder(1024);
+        shellLink.GetArguments(stringBuilder2, stringBuilder2.Capacity);
+        return stringBuilder.ToString().ToUpperInvariant() + text.ToUpperInvariant() + stringBuilder2.ToString();
+    }
+
+    private void RejectEverything()
+    {
+        EventHandler<JumpItemsRejectedEventArgs> jumpItemsRejected = this.JumpItemsRejected;
+        if (jumpItemsRejected == null)
+        {
+            this._jumpItems.Clear();
+            return;
+        }
+        if (this._jumpItems.Count > 0)
+        {
+            List<JumpItemRejectionReason> list = new List<JumpItemRejectionReason>(this.JumpItems.Count);
+            for (int i = 0; i < this.JumpItems.Count; i++)
+            {
+                list.Add(JumpItemRejectionReason.InvalidItem);
+            }
+            JumpItemsRejectedEventArgs e = new JumpItemsRejectedEventArgs(this.JumpItems, list);
+            this._jumpItems.Clear();
+            jumpItemsRejected(this, e);
+        }
+    }
+
+    public event EventHandler<JumpItemsRejectedEventArgs> JumpItemsRejected;
+
+    public event EventHandler<JumpItemsRemovedEventArgs> JumpItemsRemovedByUser;
+
+    private static readonly object s_lock = new object();
+
+    private static readonly Dictionary<Application, JumpList> s_applicationMap = new Dictionary<Application, JumpList>();
+
+    private Application _application;
+
+    private bool? _initializing;
+
+    private List<JumpItem> _jumpItems;
+
+    private static readonly string _FullName = NativeMethods.GetModuleFileName(IntPtr.Zero);
+
+    private class _RejectedJumpItemPair
+    {
+        public JumpItem JumpItem { get; set; }
+
+        public JumpItemRejectionReason Reason { get; set; }
+    }
+
+    private class _ShellObjectPair
+    {
+        public JumpItem JumpItem { get; set; }
+
+        public object ShellObject { get; set; }
+
+        public static void ReleaseShellObjects(List<JumpList._ShellObjectPair> list)
+        {
+            if (list != null)
+            {
+                foreach (JumpList._ShellObjectPair shellObjectPair in list)
+                {
+                    object shellObject = shellObjectPair.ShellObject;
+                    shellObjectPair.ShellObject = null;
+                    Utility.SafeRelease<object>(ref shellObject);
                 }
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpPath.cs b/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
index f58926d2..091993f8 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public class JumpPath : JumpItem
 {
-    public class JumpPath : JumpItem
-    {
-        public string Path { get; set; }
-    }
-}
+    public string Path { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpTask.cs b/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
index d4a64eb7..b7c76925 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public class JumpTask : JumpItem
 {
-    public class JumpTask : JumpItem
-    {
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public string ApplicationPath { get; set; }
+    public string ApplicationPath { get; set; }
 
-        public string Arguments { get; set; }
+    public string Arguments { get; set; }
 
-        public string WorkingDirectory { get; set; }
+    public string WorkingDirectory { get; set; }
 
-        public string IconResourcePath { get; set; }
+    public string IconResourcePath { get; set; }
 
-        public int IconResourceIndex { get; set; }
-    }
-}
+    public int IconResourceIndex { get; set; }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
index 84bbe118..f712742f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum AC : byte
 {
-    internal enum AC : byte
-    {
-        SRC_OVER,
-        SRC_ALPHA
-    }
-}
+    SRC_OVER,
+    SRC_ALPHA
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
index bcad937a..87720c45 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum APPDOCLISTTYPE
 {
-    internal enum APPDOCLISTTYPE
-    {
-        ADLT_RECENT,
-        ADLT_FREQUENT
-    }
-}
+    ADLT_RECENT,
+    ADLT_FREQUENT
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
index efea3fbd..b2eb66c8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
@@ -3,231 +3,230 @@ using System.Diagnostics;
 using System.Threading;
 using System.Windows;
 
-namespace Standard
+namespace Standard;
+
+internal static class Assert
 {
-    internal static class Assert
+    private static void _Break()
     {
-        private static void _Break()
-        {
-            Debugger.Break();
-        }
-
-        [Conditional("DEBUG")]
-        public static void Evaluate(Assert.EvaluateFunction argument)
-        {
-            argument();
-        }
-
-        [Obsolete("Use Assert.AreEqual instead of Assert.Equals", false)]
-        [Conditional("DEBUG")]
-        public static void Equals<T>(T expected, T actual)
-        {
-        }
-
-        [Conditional("DEBUG")]
-        public static void AreEqual<T>(T expected, T actual)
-        {
-            if (expected == null)
-            {
-                if (actual != null && !actual.Equals(expected))
-                {
-                    Assert._Break();
-                    return;
-                }
-            }
-            else if (!expected.Equals(actual))
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void AreNotEqual<T>(T notExpected, T actual)
-        {
-            if (notExpected == null)
-            {
-                if (actual == null || actual.Equals(notExpected))
-                {
-                    Assert._Break();
-                    return;
-                }
-            }
-            else if (notExpected.Equals(actual))
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void Implies(bool condition, bool result)
-        {
-            if (condition && !result)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void Implies(bool condition, Assert.ImplicationFunction result)
-        {
-            if (condition && !result())
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNeitherNullNorEmpty(string value)
-        {
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNeitherNullNorWhitespace(string value)
-        {
-            if (string.IsNullOrEmpty(value))
-            {
-                Assert._Break();
-            }
-            if (value.Trim().Length == 0)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNotNull<T>(T value) where T : class
-        {
-            if (value == null)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsDefault<T>(T value) where T : struct
-        {
-            value.Equals(default(T));
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNotDefault<T>(T value) where T : struct
-        {
-            value.Equals(default(T));
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsFalse(bool condition)
-        {
-            if (condition)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsFalse(bool condition, string message)
-        {
-            if (condition)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsTrue(bool condition)
-        {
-            if (!condition)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsTrue(bool condition, string message)
-        {
-            if (!condition)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void Fail()
-        {
-            Assert._Break();
-        }
-
-        [Conditional("DEBUG")]
-        public static void Fail(string message)
-        {
-            Assert._Break();
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNull<T>(T item) where T : class
-        {
-            if (item != null)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive)
-        {
-            if (value < lowerBoundInclusive || value > upperBoundInclusive)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive)
-        {
-            if (value < lowerBoundInclusive || value >= upperBoundExclusive)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsApartmentState(ApartmentState expectedState)
-        {
-            if (Thread.CurrentThread.GetApartmentState() != expectedState)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void NullableIsNotNull<T>(T? value) where T : struct
-        {
-            if (value == null)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void NullableIsNull<T>(T? value) where T : struct
-        {
-            if (value != null)
-            {
-                Assert._Break();
-            }
-        }
-
-        [Conditional("DEBUG")]
-        public static void IsNotOnMainThread()
-        {
-            if (Application.Current.Dispatcher.CheckAccess())
-            {
-                Assert._Break();
-            }
-        }
-
-        public delegate void EvaluateFunction();
-
-        public delegate bool ImplicationFunction();
+        Debugger.Break();
     }
-}
+
+    [Conditional("DEBUG")]
+    public static void Evaluate(Assert.EvaluateFunction argument)
+    {
+        argument();
+    }
+
+    [Obsolete("Use Assert.AreEqual instead of Assert.Equals", false)]
+    [Conditional("DEBUG")]
+    public static void Equals<T>(T expected, T actual)
+    {
+    }
+
+    [Conditional("DEBUG")]
+    public static void AreEqual<T>(T expected, T actual)
+    {
+        if (expected == null)
+        {
+            if (actual != null && !actual.Equals(expected))
+            {
+                Assert._Break();
+                return;
+            }
+        }
+        else if (!expected.Equals(actual))
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void AreNotEqual<T>(T notExpected, T actual)
+    {
+        if (notExpected == null)
+        {
+            if (actual == null || actual.Equals(notExpected))
+            {
+                Assert._Break();
+                return;
+            }
+        }
+        else if (notExpected.Equals(actual))
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void Implies(bool condition, bool result)
+    {
+        if (condition && !result)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void Implies(bool condition, Assert.ImplicationFunction result)
+    {
+        if (condition && !result())
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNeitherNullNorEmpty(string value)
+    {
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNeitherNullNorWhitespace(string value)
+    {
+        if (string.IsNullOrEmpty(value))
+        {
+            Assert._Break();
+        }
+        if (value.Trim().Length == 0)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNotNull<T>(T value) where T : class
+    {
+        if (value == null)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsDefault<T>(T value) where T : struct
+    {
+        value.Equals(default(T));
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNotDefault<T>(T value) where T : struct
+    {
+        value.Equals(default(T));
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsFalse(bool condition)
+    {
+        if (condition)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsFalse(bool condition, string message)
+    {
+        if (condition)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsTrue(bool condition)
+    {
+        if (!condition)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsTrue(bool condition, string message)
+    {
+        if (!condition)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void Fail()
+    {
+        Assert._Break();
+    }
+
+    [Conditional("DEBUG")]
+    public static void Fail(string message)
+    {
+        Assert._Break();
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNull<T>(T item) where T : class
+    {
+        if (item != null)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive)
+    {
+        if (value < lowerBoundInclusive || value > upperBoundInclusive)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive)
+    {
+        if (value < lowerBoundInclusive || value >= upperBoundExclusive)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsApartmentState(ApartmentState expectedState)
+    {
+        if (Thread.CurrentThread.GetApartmentState() != expectedState)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void NullableIsNotNull<T>(T? value) where T : struct
+    {
+        if (value == null)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void NullableIsNull<T>(T? value) where T : struct
+    {
+        if (value != null)
+        {
+            Assert._Break();
+        }
+    }
+
+    [Conditional("DEBUG")]
+    public static void IsNotOnMainThread()
+    {
+        if (Application.Current.Dispatcher.CheckAccess())
+        {
+            Assert._Break();
+        }
+    }
+
+    public delegate void EvaluateFunction();
+
+    public delegate bool ImplicationFunction();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
index b7385201..9560f7b4 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum BI
 {
-    internal enum BI
-    {
-        RGB
-    }
-}
+    RGB
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
index 1bc43fce..68abffa3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct BITMAPINFO
-    {
-        public BITMAPINFOHEADER bmiHeader;
+namespace Standard;
 
-        public RGBQUAD bmiColors;
-    }
-}
+internal struct BITMAPINFO
+{
+    public BITMAPINFOHEADER bmiHeader;
+
+    public RGBQUAD bmiColors;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
index 8e20e6dd..99438538 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
@@ -1,31 +1,30 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, Pack = 2)]
+internal struct BITMAPINFOHEADER
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 2)]
-    internal struct BITMAPINFOHEADER
-    {
-        public int biSize;
+    public int biSize;
 
-        public int biWidth;
+    public int biWidth;
 
-        public int biHeight;
+    public int biHeight;
 
-        public short biPlanes;
+    public short biPlanes;
 
-        public short biBitCount;
+    public short biBitCount;
 
-        public BI biCompression;
+    public BI biCompression;
 
-        public int biSizeImage;
+    public int biSizeImage;
 
-        public int biXPelsPerMeter;
+    public int biXPelsPerMeter;
 
-        public int biYPelsPerMeter;
+    public int biYPelsPerMeter;
 
-        public int biClrUsed;
+    public int biClrUsed;
 
-        public int biClrImportant;
-    }
-}
+    public int biClrImportant;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
index 049b7f6c..dcb011c5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct BLENDFUNCTION
 {
-    internal struct BLENDFUNCTION
-    {
-        public AC BlendOp;
+    public AC BlendOp;
 
-        public byte BlendFlags;
+    public byte BlendFlags;
 
-        public byte SourceConstantAlpha;
+    public byte SourceConstantAlpha;
 
-        public AC AlphaFormat;
-    }
-}
+    public AC AlphaFormat;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
index 48666fa3..3019fbe0 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct CHANGEFILTERSTRUCT
-    {
-        public uint cbSize;
+namespace Standard;
 
-        public MSGFLTINFO ExtStatus;
-    }
-}
+internal struct CHANGEFILTERSTRUCT
+{
+    public uint cbSize;
+
+    public MSGFLTINFO ExtStatus;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
index 82471f7b..0b362863 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal static class CLSID
 {
-    internal static class CLSID
+    public static T CoCreateInstance<T>(string clsid)
     {
-        public static T CoCreateInstance<T>(string clsid)
-        {
-            return (T) ((object) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid(clsid))));
-        }
-
-        public const string TaskbarList = "56FDF344-FD6D-11d0-958A-006097C9A090";
-
-        public const string EnumerableObjectCollection = "2d3468c1-36a7-43b6-ac24-d3f02fd9607a";
-
-        public const string ShellLink = "00021401-0000-0000-C000-000000000046";
-
-        public const string DestinationList = "77f10cf0-3db5-4966-b520-b7c54fd35ed6";
-
-        public const string ApplicationDestinations = "86c14003-4d6b-4ef3-a7b4-0506663b2e68";
-
-        public const string ApplicationDocumentLists = "86bec222-30f2-47e0-9f25-60d11cd75c28";
+        return (T) ((object) Activator.CreateInstance(Type.GetTypeFromCLSID(new Guid(clsid))));
     }
-}
+
+    public const string TaskbarList = "56FDF344-FD6D-11d0-958A-006097C9A090";
+
+    public const string EnumerableObjectCollection = "2d3468c1-36a7-43b6-ac24-d3f02fd9607a";
+
+    public const string ShellLink = "00021401-0000-0000-C000-000000000046";
+
+    public const string DestinationList = "77f10cf0-3db5-4966-b520-b7c54fd35ed6";
+
+    public const string ApplicationDestinations = "86c14003-4d6b-4ef3-a7b4-0506663b2e68";
+
+    public const string ApplicationDocumentLists = "86bec222-30f2-47e0-9f25-60d11cd75c28";
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
index 2ca9094f..de8c9194 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
@@ -1,35 +1,34 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+internal struct CREATESTRUCT
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    internal struct CREATESTRUCT
-    {
-        public IntPtr lpCreateParams;
+    public IntPtr lpCreateParams;
 
-        public IntPtr hInstance;
+    public IntPtr hInstance;
 
-        public IntPtr hMenu;
+    public IntPtr hMenu;
 
-        public IntPtr hwndParent;
+    public IntPtr hwndParent;
 
-        public int cy;
+    public int cy;
 
-        public int cx;
+    public int cx;
 
-        public int y;
+    public int y;
 
-        public int x;
+    public int x;
 
-        public WS style;
+    public WS style;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        public string lpszName;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string lpszName;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        public string lpszClass;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string lpszClass;
 
-        public WS_EX dwExStyle;
-    }
-}
+    public WS_EX dwExStyle;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
index d73d81cb..81c8863a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
@@ -1,22 +1,21 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum CS : uint
 {
-    [Flags]
-    internal enum CS : uint
-    {
-        VREDRAW = 1u,
-        HREDRAW = 2u,
-        DBLCLKS = 8u,
-        OWNDC = 32u,
-        CLASSDC = 64u,
-        PARENTDC = 128u,
-        NOCLOSE = 512u,
-        SAVEBITS = 2048u,
-        BYTEALIGNCLIENT = 4096u,
-        BYTEALIGNWINDOW = 8192u,
-        GLOBALCLASS = 16384u,
-        IME = 65536u,
-        DROPSHADOW = 131072u
-    }
-}
+    VREDRAW = 1u,
+    HREDRAW = 2u,
+    DBLCLKS = 8u,
+    OWNDC = 32u,
+    CLASSDC = 64u,
+    PARENTDC = 128u,
+    NOCLOSE = 512u,
+    SAVEBITS = 2048u,
+    BYTEALIGNCLIENT = 4096u,
+    BYTEALIGNWINDOW = 8192u,
+    GLOBALCLASS = 16384u,
+    IME = 65536u,
+    DROPSHADOW = 131072u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
index a883de54..7b57389a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum CombineRgnResult
 {
-    internal enum CombineRgnResult
-    {
-        ERROR,
-        NULLREGION,
-        SIMPLEREGION,
-        COMPLEXREGION
-    }
-}
+    ERROR,
+    NULLREGION,
+    SIMPLEREGION,
+    COMPLEXREGION
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
index c46f781c..4dab6fdd 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DOGIF
 {
-    internal enum DOGIF
-    {
-        DEFAULT,
-        TRAVERSE_LINK,
-        NO_HDROP,
-        NO_URL = 4,
-        ONLY_IF_ONE = 8
-    }
-}
+    DEFAULT,
+    TRAVERSE_LINK,
+    NO_HDROP,
+    NO_URL = 4,
+    ONLY_IF_ONE = 8
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
index 0d54674e..9373ff03 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DWMFLIP3D
 {
-    internal enum DWMFLIP3D
-    {
-        DEFAULT,
-        EXCLUDEBELOW,
-        EXCLUDEABOVE
-    }
-}
+    DEFAULT,
+    EXCLUDEBELOW,
+    EXCLUDEABOVE
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
index 97acd2a6..4ec4f9cb 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DWMNCRP
 {
-    internal enum DWMNCRP
-    {
-        USEWINDOWSTYLE,
-        DISABLED,
-        ENABLED
-    }
-}
+    USEWINDOWSTYLE,
+    DISABLED,
+    ENABLED
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
index c201dc09..0cfa3a8b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
@@ -1,20 +1,19 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DWMWA
 {
-    internal enum DWMWA
-    {
-        NCRENDERING_ENABLED = 1,
-        NCRENDERING_POLICY,
-        TRANSITIONS_FORCEDISABLED,
-        ALLOW_NCPAINT,
-        CAPTION_BUTTON_BOUNDS,
-        NONCLIENT_RTL_LAYOUT,
-        FORCE_ICONIC_REPRESENTATION,
-        FLIP3D_POLICY,
-        EXTENDED_FRAME_BOUNDS,
-        HAS_ICONIC_BITMAP,
-        DISALLOW_PEEK,
-        EXCLUDED_FROM_PEEK
-    }
-}
+    NCRENDERING_ENABLED = 1,
+    NCRENDERING_POLICY,
+    TRANSITIONS_FORCEDISABLED,
+    ALLOW_NCPAINT,
+    CAPTION_BUTTON_BOUNDS,
+    NONCLIENT_RTL_LAYOUT,
+    FORCE_ICONIC_REPRESENTATION,
+    FLIP3D_POLICY,
+    EXTENDED_FRAME_BOUNDS,
+    HAS_ICONIC_BITMAP,
+    DISALLOW_PEEK,
+    EXCLUDED_FROM_PEEK
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
index 7f1bd334..94db57df 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DWM_SIT
 {
-    internal enum DWM_SIT
-    {
-        None,
-        DISPLAYFRAME
-    }
-}
+    None,
+    DISPLAYFRAME
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
index db062bdf..5c786ece 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
@@ -1,89 +1,88 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, Pack = 1)]
+internal struct DWM_TIMING_INFO
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    internal struct DWM_TIMING_INFO
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public UNSIGNED_RATIO rateRefresh;
+    public UNSIGNED_RATIO rateRefresh;
 
-        public ulong qpcRefreshPeriod;
+    public ulong qpcRefreshPeriod;
 
-        public UNSIGNED_RATIO rateCompose;
+    public UNSIGNED_RATIO rateCompose;
 
-        public ulong qpcVBlank;
+    public ulong qpcVBlank;
 
-        public ulong cRefresh;
+    public ulong cRefresh;
 
-        public uint cDXRefresh;
+    public uint cDXRefresh;
 
-        public ulong qpcCompose;
+    public ulong qpcCompose;
 
-        public ulong cFrame;
+    public ulong cFrame;
 
-        public uint cDXPresent;
+    public uint cDXPresent;
 
-        public ulong cRefreshFrame;
+    public ulong cRefreshFrame;
 
-        public ulong cFrameSubmitted;
+    public ulong cFrameSubmitted;
 
-        public uint cDXPresentSubmitted;
+    public uint cDXPresentSubmitted;
 
-        public ulong cFrameConfirmed;
+    public ulong cFrameConfirmed;
 
-        public uint cDXPresentConfirmed;
+    public uint cDXPresentConfirmed;
 
-        public ulong cRefreshConfirmed;
+    public ulong cRefreshConfirmed;
 
-        public uint cDXRefreshConfirmed;
+    public uint cDXRefreshConfirmed;
 
-        public ulong cFramesLate;
+    public ulong cFramesLate;
 
-        public uint cFramesOutstanding;
+    public uint cFramesOutstanding;
 
-        public ulong cFrameDisplayed;
+    public ulong cFrameDisplayed;
 
-        public ulong qpcFrameDisplayed;
+    public ulong qpcFrameDisplayed;
 
-        public ulong cRefreshFrameDisplayed;
+    public ulong cRefreshFrameDisplayed;
 
-        public ulong cFrameComplete;
+    public ulong cFrameComplete;
 
-        public ulong qpcFrameComplete;
+    public ulong qpcFrameComplete;
 
-        public ulong cFramePending;
+    public ulong cFramePending;
 
-        public ulong qpcFramePending;
+    public ulong qpcFramePending;
 
-        public ulong cFramesDisplayed;
+    public ulong cFramesDisplayed;
 
-        public ulong cFramesComplete;
+    public ulong cFramesComplete;
 
-        public ulong cFramesPending;
+    public ulong cFramesPending;
 
-        public ulong cFramesAvailable;
+    public ulong cFramesAvailable;
 
-        public ulong cFramesDropped;
+    public ulong cFramesDropped;
 
-        public ulong cFramesMissed;
+    public ulong cFramesMissed;
 
-        public ulong cRefreshNextDisplayed;
+    public ulong cRefreshNextDisplayed;
 
-        public ulong cRefreshNextPresented;
+    public ulong cRefreshNextPresented;
 
-        public ulong cRefreshesDisplayed;
+    public ulong cRefreshesDisplayed;
 
-        public ulong cRefreshesPresented;
+    public ulong cRefreshesPresented;
 
-        public ulong cRefreshStarted;
+    public ulong cRefreshStarted;
 
-        public ulong cPixelsReceived;
+    public ulong cPixelsReceived;
 
-        public ulong cPixelsDrawn;
+    public ulong cPixelsDrawn;
 
-        public ulong cBuffersEmpty;
-    }
-}
+    public ulong cBuffersEmpty;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
index a39da16f..119a4d18 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum DeviceCap
 {
-    internal enum DeviceCap
-    {
-        BITSPIXEL = 12,
-        PLANES = 14,
-        LOGPIXELSX = 88,
-        LOGPIXELSY = 90
-    }
-}
+    BITSPIXEL = 12,
+    PLANES = 14,
+    LOGPIXELSX = 88,
+    LOGPIXELSY = 90
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
index e263470e..a93bc00c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
@@ -1,57 +1,56 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Standard
+namespace Standard;
+
+internal static class DoubleUtilities
 {
-    internal static class DoubleUtilities
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool AreClose(double value1, double value2)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool AreClose(double value1, double value2)
+        if (value1 == value2)
         {
-            if (value1 == value2)
-            {
-                return true;
-            }
-            double num = value1 - value2;
-            return num < 1.53E-06 && num > -1.53E-06;
+            return true;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool LessThan(double value1, double value2)
-        {
-            return value1 < value2 && !DoubleUtilities.AreClose(value1, value2);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool GreaterThan(double value1, double value2)
-        {
-            return value1 > value2 && !DoubleUtilities.AreClose(value1, value2);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool LessThanOrClose(double value1, double value2)
-        {
-            return value1 < value2 || DoubleUtilities.AreClose(value1, value2);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool GreaterThanOrClose(double value1, double value2)
-        {
-            return value1 > value2 || DoubleUtilities.AreClose(value1, value2);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsFinite(double value)
-        {
-            return !double.IsNaN(value) && !double.IsInfinity(value);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsValidSize(double value)
-        {
-            return DoubleUtilities.IsFinite(value) && DoubleUtilities.GreaterThanOrClose(value, 0.0);
-        }
-
-        private const double Epsilon = 1.53E-06;
+        double num = value1 - value2;
+        return num < 1.53E-06 && num > -1.53E-06;
     }
-}
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool LessThan(double value1, double value2)
+    {
+        return value1 < value2 && !DoubleUtilities.AreClose(value1, value2);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool GreaterThan(double value1, double value2)
+    {
+        return value1 > value2 && !DoubleUtilities.AreClose(value1, value2);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool LessThanOrClose(double value1, double value2)
+    {
+        return value1 < value2 || DoubleUtilities.AreClose(value1, value2);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool GreaterThanOrClose(double value1, double value2)
+    {
+        return value1 > value2 || DoubleUtilities.AreClose(value1, value2);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsFinite(double value)
+    {
+        return !double.IsNaN(value) && !double.IsInfinity(value);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsValidSize(double value)
+    {
+        return DoubleUtilities.IsFinite(value) && DoubleUtilities.GreaterThanOrClose(value, 0.0);
+    }
+
+    private const double Epsilon = 1.53E-06;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
index 8b621005..53fbb8de 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
@@ -3,68 +3,67 @@ using System.Diagnostics.CodeAnalysis;
 using System.Windows;
 using System.Windows.Media;
 
-namespace Standard
+namespace Standard;
+
+internal static class DpiHelper
 {
-    internal static class DpiHelper
+    [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]
+    static DpiHelper()
     {
-        [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]
-        static DpiHelper()
+        using (SafeDC desktop = SafeDC.GetDesktop())
         {
-            using (SafeDC desktop = SafeDC.GetDesktop())
-            {
-                int deviceCaps = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSX);
-                int deviceCaps2 = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSY);
-                DpiHelper._transformToDip = Matrix.Identity;
-                DpiHelper._transformToDip.Scale(96.0 / (double) deviceCaps, 96.0 / (double) deviceCaps2);
-                DpiHelper._transformToDevice = Matrix.Identity;
-                DpiHelper._transformToDevice.Scale((double) deviceCaps / 96.0, (double) deviceCaps2 / 96.0);
-            }
+            int deviceCaps = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSX);
+            int deviceCaps2 = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSY);
+            DpiHelper._transformToDip = Matrix.Identity;
+            DpiHelper._transformToDip.Scale(96.0 / (double) deviceCaps, 96.0 / (double) deviceCaps2);
+            DpiHelper._transformToDevice = Matrix.Identity;
+            DpiHelper._transformToDevice.Scale((double) deviceCaps / 96.0, (double) deviceCaps2 / 96.0);
         }
-
-        public static Point LogicalPixelsToDevice(Point logicalPoint)
-        {
-            return DpiHelper._transformToDevice.Transform(logicalPoint);
-        }
-
-        public static Point DevicePixelsToLogical(Point devicePoint)
-        {
-            return DpiHelper._transformToDip.Transform(devicePoint);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static Rect LogicalRectToDevice(Rect logicalRectangle)
-        {
-            Point point = DpiHelper.LogicalPixelsToDevice(new Point(logicalRectangle.Left, logicalRectangle.Top));
-            Point point2 = DpiHelper.LogicalPixelsToDevice(new Point(logicalRectangle.Right, logicalRectangle.Bottom));
-            return new Rect(point, point2);
-        }
-
-        public static Rect DeviceRectToLogical(Rect deviceRectangle)
-        {
-            Point point = DpiHelper.DevicePixelsToLogical(new Point(deviceRectangle.Left, deviceRectangle.Top));
-            Point point2 = DpiHelper.DevicePixelsToLogical(new Point(deviceRectangle.Right, deviceRectangle.Bottom));
-            return new Rect(point, point2);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static Size LogicalSizeToDevice(Size logicalSize)
-        {
-            Point point = DpiHelper.LogicalPixelsToDevice(new Point(logicalSize.Width, logicalSize.Height));
-            return new Size
-            {
-                Width = point.X,
-                Height = point.Y
-            };
-        }
-
-        public static Size DeviceSizeToLogical(Size deviceSize)
-        {
-            Point point = DpiHelper.DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height));
-            return new Size(point.X, point.Y);
-        }
-
-        private static Matrix _transformToDevice;
-
-        private static Matrix _transformToDip;
     }
-}
+
+    public static Point LogicalPixelsToDevice(Point logicalPoint)
+    {
+        return DpiHelper._transformToDevice.Transform(logicalPoint);
+    }
+
+    public static Point DevicePixelsToLogical(Point devicePoint)
+    {
+        return DpiHelper._transformToDip.Transform(devicePoint);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static Rect LogicalRectToDevice(Rect logicalRectangle)
+    {
+        Point point = DpiHelper.LogicalPixelsToDevice(new Point(logicalRectangle.Left, logicalRectangle.Top));
+        Point point2 = DpiHelper.LogicalPixelsToDevice(new Point(logicalRectangle.Right, logicalRectangle.Bottom));
+        return new Rect(point, point2);
+    }
+
+    public static Rect DeviceRectToLogical(Rect deviceRectangle)
+    {
+        Point point = DpiHelper.DevicePixelsToLogical(new Point(deviceRectangle.Left, deviceRectangle.Top));
+        Point point2 = DpiHelper.DevicePixelsToLogical(new Point(deviceRectangle.Right, deviceRectangle.Bottom));
+        return new Rect(point, point2);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static Size LogicalSizeToDevice(Size logicalSize)
+    {
+        Point point = DpiHelper.LogicalPixelsToDevice(new Point(logicalSize.Width, logicalSize.Height));
+        return new Size
+        {
+            Width = point.X,
+            Height = point.Y
+        };
+    }
+
+    public static Size DeviceSizeToLogical(Size deviceSize)
+    {
+        Point point = DpiHelper.DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height));
+        return new Size(point.X, point.Y);
+    }
+
+    private static Matrix _transformToDevice;
+
+    private static Matrix _transformToDip;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
index 481a72e8..48c0948b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum ErrorModes
 {
-    [Flags]
-    internal enum ErrorModes
-    {
-        Default = 0,
-        FailCriticalErrors = 1,
-        NoGpFaultErrorBox = 2,
-        NoAlignmentFaultExcept = 4,
-        NoOpenFileErrorBox = 32768
-    }
-}
+    Default = 0,
+    FailCriticalErrors = 1,
+    NoGpFaultErrorBox = 2,
+    NoAlignmentFaultExcept = 4,
+    NoOpenFileErrorBox = 32768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
index ff48cf98..762a3697 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum FO
 {
-    internal enum FO
-    {
-        MOVE = 1,
-        COPY,
-        DELETE,
-        RENAME
-    }
-}
+    MOVE = 1,
+    COPY,
+    DELETE,
+    RENAME
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
index 72688267..75822e1c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum FOF : ushort
 {
-    internal enum FOF : ushort
-    {
-        MULTIDESTFILES = 1,
-        CONFIRMMOUSE,
-        SILENT = 4,
-        RENAMEONCOLLISION = 8,
-        NOCONFIRMATION = 16,
-        WANTMAPPINGHANDLE = 32,
-        ALLOWUNDO = 64,
-        FILESONLY = 128,
-        SIMPLEPROGRESS = 256,
-        NOCONFIRMMKDIR = 512,
-        NOERRORUI = 1024,
-        NOCOPYSECURITYATTRIBS = 2048,
-        NORECURSION = 4096,
-        NO_CONNECTED_ELEMENTS = 8192,
-        WANTNUKEWARNING = 16384,
-        NORECURSEREPARSE = 32768
-    }
-}
+    MULTIDESTFILES = 1,
+    CONFIRMMOUSE,
+    SILENT = 4,
+    RENAMEONCOLLISION = 8,
+    NOCONFIRMATION = 16,
+    WANTMAPPINGHANDLE = 32,
+    ALLOWUNDO = 64,
+    FILESONLY = 128,
+    SIMPLEPROGRESS = 256,
+    NOCONFIRMMKDIR = 512,
+    NOERRORUI = 1024,
+    NOCOPYSECURITYATTRIBS = 2048,
+    NORECURSION = 4096,
+    NO_CONNECTED_ELEMENTS = 8192,
+    WANTNUKEWARNING = 16384,
+    NORECURSEREPARSE = 32768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
index 3287cfcb..8f46a422 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum Facility
 {
-    [Flags]
-    internal enum Facility
-    {
-        Null,
-        Rpc,
-        Dispatch,
-        Storage,
-        Itf,
-        Win32 = 7,
-        Windows,
-        Control = 10,
-        Ese = 3678,
-        WinCodec = 2200
-    }
-}
+    Null,
+    Rpc,
+    Dispatch,
+    Storage,
+    Itf,
+    Win32 = 7,
+    Windows,
+    Control = 10,
+    Ese = 3678,
+    WinCodec = 2200
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
index 8704c36e..e42569cf 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum GCLP
 {
-    internal enum GCLP
-    {
-        HBRBACKGROUND = -10
-    }
-}
+    HBRBACKGROUND = -10
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
index ce778197..e3cbef16 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
@@ -1,18 +1,17 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum GPS
 {
-    internal enum GPS
-    {
-        DEFAULT,
-        HANDLERPROPERTIESONLY,
-        READWRITE,
-        TEMPORARY = 4,
-        FASTPROPERTIESONLY = 8,
-        OPENSLOWITEM = 16,
-        DELAYCREATION = 32,
-        BESTEFFORT = 64,
-        NO_OPLOCK = 128,
-        MASK_VALID = 255
-    }
-}
+    DEFAULT,
+    HANDLERPROPERTIESONLY,
+    READWRITE,
+    TEMPORARY = 4,
+    FASTPROPERTIESONLY = 8,
+    OPENSLOWITEM = 16,
+    DELAYCREATION = 32,
+    BESTEFFORT = 64,
+    NO_OPLOCK = 128,
+    MASK_VALID = 255
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
index 26541f9d..59f9dad2 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum GWL
 {
-    internal enum GWL
-    {
-        WNDPROC = -4,
-        HINSTANCE = -6,
-        HWNDPARENT = -8,
-        STYLE = -16,
-        EXSTYLE = -20,
-        USERDATA = -21,
-        ID = -12
-    }
-}
+    WNDPROC = -4,
+    HINSTANCE = -6,
+    HWNDPARENT = -8,
+    STYLE = -16,
+    EXSTYLE = -20,
+    USERDATA = -21,
+    ID = -12
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
index d3596459..2d3fec27 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
@@ -1,16 +1,15 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum HCF
 {
-    [Flags]
-    internal enum HCF
-    {
-        HIGHCONTRASTON = 1,
-        AVAILABLE = 2,
-        HOTKEYACTIVE = 4,
-        CONFIRMHOTKEY = 8,
-        HOTKEYSOUND = 16,
-        INDICATOR = 32,
-        HOTKEYAVAILABLE = 64
-    }
-}
+    HIGHCONTRASTON = 1,
+    AVAILABLE = 2,
+    HOTKEYACTIVE = 4,
+    CONFIRMHOTKEY = 8,
+    HOTKEYSOUND = 16,
+    INDICATOR = 32,
+    HOTKEYAVAILABLE = 64
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
index 3f1c884a..62a3d406 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct HIGHCONTRAST
 {
-    internal struct HIGHCONTRAST
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public HCF dwFlags;
+    public HCF dwFlags;
 
-        public IntPtr lpszDefaultScheme;
-    }
-}
+    public IntPtr lpszDefaultScheme;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
index b8842d8a..aee72456 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
@@ -5,240 +5,239 @@ using System.Globalization;
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Explicit)]
+internal struct HRESULT
 {
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct HRESULT
+    public HRESULT(uint i)
     {
-        public HRESULT(uint i)
-        {
-            this._value = i;
-        }
+        this._value = i;
+    }
 
-        public static HRESULT Make(bool severe, Facility facility, int code)
-        {
-            return new HRESULT((uint) ((severe ? (Facility) (-2147483648) : Facility.Null) | (Facility) ((int) facility << 16) | (Facility) code));
-        }
+    public static HRESULT Make(bool severe, Facility facility, int code)
+    {
+        return new HRESULT((uint) ((severe ? (Facility) (-2147483648) : Facility.Null) | (Facility) ((int) facility << 16) | (Facility) code));
+    }
 
-        public Facility Facility
+    public Facility Facility
+    {
+        get
         {
-            get
+            return HRESULT.GetFacility((int) this._value);
+        }
+    }
+
+    public static Facility GetFacility(int errorCode)
+    {
+        return (Facility) (errorCode >> 16 & 8191);
+    }
+
+    public int Code
+    {
+        get
+        {
+            return HRESULT.GetCode((int) this._value);
+        }
+    }
+
+    public static int GetCode(int error)
+    {
+        return error & 65535;
+    }
+
+    public override string ToString()
+    {
+        foreach (FieldInfo fieldInfo in typeof(HRESULT).GetFields(BindingFlags.Static | BindingFlags.Public))
+        {
+            if (fieldInfo.FieldType == typeof(HRESULT))
             {
-                return HRESULT.GetFacility((int) this._value);
-            }
-        }
-
-        public static Facility GetFacility(int errorCode)
-        {
-            return (Facility) (errorCode >> 16 & 8191);
-        }
-
-        public int Code
-        {
-            get
-            {
-                return HRESULT.GetCode((int) this._value);
-            }
-        }
-
-        public static int GetCode(int error)
-        {
-            return error & 65535;
-        }
-
-        public override string ToString()
-        {
-            foreach (FieldInfo fieldInfo in typeof(HRESULT).GetFields(BindingFlags.Static | BindingFlags.Public))
-            {
-                if (fieldInfo.FieldType == typeof(HRESULT))
+                HRESULT hrLeft = (HRESULT) fieldInfo.GetValue(null);
+                if (hrLeft == this)
                 {
-                    HRESULT hrLeft = (HRESULT) fieldInfo.GetValue(null);
-                    if (hrLeft == this)
+                    return fieldInfo.Name;
+                }
+            }
+        }
+        if (this.Facility == Facility.Win32)
+        {
+            foreach (FieldInfo fieldInfo2 in typeof(Win32Error).GetFields(BindingFlags.Static | BindingFlags.Public))
+            {
+                if (fieldInfo2.FieldType == typeof(Win32Error))
+                {
+                    Win32Error error = (Win32Error) fieldInfo2.GetValue(null);
+                    if ((HRESULT) error == this)
                     {
-                        return fieldInfo.Name;
+                        return "HRESULT_FROM_WIN32(" + fieldInfo2.Name + ")";
                     }
                 }
             }
-            if (this.Facility == Facility.Win32)
+        }
+        return string.Format(CultureInfo.InvariantCulture, "0x{0:X8}", new object[]
+        {
+            this._value
+        });
+    }
+
+    public override bool Equals(object obj)
+    {
+        bool result;
+        try
+        {
+            result = (((HRESULT) obj)._value == this._value);
+        }
+        catch (InvalidCastException)
+        {
+            result = false;
+        }
+        return result;
+    }
+
+    public override int GetHashCode()
+    {
+        return this._value.GetHashCode();
+    }
+
+    public static bool operator ==(HRESULT hrLeft, HRESULT hrRight)
+    {
+        return hrLeft._value == hrRight._value;
+    }
+
+    public static bool operator !=(HRESULT hrLeft, HRESULT hrRight)
+    {
+        return !(hrLeft == hrRight);
+    }
+
+    public bool Succeeded
+    {
+        get
+        {
+            return this._value >= 0u;
+        }
+    }
+
+    public bool Failed
+    {
+        get
+        {
+            return this._value < 0u;
+        }
+    }
+
+    public void ThrowIfFailed()
+    {
+        this.ThrowIfFailed(null);
+    }
+
+    [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes", Justification = "Only recreating Exceptions that were already raised.")]
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public void ThrowIfFailed(string message)
+    {
+        if (this.Failed)
+        {
+            if (string.IsNullOrEmpty(message))
             {
-                foreach (FieldInfo fieldInfo2 in typeof(Win32Error).GetFields(BindingFlags.Static | BindingFlags.Public))
+                message = this.ToString();
+            }
+            Exception ex = Marshal.GetExceptionForHR((int) this._value, new IntPtr(-1));
+            if (ex.GetType() == typeof(COMException))
+            {
+                Facility facility = this.Facility;
+                if (facility == Facility.Win32)
                 {
-                    if (fieldInfo2.FieldType == typeof(Win32Error))
-                    {
-                        Win32Error error = (Win32Error) fieldInfo2.GetValue(null);
-                        if ((HRESULT) error == this)
-                        {
-                            return "HRESULT_FROM_WIN32(" + fieldInfo2.Name + ")";
-                        }
-                    }
-                }
-            }
-            return string.Format(CultureInfo.InvariantCulture, "0x{0:X8}", new object[]
-            {
-                this._value
-            });
-        }
-
-        public override bool Equals(object obj)
-        {
-            bool result;
-            try
-            {
-                result = (((HRESULT) obj)._value == this._value);
-            }
-            catch (InvalidCastException)
-            {
-                result = false;
-            }
-            return result;
-        }
-
-        public override int GetHashCode()
-        {
-            return this._value.GetHashCode();
-        }
-
-        public static bool operator ==(HRESULT hrLeft, HRESULT hrRight)
-        {
-            return hrLeft._value == hrRight._value;
-        }
-
-        public static bool operator !=(HRESULT hrLeft, HRESULT hrRight)
-        {
-            return !(hrLeft == hrRight);
-        }
-
-        public bool Succeeded
-        {
-            get
-            {
-                return this._value >= 0u;
-            }
-        }
-
-        public bool Failed
-        {
-            get
-            {
-                return this._value < 0u;
-            }
-        }
-
-        public void ThrowIfFailed()
-        {
-            this.ThrowIfFailed(null);
-        }
-
-        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes", Justification = "Only recreating Exceptions that were already raised.")]
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public void ThrowIfFailed(string message)
-        {
-            if (this.Failed)
-            {
-                if (string.IsNullOrEmpty(message))
-                {
-                    message = this.ToString();
-                }
-                Exception ex = Marshal.GetExceptionForHR((int) this._value, new IntPtr(-1));
-                if (ex.GetType() == typeof(COMException))
-                {
-                    Facility facility = this.Facility;
-                    if (facility == Facility.Win32)
-                    {
-                        ex = new Win32Exception(this.Code, message);
-                    }
-                    else
-                    {
-                        ex = new COMException(message, (int) this._value);
-                    }
+                    ex = new Win32Exception(this.Code, message);
                 }
                 else
                 {
-                    ConstructorInfo constructor = ex.GetType().GetConstructor(new Type[]
-                    {
-                        typeof(string)
-                    });
-                    if (null != constructor)
-                    {
-                        ex = (constructor.Invoke(new object[]
-                        {
-                            message
-                        }) as Exception);
-                    }
+                    ex = new COMException(message, (int) this._value);
                 }
-                throw ex;
             }
+            else
+            {
+                ConstructorInfo constructor = ex.GetType().GetConstructor(new Type[]
+                {
+                    typeof(string)
+                });
+                if (null != constructor)
+                {
+                    ex = (constructor.Invoke(new object[]
+                    {
+                        message
+                    }) as Exception);
+                }
+            }
+            throw ex;
         }
-
-        public static void ThrowLastError()
-        {
-            ((HRESULT) Win32Error.GetLastError()).ThrowIfFailed();
-        }
-
-        [FieldOffset(0)]
-        private readonly uint _value;
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT S_OK = new HRESULT(0u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT S_FALSE = new HRESULT(1u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_PENDING = new HRESULT(2147483658u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_NOTIMPL = new HRESULT(2147500033u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_NOINTERFACE = new HRESULT(2147500034u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_POINTER = new HRESULT(2147500035u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_ABORT = new HRESULT(2147500036u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_FAIL = new HRESULT(2147500037u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_UNEXPECTED = new HRESULT(2147549183u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT STG_E_INVALIDFUNCTION = new HRESULT(2147680257u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT REGDB_E_CLASSNOTREG = new HRESULT(2147746132u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT DESTS_E_NO_MATCHING_ASSOC_HANDLER = new HRESULT(2147749635u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT DESTS_E_NORECDOCS = new HRESULT(2147749636u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT DESTS_E_NOTALLCLEARED = new HRESULT(2147749637u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_ACCESSDENIED = new HRESULT(2147942405u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_OUTOFMEMORY = new HRESULT(2147942414u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT E_INVALIDARG = new HRESULT(2147942487u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT INTSAFE_E_ARITHMETIC_OVERFLOW = new HRESULT(2147942934u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT COR_E_OBJECTDISPOSED = new HRESULT(2148734498u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT WC_E_GREATERTHAN = new HRESULT(3222072867u);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly HRESULT WC_E_SYNTAX = new HRESULT(3222072877u);
     }
-}
+
+    public static void ThrowLastError()
+    {
+        ((HRESULT) Win32Error.GetLastError()).ThrowIfFailed();
+    }
+
+    [FieldOffset(0)]
+    private readonly uint _value;
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT S_OK = new HRESULT(0u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT S_FALSE = new HRESULT(1u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_PENDING = new HRESULT(2147483658u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_NOTIMPL = new HRESULT(2147500033u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_NOINTERFACE = new HRESULT(2147500034u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_POINTER = new HRESULT(2147500035u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_ABORT = new HRESULT(2147500036u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_FAIL = new HRESULT(2147500037u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_UNEXPECTED = new HRESULT(2147549183u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT STG_E_INVALIDFUNCTION = new HRESULT(2147680257u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT REGDB_E_CLASSNOTREG = new HRESULT(2147746132u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT DESTS_E_NO_MATCHING_ASSOC_HANDLER = new HRESULT(2147749635u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT DESTS_E_NORECDOCS = new HRESULT(2147749636u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT DESTS_E_NOTALLCLEARED = new HRESULT(2147749637u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_ACCESSDENIED = new HRESULT(2147942405u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_OUTOFMEMORY = new HRESULT(2147942414u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT E_INVALIDARG = new HRESULT(2147942487u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT INTSAFE_E_ARITHMETIC_OVERFLOW = new HRESULT(2147942934u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT COR_E_OBJECTDISPOSED = new HRESULT(2148734498u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT WC_E_GREATERTHAN = new HRESULT(3222072867u);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly HRESULT WC_E_SYNTAX = new HRESULT(3222072877u);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
index 35edb8c7..70b14e62 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
@@ -1,37 +1,36 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum HT
 {
-    internal enum HT
-    {
-        ERROR = -2,
-        TRANSPARENT,
-        NOWHERE,
-        CLIENT,
-        CAPTION,
-        SYSMENU,
-        GROWBOX,
-        SIZE = 4,
-        MENU,
-        HSCROLL,
-        VSCROLL,
-        MINBUTTON,
-        MAXBUTTON,
-        LEFT,
-        RIGHT,
-        TOP,
-        TOPLEFT,
-        TOPRIGHT,
-        BOTTOM,
-        BOTTOMLEFT,
-        BOTTOMRIGHT,
-        BORDER,
-        REDUCE = 8,
-        ZOOM,
-        SIZEFIRST,
-        SIZELAST = 17,
-        OBJECT = 19,
-        CLOSE,
-        HELP
-    }
-}
+    ERROR = -2,
+    TRANSPARENT,
+    NOWHERE,
+    CLIENT,
+    CAPTION,
+    SYSMENU,
+    GROWBOX,
+    SIZE = 4,
+    MENU,
+    HSCROLL,
+    VSCROLL,
+    MINBUTTON,
+    MAXBUTTON,
+    LEFT,
+    RIGHT,
+    TOP,
+    TOPLEFT,
+    TOPRIGHT,
+    BOTTOM,
+    BOTTOMLEFT,
+    BOTTOMRIGHT,
+    BORDER,
+    REDUCE = 8,
+    ZOOM,
+    SIZEFIRST,
+    SIZELAST = 17,
+    OBJECT = 19,
+    CLOSE,
+    HELP
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
index 0180333c..31d1f022 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("12337d35-94c6-48a0-bce7-6a9c69d4d600")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IApplicationDestinations
 {
-    [Guid("12337d35-94c6-48a0-bce7-6a9c69d4d600")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IApplicationDestinations
-    {
-        void SetAppID([MarshalAs(UnmanagedType.LPWStr)][In] string pszAppID);
+    void SetAppID([MarshalAs(UnmanagedType.LPWStr)][In] string pszAppID);
 
-        void RemoveDestination([MarshalAs(UnmanagedType.IUnknown)] object punk);
+    void RemoveDestination([MarshalAs(UnmanagedType.IUnknown)] object punk);
 
-        void RemoveAllDestinations();
-    }
-}
+    void RemoveAllDestinations();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
index a0b1b026..3f3bfd35 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [Guid("3c594f9f-9f30-47a1-979a-c9e83d3d0a06")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IApplicationDocumentLists
-    {
-        void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+namespace Standard;
 
-        [return: MarshalAs(UnmanagedType.IUnknown)]
-        object GetList([In] APPDOCLISTTYPE listtype, [In] uint cItemsDesired, [In] ref Guid riid);
-    }
-}
+[Guid("3c594f9f-9f30-47a1-979a-c9e83d3d0a06")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IApplicationDocumentLists
+{
+    void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
+    [return: MarshalAs(UnmanagedType.IUnknown)]
+    object GetList([In] APPDOCLISTTYPE listtype, [In] uint cItemsDesired, [In] ref Guid riid);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
index 68ad37d0..91d928a5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
@@ -1,33 +1,32 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("6332debf-87b5-4670-90c0-5e57b408a49e")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface ICustomDestinationList
 {
-    [Guid("6332debf-87b5-4670-90c0-5e57b408a49e")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface ICustomDestinationList
-    {
-        void SetAppID([MarshalAs(UnmanagedType.LPWStr)][In] string pszAppID);
+    void SetAppID([MarshalAs(UnmanagedType.LPWStr)][In] string pszAppID);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BeginList(out uint pcMaxSlots, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BeginList(out uint pcMaxSlots, [In] ref Guid riid);
 
-        [PreserveSig]
-        HRESULT AppendCategory([MarshalAs(UnmanagedType.LPWStr)] string pszCategory, IObjectArray poa);
+    [PreserveSig]
+    HRESULT AppendCategory([MarshalAs(UnmanagedType.LPWStr)] string pszCategory, IObjectArray poa);
 
-        void AppendKnownCategory(KDC category);
+    void AppendKnownCategory(KDC category);
 
-        [PreserveSig]
-        HRESULT AddUserTasks(IObjectArray poa);
+    [PreserveSig]
+    HRESULT AddUserTasks(IObjectArray poa);
 
-        void CommitList();
+    void CommitList();
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetRemovedDestinations([In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetRemovedDestinations([In] ref Guid riid);
 
-        void DeleteList([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+    void DeleteList([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
 
-        void AbortList();
-    }
-}
+    void AbortList();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
index 0cd66852..69f7bcb3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("000214F2-0000-0000-C000-000000000046")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IEnumIDList
 {
-    [Guid("000214F2-0000-0000-C000-000000000046")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IEnumIDList
-    {
-        [PreserveSig]
-        HRESULT Next(uint celt, out IntPtr rgelt, out int pceltFetched);
+    [PreserveSig]
+    HRESULT Next(uint celt, out IntPtr rgelt, out int pceltFetched);
 
-        [PreserveSig]
-        HRESULT Skip(uint celt);
+    [PreserveSig]
+    HRESULT Skip(uint celt);
 
-        void Reset();
+    void Reset();
 
-        void Clone([MarshalAs(UnmanagedType.Interface)] out IEnumIDList ppenum);
-    }
-}
+    void Clone([MarshalAs(UnmanagedType.Interface)] out IEnumIDList ppenum);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
index 4b522189..2821d169 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("2c1c7e2e-2d0e-4059-831e-1e6f82335c2e")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IEnumObjects
 {
-    [Guid("2c1c7e2e-2d0e-4059-831e-1e6f82335c2e")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IEnumObjects
-    {
-        void Next(uint celt, [In] ref Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.IUnknown, SizeParamIndex = 0)][Out] object[] rgelt, out uint pceltFetched);
+    void Next(uint celt, [In] ref Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.IUnknown, SizeParamIndex = 0)][Out] object[] rgelt, out uint pceltFetched);
 
-        void Skip(uint celt);
+    void Skip(uint celt);
 
-        void Reset();
+    void Reset();
 
-        IEnumObjects Clone();
-    }
-}
+    IEnumObjects Clone();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
index 6e2bc86b..78374c1e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
@@ -1,55 +1,54 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal static class IID
 {
-    internal static class IID
-    {
-        public const string EnumIdList = "000214F2-0000-0000-C000-000000000046";
+    public const string EnumIdList = "000214F2-0000-0000-C000-000000000046";
 
-        public const string EnumObjects = "2c1c7e2e-2d0e-4059-831e-1e6f82335c2e";
+    public const string EnumObjects = "2c1c7e2e-2d0e-4059-831e-1e6f82335c2e";
 
-        public const string HtmlDocument2 = "332C4425-26CB-11D0-B483-00C04FD90119";
+    public const string HtmlDocument2 = "332C4425-26CB-11D0-B483-00C04FD90119";
 
-        public const string ModalWindow = "b4db1657-70d7-485e-8e3e-6fcb5a5c1802";
+    public const string ModalWindow = "b4db1657-70d7-485e-8e3e-6fcb5a5c1802";
 
-        public const string ObjectArray = "92CA9DCD-5622-4bba-A805-5E9F541BD8C9";
+    public const string ObjectArray = "92CA9DCD-5622-4bba-A805-5E9F541BD8C9";
 
-        public const string ObjectCollection = "5632b1a4-e38a-400a-928a-d4cd63230295";
+    public const string ObjectCollection = "5632b1a4-e38a-400a-928a-d4cd63230295";
 
-        public const string PropertyNotifySink = "9BFBBC02-EFF1-101A-84ED-00AA00341D07";
+    public const string PropertyNotifySink = "9BFBBC02-EFF1-101A-84ED-00AA00341D07";
 
-        public const string PropertyStore = "886d8eeb-8cf2-4446-8d02-cdba1dbdcf99";
+    public const string PropertyStore = "886d8eeb-8cf2-4446-8d02-cdba1dbdcf99";
 
-        public const string ServiceProvider = "6d5140c1-7436-11ce-8034-00aa006009fa";
+    public const string ServiceProvider = "6d5140c1-7436-11ce-8034-00aa006009fa";
 
-        public const string ShellFolder = "000214E6-0000-0000-C000-000000000046";
+    public const string ShellFolder = "000214E6-0000-0000-C000-000000000046";
 
-        public const string ShellLink = "000214F9-0000-0000-C000-000000000046";
+    public const string ShellLink = "000214F9-0000-0000-C000-000000000046";
 
-        public const string ShellItem = "43826d1e-e718-42ee-bc55-a1e261c37bfe";
+    public const string ShellItem = "43826d1e-e718-42ee-bc55-a1e261c37bfe";
 
-        public const string ShellItem2 = "7e9fb0d3-919f-4307-ab2e-9b1860310c93";
+    public const string ShellItem2 = "7e9fb0d3-919f-4307-ab2e-9b1860310c93";
 
-        public const string ShellItemArray = "B63EA76D-1F85-456F-A19C-48159EFA858B";
+    public const string ShellItemArray = "B63EA76D-1F85-456F-A19C-48159EFA858B";
 
-        public const string TaskbarList = "56FDF342-FD6D-11d0-958A-006097C9A090";
+    public const string TaskbarList = "56FDF342-FD6D-11d0-958A-006097C9A090";
 
-        public const string TaskbarList2 = "602D4995-B13A-429b-A66E-1935E44F4317";
+    public const string TaskbarList2 = "602D4995-B13A-429b-A66E-1935E44F4317";
 
-        public const string Unknown = "00000000-0000-0000-C000-000000000046";
+    public const string Unknown = "00000000-0000-0000-C000-000000000046";
 
-        public const string ApplicationDestinations = "12337d35-94c6-48a0-bce7-6a9c69d4d600";
+    public const string ApplicationDestinations = "12337d35-94c6-48a0-bce7-6a9c69d4d600";
 
-        public const string ApplicationDocumentLists = "3c594f9f-9f30-47a1-979a-c9e83d3d0a06";
+    public const string ApplicationDocumentLists = "3c594f9f-9f30-47a1-979a-c9e83d3d0a06";
 
-        public const string CustomDestinationList = "6332debf-87b5-4670-90c0-5e57b408a49e";
+    public const string CustomDestinationList = "6332debf-87b5-4670-90c0-5e57b408a49e";
 
-        public const string ObjectWithAppUserModelId = "36db0196-9665-46d1-9ba7-d3709eecf9ed";
+    public const string ObjectWithAppUserModelId = "36db0196-9665-46d1-9ba7-d3709eecf9ed";
 
-        public const string ObjectWithProgId = "71e806fb-8dee-46fc-bf8c-7748a8a1ae13";
+    public const string ObjectWithProgId = "71e806fb-8dee-46fc-bf8c-7748a8a1ae13";
 
-        public const string TaskbarList3 = "ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf";
+    public const string TaskbarList3 = "ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf";
 
-        public const string TaskbarList4 = "c43dc798-95d1-4bea-9030-bb99e2983a1a";
-    }
-}
+    public const string TaskbarList4 = "c43dc798-95d1-4bea-9030-bb99e2983a1a";
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
index 35ee9454..1e0e7fba 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct INPUT
-    {
-        public uint type;
+namespace Standard;
 
-        public MOUSEINPUT mi;
-    }
-}
+internal struct INPUT
+{
+    public uint type;
+
+    public MOUSEINPUT mi;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
index 01781737..bc32819b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum INPUT_TYPE : uint
 {
-    internal enum INPUT_TYPE : uint
-    {
-        MOUSE
-    }
-}
+    MOUSE
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
index 628d50aa..935ce552 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9")]
-    [ComImport]
-    internal interface IObjectArray
-    {
-        uint GetCount();
+namespace Standard;
 
-        [return: MarshalAs(UnmanagedType.IUnknown)]
-        object GetAt([In] uint uiIndex, [In] ref Guid riid);
-    }
-}
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9")]
+[ComImport]
+internal interface IObjectArray
+{
+    uint GetCount();
+
+    [return: MarshalAs(UnmanagedType.IUnknown)]
+    object GetAt([In] uint uiIndex, [In] ref Guid riid);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
index 1ad6b47e..8c07951e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9")]
+[ComImport]
+internal interface IObjectCollection : IObjectArray
 {
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("92CA9DCD-5622-4bba-A805-5E9F541BD8C9")]
-    [ComImport]
-    internal interface IObjectCollection : IObjectArray
-    {
-        uint GetCount();
+    uint GetCount();
 
-        [return: MarshalAs(UnmanagedType.IUnknown)]
-        object GetAt([In] uint uiIndex, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.IUnknown)]
+    object GetAt([In] uint uiIndex, [In] ref Guid riid);
 
-        void AddObject([MarshalAs(UnmanagedType.IUnknown)] object punk);
+    void AddObject([MarshalAs(UnmanagedType.IUnknown)] object punk);
 
-        void AddFromArray(IObjectArray poaSource);
+    void AddFromArray(IObjectArray poaSource);
 
-        void RemoveObjectAt(uint uiIndex);
+    void RemoveObjectAt(uint uiIndex);
 
-        void Clear();
-    }
-}
+    void Clear();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
index 2ae8d895..0387fa72 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [Guid("36db0196-9665-46d1-9ba7-d3709eecf9ed")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IObjectWithAppUserModelId
-    {
-        void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+namespace Standard;
 
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        string GetAppID();
-    }
-}
+[Guid("36db0196-9665-46d1-9ba7-d3709eecf9ed")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IObjectWithAppUserModelId
+{
+    void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GetAppID();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
index 20455fd8..bf94e01a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [Guid("71e806fb-8dee-46fc-bf8c-7748a8a1ae13")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IObjectWithProgId
-    {
-        void SetProgID([MarshalAs(UnmanagedType.LPWStr)] string pszProgID);
+namespace Standard;
 
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        string GetProgID();
-    }
-}
+[Guid("71e806fb-8dee-46fc-bf8c-7748a8a1ae13")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IObjectWithProgId
+{
+    void SetProgID([MarshalAs(UnmanagedType.LPWStr)] string pszProgID);
+
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GetProgID();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
index 9779307b..e6e1afc3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IPropertyStore
 {
-    [Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IPropertyStore
-    {
-        uint GetCount();
+    uint GetCount();
 
-        PKEY GetAt(uint iProp);
+    PKEY GetAt(uint iProp);
 
-        void GetValue([In] ref PKEY pkey, [In][Out] PROPVARIANT pv);
+    void GetValue([In] ref PKEY pkey, [In][Out] PROPVARIANT pv);
 
-        void SetValue([In] ref PKEY pkey, PROPVARIANT pv);
+    void SetValue([In] ref PKEY pkey, PROPVARIANT pv);
 
-        void Commit();
-    }
-}
+    void Commit();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
index 03ab4eb4..e9ff5d04 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
@@ -2,36 +2,35 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("000214E6-0000-0000-C000-000000000046")]
+[ComImport]
+internal interface IShellFolder
 {
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("000214E6-0000-0000-C000-000000000046")]
-    [ComImport]
-    internal interface IShellFolder
-    {
-        void ParseDisplayName([In] IntPtr hwnd, [In] IBindCtx pbc, [MarshalAs(UnmanagedType.LPWStr)][In] string pszDisplayName, [In][Out] ref int pchEaten, out IntPtr ppidl, [In][Out] ref uint pdwAttributes);
+    void ParseDisplayName([In] IntPtr hwnd, [In] IBindCtx pbc, [MarshalAs(UnmanagedType.LPWStr)][In] string pszDisplayName, [In][Out] ref int pchEaten, out IntPtr ppidl, [In][Out] ref uint pdwAttributes);
 
-        IEnumIDList EnumObjects([In] IntPtr hwnd, [In] SHCONTF grfFlags);
+    IEnumIDList EnumObjects([In] IntPtr hwnd, [In] SHCONTF grfFlags);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BindToObject([In] IntPtr pidl, [In] IBindCtx pbc, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BindToObject([In] IntPtr pidl, [In] IBindCtx pbc, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BindToStorage([In] IntPtr pidl, [In] IBindCtx pbc, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BindToStorage([In] IntPtr pidl, [In] IBindCtx pbc, [In] ref Guid riid);
 
-        [PreserveSig]
-        HRESULT CompareIDs([In] IntPtr lParam, [In] IntPtr pidl1, [In] IntPtr pidl2);
+    [PreserveSig]
+    HRESULT CompareIDs([In] IntPtr lParam, [In] IntPtr pidl1, [In] IntPtr pidl2);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object CreateViewObject([In] IntPtr hwndOwner, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object CreateViewObject([In] IntPtr hwndOwner, [In] ref Guid riid);
 
-        void GetAttributesOf([In] uint cidl, [In] IntPtr apidl, [In][Out] ref SFGAO rgfInOut);
+    void GetAttributesOf([In] uint cidl, [In] IntPtr apidl, [In][Out] ref SFGAO rgfInOut);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetUIObjectOf([In] IntPtr hwndOwner, [In] uint cidl, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.SysInt, SizeParamIndex = 2)][In] IntPtr apidl, [In] ref Guid riid, [In][Out] ref uint rgfReserved);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetUIObjectOf([In] IntPtr hwndOwner, [In] uint cidl, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.SysInt, SizeParamIndex = 2)][In] IntPtr apidl, [In] ref Guid riid, [In][Out] ref uint rgfReserved);
 
-        void GetDisplayNameOf([In] IntPtr pidl, [In] SHGDN uFlags, out IntPtr pName);
+    void GetDisplayNameOf([In] IntPtr pidl, [In] SHGDN uFlags, out IntPtr pName);
 
-        void SetNameOf([In] IntPtr hwnd, [In] IntPtr pidl, [MarshalAs(UnmanagedType.LPWStr)][In] string pszName, [In] SHGDN uFlags, out IntPtr ppidlOut);
-    }
-}
+    void SetNameOf([In] IntPtr hwnd, [In] IntPtr pidl, [MarshalAs(UnmanagedType.LPWStr)][In] string pszName, [In] SHGDN uFlags, out IntPtr ppidlOut);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
index 5f2d12ec..9918ac66 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
@@ -2,23 +2,22 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+[Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IShellItem
 {
-    [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IShellItem
-    {
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BindToHandler(IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BindToHandler(IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
 
-        IShellItem GetParent();
+    IShellItem GetParent();
 
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        string GetDisplayName(SIGDN sigdnName);
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GetDisplayName(SIGDN sigdnName);
 
-        SFGAO GetAttributes(SFGAO sfgaoMask);
+    SFGAO GetAttributes(SFGAO sfgaoMask);
 
-        int Compare(IShellItem psi, SICHINT hint);
-    }
-}
+    int Compare(IShellItem psi, SICHINT hint);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
index 80bc1699..9a809623 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
@@ -2,55 +2,54 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("7e9fb0d3-919f-4307-ab2e-9b1860310c93")]
+[ComImport]
+internal interface IShellItem2 : IShellItem
 {
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("7e9fb0d3-919f-4307-ab2e-9b1860310c93")]
-    [ComImport]
-    internal interface IShellItem2 : IShellItem
-    {
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BindToHandler([In] IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BindToHandler([In] IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
 
-        IShellItem GetParent();
+    IShellItem GetParent();
 
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        string GetDisplayName(SIGDN sigdnName);
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GetDisplayName(SIGDN sigdnName);
 
-        SFGAO GetAttributes(SFGAO sfgaoMask);
+    SFGAO GetAttributes(SFGAO sfgaoMask);
 
-        int Compare(IShellItem psi, SICHINT hint);
+    int Compare(IShellItem psi, SICHINT hint);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyStore(GPS flags, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyStore(GPS flags, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyStoreWithCreateObject(GPS flags, [MarshalAs(UnmanagedType.IUnknown)] object punkCreateObject, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyStoreWithCreateObject(GPS flags, [MarshalAs(UnmanagedType.IUnknown)] object punkCreateObject, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyStoreForKeys(IntPtr rgKeys, uint cKeys, GPS flags, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyStoreForKeys(IntPtr rgKeys, uint cKeys, GPS flags, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyDescriptionList(IntPtr keyType, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyDescriptionList(IntPtr keyType, [In] ref Guid riid);
 
-        void Update(IBindCtx pbc);
+    void Update(IBindCtx pbc);
 
-        PROPVARIANT GetProperty(IntPtr key);
+    PROPVARIANT GetProperty(IntPtr key);
 
-        Guid GetCLSID(IntPtr key);
+    Guid GetCLSID(IntPtr key);
 
-        System.Runtime.InteropServices.ComTypes.FILETIME GetFileTime(IntPtr key);
+    System.Runtime.InteropServices.ComTypes.FILETIME GetFileTime(IntPtr key);
 
-        int GetInt32(IntPtr key);
+    int GetInt32(IntPtr key);
 
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        string GetString(IntPtr key);
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    string GetString(IntPtr key);
 
-        uint GetUInt32(IntPtr key);
+    uint GetUInt32(IntPtr key);
 
-        ulong GetUInt64(IntPtr key);
+    ulong GetUInt64(IntPtr key);
 
-        [return: MarshalAs(UnmanagedType.Bool)]
-        void GetBool(IntPtr key);
-    }
-}
+    [return: MarshalAs(UnmanagedType.Bool)]
+    void GetBool(IntPtr key);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
index 1227a28f..00bee5c4 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
@@ -2,29 +2,28 @@
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
+[ComImport]
+internal interface IShellItemArray
 {
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
-    [ComImport]
-    internal interface IShellItemArray
-    {
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object BindToHandler(IBindCtx pbc, [In] ref Guid rbhid, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object BindToHandler(IBindCtx pbc, [In] ref Guid rbhid, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyStore(int flags, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyStore(int flags, [In] ref Guid riid);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object GetPropertyDescriptionList([In] ref PKEY keyType, [In] ref Guid riid);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPropertyDescriptionList([In] ref PKEY keyType, [In] ref Guid riid);
 
-        uint GetAttributes(SIATTRIBFLAGS dwAttribFlags, uint sfgaoMask);
+    uint GetAttributes(SIATTRIBFLAGS dwAttribFlags, uint sfgaoMask);
 
-        uint GetCount();
+    uint GetCount();
 
-        IShellItem GetItemAt(uint dwIndex);
+    IShellItem GetItemAt(uint dwIndex);
 
-        [return: MarshalAs(UnmanagedType.Interface)]
-        object EnumItems();
-    }
-}
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object EnumItems();
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
index 3394d67b..2769321d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
@@ -2,47 +2,46 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Standard
+namespace Standard;
+
+[Guid("000214F9-0000-0000-C000-000000000046")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface IShellLinkW
 {
-    [Guid("000214F9-0000-0000-C000-000000000046")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface IShellLinkW
-    {
-        void GetPath([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszFile, int cchMaxPath, [In][Out] WIN32_FIND_DATAW pfd, SLGP fFlags);
+    void GetPath([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszFile, int cchMaxPath, [In][Out] WIN32_FIND_DATAW pfd, SLGP fFlags);
 
-        void GetIDList(out IntPtr ppidl);
+    void GetIDList(out IntPtr ppidl);
 
-        void SetIDList(IntPtr pidl);
+    void SetIDList(IntPtr pidl);
 
-        void GetDescription([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszFile, int cchMaxName);
+    void GetDescription([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszFile, int cchMaxName);
 
-        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+    void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
 
-        void GetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszDir, int cchMaxPath);
+    void GetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszDir, int cchMaxPath);
 
-        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+    void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
 
-        void GetArguments([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszArgs, int cchMaxPath);
+    void GetArguments([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszArgs, int cchMaxPath);
 
-        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+    void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
 
-        short GetHotKey();
+    short GetHotKey();
 
-        void SetHotKey(short wHotKey);
+    void SetHotKey(short wHotKey);
 
-        uint GetShowCmd();
+    uint GetShowCmd();
 
-        void SetShowCmd(uint iShowCmd);
+    void SetShowCmd(uint iShowCmd);
 
-        void GetIconLocation([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
+    void GetIconLocation([MarshalAs(UnmanagedType.LPWStr)][Out] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
 
-        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+    void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
 
-        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, uint dwReserved);
+    void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, uint dwReserved);
 
-        void Resolve(IntPtr hwnd, uint fFlags);
+    void Resolve(IntPtr hwnd, uint fFlags);
 
-        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
-    }
-}
+    void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
index 6ef760be..3591e9d3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("56FDF342-FD6D-11d0-958A-006097C9A090")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface ITaskbarList
 {
-    [Guid("56FDF342-FD6D-11d0-958A-006097C9A090")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface ITaskbarList
-    {
-        void HrInit();
+    void HrInit();
 
-        void AddTab(IntPtr hwnd);
+    void AddTab(IntPtr hwnd);
 
-        void DeleteTab(IntPtr hwnd);
+    void DeleteTab(IntPtr hwnd);
 
-        void ActivateTab(IntPtr hwnd);
+    void ActivateTab(IntPtr hwnd);
 
-        void SetActiveAlt(IntPtr hwnd);
-    }
-}
+    void SetActiveAlt(IntPtr hwnd);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
index 3d7d566f..d1e3dce8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
@@ -1,23 +1,22 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("602D4995-B13A-429b-A66E-1935E44F4317")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface ITaskbarList2 : ITaskbarList
 {
-    [Guid("602D4995-B13A-429b-A66E-1935E44F4317")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface ITaskbarList2 : ITaskbarList
-    {
-        void HrInit();
+    void HrInit();
 
-        void AddTab(IntPtr hwnd);
+    void AddTab(IntPtr hwnd);
 
-        void DeleteTab(IntPtr hwnd);
+    void DeleteTab(IntPtr hwnd);
 
-        void ActivateTab(IntPtr hwnd);
+    void ActivateTab(IntPtr hwnd);
 
-        void SetActiveAlt(IntPtr hwnd);
+    void SetActiveAlt(IntPtr hwnd);
 
-        void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
-    }
-}
+    void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
index e91c69e8..4e310e21 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
@@ -1,59 +1,58 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[Guid("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[ComImport]
+internal interface ITaskbarList3 : ITaskbarList2, ITaskbarList
 {
-    [Guid("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [ComImport]
-    internal interface ITaskbarList3 : ITaskbarList2, ITaskbarList
-    {
-        void HrInit();
+    void HrInit();
 
-        void AddTab(IntPtr hwnd);
+    void AddTab(IntPtr hwnd);
 
-        void DeleteTab(IntPtr hwnd);
+    void DeleteTab(IntPtr hwnd);
 
-        void ActivateTab(IntPtr hwnd);
+    void ActivateTab(IntPtr hwnd);
 
-        void SetActiveAlt(IntPtr hwnd);
+    void SetActiveAlt(IntPtr hwnd);
 
-        void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+    void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
 
-        [PreserveSig]
-        HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
+    [PreserveSig]
+    HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
 
-        [PreserveSig]
-        HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
+    [PreserveSig]
+    HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
 
-        [PreserveSig]
-        HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
+    [PreserveSig]
+    HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
 
-        [PreserveSig]
-        HRESULT UnregisterTab(IntPtr hwndTab);
+    [PreserveSig]
+    HRESULT UnregisterTab(IntPtr hwndTab);
 
-        [PreserveSig]
-        HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
+    [PreserveSig]
+    HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
 
-        [PreserveSig]
-        HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
+    [PreserveSig]
+    HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
 
-        [PreserveSig]
-        HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+    [PreserveSig]
+    HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
 
-        [PreserveSig]
-        HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+    [PreserveSig]
+    HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
 
-        [PreserveSig]
-        HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
+    [PreserveSig]
+    HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
 
-        [PreserveSig]
-        HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
+    [PreserveSig]
+    HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
 
-        [PreserveSig]
-        HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
+    [PreserveSig]
+    HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
 
-        [PreserveSig]
-        HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
-    }
-}
+    [PreserveSig]
+    HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
index 3e46805f..6f76e491 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
@@ -1,61 +1,60 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[Guid("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf")]
+[ComImport]
+internal interface ITaskbarList4 : ITaskbarList3, ITaskbarList2, ITaskbarList
 {
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    [Guid("ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf")]
-    [ComImport]
-    internal interface ITaskbarList4 : ITaskbarList3, ITaskbarList2, ITaskbarList
-    {
-        void HrInit();
+    void HrInit();
 
-        void AddTab(IntPtr hwnd);
+    void AddTab(IntPtr hwnd);
 
-        void DeleteTab(IntPtr hwnd);
+    void DeleteTab(IntPtr hwnd);
 
-        void ActivateTab(IntPtr hwnd);
+    void ActivateTab(IntPtr hwnd);
 
-        void SetActiveAlt(IntPtr hwnd);
+    void SetActiveAlt(IntPtr hwnd);
 
-        void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+    void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
 
-        [PreserveSig]
-        HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
+    [PreserveSig]
+    HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
 
-        [PreserveSig]
-        HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
+    [PreserveSig]
+    HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
 
-        [PreserveSig]
-        HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
+    [PreserveSig]
+    HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
 
-        [PreserveSig]
-        HRESULT UnregisterTab(IntPtr hwndTab);
+    [PreserveSig]
+    HRESULT UnregisterTab(IntPtr hwndTab);
 
-        [PreserveSig]
-        HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
+    [PreserveSig]
+    HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
 
-        [PreserveSig]
-        HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
+    [PreserveSig]
+    HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
 
-        [PreserveSig]
-        HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+    [PreserveSig]
+    HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
 
-        [PreserveSig]
-        HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+    [PreserveSig]
+    HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
 
-        [PreserveSig]
-        HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
+    [PreserveSig]
+    HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
 
-        [PreserveSig]
-        HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
+    [PreserveSig]
+    HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
 
-        [PreserveSig]
-        HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
+    [PreserveSig]
+    HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
 
-        [PreserveSig]
-        HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
+    [PreserveSig]
+    HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
 
-        void SetTabProperties(IntPtr hwndTab, STPF stpFlags);
-    }
-}
+    void SetTabProperties(IntPtr hwndTab, STPF stpFlags);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
index 47ffd773..30f3f414 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum KDC
 {
-    internal enum KDC
-    {
-        FREQUENT = 1,
-        RECENT
-    }
-}
+    FREQUENT = 1,
+    RECENT
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
index 2415bbee..85f32190 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
@@ -1,38 +1,37 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+internal struct LOGFONT
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    internal struct LOGFONT
-    {
-        public int lfHeight;
+    public int lfHeight;
 
-        public int lfWidth;
+    public int lfWidth;
 
-        public int lfEscapement;
+    public int lfEscapement;
 
-        public int lfOrientation;
+    public int lfOrientation;
 
-        public int lfWeight;
+    public int lfWeight;
 
-        public byte lfItalic;
+    public byte lfItalic;
 
-        public byte lfUnderline;
+    public byte lfUnderline;
 
-        public byte lfStrikeOut;
+    public byte lfStrikeOut;
 
-        public byte lfCharSet;
+    public byte lfCharSet;
 
-        public byte lfOutPrecision;
+    public byte lfOutPrecision;
 
-        public byte lfClipPrecision;
+    public byte lfClipPrecision;
 
-        public byte lfQuality;
+    public byte lfQuality;
 
-        public byte lfPitchAndFamily;
+    public byte lfPitchAndFamily;
 
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-        public string lfFaceName;
-    }
-}
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+    public string lfFaceName;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
index 1f68ff94..fac3517f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct MARGINS
 {
-    internal struct MARGINS
-    {
-        public int cxLeftWidth;
+    public int cxLeftWidth;
 
-        public int cxRightWidth;
+    public int cxRightWidth;
 
-        public int cyTopHeight;
+    public int cyTopHeight;
 
-        public int cyBottomHeight;
-    }
-}
+    public int cyBottomHeight;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
index e87794fc..89d27162 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum MF : uint
 {
-    [Flags]
-    internal enum MF : uint
-    {
-        DOES_NOT_EXIST = 4294967295u,
-        ENABLED = 0u,
-        BYCOMMAND = 0u,
-        GRAYED = 1u,
-        DISABLED = 2u
-    }
-}
+    DOES_NOT_EXIST = 4294967295u,
+    ENABLED = 0u,
+    BYCOMMAND = 0u,
+    GRAYED = 1u,
+    DISABLED = 2u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
index 9337e43a..959331ae 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct MINMAXINFO
 {
-    internal struct MINMAXINFO
-    {
-        public POINT ptReserved;
+    public POINT ptReserved;
 
-        public POINT ptMaxSize;
+    public POINT ptMaxSize;
 
-        public POINT ptMaxPosition;
+    public POINT ptMaxPosition;
 
-        public POINT ptMinTrackSize;
+    public POINT ptMinTrackSize;
 
-        public POINT ptMaxTrackSize;
-    }
-}
+    public POINT ptMaxTrackSize;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
index c63bf057..46ee848d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential)]
+internal class MONITORINFO
 {
-    [StructLayout(LayoutKind.Sequential)]
-    internal class MONITORINFO
-    {
-        public int cbSize = Marshal.SizeOf(typeof(MONITORINFO));
+    public int cbSize = Marshal.SizeOf(typeof(MONITORINFO));
 
-        public RECT rcMonitor;
+    public RECT rcMonitor;
 
-        public RECT rcWork;
+    public RECT rcWork;
 
-        public int dwFlags;
-    }
-}
+    public int dwFlags;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
index b61db210..c260b194 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
@@ -1,10 +1,9 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum MOUSEEVENTF
 {
-    internal enum MOUSEEVENTF
-    {
-        LEFTDOWN = 2,
-        LEFTUP = 4
-    }
-}
+    LEFTDOWN = 2,
+    LEFTUP = 4
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
index 06b02b59..f01eca97 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct MOUSEINPUT
 {
-    internal struct MOUSEINPUT
-    {
-        public int dx;
+    public int dx;
 
-        public int dy;
+    public int dy;
 
-        public int mouseData;
+    public int mouseData;
 
-        public int dwFlags;
+    public int dwFlags;
 
-        public int time;
+    public int time;
 
-        public IntPtr dwExtraInfo;
-    }
-}
+    public IntPtr dwExtraInfo;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
index e6b97e0b..1fd0d017 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum MSGFLT
 {
-    internal enum MSGFLT
-    {
-        RESET,
-        ALLOW,
-        DISALLOW
-    }
-}
+    RESET,
+    ALLOW,
+    DISALLOW
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
index 49dd757c..e529a16e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum MSGFLTINFO
 {
-    internal enum MSGFLTINFO
-    {
-        NONE,
-        ALREADYALLOWED_FORWND,
-        ALREADYDISALLOWED_FORWND,
-        ALLOWED_HIGHER
-    }
-}
+    NONE,
+    ALREADYALLOWED_FORWND,
+    ALREADYDISALLOWED_FORWND,
+    ALLOWED_HIGHER
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
index 4c121de7..4862d669 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
@@ -4,147 +4,146 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+internal sealed class ManagedIStream : IStream, IDisposable
 {
-    internal sealed class ManagedIStream : IStream, IDisposable
+    public ManagedIStream(Stream source)
     {
-        public ManagedIStream(Stream source)
-        {
-            Verify.IsNotNull<Stream>(source, "source");
-            this._source = source;
-        }
-
-        private void _Validate()
-        {
-            if (this._source == null)
-            {
-                throw new ObjectDisposedException("this");
-            }
-        }
-
-        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
-        [Obsolete("The method is not implemented", true)]
-        public void Clone(out IStream ppstm)
-        {
-            ppstm = null;
-            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
-        }
-
-        public void Commit(int grfCommitFlags)
-        {
-            this._Validate();
-            this._source.Flush();
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
-        {
-            Verify.IsNotNull<IStream>(pstm, "pstm");
-            this._Validate();
-            byte[] array = new byte[4096];
-            long num;
-            int num2;
-            for (num = 0L; num < cb; num += (long) num2)
-            {
-                num2 = this._source.Read(array, 0, array.Length);
-                if (num2 == 0)
-                {
-                    break;
-                }
-                pstm.Write(array, num2, IntPtr.Zero);
-            }
-            if (IntPtr.Zero != pcbRead)
-            {
-                Marshal.WriteInt64(pcbRead, num);
-            }
-            if (IntPtr.Zero != pcbWritten)
-            {
-                Marshal.WriteInt64(pcbWritten, num);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
-        [Obsolete("The method is not implemented", true)]
-        public void LockRegion(long libOffset, long cb, int dwLockType)
-        {
-            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public void Read(byte[] pv, int cb, IntPtr pcbRead)
-        {
-            this._Validate();
-            int val = this._source.Read(pv, 0, cb);
-            if (IntPtr.Zero != pcbRead)
-            {
-                Marshal.WriteInt32(pcbRead, val);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
-        [Obsolete("The method is not implemented", true)]
-        public void Revert()
-        {
-            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
-        {
-            this._Validate();
-            long val = this._source.Seek(dlibMove, (SeekOrigin) dwOrigin);
-            if (IntPtr.Zero != plibNewPosition)
-            {
-                Marshal.WriteInt64(plibNewPosition, val);
-            }
-        }
-
-        public void SetSize(long libNewSize)
-        {
-            this._Validate();
-            this._source.SetLength(libNewSize);
-        }
-
-        public void Stat(out System.Runtime.InteropServices.ComTypes.STATSTG pstatstg, int grfStatFlag)
-        {
-            pstatstg = default(System.Runtime.InteropServices.ComTypes.STATSTG);
-            this._Validate();
-            pstatstg.type = 2;
-            pstatstg.cbSize = this._source.Length;
-            pstatstg.grfMode = 2;
-            pstatstg.grfLocksSupported = 2;
-        }
-
-        [Obsolete("The method is not implemented", true)]
-        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
-        public void UnlockRegion(long libOffset, long cb, int dwLockType)
-        {
-            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public void Write(byte[] pv, int cb, IntPtr pcbWritten)
-        {
-            this._Validate();
-            this._source.Write(pv, 0, cb);
-            if (IntPtr.Zero != pcbWritten)
-            {
-                Marshal.WriteInt32(pcbWritten, cb);
-            }
-        }
-
-        public void Dispose()
-        {
-            this._source = null;
-        }
-
-        private const int STGTY_STREAM = 2;
-
-        private const int STGM_READWRITE = 2;
-
-        private const int LOCK_EXCLUSIVE = 2;
-
-        private Stream _source;
+        Verify.IsNotNull<Stream>(source, "source");
+        this._source = source;
     }
-}
+
+    private void _Validate()
+    {
+        if (this._source == null)
+        {
+            throw new ObjectDisposedException("this");
+        }
+    }
+
+    [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+    [Obsolete("The method is not implemented", true)]
+    public void Clone(out IStream ppstm)
+    {
+        ppstm = null;
+        HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+    }
+
+    public void Commit(int grfCommitFlags)
+    {
+        this._Validate();
+        this._source.Flush();
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
+    {
+        Verify.IsNotNull<IStream>(pstm, "pstm");
+        this._Validate();
+        byte[] array = new byte[4096];
+        long num;
+        int num2;
+        for (num = 0L; num < cb; num += (long) num2)
+        {
+            num2 = this._source.Read(array, 0, array.Length);
+            if (num2 == 0)
+            {
+                break;
+            }
+            pstm.Write(array, num2, IntPtr.Zero);
+        }
+        if (IntPtr.Zero != pcbRead)
+        {
+            Marshal.WriteInt64(pcbRead, num);
+        }
+        if (IntPtr.Zero != pcbWritten)
+        {
+            Marshal.WriteInt64(pcbWritten, num);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+    [Obsolete("The method is not implemented", true)]
+    public void LockRegion(long libOffset, long cb, int dwLockType)
+    {
+        HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public void Read(byte[] pv, int cb, IntPtr pcbRead)
+    {
+        this._Validate();
+        int val = this._source.Read(pv, 0, cb);
+        if (IntPtr.Zero != pcbRead)
+        {
+            Marshal.WriteInt32(pcbRead, val);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+    [Obsolete("The method is not implemented", true)]
+    public void Revert()
+    {
+        HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
+    {
+        this._Validate();
+        long val = this._source.Seek(dlibMove, (SeekOrigin) dwOrigin);
+        if (IntPtr.Zero != plibNewPosition)
+        {
+            Marshal.WriteInt64(plibNewPosition, val);
+        }
+    }
+
+    public void SetSize(long libNewSize)
+    {
+        this._Validate();
+        this._source.SetLength(libNewSize);
+    }
+
+    public void Stat(out System.Runtime.InteropServices.ComTypes.STATSTG pstatstg, int grfStatFlag)
+    {
+        pstatstg = default(System.Runtime.InteropServices.ComTypes.STATSTG);
+        this._Validate();
+        pstatstg.type = 2;
+        pstatstg.cbSize = this._source.Length;
+        pstatstg.grfMode = 2;
+        pstatstg.grfLocksSupported = 2;
+    }
+
+    [Obsolete("The method is not implemented", true)]
+    [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+    public void UnlockRegion(long libOffset, long cb, int dwLockType)
+    {
+        HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public void Write(byte[] pv, int cb, IntPtr pcbWritten)
+    {
+        this._Validate();
+        this._source.Write(pv, 0, cb);
+        if (IntPtr.Zero != pcbWritten)
+        {
+            Marshal.WriteInt32(pcbWritten, cb);
+        }
+    }
+
+    public void Dispose()
+    {
+        this._source = null;
+    }
+
+    private const int STGTY_STREAM = 2;
+
+    private const int STGM_READWRITE = 2;
+
+    private const int LOCK_EXCLUSIVE = 2;
+
+    private Stream _source;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
index 5bc15578..e22b3edb 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
@@ -1,6 +1,5 @@
 using System;
 
-namespace Standard
-{
-    internal delegate IntPtr MessageHandler(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled);
-}
+namespace Standard;
+
+internal delegate IntPtr MessageHandler(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled);
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
index 0dc6e68f..f0290827 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
@@ -5,128 +5,127 @@ using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Threading;
 
-namespace Standard
+namespace Standard;
+
+internal sealed class MessageWindow : DispatcherObject, IDisposable
 {
-    internal sealed class MessageWindow : DispatcherObject, IDisposable
+    public IntPtr Handle { get; private set; }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public MessageWindow(CS classStyle, WS style, WS_EX exStyle, Rect location, string name, WndProc callback)
     {
-        public IntPtr Handle { get; private set; }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public MessageWindow(CS classStyle, WS style, WS_EX exStyle, Rect location, string name, WndProc callback)
+        this._wndProcCallback = callback;
+        this._className = "MessageWindowClass+" + Guid.NewGuid().ToString();
+        WNDCLASSEX wndclassex = new WNDCLASSEX
         {
-            this._wndProcCallback = callback;
-            this._className = "MessageWindowClass+" + Guid.NewGuid().ToString();
-            WNDCLASSEX wndclassex = new WNDCLASSEX
-            {
-                cbSize = Marshal.SizeOf(typeof(WNDCLASSEX)),
-                style = classStyle,
-                lpfnWndProc = MessageWindow.s_WndProc,
-                hInstance = NativeMethods.GetModuleHandle(null),
-                hbrBackground = NativeMethods.GetStockObject(StockObject.NULL_BRUSH),
-                lpszMenuName = "",
-                lpszClassName = this._className
-            };
-            NativeMethods.RegisterClassEx(ref wndclassex);
-            GCHandle value = default(GCHandle);
-            try
-            {
-                value = GCHandle.Alloc(this);
-                IntPtr lpParam = (IntPtr) value;
-                this.Handle = NativeMethods.CreateWindowEx(exStyle, this._className, name, style, (int) location.X, (int) location.Y, (int) location.Width, (int) location.Height, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, lpParam);
-            }
-            finally
-            {
-                value.Free();
-            }
+            cbSize = Marshal.SizeOf(typeof(WNDCLASSEX)),
+            style = classStyle,
+            lpfnWndProc = MessageWindow.s_WndProc,
+            hInstance = NativeMethods.GetModuleHandle(null),
+            hbrBackground = NativeMethods.GetStockObject(StockObject.NULL_BRUSH),
+            lpszMenuName = "",
+            lpszClassName = this._className
+        };
+        NativeMethods.RegisterClassEx(ref wndclassex);
+        GCHandle value = default(GCHandle);
+        try
+        {
+            value = GCHandle.Alloc(this);
+            IntPtr lpParam = (IntPtr) value;
+            this.Handle = NativeMethods.CreateWindowEx(exStyle, this._className, name, style, (int) location.X, (int) location.Y, (int) location.Width, (int) location.Height, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, lpParam);
         }
-
-        ~MessageWindow()
+        finally
         {
-            this._Dispose(false, false);
+            value.Free();
         }
+    }
 
-        public void Dispose()
+    ~MessageWindow()
+    {
+        this._Dispose(false, false);
+    }
+
+    public void Dispose()
+    {
+        this._Dispose(true, false);
+        GC.SuppressFinalize(this);
+    }
+
+    [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
+    private void _Dispose(bool disposing, bool isHwndBeingDestroyed)
+    {
+        if (this._isDisposed)
         {
-            this._Dispose(true, false);
-            GC.SuppressFinalize(this);
+            return;
         }
-
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
-        private void _Dispose(bool disposing, bool isHwndBeingDestroyed)
+        this._isDisposed = true;
+        IntPtr hwnd = this.Handle;
+        string className = this._className;
+        if (isHwndBeingDestroyed)
         {
-            if (this._isDisposed)
-            {
-                return;
-            }
-            this._isDisposed = true;
-            IntPtr hwnd = this.Handle;
-            string className = this._className;
-            if (isHwndBeingDestroyed)
-            {
-                base.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback((object arg) => MessageWindow._DestroyWindow(IntPtr.Zero, className)));
-            }
-            else if (this.Handle != IntPtr.Zero)
-            {
-                if (base.CheckAccess())
-                {
-                    MessageWindow._DestroyWindow(hwnd, className);
-                }
-                else
-                {
-                    base.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback((object arg) => MessageWindow._DestroyWindow(hwnd, className)));
-                }
-            }
-            MessageWindow.s_windowLookup.Remove(hwnd);
-            this._className = null;
-            this.Handle = IntPtr.Zero;
+            base.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback((object arg) => MessageWindow._DestroyWindow(IntPtr.Zero, className)));
         }
-
-        [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly")]
-        private static IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
+        else if (this.Handle != IntPtr.Zero)
         {
-            IntPtr result = IntPtr.Zero;
-            MessageWindow messageWindow = null;
-            if (msg == WM.CREATE)
+            if (base.CheckAccess())
             {
-                messageWindow = (MessageWindow) GCHandle.FromIntPtr(((CREATESTRUCT) Marshal.PtrToStructure(lParam, typeof(CREATESTRUCT))).lpCreateParams).Target;
-                MessageWindow.s_windowLookup.Add(hwnd, messageWindow);
-            }
-            else if (!MessageWindow.s_windowLookup.TryGetValue(hwnd, out messageWindow))
-            {
-                return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
-            }
-            WndProc wndProcCallback = messageWindow._wndProcCallback;
-            if (wndProcCallback != null)
-            {
-                result = wndProcCallback(hwnd, msg, wParam, lParam);
+                MessageWindow._DestroyWindow(hwnd, className);
             }
             else
             {
-                result = NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+                base.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback((object arg) => MessageWindow._DestroyWindow(hwnd, className)));
             }
-            if (msg == WM.NCDESTROY)
-            {
-                messageWindow._Dispose(true, true);
-                GC.SuppressFinalize(messageWindow);
-            }
-            return result;
         }
-
-        private static object _DestroyWindow(IntPtr hwnd, string className)
-        {
-            Utility.SafeDestroyWindow(ref hwnd);
-            NativeMethods.UnregisterClass(className, NativeMethods.GetModuleHandle(null));
-            return null;
-        }
-
-        private static readonly WndProc s_WndProc = new WndProc(MessageWindow._WndProc);
-
-        private static readonly Dictionary<IntPtr, MessageWindow> s_windowLookup = new Dictionary<IntPtr, MessageWindow>();
-
-        private WndProc _wndProcCallback;
-
-        private string _className;
-
-        private bool _isDisposed;
+        MessageWindow.s_windowLookup.Remove(hwnd);
+        this._className = null;
+        this.Handle = IntPtr.Zero;
     }
-}
+
+    [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly")]
+    private static IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
+    {
+        IntPtr result = IntPtr.Zero;
+        MessageWindow messageWindow = null;
+        if (msg == WM.CREATE)
+        {
+            messageWindow = (MessageWindow) GCHandle.FromIntPtr(((CREATESTRUCT) Marshal.PtrToStructure(lParam, typeof(CREATESTRUCT))).lpCreateParams).Target;
+            MessageWindow.s_windowLookup.Add(hwnd, messageWindow);
+        }
+        else if (!MessageWindow.s_windowLookup.TryGetValue(hwnd, out messageWindow))
+        {
+            return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+        }
+        WndProc wndProcCallback = messageWindow._wndProcCallback;
+        if (wndProcCallback != null)
+        {
+            result = wndProcCallback(hwnd, msg, wParam, lParam);
+        }
+        else
+        {
+            result = NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+        }
+        if (msg == WM.NCDESTROY)
+        {
+            messageWindow._Dispose(true, true);
+            GC.SuppressFinalize(messageWindow);
+        }
+        return result;
+    }
+
+    private static object _DestroyWindow(IntPtr hwnd, string className)
+    {
+        Utility.SafeDestroyWindow(ref hwnd);
+        NativeMethods.UnregisterClass(className, NativeMethods.GetModuleHandle(null));
+        return null;
+    }
+
+    private static readonly WndProc s_WndProc = new WndProc(MessageWindow._WndProc);
+
+    private static readonly Dictionary<IntPtr, MessageWindow> s_windowLookup = new Dictionary<IntPtr, MessageWindow>();
+
+    private WndProc _wndProcCallback;
+
+    private string _className;
+
+    private bool _isDisposed;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
index bad4c217..b4a007ff 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum NIF : uint
 {
-    [Flags]
-    internal enum NIF : uint
-    {
-        MESSAGE = 1u,
-        ICON = 2u,
-        TIP = 4u,
-        STATE = 8u,
-        INFO = 16u,
-        GUID = 32u,
-        REALTIME = 64u,
-        SHOWTIP = 128u,
-        XP_MASK = 59u,
-        VISTA_MASK = 251u
-    }
-}
+    MESSAGE = 1u,
+    ICON = 2u,
+    TIP = 4u,
+    STATE = 8u,
+    INFO = 16u,
+    GUID = 32u,
+    REALTIME = 64u,
+    SHOWTIP = 128u,
+    XP_MASK = 59u,
+    VISTA_MASK = 251u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
index db9dbea1..0707e86f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum NIIF
 {
-    internal enum NIIF
-    {
-        NONE,
-        INFO,
-        WARNING,
-        ERROR,
-        USER,
-        NOSOUND = 16,
-        LARGE_ICON = 32,
-        NIIF_RESPECT_QUIET_TIME = 128,
-        XP_ICON_MASK = 15
-    }
-}
+    NONE,
+    INFO,
+    WARNING,
+    ERROR,
+    USER,
+    NOSOUND = 16,
+    LARGE_ICON = 32,
+    NIIF_RESPECT_QUIET_TIME = 128,
+    XP_ICON_MASK = 15
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
index 47e29b63..7f4e820c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum NIM : uint
 {
-    internal enum NIM : uint
-    {
-        ADD,
-        MODIFY,
-        DELETE,
-        SETFOCUS,
-        SETVERSION
-    }
-}
+    ADD,
+    MODIFY,
+    DELETE,
+    SETFOCUS,
+    SETVERSION
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
index 00d8eb1e..d0004706 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
@@ -2,64 +2,63 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+internal struct NONCLIENTMETRICS
 {
-    internal struct NONCLIENTMETRICS
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static NONCLIENTMETRICS VistaMetricsStruct
     {
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static NONCLIENTMETRICS VistaMetricsStruct
+        get
         {
-            get
+            return new NONCLIENTMETRICS
             {
-                return new NONCLIENTMETRICS
-                {
-                    cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS))
-                };
-            }
+                cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS))
+            };
         }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static NONCLIENTMETRICS XPMetricsStruct
-        {
-            get
-            {
-                return new NONCLIENTMETRICS
-                {
-                    cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS)) - 4
-                };
-            }
-        }
-
-        public int cbSize;
-
-        public int iBorderWidth;
-
-        public int iScrollWidth;
-
-        public int iScrollHeight;
-
-        public int iCaptionWidth;
-
-        public int iCaptionHeight;
-
-        public LOGFONT lfCaptionFont;
-
-        public int iSmCaptionWidth;
-
-        public int iSmCaptionHeight;
-
-        public LOGFONT lfSmCaptionFont;
-
-        public int iMenuWidth;
-
-        public int iMenuHeight;
-
-        public LOGFONT lfMenuFont;
-
-        public LOGFONT lfStatusFont;
-
-        public LOGFONT lfMessageFont;
-
-        public int iPaddedBorderWidth;
     }
-}
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static NONCLIENTMETRICS XPMetricsStruct
+    {
+        get
+        {
+            return new NONCLIENTMETRICS
+            {
+                cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS)) - 4
+            };
+        }
+    }
+
+    public int cbSize;
+
+    public int iBorderWidth;
+
+    public int iScrollWidth;
+
+    public int iScrollHeight;
+
+    public int iCaptionWidth;
+
+    public int iCaptionHeight;
+
+    public LOGFONT lfCaptionFont;
+
+    public int iSmCaptionWidth;
+
+    public int iSmCaptionHeight;
+
+    public LOGFONT lfSmCaptionFont;
+
+    public int iMenuWidth;
+
+    public int iMenuHeight;
+
+    public LOGFONT lfMenuFont;
+
+    public LOGFONT lfStatusFont;
+
+    public LOGFONT lfMessageFont;
+
+    public int iPaddedBorderWidth;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
index b0ef5314..feb7987c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
@@ -2,43 +2,42 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential)]
+internal class NOTIFYICONDATA
 {
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal class NOTIFYICONDATA
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public IntPtr hWnd;
+    public IntPtr hWnd;
 
-        public int uID;
+    public int uID;
 
-        public NIF uFlags;
+    public NIF uFlags;
 
-        public int uCallbackMessage;
+    public int uCallbackMessage;
 
-        public IntPtr hIcon;
+    public IntPtr hIcon;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-        public char[] szTip = new char[128];
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+    public char[] szTip = new char[128];
 
-        public uint dwState;
+    public uint dwState;
 
-        public uint dwStateMask;
+    public uint dwStateMask;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
-        public char[] szInfo = new char[256];
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
+    public char[] szInfo = new char[256];
 
-        public uint uVersion;
+    public uint uVersion;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-        public char[] szInfoTitle = new char[64];
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+    public char[] szInfoTitle = new char[64];
 
-        public uint dwInfoFlags;
+    public uint dwInfoFlags;
 
-        public Guid guidItem;
+    public Guid guidItem;
 
-        private IntPtr hBalloonIcon;
-    }
-}
+    private IntPtr hBalloonIcon;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
index e960c977..f5b2483e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
@@ -6,903 +6,902 @@ using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 
-namespace Standard
+namespace Standard;
+
+internal static class NativeMethods
 {
-    internal static class NativeMethods
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "AdjustWindowRectEx", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _AdjustWindowRectEx(ref RECT lpRect, WS dwStyle, [MarshalAs(UnmanagedType.Bool)] bool bMenu, WS_EX dwExStyle);
+
+    public static RECT AdjustWindowRectEx(RECT lpRect, WS dwStyle, bool bMenu, WS_EX dwExStyle)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "AdjustWindowRectEx", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _AdjustWindowRectEx(ref RECT lpRect, WS dwStyle, [MarshalAs(UnmanagedType.Bool)] bool bMenu, WS_EX dwExStyle);
-
-        public static RECT AdjustWindowRectEx(RECT lpRect, WS dwStyle, bool bMenu, WS_EX dwExStyle)
+        if (!NativeMethods._AdjustWindowRectEx(ref lpRect, dwStyle, bMenu, dwExStyle))
         {
-            if (!NativeMethods._AdjustWindowRectEx(ref lpRect, dwStyle, bMenu, dwExStyle))
+            HRESULT.ThrowLastError();
+        }
+        return lpRect;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilter", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _ChangeWindowMessageFilter(WM message, MSGFLT dwFlag);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilterEx", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, [In][Out] ref CHANGEFILTERSTRUCT pChangeFilterStruct);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static HRESULT ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, out MSGFLTINFO filterInfo)
+    {
+        filterInfo = MSGFLTINFO.NONE;
+        if (!Utility.IsOSVistaOrNewer)
+        {
+            return HRESULT.S_FALSE;
+        }
+        if (!Utility.IsOSWindows7OrNewer)
+        {
+            if (!NativeMethods._ChangeWindowMessageFilter(message, action))
             {
-                HRESULT.ThrowLastError();
+                return (HRESULT) Win32Error.GetLastError();
             }
-            return lpRect;
+            return HRESULT.S_OK;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilter", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _ChangeWindowMessageFilter(WM message, MSGFLT dwFlag);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilterEx", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, [In][Out] ref CHANGEFILTERSTRUCT pChangeFilterStruct);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static HRESULT ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, out MSGFLTINFO filterInfo)
+        else
         {
-            filterInfo = MSGFLTINFO.NONE;
-            if (!Utility.IsOSVistaOrNewer)
+            CHANGEFILTERSTRUCT changefilterstruct = new CHANGEFILTERSTRUCT
             {
-                return HRESULT.S_FALSE;
-            }
-            if (!Utility.IsOSWindows7OrNewer)
+                cbSize = (uint) Marshal.SizeOf(typeof(CHANGEFILTERSTRUCT))
+            };
+            if (!NativeMethods._ChangeWindowMessageFilterEx(hwnd, message, action, ref changefilterstruct))
             {
-                if (!NativeMethods._ChangeWindowMessageFilter(message, action))
-                {
-                    return (HRESULT) Win32Error.GetLastError();
-                }
-                return HRESULT.S_OK;
-            }
-            else
-            {
-                CHANGEFILTERSTRUCT changefilterstruct = new CHANGEFILTERSTRUCT
-                {
-                    cbSize = (uint) Marshal.SizeOf(typeof(CHANGEFILTERSTRUCT))
-                };
-                if (!NativeMethods._ChangeWindowMessageFilterEx(hwnd, message, action, ref changefilterstruct))
-                {
-                    return (HRESULT) Win32Error.GetLastError();
-                }
-                filterInfo = changefilterstruct.ExtStatus;
-                return HRESULT.S_OK;
+                return (HRESULT) Win32Error.GetLastError();
             }
+            filterInfo = changefilterstruct.ExtStatus;
+            return HRESULT.S_OK;
         }
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll")]
-        public static extern CombineRgnResult CombineRgn(IntPtr hrgnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, RGN fnCombineMode);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll")]
+    public static extern CombineRgnResult CombineRgn(IntPtr hrgnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, RGN fnCombineMode);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll", CharSet = CharSet.Unicode, EntryPoint = "CommandLineToArgvW")]
-        private static extern IntPtr _CommandLineToArgvW([MarshalAs(UnmanagedType.LPWStr)] string cmdLine, out int numArgs);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode, EntryPoint = "CommandLineToArgvW")]
+    private static extern IntPtr _CommandLineToArgvW([MarshalAs(UnmanagedType.LPWStr)] string cmdLine, out int numArgs);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static string[] CommandLineToArgvW(string cmdLine)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static string[] CommandLineToArgvW(string cmdLine)
+    {
+        IntPtr intPtr = IntPtr.Zero;
+        string[] result;
+        try
         {
-            IntPtr intPtr = IntPtr.Zero;
-            string[] result;
-            try
-            {
-                int num = 0;
-                intPtr = NativeMethods._CommandLineToArgvW(cmdLine, out num);
-                if (intPtr == IntPtr.Zero)
-                {
-                    throw new Win32Exception();
-                }
-                string[] array = new string[num];
-                for (int i = 0; i < num; i++)
-                {
-                    IntPtr ptr = Marshal.ReadIntPtr(intPtr, i * Marshal.SizeOf(typeof(IntPtr)));
-                    array[i] = Marshal.PtrToStringUni(ptr);
-                }
-                result = array;
-            }
-            finally
-            {
-                NativeMethods._LocalFree(intPtr);
-            }
-            return result;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
-        private static extern SafeHBITMAP _CreateDIBSection(SafeDC hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, out IntPtr ppvBits, IntPtr hSection, int dwOffset);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
-        private static extern SafeHBITMAP _CreateDIBSectionIntPtr(IntPtr hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, out IntPtr ppvBits, IntPtr hSection, int dwOffset);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static SafeHBITMAP CreateDIBSection(SafeDC hdc, ref BITMAPINFO bitmapInfo, out IntPtr ppvBits, IntPtr hSection, int dwOffset)
-        {
-            SafeHBITMAP safeHBITMAP;
-            if (hdc == null)
-            {
-                safeHBITMAP = NativeMethods._CreateDIBSectionIntPtr(IntPtr.Zero, ref bitmapInfo, 0, out ppvBits, hSection, dwOffset);
-            }
-            else
-            {
-                safeHBITMAP = NativeMethods._CreateDIBSection(hdc, ref bitmapInfo, 0, out ppvBits, hSection, dwOffset);
-            }
-            if (safeHBITMAP.IsInvalid)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return safeHBITMAP;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "CreateRoundRectRgn", SetLastError = true)]
-        private static extern IntPtr _CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse)
-        {
-            IntPtr intPtr = NativeMethods._CreateRoundRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect, nWidthEllipse, nHeightEllipse);
-            if (IntPtr.Zero == intPtr)
-            {
-                throw new Win32Exception();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "CreateRectRgn", SetLastError = true)]
-        private static extern IntPtr _CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
-        {
-            IntPtr intPtr = NativeMethods._CreateRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect);
-            if (IntPtr.Zero == intPtr)
-            {
-                throw new Win32Exception();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "CreateRectRgnIndirect", SetLastError = true)]
-        private static extern IntPtr _CreateRectRgnIndirect([In] ref RECT lprc);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr CreateRectRgnIndirect(RECT lprc)
-        {
-            IntPtr intPtr = NativeMethods._CreateRectRgnIndirect(ref lprc);
-            if (IntPtr.Zero == intPtr)
-            {
-                throw new Win32Exception();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll")]
-        public static extern IntPtr CreateSolidBrush(int crColor);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW", SetLastError = true)]
-        private static extern IntPtr _CreateWindowEx(WS_EX dwExStyle, [MarshalAs(UnmanagedType.LPWStr)] string lpClassName, [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName, WS dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr CreateWindowEx(WS_EX dwExStyle, string lpClassName, string lpWindowName, WS dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam)
-        {
-            IntPtr intPtr = NativeMethods._CreateWindowEx(dwExStyle, lpClassName, lpWindowName, dwStyle, x, y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
-            if (IntPtr.Zero == intPtr)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
-        public static extern IntPtr DefWindowProc(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DeleteObject(IntPtr hObject);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DestroyIcon(IntPtr handle);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DestroyWindow(IntPtr hwnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool IsWindow(IntPtr hwnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", PreserveSig = false)]
-        public static extern void DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS pMarInset);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", EntryPoint = "DwmIsCompositionEnabled", PreserveSig = false)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _DwmIsCompositionEnabled();
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", EntryPoint = "DwmGetColorizationColor")]
-        private static extern HRESULT _DwmGetColorizationColor(out uint pcrColorization, [MarshalAs(UnmanagedType.Bool)] out bool pfOpaqueBlend);
-
-        public static bool DwmGetColorizationColor(out uint pcrColorization, out bool pfOpaqueBlend)
-        {
-            if (Utility.IsOSVistaOrNewer && NativeMethods.IsThemeActive() && NativeMethods._DwmGetColorizationColor(out pcrColorization, out pfOpaqueBlend).Succeeded)
-            {
-                return true;
-            }
-            pcrColorization = 4278190080u;
-            pfOpaqueBlend = true;
-            return false;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool DwmIsCompositionEnabled()
-        {
-            return Utility.IsOSVistaOrNewer && NativeMethods._DwmIsCompositionEnabled();
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DwmDefWindowProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam, out IntPtr plResult);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", EntryPoint = "DwmSetWindowAttribute")]
-        private static extern void _DwmSetWindowAttribute(IntPtr hwnd, DWMWA dwAttribute, ref int pvAttribute, int cbAttribute);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void DwmSetWindowAttributeFlip3DPolicy(IntPtr hwnd, DWMFLIP3D flip3dPolicy)
-        {
-            int num = (int) flip3dPolicy;
-            NativeMethods._DwmSetWindowAttribute(hwnd, DWMWA.FLIP3D_POLICY, ref num, 4);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void DwmSetWindowAttributeDisallowPeek(IntPtr hwnd, bool disallowPeek)
-        {
-            int num = disallowPeek ? 1 : 0;
-            NativeMethods._DwmSetWindowAttribute(hwnd, DWMWA.DISALLOW_PEEK, ref num, 4);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "EnableMenuItem")]
-        private static extern int _EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static MF EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable)
-        {
-            return (MF) NativeMethods._EnableMenuItem(hMenu, uIDEnableItem, uEnable);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "RemoveMenu", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _RemoveMenu(IntPtr hMenu, uint uPosition, uint uFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void RemoveMenu(IntPtr hMenu, SC uPosition, MF uFlags)
-        {
-            if (!NativeMethods._RemoveMenu(hMenu, (uint) uPosition, (uint) uFlags))
-            {
-                throw new Win32Exception();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "DrawMenuBar", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _DrawMenuBar(IntPtr hWnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void DrawMenuBar(IntPtr hWnd)
-        {
-            if (!NativeMethods._DrawMenuBar(hWnd))
-            {
-                throw new Win32Exception();
-            }
-        }
-
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool FindClose(IntPtr handle);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        public static extern SafeFindHandle FindFirstFileW(string lpFileName, [MarshalAs(UnmanagedType.LPStruct)][In][Out] WIN32_FIND_DATAW lpFindFileData);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool FindNextFileW(SafeFindHandle hndFindFile, [MarshalAs(UnmanagedType.LPStruct)][In][Out] WIN32_FIND_DATAW lpFindFileData);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "GetClientRect", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _GetClientRect(IntPtr hwnd, out RECT lpRect);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static RECT GetClientRect(IntPtr hwnd)
-        {
-            RECT result;
-            if (!NativeMethods._GetClientRect(hwnd, out result))
-            {
-                HRESULT.ThrowLastError();
-            }
-            return result;
-        }
-
-        [DllImport("uxtheme.dll", CharSet = CharSet.Unicode, EntryPoint = "GetCurrentThemeName")]
-        private static extern HRESULT _GetCurrentThemeName(StringBuilder pszThemeFileName, int dwMaxNameChars, StringBuilder pszColorBuff, int cchMaxColorChars, StringBuilder pszSizeBuff, int cchMaxSizeChars);
-
-        public static void GetCurrentThemeName(out string themeFileName, out string color, out string size)
-        {
-            StringBuilder stringBuilder = new StringBuilder(260);
-            StringBuilder stringBuilder2 = new StringBuilder(260);
-            StringBuilder stringBuilder3 = new StringBuilder(260);
-            NativeMethods._GetCurrentThemeName(stringBuilder, stringBuilder.Capacity, stringBuilder2, stringBuilder2.Capacity, stringBuilder3, stringBuilder3.Capacity).ThrowIfFailed();
-            themeFileName = stringBuilder.ToString();
-            color = stringBuilder2.ToString();
-            size = stringBuilder3.ToString();
-        }
-
-        [DllImport("uxtheme.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool IsThemeActive();
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [Obsolete("Use SafeDC.GetDC instead.", true)]
-        public static void GetDC()
-        {
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll")]
-        public static extern int GetDeviceCaps(SafeDC hdc, DeviceCap nIndex);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetModuleFileName", SetLastError = true)]
-        private static extern int _GetModuleFileName(IntPtr hModule, StringBuilder lpFilename, int nSize);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static string GetModuleFileName(IntPtr hModule)
-        {
-            StringBuilder stringBuilder = new StringBuilder(260);
-            for (; ; )
-            {
-                int num = NativeMethods._GetModuleFileName(hModule, stringBuilder, stringBuilder.Capacity);
-                if (num == 0)
-                {
-                    HRESULT.ThrowLastError();
-                }
-                if (num != stringBuilder.Capacity)
-                {
-                    break;
-                }
-                stringBuilder.EnsureCapacity(stringBuilder.Capacity * 2);
-            }
-            return stringBuilder.ToString();
-        }
-
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetModuleHandleW", SetLastError = true)]
-        private static extern IntPtr _GetModuleHandle([MarshalAs(UnmanagedType.LPWStr)] string lpModuleName);
-
-        public static IntPtr GetModuleHandle(string lpModuleName)
-        {
-            IntPtr intPtr = NativeMethods._GetModuleHandle(lpModuleName);
+            int num = 0;
+            intPtr = NativeMethods._CommandLineToArgvW(cmdLine, out num);
             if (intPtr == IntPtr.Zero)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "GetMonitorInfo", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _GetMonitorInfo(IntPtr hMonitor, [In][Out] MONITORINFO lpmi);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static MONITORINFO GetMonitorInfo(IntPtr hMonitor)
-        {
-            MONITORINFO monitorinfo = new MONITORINFO();
-            if (!NativeMethods._GetMonitorInfo(hMonitor, monitorinfo))
             {
                 throw new Win32Exception();
             }
-            return monitorinfo;
+            string[] array = new string[num];
+            for (int i = 0; i < num; i++)
+            {
+                IntPtr ptr = Marshal.ReadIntPtr(intPtr, i * Marshal.SizeOf(typeof(IntPtr)));
+                array[i] = Marshal.PtrToStringUni(ptr);
+            }
+            result = array;
         }
-
-        [DllImport("gdi32.dll", EntryPoint = "GetStockObject", SetLastError = true)]
-        private static extern IntPtr _GetStockObject(StockObject fnObject);
-
-        public static IntPtr GetStockObject(StockObject fnObject)
+        finally
         {
-            return NativeMethods._GetStockObject(fnObject);
+            NativeMethods._LocalFree(intPtr);
         }
+        return result;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        public static extern IntPtr GetSystemMenu(IntPtr hWnd, [MarshalAs(UnmanagedType.Bool)] bool bRevert);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
+    private static extern SafeHBITMAP _CreateDIBSection(SafeDC hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, out IntPtr ppvBits, IntPtr hSection, int dwOffset);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        public static extern int GetSystemMetrics(SM nIndex);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
+    private static extern SafeHBITMAP _CreateDIBSectionIntPtr(IntPtr hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, out IntPtr ppvBits, IntPtr hSection, int dwOffset);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr GetWindowLongPtr(IntPtr hwnd, GWL nIndex)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static SafeHBITMAP CreateDIBSection(SafeDC hdc, ref BITMAPINFO bitmapInfo, out IntPtr ppvBits, IntPtr hSection, int dwOffset)
+    {
+        SafeHBITMAP safeHBITMAP;
+        if (hdc == null)
         {
-            IntPtr intPtr = IntPtr.Zero;
-            if (8 == IntPtr.Size)
-            {
-                intPtr = NativeMethods.GetWindowLongPtr64(hwnd, nIndex);
-            }
-            else
-            {
-                intPtr = new IntPtr(NativeMethods.GetWindowLongPtr32(hwnd, nIndex));
-            }
-            if (IntPtr.Zero == intPtr)
-            {
-                throw new Win32Exception();
-            }
-            return intPtr;
+            safeHBITMAP = NativeMethods._CreateDIBSectionIntPtr(IntPtr.Zero, ref bitmapInfo, 0, out ppvBits, hSection, dwOffset);
         }
+        else
+        {
+            safeHBITMAP = NativeMethods._CreateDIBSection(hdc, ref bitmapInfo, 0, out ppvBits, hSection, dwOffset);
+        }
+        if (safeHBITMAP.IsInvalid)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return safeHBITMAP;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("uxtheme.dll", PreserveSig = false)]
-        public static extern void SetWindowThemeAttribute([In] IntPtr hwnd, [In] WINDOWTHEMEATTRIBUTETYPE eAttribute, [In] ref WTA_OPTIONS pvAttribute, [In] uint cbAttribute);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "CreateRoundRectRgn", SetLastError = true)]
+    private static extern IntPtr _CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse);
 
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "GetWindowLong", SetLastError = true)]
-        private static extern int GetWindowLongPtr32(IntPtr hWnd, GWL nIndex);
-
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr", SetLastError = true)]
-        private static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, GWL nIndex);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool GetWindowPlacement(IntPtr hwnd, WINDOWPLACEMENT lpwndpl);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse)
+    {
+        IntPtr intPtr = NativeMethods._CreateRoundRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect, nWidthEllipse, nHeightEllipse);
+        if (IntPtr.Zero == intPtr)
         {
-            WINDOWPLACEMENT windowplacement = new WINDOWPLACEMENT();
-            if (NativeMethods.GetWindowPlacement(hwnd, windowplacement))
-            {
-                return windowplacement;
-            }
             throw new Win32Exception();
         }
+        return intPtr;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "GetWindowRect", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _GetWindowRect(IntPtr hWnd, out RECT lpRect);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "CreateRectRgn", SetLastError = true)]
+    private static extern IntPtr _CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
 
-        public static RECT GetWindowRect(IntPtr hwnd)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
+    {
+        IntPtr intPtr = NativeMethods._CreateRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect);
+        if (IntPtr.Zero == intPtr)
         {
-            RECT result;
-            if (!NativeMethods._GetWindowRect(hwnd, out result))
-            {
-                HRESULT.ThrowLastError();
-            }
-            return result;
+            throw new Win32Exception();
         }
+        return intPtr;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipCreateBitmapFromStream(IStream stream, out IntPtr bitmap);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "CreateRectRgnIndirect", SetLastError = true)]
+    private static extern IntPtr _CreateRectRgnIndirect([In] ref RECT lprc);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipCreateHBITMAPFromBitmap(IntPtr bitmap, out IntPtr hbmReturn, int background);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipCreateHICONFromBitmap(IntPtr bitmap, out IntPtr hbmReturn);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipDisposeImage(IntPtr image);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdipImageForceValidation(IntPtr image);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdiplusStartup(out IntPtr token, StartupInput input, out StartupOutput output);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdiplus.dll")]
-        public static extern Status GdiplusShutdown(IntPtr token);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool IsWindowVisible(IntPtr hwnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", EntryPoint = "LocalFree", SetLastError = true)]
-        private static extern IntPtr _LocalFree(IntPtr hMem);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll")]
-        public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "PostMessage", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr CreateRectRgnIndirect(RECT lprc)
+    {
+        IntPtr intPtr = NativeMethods._CreateRectRgnIndirect(ref lprc);
+        if (IntPtr.Zero == intPtr)
         {
-            if (!NativeMethods._PostMessage(hWnd, Msg, wParam, lParam))
-            {
-                throw new Win32Exception();
-            }
+            throw new Win32Exception();
         }
+        return intPtr;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "RegisterClassExW", SetLastError = true)]
-        private static extern short _RegisterClassEx([In] ref WNDCLASSEX lpwcx);
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll")]
+    public static extern IntPtr CreateSolidBrush(int crColor);
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static short RegisterClassEx(ref WNDCLASSEX lpwcx)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW", SetLastError = true)]
+    private static extern IntPtr _CreateWindowEx(WS_EX dwExStyle, [MarshalAs(UnmanagedType.LPWStr)] string lpClassName, [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName, WS dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr CreateWindowEx(WS_EX dwExStyle, string lpClassName, string lpWindowName, WS dwStyle, int x, int y, int nWidth, int nHeight, IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance, IntPtr lpParam)
+    {
+        IntPtr intPtr = NativeMethods._CreateWindowEx(dwExStyle, lpClassName, lpWindowName, dwStyle, x, y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
+        if (IntPtr.Zero == intPtr)
         {
-            short num = NativeMethods._RegisterClassEx(ref lpwcx);
+            HRESULT.ThrowLastError();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+    public static extern IntPtr DefWindowProc(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DeleteObject(IntPtr hObject);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DestroyIcon(IntPtr handle);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DestroyWindow(IntPtr hwnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool IsWindow(IntPtr hwnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", PreserveSig = false)]
+    public static extern void DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS pMarInset);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", EntryPoint = "DwmIsCompositionEnabled", PreserveSig = false)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _DwmIsCompositionEnabled();
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", EntryPoint = "DwmGetColorizationColor")]
+    private static extern HRESULT _DwmGetColorizationColor(out uint pcrColorization, [MarshalAs(UnmanagedType.Bool)] out bool pfOpaqueBlend);
+
+    public static bool DwmGetColorizationColor(out uint pcrColorization, out bool pfOpaqueBlend)
+    {
+        if (Utility.IsOSVistaOrNewer && NativeMethods.IsThemeActive() && NativeMethods._DwmGetColorizationColor(out pcrColorization, out pfOpaqueBlend).Succeeded)
+        {
+            return true;
+        }
+        pcrColorization = 4278190080u;
+        pfOpaqueBlend = true;
+        return false;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool DwmIsCompositionEnabled()
+    {
+        return Utility.IsOSVistaOrNewer && NativeMethods._DwmIsCompositionEnabled();
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool DwmDefWindowProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam, out IntPtr plResult);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", EntryPoint = "DwmSetWindowAttribute")]
+    private static extern void _DwmSetWindowAttribute(IntPtr hwnd, DWMWA dwAttribute, ref int pvAttribute, int cbAttribute);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void DwmSetWindowAttributeFlip3DPolicy(IntPtr hwnd, DWMFLIP3D flip3dPolicy)
+    {
+        int num = (int) flip3dPolicy;
+        NativeMethods._DwmSetWindowAttribute(hwnd, DWMWA.FLIP3D_POLICY, ref num, 4);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void DwmSetWindowAttributeDisallowPeek(IntPtr hwnd, bool disallowPeek)
+    {
+        int num = disallowPeek ? 1 : 0;
+        NativeMethods._DwmSetWindowAttribute(hwnd, DWMWA.DISALLOW_PEEK, ref num, 4);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "EnableMenuItem")]
+    private static extern int _EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static MF EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable)
+    {
+        return (MF) NativeMethods._EnableMenuItem(hMenu, uIDEnableItem, uEnable);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "RemoveMenu", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _RemoveMenu(IntPtr hMenu, uint uPosition, uint uFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void RemoveMenu(IntPtr hMenu, SC uPosition, MF uFlags)
+    {
+        if (!NativeMethods._RemoveMenu(hMenu, (uint) uPosition, (uint) uFlags))
+        {
+            throw new Win32Exception();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "DrawMenuBar", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _DrawMenuBar(IntPtr hWnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void DrawMenuBar(IntPtr hWnd)
+    {
+        if (!NativeMethods._DrawMenuBar(hWnd))
+        {
+            throw new Win32Exception();
+        }
+    }
+
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool FindClose(IntPtr handle);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    public static extern SafeFindHandle FindFirstFileW(string lpFileName, [MarshalAs(UnmanagedType.LPStruct)][In][Out] WIN32_FIND_DATAW lpFindFileData);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool FindNextFileW(SafeFindHandle hndFindFile, [MarshalAs(UnmanagedType.LPStruct)][In][Out] WIN32_FIND_DATAW lpFindFileData);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "GetClientRect", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _GetClientRect(IntPtr hwnd, out RECT lpRect);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static RECT GetClientRect(IntPtr hwnd)
+    {
+        RECT result;
+        if (!NativeMethods._GetClientRect(hwnd, out result))
+        {
+            HRESULT.ThrowLastError();
+        }
+        return result;
+    }
+
+    [DllImport("uxtheme.dll", CharSet = CharSet.Unicode, EntryPoint = "GetCurrentThemeName")]
+    private static extern HRESULT _GetCurrentThemeName(StringBuilder pszThemeFileName, int dwMaxNameChars, StringBuilder pszColorBuff, int cchMaxColorChars, StringBuilder pszSizeBuff, int cchMaxSizeChars);
+
+    public static void GetCurrentThemeName(out string themeFileName, out string color, out string size)
+    {
+        StringBuilder stringBuilder = new StringBuilder(260);
+        StringBuilder stringBuilder2 = new StringBuilder(260);
+        StringBuilder stringBuilder3 = new StringBuilder(260);
+        NativeMethods._GetCurrentThemeName(stringBuilder, stringBuilder.Capacity, stringBuilder2, stringBuilder2.Capacity, stringBuilder3, stringBuilder3.Capacity).ThrowIfFailed();
+        themeFileName = stringBuilder.ToString();
+        color = stringBuilder2.ToString();
+        size = stringBuilder3.ToString();
+    }
+
+    [DllImport("uxtheme.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool IsThemeActive();
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [Obsolete("Use SafeDC.GetDC instead.", true)]
+    public static void GetDC()
+    {
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll")]
+    public static extern int GetDeviceCaps(SafeDC hdc, DeviceCap nIndex);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetModuleFileName", SetLastError = true)]
+    private static extern int _GetModuleFileName(IntPtr hModule, StringBuilder lpFilename, int nSize);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static string GetModuleFileName(IntPtr hModule)
+    {
+        StringBuilder stringBuilder = new StringBuilder(260);
+        for (; ; )
+        {
+            int num = NativeMethods._GetModuleFileName(hModule, stringBuilder, stringBuilder.Capacity);
             if (num == 0)
             {
                 HRESULT.ThrowLastError();
             }
-            return num;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "RegisterWindowMessage", SetLastError = true)]
-        private static extern uint _RegisterWindowMessage([MarshalAs(UnmanagedType.LPWStr)] string lpString);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static WM RegisterWindowMessage(string lpString)
-        {
-            uint num = NativeMethods._RegisterWindowMessage(lpString);
-            if (num == 0u)
+            if (num != stringBuilder.Capacity)
             {
-                HRESULT.ThrowLastError();
+                break;
             }
-            return (WM) num;
+            stringBuilder.EnsureCapacity(stringBuilder.Capacity * 2);
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetActiveWindow", SetLastError = true)]
-        private static extern IntPtr _SetActiveWindow(IntPtr hWnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr SetActiveWindow(IntPtr hwnd)
-        {
-            Verify.IsNotDefault<IntPtr>(hwnd, "hwnd");
-            IntPtr intPtr = NativeMethods._SetActiveWindow(hwnd);
-            if (intPtr == IntPtr.Zero)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr SetClassLongPtr(IntPtr hwnd, GCLP nIndex, IntPtr dwNewLong)
-        {
-            if (8 == IntPtr.Size)
-            {
-                return NativeMethods.SetClassLongPtr64(hwnd, nIndex, dwNewLong);
-            }
-            return new IntPtr(NativeMethods.SetClassLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
-        }
-
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetClassLong", SetLastError = true)]
-        private static extern int SetClassLongPtr32(IntPtr hWnd, GCLP nIndex, int dwNewLong);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [DllImport("user32.dll", EntryPoint = "SetClassLongPtr", SetLastError = true)]
-        private static extern IntPtr SetClassLongPtr64(IntPtr hWnd, GCLP nIndex, IntPtr dwNewLong);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", SetLastError = true)]
-        public static extern ErrorModes SetErrorMode(ErrorModes newMode);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _SetProcessWorkingSetSize(IntPtr hProcess, IntPtr dwMinimiumWorkingSetSize, IntPtr dwMaximumWorkingSetSize);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SetProcessWorkingSetSize(IntPtr hProcess, int dwMinimumWorkingSetSize, int dwMaximumWorkingSetSize)
-        {
-            if (!NativeMethods._SetProcessWorkingSetSize(hProcess, new IntPtr(dwMinimumWorkingSetSize), new IntPtr(dwMaximumWorkingSetSize)))
-            {
-                throw new Win32Exception();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr SetWindowLongPtr(IntPtr hwnd, GWL nIndex, IntPtr dwNewLong)
-        {
-            if (8 == IntPtr.Size)
-            {
-                return NativeMethods.SetWindowLongPtr64(hwnd, nIndex, dwNewLong);
-            }
-            return new IntPtr(NativeMethods.SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
-        }
-
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetWindowLong", SetLastError = true)]
-        private static extern int SetWindowLongPtr32(IntPtr hWnd, GWL nIndex, int dwNewLong);
-
-        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetWindowLongPtr", SetLastError = true)]
-        private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, GWL nIndex, IntPtr dwNewLong);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetWindowRgn", SetLastError = true)]
-        private static extern int _SetWindowRgn(IntPtr hWnd, IntPtr hRgn, [MarshalAs(UnmanagedType.Bool)] bool bRedraw);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw)
-        {
-            if (NativeMethods._SetWindowRgn(hWnd, hRgn, bRedraw) == 0)
-            {
-                throw new Win32Exception();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SetWindowPos", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags)
-        {
-            return NativeMethods._SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll")]
-        public static extern Win32Error SHFileOperation(ref SHFILEOPSTRUCT lpFileOp);
-
-        [DllImport("user32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool ShowWindow(IntPtr hwnd, SW nCmdShow);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "SystemParametersInfoW", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _SystemParametersInfo_String(SPI uiAction, int uiParam, [MarshalAs(UnmanagedType.LPWStr)] string pvParam, SPIF fWinIni);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SystemParametersInfoW", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _SystemParametersInfo_NONCLIENTMETRICS(SPI uiAction, int uiParam, [In][Out] ref NONCLIENTMETRICS pvParam, SPIF fWinIni);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SystemParametersInfoW", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _SystemParametersInfo_HIGHCONTRAST(SPI uiAction, int uiParam, [In][Out] ref HIGHCONTRAST pvParam, SPIF fWinIni);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SystemParametersInfo(SPI uiAction, int uiParam, string pvParam, SPIF fWinIni)
-        {
-            if (!NativeMethods._SystemParametersInfo_String(uiAction, uiParam, pvParam, fWinIni))
-            {
-                HRESULT.ThrowLastError();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static NONCLIENTMETRICS SystemParameterInfo_GetNONCLIENTMETRICS()
-        {
-            NONCLIENTMETRICS result = Utility.IsOSVistaOrNewer ? NONCLIENTMETRICS.VistaMetricsStruct : NONCLIENTMETRICS.XPMetricsStruct;
-            if (!NativeMethods._SystemParametersInfo_NONCLIENTMETRICS(SPI.GETNONCLIENTMETRICS, result.cbSize, ref result, SPIF.None))
-            {
-                HRESULT.ThrowLastError();
-            }
-            return result;
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static HIGHCONTRAST SystemParameterInfo_GetHIGHCONTRAST()
-        {
-            HIGHCONTRAST result = new HIGHCONTRAST
-            {
-                cbSize = Marshal.SizeOf(typeof(HIGHCONTRAST))
-            };
-            if (!NativeMethods._SystemParametersInfo_HIGHCONTRAST(SPI.GETHIGHCONTRAST, result.cbSize, ref result, SPIF.None))
-            {
-                HRESULT.ThrowLastError();
-            }
-            return result;
-        }
-
-        [DllImport("user32.dll")]
-        public static extern uint TrackPopupMenuEx(IntPtr hmenu, uint fuFlags, int x, int y, IntPtr hwnd, IntPtr lptpm);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
-        private static extern IntPtr _SelectObject(SafeDC hdc, IntPtr hgdiobj);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr SelectObject(SafeDC hdc, IntPtr hgdiobj)
-        {
-            IntPtr intPtr = NativeMethods._SelectObject(hdc, hgdiobj);
-            if (intPtr == IntPtr.Zero)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
-        private static extern IntPtr _SelectObjectSafeHBITMAP(SafeDC hdc, SafeHBITMAP hgdiobj);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static IntPtr SelectObject(SafeDC hdc, SafeHBITMAP hgdiobj)
-        {
-            IntPtr intPtr = NativeMethods._SelectObjectSafeHBITMAP(hdc, hgdiobj);
-            if (intPtr == IntPtr.Zero)
-            {
-                HRESULT.ThrowLastError();
-            }
-            return intPtr;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern int SendInput(int nInputs, ref INPUT pInputs, int cbSize);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        public static extern IntPtr SendMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "UnregisterClass", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _UnregisterClassAtom(IntPtr lpClassName, IntPtr hInstance);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "UnregisterClass", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _UnregisterClassName(string lpClassName, IntPtr hInstance);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void UnregisterClass(short atom, IntPtr hinstance)
-        {
-            if (!NativeMethods._UnregisterClassAtom(new IntPtr((int) atom), hinstance))
-            {
-                HRESULT.ThrowLastError();
-            }
-        }
-
-        public static void UnregisterClass(string lpClassName, IntPtr hInstance)
-        {
-            if (!NativeMethods._UnregisterClassName(lpClassName, hInstance))
-            {
-                HRESULT.ThrowLastError();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "UpdateLayeredWindow", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _UpdateLayeredWindow(IntPtr hwnd, SafeDC hdcDst, [In] ref POINT pptDst, [In] ref SIZE psize, SafeDC hdcSrc, [In] ref POINT pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("user32.dll", EntryPoint = "UpdateLayeredWindow", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static extern bool _UpdateLayeredWindowIntPtr(IntPtr hwnd, IntPtr hdcDst, IntPtr pptDst, IntPtr psize, IntPtr hdcSrc, IntPtr pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void UpdateLayeredWindow(IntPtr hwnd, SafeDC hdcDst, ref POINT pptDst, ref SIZE psize, SafeDC hdcSrc, ref POINT pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags)
-        {
-            if (!NativeMethods._UpdateLayeredWindow(hwnd, hdcDst, ref pptDst, ref psize, hdcSrc, ref pptSrc, crKey, ref pblend, dwFlags))
-            {
-                HRESULT.ThrowLastError();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void UpdateLayeredWindow(IntPtr hwnd, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags)
-        {
-            if (!NativeMethods._UpdateLayeredWindowIntPtr(hwnd, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, crKey, ref pblend, dwFlags))
-            {
-                HRESULT.ThrowLastError();
-            }
-        }
-
-        [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
-        private static extern void _SHAddToRecentDocs_String(SHARD uFlags, [MarshalAs(UnmanagedType.LPWStr)] string pv);
-
-        [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
-        private static extern void _SHAddToRecentDocs_ShellLink(SHARD uFlags, IShellLinkW pv);
-
-        public static void SHAddToRecentDocs(string path)
-        {
-            NativeMethods._SHAddToRecentDocs_String(SHARD.PATHW, path);
-        }
-
-        public static void SHAddToRecentDocs(IShellLinkW shellLink)
-        {
-            NativeMethods._SHAddToRecentDocs_ShellLink(SHARD.LINK, shellLink);
-        }
-
-        [DllImport("dwmapi.dll", EntryPoint = "DwmGetCompositionTimingInfo")]
-        private static extern HRESULT _DwmGetCompositionTimingInfo(IntPtr hwnd, ref DWM_TIMING_INFO pTimingInfo);
-
-        public static DWM_TIMING_INFO? DwmGetCompositionTimingInfo(IntPtr hwnd)
-        {
-            if (!Utility.IsOSVistaOrNewer)
-            {
-                return null;
-            }
-            DWM_TIMING_INFO value = new DWM_TIMING_INFO
-            {
-                cbSize = Marshal.SizeOf(typeof(DWM_TIMING_INFO))
-            };
-            HRESULT hrLeft = NativeMethods._DwmGetCompositionTimingInfo(hwnd, ref value);
-            if (hrLeft == HRESULT.E_PENDING)
-            {
-                return null;
-            }
-            hrLeft.ThrowIfFailed();
-            return new DWM_TIMING_INFO?(value);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", PreserveSig = false)]
-        public static extern void DwmInvalidateIconicBitmaps(IntPtr hwnd);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", PreserveSig = false)]
-        public static extern void DwmSetIconicThumbnail(IntPtr hwnd, IntPtr hbmp, DWM_SIT dwSITFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("dwmapi.dll", PreserveSig = false)]
-        public static extern void DwmSetIconicLivePreviewBitmap(IntPtr hwnd, IntPtr hbmp, RefPOINT pptClient, DWM_SIT dwSITFlags);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll", PreserveSig = false)]
-        public static extern void SHGetItemFromDataObject(IDataObject pdtobj, DOGIF dwFlags, [In] ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppv);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll", PreserveSig = false)]
-        public static extern HRESULT SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath, IBindCtx pbc, [In] ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppv);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool Shell_NotifyIcon(NIM dwMessage, [In] NOTIFYICONDATA lpdata);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll", PreserveSig = false)]
-        public static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string AppID);
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DllImport("shell32.dll")]
-        public static extern HRESULT GetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] out string AppID);
+        return stringBuilder.ToString();
     }
-}
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "GetModuleHandleW", SetLastError = true)]
+    private static extern IntPtr _GetModuleHandle([MarshalAs(UnmanagedType.LPWStr)] string lpModuleName);
+
+    public static IntPtr GetModuleHandle(string lpModuleName)
+    {
+        IntPtr intPtr = NativeMethods._GetModuleHandle(lpModuleName);
+        if (intPtr == IntPtr.Zero)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "GetMonitorInfo", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _GetMonitorInfo(IntPtr hMonitor, [In][Out] MONITORINFO lpmi);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static MONITORINFO GetMonitorInfo(IntPtr hMonitor)
+    {
+        MONITORINFO monitorinfo = new MONITORINFO();
+        if (!NativeMethods._GetMonitorInfo(hMonitor, monitorinfo))
+        {
+            throw new Win32Exception();
+        }
+        return monitorinfo;
+    }
+
+    [DllImport("gdi32.dll", EntryPoint = "GetStockObject", SetLastError = true)]
+    private static extern IntPtr _GetStockObject(StockObject fnObject);
+
+    public static IntPtr GetStockObject(StockObject fnObject)
+    {
+        return NativeMethods._GetStockObject(fnObject);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    public static extern IntPtr GetSystemMenu(IntPtr hWnd, [MarshalAs(UnmanagedType.Bool)] bool bRevert);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    public static extern int GetSystemMetrics(SM nIndex);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr GetWindowLongPtr(IntPtr hwnd, GWL nIndex)
+    {
+        IntPtr intPtr = IntPtr.Zero;
+        if (8 == IntPtr.Size)
+        {
+            intPtr = NativeMethods.GetWindowLongPtr64(hwnd, nIndex);
+        }
+        else
+        {
+            intPtr = new IntPtr(NativeMethods.GetWindowLongPtr32(hwnd, nIndex));
+        }
+        if (IntPtr.Zero == intPtr)
+        {
+            throw new Win32Exception();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("uxtheme.dll", PreserveSig = false)]
+    public static extern void SetWindowThemeAttribute([In] IntPtr hwnd, [In] WINDOWTHEMEATTRIBUTETYPE eAttribute, [In] ref WTA_OPTIONS pvAttribute, [In] uint cbAttribute);
+
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "GetWindowLong", SetLastError = true)]
+    private static extern int GetWindowLongPtr32(IntPtr hWnd, GWL nIndex);
+
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr", SetLastError = true)]
+    private static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, GWL nIndex);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool GetWindowPlacement(IntPtr hwnd, WINDOWPLACEMENT lpwndpl);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
+    {
+        WINDOWPLACEMENT windowplacement = new WINDOWPLACEMENT();
+        if (NativeMethods.GetWindowPlacement(hwnd, windowplacement))
+        {
+            return windowplacement;
+        }
+        throw new Win32Exception();
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "GetWindowRect", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+    public static RECT GetWindowRect(IntPtr hwnd)
+    {
+        RECT result;
+        if (!NativeMethods._GetWindowRect(hwnd, out result))
+        {
+            HRESULT.ThrowLastError();
+        }
+        return result;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdipCreateBitmapFromStream(IStream stream, out IntPtr bitmap);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdipCreateHBITMAPFromBitmap(IntPtr bitmap, out IntPtr hbmReturn, int background);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdipCreateHICONFromBitmap(IntPtr bitmap, out IntPtr hbmReturn);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdipDisposeImage(IntPtr image);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdipImageForceValidation(IntPtr image);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdiplusStartup(out IntPtr token, StartupInput input, out StartupOutput output);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdiplus.dll")]
+    public static extern Status GdiplusShutdown(IntPtr token);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool IsWindowVisible(IntPtr hwnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", EntryPoint = "LocalFree", SetLastError = true)]
+    private static extern IntPtr _LocalFree(IntPtr hMem);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll")]
+    public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "PostMessage", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam)
+    {
+        if (!NativeMethods._PostMessage(hWnd, Msg, wParam, lParam))
+        {
+            throw new Win32Exception();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "RegisterClassExW", SetLastError = true)]
+    private static extern short _RegisterClassEx([In] ref WNDCLASSEX lpwcx);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static short RegisterClassEx(ref WNDCLASSEX lpwcx)
+    {
+        short num = NativeMethods._RegisterClassEx(ref lpwcx);
+        if (num == 0)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return num;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "RegisterWindowMessage", SetLastError = true)]
+    private static extern uint _RegisterWindowMessage([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static WM RegisterWindowMessage(string lpString)
+    {
+        uint num = NativeMethods._RegisterWindowMessage(lpString);
+        if (num == 0u)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return (WM) num;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetActiveWindow", SetLastError = true)]
+    private static extern IntPtr _SetActiveWindow(IntPtr hWnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr SetActiveWindow(IntPtr hwnd)
+    {
+        Verify.IsNotDefault<IntPtr>(hwnd, "hwnd");
+        IntPtr intPtr = NativeMethods._SetActiveWindow(hwnd);
+        if (intPtr == IntPtr.Zero)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr SetClassLongPtr(IntPtr hwnd, GCLP nIndex, IntPtr dwNewLong)
+    {
+        if (8 == IntPtr.Size)
+        {
+            return NativeMethods.SetClassLongPtr64(hwnd, nIndex, dwNewLong);
+        }
+        return new IntPtr(NativeMethods.SetClassLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+    }
+
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetClassLong", SetLastError = true)]
+    private static extern int SetClassLongPtr32(IntPtr hWnd, GCLP nIndex, int dwNewLong);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [DllImport("user32.dll", EntryPoint = "SetClassLongPtr", SetLastError = true)]
+    private static extern IntPtr SetClassLongPtr64(IntPtr hWnd, GCLP nIndex, IntPtr dwNewLong);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", SetLastError = true)]
+    public static extern ErrorModes SetErrorMode(ErrorModes newMode);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("kernel32.dll", EntryPoint = "SetProcessWorkingSetSize", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _SetProcessWorkingSetSize(IntPtr hProcess, IntPtr dwMinimiumWorkingSetSize, IntPtr dwMaximumWorkingSetSize);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SetProcessWorkingSetSize(IntPtr hProcess, int dwMinimumWorkingSetSize, int dwMaximumWorkingSetSize)
+    {
+        if (!NativeMethods._SetProcessWorkingSetSize(hProcess, new IntPtr(dwMinimumWorkingSetSize), new IntPtr(dwMaximumWorkingSetSize)))
+        {
+            throw new Win32Exception();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr SetWindowLongPtr(IntPtr hwnd, GWL nIndex, IntPtr dwNewLong)
+    {
+        if (8 == IntPtr.Size)
+        {
+            return NativeMethods.SetWindowLongPtr64(hwnd, nIndex, dwNewLong);
+        }
+        return new IntPtr(NativeMethods.SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+    }
+
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetWindowLong", SetLastError = true)]
+    private static extern int SetWindowLongPtr32(IntPtr hWnd, GWL nIndex, int dwNewLong);
+
+    [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetWindowLongPtr", SetLastError = true)]
+    private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, GWL nIndex, IntPtr dwNewLong);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetWindowRgn", SetLastError = true)]
+    private static extern int _SetWindowRgn(IntPtr hWnd, IntPtr hRgn, [MarshalAs(UnmanagedType.Bool)] bool bRedraw);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw)
+    {
+        if (NativeMethods._SetWindowRgn(hWnd, hRgn, bRedraw) == 0)
+        {
+            throw new Win32Exception();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SetWindowPos", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags)
+    {
+        return NativeMethods._SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll")]
+    public static extern Win32Error SHFileOperation(ref SHFILEOPSTRUCT lpFileOp);
+
+    [DllImport("user32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool ShowWindow(IntPtr hwnd, SW nCmdShow);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "SystemParametersInfoW", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _SystemParametersInfo_String(SPI uiAction, int uiParam, [MarshalAs(UnmanagedType.LPWStr)] string pvParam, SPIF fWinIni);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SystemParametersInfoW", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _SystemParametersInfo_NONCLIENTMETRICS(SPI uiAction, int uiParam, [In][Out] ref NONCLIENTMETRICS pvParam, SPIF fWinIni);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "SystemParametersInfoW", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _SystemParametersInfo_HIGHCONTRAST(SPI uiAction, int uiParam, [In][Out] ref HIGHCONTRAST pvParam, SPIF fWinIni);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SystemParametersInfo(SPI uiAction, int uiParam, string pvParam, SPIF fWinIni)
+    {
+        if (!NativeMethods._SystemParametersInfo_String(uiAction, uiParam, pvParam, fWinIni))
+        {
+            HRESULT.ThrowLastError();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static NONCLIENTMETRICS SystemParameterInfo_GetNONCLIENTMETRICS()
+    {
+        NONCLIENTMETRICS result = Utility.IsOSVistaOrNewer ? NONCLIENTMETRICS.VistaMetricsStruct : NONCLIENTMETRICS.XPMetricsStruct;
+        if (!NativeMethods._SystemParametersInfo_NONCLIENTMETRICS(SPI.GETNONCLIENTMETRICS, result.cbSize, ref result, SPIF.None))
+        {
+            HRESULT.ThrowLastError();
+        }
+        return result;
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static HIGHCONTRAST SystemParameterInfo_GetHIGHCONTRAST()
+    {
+        HIGHCONTRAST result = new HIGHCONTRAST
+        {
+            cbSize = Marshal.SizeOf(typeof(HIGHCONTRAST))
+        };
+        if (!NativeMethods._SystemParametersInfo_HIGHCONTRAST(SPI.GETHIGHCONTRAST, result.cbSize, ref result, SPIF.None))
+        {
+            HRESULT.ThrowLastError();
+        }
+        return result;
+    }
+
+    [DllImport("user32.dll")]
+    public static extern uint TrackPopupMenuEx(IntPtr hmenu, uint fuFlags, int x, int y, IntPtr hwnd, IntPtr lptpm);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
+    private static extern IntPtr _SelectObject(SafeDC hdc, IntPtr hgdiobj);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr SelectObject(SafeDC hdc, IntPtr hgdiobj)
+    {
+        IntPtr intPtr = NativeMethods._SelectObject(hdc, hgdiobj);
+        if (intPtr == IntPtr.Zero)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
+    private static extern IntPtr _SelectObjectSafeHBITMAP(SafeDC hdc, SafeHBITMAP hgdiobj);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static IntPtr SelectObject(SafeDC hdc, SafeHBITMAP hgdiobj)
+    {
+        IntPtr intPtr = NativeMethods._SelectObjectSafeHBITMAP(hdc, hgdiobj);
+        if (intPtr == IntPtr.Zero)
+        {
+            HRESULT.ThrowLastError();
+        }
+        return intPtr;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern int SendInput(int nInputs, ref INPUT pInputs, int cbSize);
+
+    [DllImport("user32.dll", SetLastError = true)]
+    public static extern IntPtr SendMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "UnregisterClass", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _UnregisterClassAtom(IntPtr lpClassName, IntPtr hInstance);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "UnregisterClass", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _UnregisterClassName(string lpClassName, IntPtr hInstance);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void UnregisterClass(short atom, IntPtr hinstance)
+    {
+        if (!NativeMethods._UnregisterClassAtom(new IntPtr((int) atom), hinstance))
+        {
+            HRESULT.ThrowLastError();
+        }
+    }
+
+    public static void UnregisterClass(string lpClassName, IntPtr hInstance)
+    {
+        if (!NativeMethods._UnregisterClassName(lpClassName, hInstance))
+        {
+            HRESULT.ThrowLastError();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "UpdateLayeredWindow", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _UpdateLayeredWindow(IntPtr hwnd, SafeDC hdcDst, [In] ref POINT pptDst, [In] ref SIZE psize, SafeDC hdcSrc, [In] ref POINT pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("user32.dll", EntryPoint = "UpdateLayeredWindow", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool _UpdateLayeredWindowIntPtr(IntPtr hwnd, IntPtr hdcDst, IntPtr pptDst, IntPtr psize, IntPtr hdcSrc, IntPtr pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void UpdateLayeredWindow(IntPtr hwnd, SafeDC hdcDst, ref POINT pptDst, ref SIZE psize, SafeDC hdcSrc, ref POINT pptSrc, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags)
+    {
+        if (!NativeMethods._UpdateLayeredWindow(hwnd, hdcDst, ref pptDst, ref psize, hdcSrc, ref pptSrc, crKey, ref pblend, dwFlags))
+        {
+            HRESULT.ThrowLastError();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void UpdateLayeredWindow(IntPtr hwnd, int crKey, ref BLENDFUNCTION pblend, ULW dwFlags)
+    {
+        if (!NativeMethods._UpdateLayeredWindowIntPtr(hwnd, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, crKey, ref pblend, dwFlags))
+        {
+            HRESULT.ThrowLastError();
+        }
+    }
+
+    [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
+    private static extern void _SHAddToRecentDocs_String(SHARD uFlags, [MarshalAs(UnmanagedType.LPWStr)] string pv);
+
+    [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
+    private static extern void _SHAddToRecentDocs_ShellLink(SHARD uFlags, IShellLinkW pv);
+
+    public static void SHAddToRecentDocs(string path)
+    {
+        NativeMethods._SHAddToRecentDocs_String(SHARD.PATHW, path);
+    }
+
+    public static void SHAddToRecentDocs(IShellLinkW shellLink)
+    {
+        NativeMethods._SHAddToRecentDocs_ShellLink(SHARD.LINK, shellLink);
+    }
+
+    [DllImport("dwmapi.dll", EntryPoint = "DwmGetCompositionTimingInfo")]
+    private static extern HRESULT _DwmGetCompositionTimingInfo(IntPtr hwnd, ref DWM_TIMING_INFO pTimingInfo);
+
+    public static DWM_TIMING_INFO? DwmGetCompositionTimingInfo(IntPtr hwnd)
+    {
+        if (!Utility.IsOSVistaOrNewer)
+        {
+            return null;
+        }
+        DWM_TIMING_INFO value = new DWM_TIMING_INFO
+        {
+            cbSize = Marshal.SizeOf(typeof(DWM_TIMING_INFO))
+        };
+        HRESULT hrLeft = NativeMethods._DwmGetCompositionTimingInfo(hwnd, ref value);
+        if (hrLeft == HRESULT.E_PENDING)
+        {
+            return null;
+        }
+        hrLeft.ThrowIfFailed();
+        return new DWM_TIMING_INFO?(value);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", PreserveSig = false)]
+    public static extern void DwmInvalidateIconicBitmaps(IntPtr hwnd);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", PreserveSig = false)]
+    public static extern void DwmSetIconicThumbnail(IntPtr hwnd, IntPtr hbmp, DWM_SIT dwSITFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("dwmapi.dll", PreserveSig = false)]
+    public static extern void DwmSetIconicLivePreviewBitmap(IntPtr hwnd, IntPtr hbmp, RefPOINT pptClient, DWM_SIT dwSITFlags);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll", PreserveSig = false)]
+    public static extern void SHGetItemFromDataObject(IDataObject pdtobj, DOGIF dwFlags, [In] ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppv);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll", PreserveSig = false)]
+    public static extern HRESULT SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath, IBindCtx pbc, [In] ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppv);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll")]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static extern bool Shell_NotifyIcon(NIM dwMessage, [In] NOTIFYICONDATA lpdata);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll", PreserveSig = false)]
+    public static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string AppID);
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DllImport("shell32.dll")]
+    public static extern HRESULT GetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] out string AppID);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
index ba8cc1a0..dddd7060 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum OLECMDEXECOPT
 {
-    internal enum OLECMDEXECOPT
-    {
-        DODEFAULT,
-        PROMPTUSER,
-        DONTPROMPTUSER,
-        SHOWHELP
-    }
-}
+    DODEFAULT,
+    PROMPTUSER,
+    DONTPROMPTUSER,
+    SHOWHELP
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
index efea165f..126c6106 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum OLECMDF
 {
-    internal enum OLECMDF
-    {
-        SUPPORTED = 1,
-        ENABLED,
-        LATCHED = 4,
-        NINCHED = 8,
-        INVISIBLE = 16,
-        DEFHIDEONCTXTMENU = 32
-    }
-}
+    SUPPORTED = 1,
+    ENABLED,
+    LATCHED = 4,
+    NINCHED = 8,
+    INVISIBLE = 16,
+    DEFHIDEONCTXTMENU = 32
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
index f62af704..93bb23b3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
@@ -1,65 +1,64 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum OLECMDID
 {
-    internal enum OLECMDID
-    {
-        OPEN = 1,
-        NEW,
-        SAVE,
-        SAVEAS,
-        SAVECOPYAS,
-        PRINT,
-        PRINTPREVIEW,
-        PAGESETUP,
-        SPELL,
-        PROPERTIES,
-        CUT,
-        COPY,
-        PASTE,
-        PASTESPECIAL,
-        UNDO,
-        REDO,
-        SELECTALL,
-        CLEARSELECTION,
-        ZOOM,
-        GETZOOMRANGE,
-        UPDATECOMMANDS,
-        REFRESH,
-        STOP,
-        HIDETOOLBARS,
-        SETPROGRESSMAX,
-        SETPROGRESSPOS,
-        SETPROGRESSTEXT,
-        SETTITLE,
-        SETDOWNLOADSTATE,
-        STOPDOWNLOAD,
-        ONTOOLBARACTIVATED,
-        FIND,
-        DELETE,
-        HTTPEQUIV,
-        HTTPEQUIV_DONE,
-        ENABLE_INTERACTION,
-        ONUNLOAD,
-        PROPERTYBAG2,
-        PREREFRESH,
-        SHOWSCRIPTERROR,
-        SHOWMESSAGE,
-        SHOWFIND,
-        SHOWPAGESETUP,
-        SHOWPRINT,
-        CLOSE,
-        ALLOWUILESSSAVEAS,
-        DONTDOWNLOADCSS,
-        UPDATEPAGESTATUS,
-        PRINT2,
-        PRINTPREVIEW2,
-        SETPRINTTEMPLATE,
-        GETPRINTTEMPLATE,
-        PAGEACTIONBLOCKED = 55,
-        PAGEACTIONUIQUERY,
-        FOCUSVIEWCONTROLS,
-        FOCUSVIEWCONTROLSQUERY,
-        SHOWPAGEACTIONMENU
-    }
-}
+    OPEN = 1,
+    NEW,
+    SAVE,
+    SAVEAS,
+    SAVECOPYAS,
+    PRINT,
+    PRINTPREVIEW,
+    PAGESETUP,
+    SPELL,
+    PROPERTIES,
+    CUT,
+    COPY,
+    PASTE,
+    PASTESPECIAL,
+    UNDO,
+    REDO,
+    SELECTALL,
+    CLEARSELECTION,
+    ZOOM,
+    GETZOOMRANGE,
+    UPDATECOMMANDS,
+    REFRESH,
+    STOP,
+    HIDETOOLBARS,
+    SETPROGRESSMAX,
+    SETPROGRESSPOS,
+    SETPROGRESSTEXT,
+    SETTITLE,
+    SETDOWNLOADSTATE,
+    STOPDOWNLOAD,
+    ONTOOLBARACTIVATED,
+    FIND,
+    DELETE,
+    HTTPEQUIV,
+    HTTPEQUIV_DONE,
+    ENABLE_INTERACTION,
+    ONUNLOAD,
+    PROPERTYBAG2,
+    PREREFRESH,
+    SHOWSCRIPTERROR,
+    SHOWMESSAGE,
+    SHOWFIND,
+    SHOWPAGESETUP,
+    SHOWPRINT,
+    CLOSE,
+    ALLOWUILESSSAVEAS,
+    DONTDOWNLOADCSS,
+    UPDATEPAGESTATUS,
+    PRINT2,
+    PRINTPREVIEW2,
+    SETPRINTTEMPLATE,
+    GETPRINTTEMPLATE,
+    PAGEACTIONBLOCKED = 55,
+    PAGEACTIONUIQUERY,
+    FOCUSVIEWCONTROLS,
+    FOCUSVIEWCONTROLSQUERY,
+    SHOWPAGEACTIONMENU
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs b/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
index 3b61796b..9a3a5d90 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
@@ -1,31 +1,30 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+internal struct PKEY
 {
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    internal struct PKEY
+    public PKEY(Guid fmtid, uint pid)
     {
-        public PKEY(Guid fmtid, uint pid)
-        {
-            this._fmtid = fmtid;
-            this._pid = pid;
-        }
-
-        private readonly Guid _fmtid;
-
-        private readonly uint _pid;
-
-        public static readonly PKEY Title = new PKEY(new Guid("F29F85E0-4FF9-1068-AB91-08002B27B3D9"), 2u);
-
-        public static readonly PKEY AppUserModel_ID = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5u);
-
-        public static readonly PKEY AppUserModel_IsDestListSeparator = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 6u);
-
-        public static readonly PKEY AppUserModel_RelaunchCommand = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 2u);
-
-        public static readonly PKEY AppUserModel_RelaunchDisplayNameResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 4u);
-
-        public static readonly PKEY AppUserModel_RelaunchIconResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 3u);
+        this._fmtid = fmtid;
+        this._pid = pid;
     }
-}
+
+    private readonly Guid _fmtid;
+
+    private readonly uint _pid;
+
+    public static readonly PKEY Title = new PKEY(new Guid("F29F85E0-4FF9-1068-AB91-08002B27B3D9"), 2u);
+
+    public static readonly PKEY AppUserModel_ID = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5u);
+
+    public static readonly PKEY AppUserModel_IsDestListSeparator = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 6u);
+
+    public static readonly PKEY AppUserModel_RelaunchCommand = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 2u);
+
+    public static readonly PKEY AppUserModel_RelaunchDisplayNameResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 4u);
+
+    public static readonly PKEY AppUserModel_RelaunchIconResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 3u);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
index d48e8117..0f8e7c21 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct POINT
-    {
-        public int x;
+namespace Standard;
 
-        public int y;
-    }
-}
+internal struct POINT
+{
+    public int x;
+
+    public int y;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
index bef4f077..f7651147 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
@@ -2,93 +2,92 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Explicit)]
+internal class PROPVARIANT : IDisposable
 {
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Explicit)]
-    internal class PROPVARIANT : IDisposable
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public VarEnum VarType
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public VarEnum VarType
+        get
         {
-            get
-            {
-                return (VarEnum) this.vt;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public string GetValue()
-        {
-            if (this.vt == 31)
-            {
-                return Marshal.PtrToStringUni(this.pointerVal);
-            }
-            return null;
-        }
-
-        public void SetValue(bool f)
-        {
-            this.Clear();
-            this.vt = 11;
-            this.boolVal = (short) (f ? -1 : 0);
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public void SetValue(string val)
-        {
-            this.Clear();
-            this.vt = 31;
-            this.pointerVal = Marshal.StringToCoTaskMemUni(val);
-        }
-
-        public void Clear()
-        {
-            PROPVARIANT.NativeMethods.PropVariantClear(this);
-        }
-
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        ~PROPVARIANT()
-        {
-            this.Dispose(false);
-        }
-
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
-        private void Dispose(bool disposing)
-        {
-            this.Clear();
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        [FieldOffset(0)]
-        private ushort vt;
-
-        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        [FieldOffset(8)]
-        private IntPtr pointerVal;
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        [FieldOffset(8)]
-        private byte byteVal;
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        [FieldOffset(8)]
-        private long longVal;
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        [FieldOffset(8)]
-        private short boolVal;
-
-        private static class NativeMethods
-        {
-            [DllImport("ole32.dll")]
-            internal static extern HRESULT PropVariantClear(PROPVARIANT pvar);
+            return (VarEnum) this.vt;
         }
     }
-}
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public string GetValue()
+    {
+        if (this.vt == 31)
+        {
+            return Marshal.PtrToStringUni(this.pointerVal);
+        }
+        return null;
+    }
+
+    public void SetValue(bool f)
+    {
+        this.Clear();
+        this.vt = 11;
+        this.boolVal = (short) (f ? -1 : 0);
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public void SetValue(string val)
+    {
+        this.Clear();
+        this.vt = 31;
+        this.pointerVal = Marshal.StringToCoTaskMemUni(val);
+    }
+
+    public void Clear()
+    {
+        PROPVARIANT.NativeMethods.PropVariantClear(this);
+    }
+
+    public void Dispose()
+    {
+        this.Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    ~PROPVARIANT()
+    {
+        this.Dispose(false);
+    }
+
+    [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
+    private void Dispose(bool disposing)
+    {
+        this.Clear();
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    [FieldOffset(0)]
+    private ushort vt;
+
+    [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    [FieldOffset(8)]
+    private IntPtr pointerVal;
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    [FieldOffset(8)]
+    private byte byteVal;
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    [FieldOffset(8)]
+    private long longVal;
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    [FieldOffset(8)]
+    private short boolVal;
+
+    private static class NativeMethods
+    {
+        [DllImport("ole32.dll")]
+        internal static extern HRESULT PropVariantClear(PROPVARIANT pvar);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
index e88926fe..e321cf94 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum READYSTATE
 {
-    internal enum READYSTATE
-    {
-        UNINITIALIZED,
-        LOADING,
-        LOADED,
-        INTERACTIVE,
-        COMPLETE
-    }
-}
+    UNINITIALIZED,
+    LOADING,
+    LOADED,
+    INTERACTIVE,
+    COMPLETE
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
index 3009193e..8b7d5063 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
@@ -1,152 +1,151 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Standard
+namespace Standard;
+
+internal struct RECT
 {
-    internal struct RECT
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public void Offset(int dx, int dy)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public void Offset(int dx, int dy)
-        {
-            this._left += dx;
-            this._top += dy;
-            this._right += dx;
-            this._bottom += dy;
-        }
+        this._left += dx;
+        this._top += dy;
+        this._right += dx;
+        this._bottom += dy;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Left
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Left
+    {
+        get
         {
-            get
-            {
-                return this._left;
-            }
-            set
-            {
-                this._left = value;
-            }
+            return this._left;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Right
+        set
         {
-            get
-            {
-                return this._right;
-            }
-            set
-            {
-                this._right = value;
-            }
+            this._left = value;
         }
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Top
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Right
+    {
+        get
         {
-            get
-            {
-                return this._top;
-            }
-            set
-            {
-                this._top = value;
-            }
+            return this._right;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Bottom
+        set
         {
-            get
-            {
-                return this._bottom;
-            }
-            set
-            {
-                this._bottom = value;
-            }
+            this._right = value;
         }
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Width
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Top
+    {
+        get
         {
-            get
-            {
-                return this._right - this._left;
-            }
+            return this._top;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Height
+        set
         {
-            get
-            {
-                return this._bottom - this._top;
-            }
+            this._top = value;
         }
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public POINT Position
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Bottom
+    {
+        get
         {
-            get
-            {
-                return new POINT
-                {
-                    x = this._left,
-                    y = this._top
-                };
-            }
+            return this._bottom;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public SIZE Size
+        set
         {
-            get
-            {
-                return new SIZE
-                {
-                    cx = this.Width,
-                    cy = this.Height
-                };
-            }
+            this._bottom = value;
         }
+    }
 
-        public static RECT Union(RECT rect1, RECT rect2)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Width
+    {
+        get
         {
-            return new RECT
+            return this._right - this._left;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Height
+    {
+        get
+        {
+            return this._bottom - this._top;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public POINT Position
+    {
+        get
+        {
+            return new POINT
             {
-                Left = Math.Min(rect1.Left, rect2.Left),
-                Top = Math.Min(rect1.Top, rect2.Top),
-                Right = Math.Max(rect1.Right, rect2.Right),
-                Bottom = Math.Max(rect1.Bottom, rect2.Bottom)
+                x = this._left,
+                y = this._top
             };
         }
-
-        public override bool Equals(object obj)
-        {
-            bool result;
-            try
-            {
-                RECT rect = (RECT) obj;
-                result = (rect._bottom == this._bottom && rect._left == this._left && rect._right == this._right && rect._top == this._top);
-            }
-            catch (InvalidCastException)
-            {
-                result = false;
-            }
-            return result;
-        }
-
-        public override int GetHashCode()
-        {
-            return (this._left << 16 | Utility.LOWORD(this._right)) ^ (this._top << 16 | Utility.LOWORD(this._bottom));
-        }
-
-        private int _left;
-
-        private int _top;
-
-        private int _right;
-
-        private int _bottom;
     }
-}
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public SIZE Size
+    {
+        get
+        {
+            return new SIZE
+            {
+                cx = this.Width,
+                cy = this.Height
+            };
+        }
+    }
+
+    public static RECT Union(RECT rect1, RECT rect2)
+    {
+        return new RECT
+        {
+            Left = Math.Min(rect1.Left, rect2.Left),
+            Top = Math.Min(rect1.Top, rect2.Top),
+            Right = Math.Max(rect1.Right, rect2.Right),
+            Bottom = Math.Max(rect1.Bottom, rect2.Bottom)
+        };
+    }
+
+    public override bool Equals(object obj)
+    {
+        bool result;
+        try
+        {
+            RECT rect = (RECT) obj;
+            result = (rect._bottom == this._bottom && rect._left == this._left && rect._right == this._right && rect._top == this._top);
+        }
+        catch (InvalidCastException)
+        {
+            result = false;
+        }
+        return result;
+    }
+
+    public override int GetHashCode()
+    {
+        return (this._left << 16 | Utility.LOWORD(this._right)) ^ (this._top << 16 | Utility.LOWORD(this._bottom));
+    }
+
+    private int _left;
+
+    private int _top;
+
+    private int _right;
+
+    private int _bottom;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
index 49ff877c..a1b6a0d8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct RGBQUAD
 {
-    internal struct RGBQUAD
-    {
-        public byte rgbBlue;
+    public byte rgbBlue;
 
-        public byte rgbGreen;
+    public byte rgbGreen;
 
-        public byte rgbRed;
+    public byte rgbRed;
 
-        public byte rgbReserved;
-    }
-}
+    public byte rgbReserved;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
index b9bd3394..2c111dee 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum RGN
 {
-    internal enum RGN
-    {
-        AND = 1,
-        OR,
-        XOR,
-        DIFF,
-        COPY
-    }
-}
+    AND = 1,
+    OR,
+    XOR,
+    DIFF,
+    COPY
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
index db48cfa4..ab5583c9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
@@ -2,14 +2,13 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal class RefPOINT
-    {
-        public int x;
+namespace Standard;
 
-        public int y;
-    }
-}
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential)]
+internal class RefPOINT
+{
+    public int x;
+
+    public int y;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
index e1a9bfe1..90798337 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
@@ -2,106 +2,105 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential)]
+internal class RefRECT
 {
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential)]
-    internal class RefRECT
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public RefRECT(int left, int top, int right, int bottom)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public RefRECT(int left, int top, int right, int bottom)
-        {
-            this._left = left;
-            this._top = top;
-            this._right = right;
-            this._bottom = bottom;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Width
-        {
-            get
-            {
-                return this._right - this._left;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Height
-        {
-            get
-            {
-                return this._bottom - this._top;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Left
-        {
-            get
-            {
-                return this._left;
-            }
-            set
-            {
-                this._left = value;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Right
-        {
-            get
-            {
-                return this._right;
-            }
-            set
-            {
-                this._right = value;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Top
-        {
-            get
-            {
-                return this._top;
-            }
-            set
-            {
-                this._top = value;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public int Bottom
-        {
-            get
-            {
-                return this._bottom;
-            }
-            set
-            {
-                this._bottom = value;
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public void Offset(int dx, int dy)
-        {
-            this._left += dx;
-            this._top += dy;
-            this._right += dx;
-            this._bottom += dy;
-        }
-
-        private int _left;
-
-        private int _top;
-
-        private int _right;
-
-        private int _bottom;
+        this._left = left;
+        this._top = top;
+        this._right = right;
+        this._bottom = bottom;
     }
-}
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Width
+    {
+        get
+        {
+            return this._right - this._left;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Height
+    {
+        get
+        {
+            return this._bottom - this._top;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Left
+    {
+        get
+        {
+            return this._left;
+        }
+        set
+        {
+            this._left = value;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Right
+    {
+        get
+        {
+            return this._right;
+        }
+        set
+        {
+            this._right = value;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Top
+    {
+        get
+        {
+            return this._top;
+        }
+        set
+        {
+            this._top = value;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public int Bottom
+    {
+        get
+        {
+            return this._bottom;
+        }
+        set
+        {
+            this._bottom = value;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public void Offset(int dx, int dy)
+    {
+        this._left += dx;
+        this._top += dy;
+        this._right += dx;
+        this._bottom += dy;
+    }
+
+    private int _left;
+
+    private int _top;
+
+    private int _right;
+
+    private int _bottom;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
index e43b895b..f6cf7de7 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
@@ -1,31 +1,30 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SC
 {
-    internal enum SC
-    {
-        SIZE = 61440,
-        MOVE = 61456,
-        MINIMIZE = 61472,
-        MAXIMIZE = 61488,
-        NEXTWINDOW = 61504,
-        PREVWINDOW = 61520,
-        CLOSE = 61536,
-        VSCROLL = 61552,
-        HSCROLL = 61568,
-        MOUSEMENU = 61584,
-        KEYMENU = 61696,
-        ARRANGE = 61712,
-        RESTORE = 61728,
-        TASKLIST = 61744,
-        SCREENSAVE = 61760,
-        HOTKEY = 61776,
-        DEFAULT = 61792,
-        MONITORPOWER = 61808,
-        CONTEXTHELP = 61824,
-        SEPARATOR = 61455,
-        F_ISSECURE = 1,
-        ICON = 61472,
-        ZOOM = 61488
-    }
-}
+    SIZE = 61440,
+    MOVE = 61456,
+    MINIMIZE = 61472,
+    MAXIMIZE = 61488,
+    NEXTWINDOW = 61504,
+    PREVWINDOW = 61520,
+    CLOSE = 61536,
+    VSCROLL = 61552,
+    HSCROLL = 61568,
+    MOUSEMENU = 61584,
+    KEYMENU = 61696,
+    ARRANGE = 61712,
+    RESTORE = 61728,
+    TASKLIST = 61744,
+    SCREENSAVE = 61760,
+    HOTKEY = 61776,
+    DEFAULT = 61792,
+    MONITORPOWER = 61808,
+    CONTEXTHELP = 61824,
+    SEPARATOR = 61455,
+    F_ISSECURE = 1,
+    ICON = 61472,
+    ZOOM = 61488
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
index 26e160d1..75dda830 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
@@ -1,43 +1,42 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum SFGAO : uint
 {
-    [Flags]
-    internal enum SFGAO : uint
-    {
-        CANCOPY = 1u,
-        CANMOVE = 2u,
-        CANLINK = 4u,
-        STORAGE = 8u,
-        CANRENAME = 16u,
-        CANDELETE = 32u,
-        HASPROPSHEET = 64u,
-        DROPTARGET = 256u,
-        CAPABILITYMASK = 375u,
-        ENCRYPTED = 8192u,
-        ISSLOW = 16384u,
-        GHOSTED = 32768u,
-        LINK = 65536u,
-        SHARE = 131072u,
-        READONLY = 262144u,
-        HIDDEN = 524288u,
-        DISPLAYATTRMASK = 1032192u,
-        FILESYSANCESTOR = 268435456u,
-        FOLDER = 536870912u,
-        FILESYSTEM = 1073741824u,
-        HASSUBFOLDER = 2147483648u,
-        CONTENTSMASK = 2147483648u,
-        VALIDATE = 16777216u,
-        REMOVABLE = 33554432u,
-        COMPRESSED = 67108864u,
-        BROWSABLE = 134217728u,
-        NONENUMERATED = 1048576u,
-        NEWCONTENT = 2097152u,
-        CANMONIKER = 4194304u,
-        HASSTORAGE = 4194304u,
-        STREAM = 4194304u,
-        STORAGEANCESTOR = 8388608u,
-        STORAGECAPMASK = 1891958792u,
-        PKEYSFGAOMASK = 2164539392u
-    }
-}
+    CANCOPY = 1u,
+    CANMOVE = 2u,
+    CANLINK = 4u,
+    STORAGE = 8u,
+    CANRENAME = 16u,
+    CANDELETE = 32u,
+    HASPROPSHEET = 64u,
+    DROPTARGET = 256u,
+    CAPABILITYMASK = 375u,
+    ENCRYPTED = 8192u,
+    ISSLOW = 16384u,
+    GHOSTED = 32768u,
+    LINK = 65536u,
+    SHARE = 131072u,
+    READONLY = 262144u,
+    HIDDEN = 524288u,
+    DISPLAYATTRMASK = 1032192u,
+    FILESYSANCESTOR = 268435456u,
+    FOLDER = 536870912u,
+    FILESYSTEM = 1073741824u,
+    HASSUBFOLDER = 2147483648u,
+    CONTENTSMASK = 2147483648u,
+    VALIDATE = 16777216u,
+    REMOVABLE = 33554432u,
+    COMPRESSED = 67108864u,
+    BROWSABLE = 134217728u,
+    NONENUMERATED = 1048576u,
+    NEWCONTENT = 2097152u,
+    CANMONIKER = 4194304u,
+    HASSTORAGE = 4194304u,
+    STREAM = 4194304u,
+    STORAGEANCESTOR = 8388608u,
+    STORAGECAPMASK = 1891958792u,
+    PKEYSFGAOMASK = 2164539392u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
index 8556b1a5..068d0565 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SHARD
 {
-    internal enum SHARD
-    {
-        PIDL = 1,
-        PATHA,
-        PATHW,
-        APPIDINFO,
-        APPIDINFOIDLIST,
-        LINK,
-        APPIDINFOLINK
-    }
-}
+    PIDL = 1,
+    PATHA,
+    PATHW,
+    APPIDINFO,
+    APPIDINFOIDLIST,
+    LINK,
+    APPIDINFOLINK
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
index da8226ea..543d7d04 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
@@ -2,16 +2,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    internal class SHARDAPPIDINFO
-    {
-        [MarshalAs(UnmanagedType.Interface)]
-        private object psi;
+namespace Standard;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        private string pszAppID;
-    }
-}
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+internal class SHARDAPPIDINFO
+{
+    [MarshalAs(UnmanagedType.Interface)]
+    private object psi;
+
+    [MarshalAs(UnmanagedType.LPWStr)]
+    private string pszAppID;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
index 39fc2b05..220201a9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
@@ -2,15 +2,14 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    internal class SHARDAPPIDINFOIDLIST
-    {
-        private IntPtr pidl;
+namespace Standard;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        private string pszAppID;
-    }
-}
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+internal class SHARDAPPIDINFOIDLIST
+{
+    private IntPtr pidl;
+
+    [MarshalAs(UnmanagedType.LPWStr)]
+    private string pszAppID;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
index e40ad2f2..01c49d7a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
@@ -2,15 +2,14 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
-{
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    internal class SHARDAPPIDINFOLINK
-    {
-        private IntPtr psl;
+namespace Standard;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        private string pszAppID;
-    }
-}
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+internal class SHARDAPPIDINFOLINK
+{
+    private IntPtr psl;
+
+    [MarshalAs(UnmanagedType.LPWStr)]
+    private string pszAppID;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
index 05971ce1..db7e414e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
@@ -1,20 +1,19 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SHCONTF
 {
-    internal enum SHCONTF
-    {
-        CHECKING_FOR_CHILDREN = 16,
-        FOLDERS = 32,
-        NONFOLDERS = 64,
-        INCLUDEHIDDEN = 128,
-        INIT_ON_FIRST_NEXT = 256,
-        NETPRINTERSRCH = 512,
-        SHAREABLE = 1024,
-        STORAGE = 2048,
-        NAVIGATION_ENUM = 4096,
-        FASTITEMS = 8192,
-        FLATLIST = 16384,
-        ENABLE_ASYNC = 32768
-    }
-}
+    CHECKING_FOR_CHILDREN = 16,
+    FOLDERS = 32,
+    NONFOLDERS = 64,
+    INCLUDEHIDDEN = 128,
+    INIT_ON_FIRST_NEXT = 256,
+    NETPRINTERSRCH = 512,
+    SHAREABLE = 1024,
+    STORAGE = 2048,
+    NAVIGATION_ENUM = 4096,
+    FASTITEMS = 8192,
+    FLATLIST = 16384,
+    ENABLE_ASYNC = 32768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
index 5c79b575..af7a9b3d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
@@ -1,28 +1,27 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode, Pack = 1)]
+internal struct SHFILEOPSTRUCT
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode, Pack = 1)]
-    internal struct SHFILEOPSTRUCT
-    {
-        public IntPtr hwnd;
+    public IntPtr hwnd;
 
-        [MarshalAs(UnmanagedType.U4)]
-        public FO wFunc;
+    [MarshalAs(UnmanagedType.U4)]
+    public FO wFunc;
 
-        public string pFrom;
+    public string pFrom;
 
-        public string pTo;
+    public string pTo;
 
-        [MarshalAs(UnmanagedType.U2)]
-        public FOF fFlags;
+    [MarshalAs(UnmanagedType.U2)]
+    public FOF fFlags;
 
-        [MarshalAs(UnmanagedType.Bool)]
-        public int fAnyOperationsAborted;
+    [MarshalAs(UnmanagedType.Bool)]
+    public int fAnyOperationsAborted;
 
-        public IntPtr hNameMappings;
+    public IntPtr hNameMappings;
 
-        public string lpszProgressTitle;
-    }
-}
+    public string lpszProgressTitle;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
index e984fa7e..656e6a1e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum SHGDN
 {
-    [Flags]
-    internal enum SHGDN
-    {
-        SHGDN_NORMAL = 0,
-        SHGDN_INFOLDER = 1,
-        SHGDN_FOREDITING = 4096,
-        SHGDN_FORADDRESSBAR = 16384,
-        SHGDN_FORPARSING = 32768
-    }
-}
+    SHGDN_NORMAL = 0,
+    SHGDN_INFOLDER = 1,
+    SHGDN_FOREDITING = 4096,
+    SHGDN_FORADDRESSBAR = 16384,
+    SHGDN_FORPARSING = 32768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
index 075d879b..e723e33e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SIATTRIBFLAGS
 {
-    internal enum SIATTRIBFLAGS
-    {
-        AND = 1,
-        OR,
-        APPCOMPAT
-    }
-}
+    AND = 1,
+    OR,
+    APPCOMPAT
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
index ff7ceeb2..d4930d49 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SICHINT : uint
 {
-    internal enum SICHINT : uint
-    {
-        DISPLAY,
-        ALLFIELDS = 2147483648u,
-        CANONICAL = 268435456u,
-        TEST_FILESYSPATH_IF_NOT_EQUAL = 536870912u
-    }
-}
+    DISPLAY,
+    ALLFIELDS = 2147483648u,
+    CANONICAL = 268435456u,
+    TEST_FILESYSPATH_IF_NOT_EQUAL = 536870912u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
index 28d2455b..239e8ad3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
@@ -1,17 +1,16 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SIGDN : uint
 {
-    internal enum SIGDN : uint
-    {
-        NORMALDISPLAY,
-        PARENTRELATIVEPARSING = 2147581953u,
-        DESKTOPABSOLUTEPARSING = 2147647488u,
-        PARENTRELATIVEEDITING = 2147684353u,
-        DESKTOPABSOLUTEEDITING = 2147794944u,
-        FILESYSPATH = 2147844096u,
-        URL = 2147909632u,
-        PARENTRELATIVEFORADDRESSBAR = 2147991553u,
-        PARENTRELATIVE = 2148007937u
-    }
-}
+    NORMALDISPLAY,
+    PARENTRELATIVEPARSING = 2147581953u,
+    DESKTOPABSOLUTEPARSING = 2147647488u,
+    PARENTRELATIVEEDITING = 2147684353u,
+    DESKTOPABSOLUTEEDITING = 2147794944u,
+    FILESYSPATH = 2147844096u,
+    URL = 2147909632u,
+    PARENTRELATIVEFORADDRESSBAR = 2147991553u,
+    PARENTRELATIVE = 2148007937u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
index abf57f01..f81812cf 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct SIZE
-    {
-        public int cx;
+namespace Standard;
 
-        public int cy;
-    }
-}
+internal struct SIZE
+{
+    public int cx;
+
+    public int cy;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
index eeac2c2f..011720f5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
@@ -1,12 +1,11 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum SLGP
 {
-    [Flags]
-    internal enum SLGP
-    {
-        SHORTPATH = 1,
-        UNCPRIORITY = 2,
-        RAWPATH = 4
-    }
-}
+    SHORTPATH = 1,
+    UNCPRIORITY = 2,
+    RAWPATH = 4
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
index f69b5dd8..c16ec152 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
@@ -1,92 +1,91 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SM
 {
-    internal enum SM
-    {
-        CXSCREEN,
-        CYSCREEN,
-        CXVSCROLL,
-        CYHSCROLL,
-        CYCAPTION,
-        CXBORDER,
-        CYBORDER,
-        CXFIXEDFRAME,
-        CYFIXEDFRAME,
-        CYVTHUMB,
-        CXHTHUMB,
-        CXICON,
-        CYICON,
-        CXCURSOR,
-        CYCURSOR,
-        CYMENU,
-        CXFULLSCREEN,
-        CYFULLSCREEN,
-        CYKANJIWINDOW,
-        MOUSEPRESENT,
-        CYVSCROLL,
-        CXHSCROLL,
-        DEBUG,
-        SWAPBUTTON,
-        CXMIN = 28,
-        CYMIN,
-        CXSIZE,
-        CYSIZE,
-        CXFRAME,
-        CXSIZEFRAME = 32,
-        CYFRAME,
-        CYSIZEFRAME = 33,
-        CXMINTRACK,
-        CYMINTRACK,
-        CXDOUBLECLK,
-        CYDOUBLECLK,
-        CXICONSPACING,
-        CYICONSPACING,
-        MENUDROPALIGNMENT,
-        PENWINDOWS,
-        DBCSENABLED,
-        CMOUSEBUTTONS,
-        SECURE,
-        CXEDGE,
-        CYEDGE,
-        CXMINSPACING,
-        CYMINSPACING,
-        CXSMICON,
-        CYSMICON,
-        CYSMCAPTION,
-        CXSMSIZE,
-        CYSMSIZE,
-        CXMENUSIZE,
-        CYMENUSIZE,
-        ARRANGE,
-        CXMINIMIZED,
-        CYMINIMIZED,
-        CXMAXTRACK,
-        CYMAXTRACK,
-        CXMAXIMIZED,
-        CYMAXIMIZED,
-        NETWORK,
-        CLEANBOOT = 67,
-        CXDRAG,
-        CYDRAG,
-        SHOWSOUNDS,
-        CXMENUCHECK,
-        CYMENUCHECK,
-        SLOWMACHINE,
-        MIDEASTENABLED,
-        MOUSEWHEELPRESENT,
-        XVIRTUALSCREEN,
-        YVIRTUALSCREEN,
-        CXVIRTUALSCREEN,
-        CYVIRTUALSCREEN,
-        CMONITORS,
-        SAMEDISPLAYFORMAT,
-        IMMENABLED,
-        CXFOCUSBORDER,
-        CYFOCUSBORDER,
-        TABLETPC = 86,
-        MEDIACENTER,
-        REMOTESESSION = 4096,
-        REMOTECONTROL = 8193
-    }
-}
+    CXSCREEN,
+    CYSCREEN,
+    CXVSCROLL,
+    CYHSCROLL,
+    CYCAPTION,
+    CXBORDER,
+    CYBORDER,
+    CXFIXEDFRAME,
+    CYFIXEDFRAME,
+    CYVTHUMB,
+    CXHTHUMB,
+    CXICON,
+    CYICON,
+    CXCURSOR,
+    CYCURSOR,
+    CYMENU,
+    CXFULLSCREEN,
+    CYFULLSCREEN,
+    CYKANJIWINDOW,
+    MOUSEPRESENT,
+    CYVSCROLL,
+    CXHSCROLL,
+    DEBUG,
+    SWAPBUTTON,
+    CXMIN = 28,
+    CYMIN,
+    CXSIZE,
+    CYSIZE,
+    CXFRAME,
+    CXSIZEFRAME = 32,
+    CYFRAME,
+    CYSIZEFRAME = 33,
+    CXMINTRACK,
+    CYMINTRACK,
+    CXDOUBLECLK,
+    CYDOUBLECLK,
+    CXICONSPACING,
+    CYICONSPACING,
+    MENUDROPALIGNMENT,
+    PENWINDOWS,
+    DBCSENABLED,
+    CMOUSEBUTTONS,
+    SECURE,
+    CXEDGE,
+    CYEDGE,
+    CXMINSPACING,
+    CYMINSPACING,
+    CXSMICON,
+    CYSMICON,
+    CYSMCAPTION,
+    CXSMSIZE,
+    CYSMSIZE,
+    CXMENUSIZE,
+    CYMENUSIZE,
+    ARRANGE,
+    CXMINIMIZED,
+    CYMINIMIZED,
+    CXMAXTRACK,
+    CYMAXTRACK,
+    CXMAXIMIZED,
+    CYMAXIMIZED,
+    NETWORK,
+    CLEANBOOT = 67,
+    CXDRAG,
+    CYDRAG,
+    SHOWSOUNDS,
+    CXMENUCHECK,
+    CYMENUCHECK,
+    SLOWMACHINE,
+    MIDEASTENABLED,
+    MOUSEWHEELPRESENT,
+    XVIRTUALSCREEN,
+    YVIRTUALSCREEN,
+    CXVIRTUALSCREEN,
+    CYVIRTUALSCREEN,
+    CMONITORS,
+    SAMEDISPLAYFORMAT,
+    IMMENABLED,
+    CXFOCUSBORDER,
+    CYFOCUSBORDER,
+    TABLETPC = 86,
+    MEDIACENTER,
+    REMOTESESSION = 4096,
+    REMOTECONTROL = 8193
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
index 1a6f828b..bb20c9bc 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
@@ -1,223 +1,222 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SPI
 {
-    internal enum SPI
-    {
-        GETBEEP = 1,
-        SETBEEP,
-        GETMOUSE,
-        SETMOUSE,
-        GETBORDER,
-        SETBORDER,
-        GETKEYBOARDSPEED = 10,
-        SETKEYBOARDSPEED,
-        LANGDRIVER,
-        ICONHORIZONTALSPACING,
-        GETSCREENSAVETIMEOUT,
-        SETSCREENSAVETIMEOUT,
-        GETSCREENSAVEACTIVE,
-        SETSCREENSAVEACTIVE,
-        GETGRIDGRANULARITY,
-        SETGRIDGRANULARITY,
-        SETDESKWALLPAPER,
-        SETDESKPATTERN,
-        GETKEYBOARDDELAY,
-        SETKEYBOARDDELAY,
-        ICONVERTICALSPACING,
-        GETICONTITLEWRAP,
-        SETICONTITLEWRAP,
-        GETMENUDROPALIGNMENT,
-        SETMENUDROPALIGNMENT,
-        SETDOUBLECLKWIDTH,
-        SETDOUBLECLKHEIGHT,
-        GETICONTITLELOGFONT,
-        SETDOUBLECLICKTIME,
-        SETMOUSEBUTTONSWAP,
-        SETICONTITLELOGFONT,
-        GETFASTTASKSWITCH,
-        SETFASTTASKSWITCH,
-        SETDRAGFULLWINDOWS,
-        GETDRAGFULLWINDOWS,
-        GETNONCLIENTMETRICS = 41,
-        SETNONCLIENTMETRICS,
-        GETMINIMIZEDMETRICS,
-        SETMINIMIZEDMETRICS,
-        GETICONMETRICS,
-        SETICONMETRICS,
-        SETWORKAREA,
-        GETWORKAREA,
-        SETPENWINDOWS,
-        GETHIGHCONTRAST = 66,
-        SETHIGHCONTRAST,
-        GETKEYBOARDPREF,
-        SETKEYBOARDPREF,
-        GETSCREENREADER,
-        SETSCREENREADER,
-        GETANIMATION,
-        SETANIMATION,
-        GETFONTSMOOTHING,
-        SETFONTSMOOTHING,
-        SETDRAGWIDTH,
-        SETDRAGHEIGHT,
-        SETHANDHELD,
-        GETLOWPOWERTIMEOUT,
-        GETPOWEROFFTIMEOUT,
-        SETLOWPOWERTIMEOUT,
-        SETPOWEROFFTIMEOUT,
-        GETLOWPOWERACTIVE,
-        GETPOWEROFFACTIVE,
-        SETLOWPOWERACTIVE,
-        SETPOWEROFFACTIVE,
-        SETCURSORS,
-        SETICONS,
-        GETDEFAULTINPUTLANG,
-        SETDEFAULTINPUTLANG,
-        SETLANGTOGGLE,
-        GETWINDOWSEXTENSION,
-        SETMOUSETRAILS,
-        GETMOUSETRAILS,
-        SETSCREENSAVERRUNNING = 97,
-        SCREENSAVERRUNNING = 97,
-        GETFILTERKEYS = 50,
-        SETFILTERKEYS,
-        GETTOGGLEKEYS,
-        SETTOGGLEKEYS,
-        GETMOUSEKEYS,
-        SETMOUSEKEYS,
-        GETSHOWSOUNDS,
-        SETSHOWSOUNDS,
-        GETSTICKYKEYS,
-        SETSTICKYKEYS,
-        GETACCESSTIMEOUT,
-        SETACCESSTIMEOUT,
-        GETSERIALKEYS,
-        SETSERIALKEYS,
-        GETSOUNDSENTRY,
-        SETSOUNDSENTRY,
-        GETSNAPTODEFBUTTON = 95,
-        SETSNAPTODEFBUTTON,
-        GETMOUSEHOVERWIDTH = 98,
-        SETMOUSEHOVERWIDTH,
-        GETMOUSEHOVERHEIGHT,
-        SETMOUSEHOVERHEIGHT,
-        GETMOUSEHOVERTIME,
-        SETMOUSEHOVERTIME,
-        GETWHEELSCROLLLINES,
-        SETWHEELSCROLLLINES,
-        GETMENUSHOWDELAY,
-        SETMENUSHOWDELAY,
-        GETWHEELSCROLLCHARS,
-        SETWHEELSCROLLCHARS,
-        GETSHOWIMEUI,
-        SETSHOWIMEUI,
-        GETMOUSESPEED,
-        SETMOUSESPEED,
-        GETSCREENSAVERRUNNING,
-        GETDESKWALLPAPER,
-        GETAUDIODESCRIPTION,
-        SETAUDIODESCRIPTION,
-        GETSCREENSAVESECURE,
-        SETSCREENSAVESECURE,
-        GETHUNGAPPTIMEOUT,
-        SETHUNGAPPTIMEOUT,
-        GETWAITTOKILLTIMEOUT,
-        SETWAITTOKILLTIMEOUT,
-        GETWAITTOKILLSERVICETIMEOUT,
-        SETWAITTOKILLSERVICETIMEOUT,
-        GETMOUSEDOCKTHRESHOLD,
-        SETMOUSEDOCKTHRESHOLD,
-        GETPENDOCKTHRESHOLD,
-        SETPENDOCKTHRESHOLD,
-        GETWINARRANGING,
-        SETWINARRANGING,
-        GETMOUSEDRAGOUTTHRESHOLD,
-        SETMOUSEDRAGOUTTHRESHOLD,
-        GETPENDRAGOUTTHRESHOLD,
-        SETPENDRAGOUTTHRESHOLD,
-        GETMOUSESIDEMOVETHRESHOLD,
-        SETMOUSESIDEMOVETHRESHOLD,
-        GETPENSIDEMOVETHRESHOLD,
-        SETPENSIDEMOVETHRESHOLD,
-        GETDRAGFROMMAXIMIZE,
-        SETDRAGFROMMAXIMIZE,
-        GETSNAPSIZING,
-        SETSNAPSIZING,
-        GETDOCKMOVING,
-        SETDOCKMOVING,
-        GETACTIVEWINDOWTRACKING = 4096,
-        SETACTIVEWINDOWTRACKING,
-        GETMENUANIMATION,
-        SETMENUANIMATION,
-        GETCOMBOBOXANIMATION,
-        SETCOMBOBOXANIMATION,
-        GETLISTBOXSMOOTHSCROLLING,
-        SETLISTBOXSMOOTHSCROLLING,
-        GETGRADIENTCAPTIONS,
-        SETGRADIENTCAPTIONS,
-        GETKEYBOARDCUES,
-        SETKEYBOARDCUES,
-        GETMENUUNDERLINES = 4106,
-        SETMENUUNDERLINES,
-        GETACTIVEWNDTRKZORDER,
-        SETACTIVEWNDTRKZORDER,
-        GETHOTTRACKING,
-        SETHOTTRACKING,
-        GETMENUFADE = 4114,
-        SETMENUFADE,
-        GETSELECTIONFADE,
-        SETSELECTIONFADE,
-        GETTOOLTIPANIMATION,
-        SETTOOLTIPANIMATION,
-        GETTOOLTIPFADE,
-        SETTOOLTIPFADE,
-        GETCURSORSHADOW,
-        SETCURSORSHADOW,
-        GETMOUSESONAR,
-        SETMOUSESONAR,
-        GETMOUSECLICKLOCK,
-        SETMOUSECLICKLOCK,
-        GETMOUSEVANISH,
-        SETMOUSEVANISH,
-        GETFLATMENU,
-        SETFLATMENU,
-        GETDROPSHADOW,
-        SETDROPSHADOW,
-        GETBLOCKSENDINPUTRESETS,
-        SETBLOCKSENDINPUTRESETS,
-        GETUIEFFECTS = 4158,
-        SETUIEFFECTS,
-        GETDISABLEOVERLAPPEDCONTENT,
-        SETDISABLEOVERLAPPEDCONTENT,
-        GETCLIENTAREAANIMATION,
-        SETCLIENTAREAANIMATION,
-        GETCLEARTYPE = 4168,
-        SETCLEARTYPE,
-        GETSPEECHRECOGNITION,
-        SETSPEECHRECOGNITION,
-        GETFOREGROUNDLOCKTIMEOUT = 8192,
-        SETFOREGROUNDLOCKTIMEOUT,
-        GETACTIVEWNDTRKTIMEOUT,
-        SETACTIVEWNDTRKTIMEOUT,
-        GETFOREGROUNDFLASHCOUNT,
-        SETFOREGROUNDFLASHCOUNT,
-        GETCARETWIDTH,
-        SETCARETWIDTH,
-        GETMOUSECLICKLOCKTIME,
-        SETMOUSECLICKLOCKTIME,
-        GETFONTSMOOTHINGTYPE,
-        SETFONTSMOOTHINGTYPE,
-        GETFONTSMOOTHINGCONTRAST,
-        SETFONTSMOOTHINGCONTRAST,
-        GETFOCUSBORDERWIDTH,
-        SETFOCUSBORDERWIDTH,
-        GETFOCUSBORDERHEIGHT,
-        SETFOCUSBORDERHEIGHT,
-        GETFONTSMOOTHINGORIENTATION,
-        SETFONTSMOOTHINGORIENTATION,
-        GETMINIMUMHITRADIUS,
-        SETMINIMUMHITRADIUS,
-        GETMESSAGEDURATION,
-        SETMESSAGEDURATION
-    }
-}
+    GETBEEP = 1,
+    SETBEEP,
+    GETMOUSE,
+    SETMOUSE,
+    GETBORDER,
+    SETBORDER,
+    GETKEYBOARDSPEED = 10,
+    SETKEYBOARDSPEED,
+    LANGDRIVER,
+    ICONHORIZONTALSPACING,
+    GETSCREENSAVETIMEOUT,
+    SETSCREENSAVETIMEOUT,
+    GETSCREENSAVEACTIVE,
+    SETSCREENSAVEACTIVE,
+    GETGRIDGRANULARITY,
+    SETGRIDGRANULARITY,
+    SETDESKWALLPAPER,
+    SETDESKPATTERN,
+    GETKEYBOARDDELAY,
+    SETKEYBOARDDELAY,
+    ICONVERTICALSPACING,
+    GETICONTITLEWRAP,
+    SETICONTITLEWRAP,
+    GETMENUDROPALIGNMENT,
+    SETMENUDROPALIGNMENT,
+    SETDOUBLECLKWIDTH,
+    SETDOUBLECLKHEIGHT,
+    GETICONTITLELOGFONT,
+    SETDOUBLECLICKTIME,
+    SETMOUSEBUTTONSWAP,
+    SETICONTITLELOGFONT,
+    GETFASTTASKSWITCH,
+    SETFASTTASKSWITCH,
+    SETDRAGFULLWINDOWS,
+    GETDRAGFULLWINDOWS,
+    GETNONCLIENTMETRICS = 41,
+    SETNONCLIENTMETRICS,
+    GETMINIMIZEDMETRICS,
+    SETMINIMIZEDMETRICS,
+    GETICONMETRICS,
+    SETICONMETRICS,
+    SETWORKAREA,
+    GETWORKAREA,
+    SETPENWINDOWS,
+    GETHIGHCONTRAST = 66,
+    SETHIGHCONTRAST,
+    GETKEYBOARDPREF,
+    SETKEYBOARDPREF,
+    GETSCREENREADER,
+    SETSCREENREADER,
+    GETANIMATION,
+    SETANIMATION,
+    GETFONTSMOOTHING,
+    SETFONTSMOOTHING,
+    SETDRAGWIDTH,
+    SETDRAGHEIGHT,
+    SETHANDHELD,
+    GETLOWPOWERTIMEOUT,
+    GETPOWEROFFTIMEOUT,
+    SETLOWPOWERTIMEOUT,
+    SETPOWEROFFTIMEOUT,
+    GETLOWPOWERACTIVE,
+    GETPOWEROFFACTIVE,
+    SETLOWPOWERACTIVE,
+    SETPOWEROFFACTIVE,
+    SETCURSORS,
+    SETICONS,
+    GETDEFAULTINPUTLANG,
+    SETDEFAULTINPUTLANG,
+    SETLANGTOGGLE,
+    GETWINDOWSEXTENSION,
+    SETMOUSETRAILS,
+    GETMOUSETRAILS,
+    SETSCREENSAVERRUNNING = 97,
+    SCREENSAVERRUNNING = 97,
+    GETFILTERKEYS = 50,
+    SETFILTERKEYS,
+    GETTOGGLEKEYS,
+    SETTOGGLEKEYS,
+    GETMOUSEKEYS,
+    SETMOUSEKEYS,
+    GETSHOWSOUNDS,
+    SETSHOWSOUNDS,
+    GETSTICKYKEYS,
+    SETSTICKYKEYS,
+    GETACCESSTIMEOUT,
+    SETACCESSTIMEOUT,
+    GETSERIALKEYS,
+    SETSERIALKEYS,
+    GETSOUNDSENTRY,
+    SETSOUNDSENTRY,
+    GETSNAPTODEFBUTTON = 95,
+    SETSNAPTODEFBUTTON,
+    GETMOUSEHOVERWIDTH = 98,
+    SETMOUSEHOVERWIDTH,
+    GETMOUSEHOVERHEIGHT,
+    SETMOUSEHOVERHEIGHT,
+    GETMOUSEHOVERTIME,
+    SETMOUSEHOVERTIME,
+    GETWHEELSCROLLLINES,
+    SETWHEELSCROLLLINES,
+    GETMENUSHOWDELAY,
+    SETMENUSHOWDELAY,
+    GETWHEELSCROLLCHARS,
+    SETWHEELSCROLLCHARS,
+    GETSHOWIMEUI,
+    SETSHOWIMEUI,
+    GETMOUSESPEED,
+    SETMOUSESPEED,
+    GETSCREENSAVERRUNNING,
+    GETDESKWALLPAPER,
+    GETAUDIODESCRIPTION,
+    SETAUDIODESCRIPTION,
+    GETSCREENSAVESECURE,
+    SETSCREENSAVESECURE,
+    GETHUNGAPPTIMEOUT,
+    SETHUNGAPPTIMEOUT,
+    GETWAITTOKILLTIMEOUT,
+    SETWAITTOKILLTIMEOUT,
+    GETWAITTOKILLSERVICETIMEOUT,
+    SETWAITTOKILLSERVICETIMEOUT,
+    GETMOUSEDOCKTHRESHOLD,
+    SETMOUSEDOCKTHRESHOLD,
+    GETPENDOCKTHRESHOLD,
+    SETPENDOCKTHRESHOLD,
+    GETWINARRANGING,
+    SETWINARRANGING,
+    GETMOUSEDRAGOUTTHRESHOLD,
+    SETMOUSEDRAGOUTTHRESHOLD,
+    GETPENDRAGOUTTHRESHOLD,
+    SETPENDRAGOUTTHRESHOLD,
+    GETMOUSESIDEMOVETHRESHOLD,
+    SETMOUSESIDEMOVETHRESHOLD,
+    GETPENSIDEMOVETHRESHOLD,
+    SETPENSIDEMOVETHRESHOLD,
+    GETDRAGFROMMAXIMIZE,
+    SETDRAGFROMMAXIMIZE,
+    GETSNAPSIZING,
+    SETSNAPSIZING,
+    GETDOCKMOVING,
+    SETDOCKMOVING,
+    GETACTIVEWINDOWTRACKING = 4096,
+    SETACTIVEWINDOWTRACKING,
+    GETMENUANIMATION,
+    SETMENUANIMATION,
+    GETCOMBOBOXANIMATION,
+    SETCOMBOBOXANIMATION,
+    GETLISTBOXSMOOTHSCROLLING,
+    SETLISTBOXSMOOTHSCROLLING,
+    GETGRADIENTCAPTIONS,
+    SETGRADIENTCAPTIONS,
+    GETKEYBOARDCUES,
+    SETKEYBOARDCUES,
+    GETMENUUNDERLINES = 4106,
+    SETMENUUNDERLINES,
+    GETACTIVEWNDTRKZORDER,
+    SETACTIVEWNDTRKZORDER,
+    GETHOTTRACKING,
+    SETHOTTRACKING,
+    GETMENUFADE = 4114,
+    SETMENUFADE,
+    GETSELECTIONFADE,
+    SETSELECTIONFADE,
+    GETTOOLTIPANIMATION,
+    SETTOOLTIPANIMATION,
+    GETTOOLTIPFADE,
+    SETTOOLTIPFADE,
+    GETCURSORSHADOW,
+    SETCURSORSHADOW,
+    GETMOUSESONAR,
+    SETMOUSESONAR,
+    GETMOUSECLICKLOCK,
+    SETMOUSECLICKLOCK,
+    GETMOUSEVANISH,
+    SETMOUSEVANISH,
+    GETFLATMENU,
+    SETFLATMENU,
+    GETDROPSHADOW,
+    SETDROPSHADOW,
+    GETBLOCKSENDINPUTRESETS,
+    SETBLOCKSENDINPUTRESETS,
+    GETUIEFFECTS = 4158,
+    SETUIEFFECTS,
+    GETDISABLEOVERLAPPEDCONTENT,
+    SETDISABLEOVERLAPPEDCONTENT,
+    GETCLIENTAREAANIMATION,
+    SETCLIENTAREAANIMATION,
+    GETCLEARTYPE = 4168,
+    SETCLEARTYPE,
+    GETSPEECHRECOGNITION,
+    SETSPEECHRECOGNITION,
+    GETFOREGROUNDLOCKTIMEOUT = 8192,
+    SETFOREGROUNDLOCKTIMEOUT,
+    GETACTIVEWNDTRKTIMEOUT,
+    SETACTIVEWNDTRKTIMEOUT,
+    GETFOREGROUNDFLASHCOUNT,
+    SETFOREGROUNDFLASHCOUNT,
+    GETCARETWIDTH,
+    SETCARETWIDTH,
+    GETMOUSECLICKLOCKTIME,
+    SETMOUSECLICKLOCKTIME,
+    GETFONTSMOOTHINGTYPE,
+    SETFONTSMOOTHINGTYPE,
+    GETFONTSMOOTHINGCONTRAST,
+    SETFONTSMOOTHINGCONTRAST,
+    GETFOCUSBORDERWIDTH,
+    SETFOCUSBORDERWIDTH,
+    GETFOCUSBORDERHEIGHT,
+    SETFOCUSBORDERHEIGHT,
+    GETFONTSMOOTHINGORIENTATION,
+    SETFONTSMOOTHINGORIENTATION,
+    GETMINIMUMHITRADIUS,
+    SETMINIMUMHITRADIUS,
+    GETMESSAGEDURATION,
+    SETMESSAGEDURATION
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
index 8727f3ad..8bf40ed4 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum SPIF
 {
-    [Flags]
-    internal enum SPIF
-    {
-        None = 0,
-        UPDATEINIFILE = 1,
-        SENDCHANGE = 2,
-        SENDWININICHANGE = 2
-    }
-}
+    None = 0,
+    UPDATEINIFILE = 1,
+    SENDCHANGE = 2,
+    SENDWININICHANGE = 2
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
index 678ad5d6..d2b2e62b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
@@ -1,41 +1,40 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum STATE_SYSTEM
 {
-    [Flags]
-    internal enum STATE_SYSTEM
-    {
-        UNAVAILABLE = 1,
-        SELECTED = 2,
-        FOCUSED = 4,
-        PRESSED = 8,
-        CHECKED = 16,
-        MIXED = 32,
-        INDETERMINATE = 32,
-        READONLY = 64,
-        HOTTRACKED = 128,
-        DEFAULT = 256,
-        EXPANDED = 512,
-        COLLAPSED = 1024,
-        BUSY = 2048,
-        FLOATING = 4096,
-        MARQUEED = 8192,
-        ANIMATED = 16384,
-        INVISIBLE = 32768,
-        OFFSCREEN = 65536,
-        SIZEABLE = 131072,
-        MOVEABLE = 262144,
-        SELFVOICING = 524288,
-        FOCUSABLE = 1048576,
-        SELECTABLE = 2097152,
-        LINKED = 4194304,
-        TRAVERSED = 8388608,
-        MULTISELECTABLE = 16777216,
-        EXTSELECTABLE = 33554432,
-        ALERT_LOW = 67108864,
-        ALERT_MEDIUM = 134217728,
-        ALERT_HIGH = 268435456,
-        PROTECTED = 536870912,
-        VALID = 1073741823
-    }
-}
+    UNAVAILABLE = 1,
+    SELECTED = 2,
+    FOCUSED = 4,
+    PRESSED = 8,
+    CHECKED = 16,
+    MIXED = 32,
+    INDETERMINATE = 32,
+    READONLY = 64,
+    HOTTRACKED = 128,
+    DEFAULT = 256,
+    EXPANDED = 512,
+    COLLAPSED = 1024,
+    BUSY = 2048,
+    FLOATING = 4096,
+    MARQUEED = 8192,
+    ANIMATED = 16384,
+    INVISIBLE = 32768,
+    OFFSCREEN = 65536,
+    SIZEABLE = 131072,
+    MOVEABLE = 262144,
+    SELFVOICING = 524288,
+    FOCUSABLE = 1048576,
+    SELECTABLE = 2097152,
+    LINKED = 4194304,
+    TRAVERSED = 8388608,
+    MULTISELECTABLE = 16777216,
+    EXTSELECTABLE = 33554432,
+    ALERT_LOW = 67108864,
+    ALERT_MEDIUM = 134217728,
+    ALERT_HIGH = 268435456,
+    PROTECTED = 536870912,
+    VALID = 1073741823
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
index cfb9ff36..4fa14c46 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum STPF
 {
-    [Flags]
-    internal enum STPF
-    {
-        NONE = 0,
-        USEAPPTHUMBNAILALWAYS = 1,
-        USEAPPTHUMBNAILWHENACTIVE = 2,
-        USEAPPPEEKALWAYS = 4,
-        USEAPPPEEKWHENACTIVE = 8
-    }
-}
+    NONE = 0,
+    USEAPPTHUMBNAILALWAYS = 1,
+    USEAPPTHUMBNAILWHENACTIVE = 2,
+    USEAPPPEEKALWAYS = 4,
+    USEAPPPEEKWHENACTIVE = 8
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
index f25c6ebd..b96c486d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
@@ -1,19 +1,18 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal static class STR_GPS
 {
-    internal static class STR_GPS
-    {
-        public const string HANDLERPROPERTIESONLY = "GPS_HANDLERPROPERTIESONLY";
+    public const string HANDLERPROPERTIESONLY = "GPS_HANDLERPROPERTIESONLY";
 
-        public const string FASTPROPERTIESONLY = "GPS_FASTPROPERTIESONLY";
+    public const string FASTPROPERTIESONLY = "GPS_FASTPROPERTIESONLY";
 
-        public const string OPENSLOWITEM = "GPS_OPENSLOWITEM";
+    public const string OPENSLOWITEM = "GPS_OPENSLOWITEM";
 
-        public const string DELAYCREATION = "GPS_DELAYCREATION";
+    public const string DELAYCREATION = "GPS_DELAYCREATION";
 
-        public const string BESTEFFORT = "GPS_BESTEFFORT";
+    public const string BESTEFFORT = "GPS_BESTEFFORT";
 
-        public const string NO_OPLOCK = "GPS_NO_OPLOCK";
-    }
-}
+    public const string NO_OPLOCK = "GPS_NO_OPLOCK";
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
index 034e7fc9..d2ec25b2 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
@@ -1,22 +1,21 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum SW
 {
-    internal enum SW
-    {
-        HIDE,
-        SHOWNORMAL,
-        NORMAL = 1,
-        SHOWMINIMIZED,
-        SHOWMAXIMIZED,
-        MAXIMIZE = 3,
-        SHOWNOACTIVATE,
-        SHOW,
-        MINIMIZE,
-        SHOWMINNOACTIVE,
-        SHOWNA,
-        RESTORE,
-        SHOWDEFAULT,
-        FORCEMINIMIZE
-    }
-}
+    HIDE,
+    SHOWNORMAL,
+    NORMAL = 1,
+    SHOWMINIMIZED,
+    SHOWMAXIMIZED,
+    MAXIMIZE = 3,
+    SHOWNOACTIVATE,
+    SHOW,
+    MINIMIZE,
+    SHOWMINNOACTIVE,
+    SHOWNA,
+    RESTORE,
+    SHOWDEFAULT,
+    FORCEMINIMIZE
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
index 796e9c56..3ee5d4d6 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
@@ -1,24 +1,23 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum SWP
 {
-    [Flags]
-    internal enum SWP
-    {
-        ASYNCWINDOWPOS = 16384,
-        DEFERERASE = 8192,
-        DRAWFRAME = 32,
-        FRAMECHANGED = 32,
-        HIDEWINDOW = 128,
-        NOACTIVATE = 16,
-        NOCOPYBITS = 256,
-        NOMOVE = 2,
-        NOOWNERZORDER = 512,
-        NOREDRAW = 8,
-        NOREPOSITION = 512,
-        NOSENDCHANGING = 1024,
-        NOSIZE = 1,
-        NOZORDER = 4,
-        SHOWWINDOW = 64
-    }
-}
+    ASYNCWINDOWPOS = 16384,
+    DEFERERASE = 8192,
+    DRAWFRAME = 32,
+    FRAMECHANGED = 32,
+    HIDEWINDOW = 128,
+    NOACTIVATE = 16,
+    NOCOPYBITS = 256,
+    NOMOVE = 2,
+    NOOWNERZORDER = 512,
+    NOREDRAW = 8,
+    NOREPOSITION = 512,
+    NOSENDCHANGING = 1024,
+    NOSIZE = 1,
+    NOZORDER = 4,
+    SHOWWINDOW = 64
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
index 3331e4a3..049192ac 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
@@ -4,73 +4,72 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices.ComTypes;
 using Microsoft.Win32.SafeHandles;
 
-namespace Standard
+namespace Standard;
+
+internal sealed class SafeConnectionPointCookie : SafeHandleZeroOrMinusOneIsInvalid
 {
-    internal sealed class SafeConnectionPointCookie : SafeHandleZeroOrMinusOneIsInvalid
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "IConnectionPoint")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public SafeConnectionPointCookie(IConnectionPointContainer target, object sink, Guid eventId) : base(true)
     {
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "IConnectionPoint")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public SafeConnectionPointCookie(IConnectionPointContainer target, object sink, Guid eventId) : base(true)
+        Verify.IsNotNull<IConnectionPointContainer>(target, "target");
+        Verify.IsNotNull<object>(sink, "sink");
+        Verify.IsNotDefault<Guid>(eventId, "eventId");
+        this.handle = IntPtr.Zero;
+        IConnectionPoint connectionPoint = null;
+        try
         {
-            Verify.IsNotNull<IConnectionPointContainer>(target, "target");
-            Verify.IsNotNull<object>(sink, "sink");
-            Verify.IsNotDefault<Guid>(eventId, "eventId");
-            this.handle = IntPtr.Zero;
-            IConnectionPoint connectionPoint = null;
-            try
+            target.FindConnectionPoint(ref eventId, out connectionPoint);
+            int num;
+            connectionPoint.Advise(sink, out num);
+            if (num == 0)
             {
-                target.FindConnectionPoint(ref eventId, out connectionPoint);
-                int num;
-                connectionPoint.Advise(sink, out num);
-                if (num == 0)
-                {
-                    throw new InvalidOperationException("IConnectionPoint::Advise returned an invalid cookie.");
-                }
-                this.handle = new IntPtr(num);
-                this._cp = connectionPoint;
-                connectionPoint = null;
-            }
-            finally
-            {
-                Utility.SafeRelease<IConnectionPoint>(ref connectionPoint);
+                throw new InvalidOperationException("IConnectionPoint::Advise returned an invalid cookie.");
             }
+            this.handle = new IntPtr(num);
+            this._cp = connectionPoint;
+            connectionPoint = null;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public void Disconnect()
+        finally
         {
-            this.ReleaseHandle();
+            Utility.SafeRelease<IConnectionPoint>(ref connectionPoint);
         }
-
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            bool result;
-            try
-            {
-                if (!this.IsInvalid)
-                {
-                    int dwCookie = this.handle.ToInt32();
-                    this.handle = IntPtr.Zero;
-                    try
-                    {
-                        this._cp.Unadvise(dwCookie);
-                    }
-                    finally
-                    {
-                        Utility.SafeRelease<IConnectionPoint>(ref this._cp);
-                    }
-                }
-                result = true;
-            }
-            catch
-            {
-                result = false;
-            }
-            return result;
-        }
-
-        private IConnectionPoint _cp;
     }
-}
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public void Disconnect()
+    {
+        this.ReleaseHandle();
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        bool result;
+        try
+        {
+            if (!this.IsInvalid)
+            {
+                int dwCookie = this.handle.ToInt32();
+                this.handle = IntPtr.Zero;
+                try
+                {
+                    this._cp.Unadvise(dwCookie);
+                }
+                finally
+                {
+                    Utility.SafeRelease<IConnectionPoint>(ref this._cp);
+                }
+            }
+            result = true;
+        }
+        catch
+        {
+            result = false;
+        }
+        return result;
+    }
+
+    private IConnectionPoint _cp;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
index 124a461c..6b749d8d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
@@ -4,153 +4,152 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
 
-namespace Standard
+namespace Standard;
+
+internal sealed class SafeDC : SafeHandleZeroOrMinusOneIsInvalid
 {
-    internal sealed class SafeDC : SafeHandleZeroOrMinusOneIsInvalid
+    public IntPtr Hwnd
     {
-        public IntPtr Hwnd
+        set
         {
-            set
-            {
-                this._hwnd = new IntPtr?(value);
-            }
-        }
-
-        private SafeDC() : base(true)
-        {
-        }
-
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            if (this._created)
-            {
-                return SafeDC.NativeMethods.DeleteDC(this.handle);
-            }
-            return this._hwnd == null || this._hwnd.Value == IntPtr.Zero || SafeDC.NativeMethods.ReleaseDC(this._hwnd.Value, this.handle) == 1;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
-        public static SafeDC CreateDC(string deviceName)
-        {
-            SafeDC safeDC = null;
-            try
-            {
-                safeDC = SafeDC.NativeMethods.CreateDC(deviceName, null, IntPtr.Zero, IntPtr.Zero);
-            }
-            finally
-            {
-                if (safeDC != null)
-                {
-                    safeDC._created = true;
-                }
-            }
-            if (safeDC.IsInvalid)
-            {
-                safeDC.Dispose();
-                throw new SystemException("Unable to create a device context from the specified device information.");
-            }
-            return safeDC;
-        }
-
-        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static SafeDC CreateCompatibleDC(SafeDC hdc)
-        {
-            SafeDC safeDC = null;
-            try
-            {
-                IntPtr hdc2 = IntPtr.Zero;
-                if (hdc != null)
-                {
-                    hdc2 = hdc.handle;
-                }
-                safeDC = SafeDC.NativeMethods.CreateCompatibleDC(hdc2);
-                if (safeDC == null)
-                {
-                    HRESULT.ThrowLastError();
-                }
-            }
-            finally
-            {
-                if (safeDC != null)
-                {
-                    safeDC._created = true;
-                }
-            }
-            if (safeDC.IsInvalid)
-            {
-                safeDC.Dispose();
-                throw new SystemException("Unable to create a device context from the specified device information.");
-            }
-            return safeDC;
-        }
-
-        public static SafeDC GetDC(IntPtr hwnd)
-        {
-            SafeDC safeDC = null;
-            try
-            {
-                safeDC = SafeDC.NativeMethods.GetDC(hwnd);
-            }
-            finally
-            {
-                if (safeDC != null)
-                {
-                    safeDC.Hwnd = hwnd;
-                }
-            }
-            if (safeDC.IsInvalid)
-            {
-                HRESULT.E_FAIL.ThrowIfFailed();
-            }
-            return safeDC;
-        }
-
-        public static SafeDC GetDesktop()
-        {
-            return SafeDC.GetDC(IntPtr.Zero);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-        public static SafeDC WrapDC(IntPtr hdc)
-        {
-            return new SafeDC
-            {
-                handle = hdc,
-                _created = false,
-                _hwnd = new IntPtr?(IntPtr.Zero)
-            };
-        }
-
-        private IntPtr? _hwnd;
-
-        private bool _created;
-
-        private static class NativeMethods
-        {
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            [DllImport("user32.dll")]
-            public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            [DllImport("user32.dll")]
-            public static extern SafeDC GetDC(IntPtr hwnd);
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            [DllImport("gdi32.dll", CharSet = CharSet.Unicode)]
-            public static extern SafeDC CreateDC([MarshalAs(UnmanagedType.LPWStr)] string lpszDriver, [MarshalAs(UnmanagedType.LPWStr)] string lpszDevice, IntPtr lpszOutput, IntPtr lpInitData);
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            [DllImport("gdi32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-            public static extern SafeDC CreateCompatibleDC(IntPtr hdc);
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            [DllImport("gdi32.dll")]
-            [return: MarshalAs(UnmanagedType.Bool)]
-            public static extern bool DeleteDC(IntPtr hdc);
+            this._hwnd = new IntPtr?(value);
         }
     }
-}
+
+    private SafeDC() : base(true)
+    {
+    }
+
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        if (this._created)
+        {
+            return SafeDC.NativeMethods.DeleteDC(this.handle);
+        }
+        return this._hwnd == null || this._hwnd.Value == IntPtr.Zero || SafeDC.NativeMethods.ReleaseDC(this._hwnd.Value, this.handle) == 1;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
+    public static SafeDC CreateDC(string deviceName)
+    {
+        SafeDC safeDC = null;
+        try
+        {
+            safeDC = SafeDC.NativeMethods.CreateDC(deviceName, null, IntPtr.Zero, IntPtr.Zero);
+        }
+        finally
+        {
+            if (safeDC != null)
+            {
+                safeDC._created = true;
+            }
+        }
+        if (safeDC.IsInvalid)
+        {
+            safeDC.Dispose();
+            throw new SystemException("Unable to create a device context from the specified device information.");
+        }
+        return safeDC;
+    }
+
+    [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static SafeDC CreateCompatibleDC(SafeDC hdc)
+    {
+        SafeDC safeDC = null;
+        try
+        {
+            IntPtr hdc2 = IntPtr.Zero;
+            if (hdc != null)
+            {
+                hdc2 = hdc.handle;
+            }
+            safeDC = SafeDC.NativeMethods.CreateCompatibleDC(hdc2);
+            if (safeDC == null)
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+        finally
+        {
+            if (safeDC != null)
+            {
+                safeDC._created = true;
+            }
+        }
+        if (safeDC.IsInvalid)
+        {
+            safeDC.Dispose();
+            throw new SystemException("Unable to create a device context from the specified device information.");
+        }
+        return safeDC;
+    }
+
+    public static SafeDC GetDC(IntPtr hwnd)
+    {
+        SafeDC safeDC = null;
+        try
+        {
+            safeDC = SafeDC.NativeMethods.GetDC(hwnd);
+        }
+        finally
+        {
+            if (safeDC != null)
+            {
+                safeDC.Hwnd = hwnd;
+            }
+        }
+        if (safeDC.IsInvalid)
+        {
+            HRESULT.E_FAIL.ThrowIfFailed();
+        }
+        return safeDC;
+    }
+
+    public static SafeDC GetDesktop()
+    {
+        return SafeDC.GetDC(IntPtr.Zero);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+    public static SafeDC WrapDC(IntPtr hdc)
+    {
+        return new SafeDC
+        {
+            handle = hdc,
+            _created = false,
+            _hwnd = new IntPtr?(IntPtr.Zero)
+        };
+    }
+
+    private IntPtr? _hwnd;
+
+    private bool _created;
+
+    private static class NativeMethods
+    {
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        public static extern SafeDC GetDC(IntPtr hwnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", CharSet = CharSet.Unicode)]
+        public static extern SafeDC CreateDC([MarshalAs(UnmanagedType.LPWStr)] string lpszDriver, [MarshalAs(UnmanagedType.LPWStr)] string lpszDevice, IntPtr lpszOutput, IntPtr lpInitData);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern SafeDC CreateCompatibleDC(IntPtr hdc);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DeleteDC(IntPtr hdc);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
index 29880d01..97ed656b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
@@ -2,18 +2,17 @@
 using System.Security.Permissions;
 using Microsoft.Win32.SafeHandles;
 
-namespace Standard
-{
-    internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
-        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
-        private SafeFindHandle() : base(true)
-        {
-        }
+namespace Standard;
 
-        protected override bool ReleaseHandle()
-        {
-            return NativeMethods.FindClose(this.handle);
-        }
+internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
+{
+    [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+    private SafeFindHandle() : base(true)
+    {
     }
-}
+
+    protected override bool ReleaseHandle()
+    {
+        return NativeMethods.FindClose(this.handle);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
index a4e3e38c..5c4e94d8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
@@ -3,36 +3,35 @@ using System.Diagnostics.CodeAnalysis;
 using System.Runtime.ConstrainedExecution;
 using Microsoft.Win32.SafeHandles;
 
-namespace Standard
+namespace Standard;
+
+internal sealed class SafeGdiplusStartupToken : SafeHandleZeroOrMinusOneIsInvalid
 {
-    internal sealed class SafeGdiplusStartupToken : SafeHandleZeroOrMinusOneIsInvalid
+    private SafeGdiplusStartupToken() : base(true)
     {
-        private SafeGdiplusStartupToken() : base(true)
-        {
-        }
-
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            Status status = NativeMethods.GdiplusShutdown(this.handle);
-            return status == Status.Ok;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
-        public static SafeGdiplusStartupToken Startup()
-        {
-            SafeGdiplusStartupToken safeGdiplusStartupToken = new SafeGdiplusStartupToken();
-            IntPtr handle;
-            StartupOutput startupOutput;
-            if (NativeMethods.GdiplusStartup(out handle, new StartupInput(), out startupOutput) == Status.Ok)
-            {
-                safeGdiplusStartupToken.handle = handle;
-                return safeGdiplusStartupToken;
-            }
-            safeGdiplusStartupToken.Dispose();
-            throw new Exception("Unable to initialize GDI+");
-        }
     }
-}
+
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        Status status = NativeMethods.GdiplusShutdown(this.handle);
+        return status == Status.Ok;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+    [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
+    public static SafeGdiplusStartupToken Startup()
+    {
+        SafeGdiplusStartupToken safeGdiplusStartupToken = new SafeGdiplusStartupToken();
+        IntPtr handle;
+        StartupOutput startupOutput;
+        if (NativeMethods.GdiplusStartup(out handle, new StartupInput(), out startupOutput) == Status.Ok)
+        {
+            safeGdiplusStartupToken.handle = handle;
+            return safeGdiplusStartupToken;
+        }
+        safeGdiplusStartupToken.Dispose();
+        throw new Exception("Unable to initialize GDI+");
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
index de8e1a92..321ef567 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
@@ -2,18 +2,17 @@
 using System.Runtime.ConstrainedExecution;
 using Microsoft.Win32.SafeHandles;
 
-namespace Standard
-{
-    internal sealed class SafeHBITMAP : SafeHandleZeroOrMinusOneIsInvalid
-    {
-        private SafeHBITMAP() : base(true)
-        {
-        }
+namespace Standard;
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
-        protected override bool ReleaseHandle()
-        {
-            return NativeMethods.DeleteObject(this.handle);
-        }
+internal sealed class SafeHBITMAP : SafeHandleZeroOrMinusOneIsInvalid
+{
+    private SafeHBITMAP() : base(true)
+    {
     }
-}
+
+    [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+    protected override bool ReleaseHandle()
+    {
+        return NativeMethods.DeleteObject(this.handle);
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
index 71ed7a9d..af682487 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential)]
+internal class StartupInput
 {
-    [StructLayout(LayoutKind.Sequential)]
-    internal class StartupInput
-    {
-        public int GdiplusVersion = 1;
+    public int GdiplusVersion = 1;
 
-        public IntPtr DebugEventCallback;
+    public IntPtr DebugEventCallback;
 
-        public bool SuppressBackgroundThread;
+    public bool SuppressBackgroundThread;
 
-        public bool SuppressExternalCodecs;
-    }
-}
+    public bool SuppressExternalCodecs;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
index 83a59f76..71a22bd6 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct StartupOutput
-    {
-        public IntPtr hook;
+namespace Standard;
 
-        public IntPtr unhook;
-    }
-}
+internal struct StartupOutput
+{
+    public IntPtr hook;
+
+    public IntPtr unhook;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
index a90412d0..31aeea8c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
@@ -1,30 +1,29 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum Status
 {
-    internal enum Status
-    {
-        Ok,
-        GenericError,
-        InvalidParameter,
-        OutOfMemory,
-        ObjectBusy,
-        InsufficientBuffer,
-        NotImplemented,
-        Win32Error,
-        WrongState,
-        Aborted,
-        FileNotFound,
-        ValueOverflow,
-        AccessDenied,
-        UnknownImageFormat,
-        FontFamilyNotFound,
-        FontStyleNotFound,
-        NotTrueTypeFont,
-        UnsupportedGdiplusVersion,
-        GdiplusNotInitialized,
-        PropertyNotFound,
-        PropertyNotSupported,
-        ProfileNotFound
-    }
-}
+    Ok,
+    GenericError,
+    InvalidParameter,
+    OutOfMemory,
+    ObjectBusy,
+    InsufficientBuffer,
+    NotImplemented,
+    Win32Error,
+    WrongState,
+    Aborted,
+    FileNotFound,
+    ValueOverflow,
+    AccessDenied,
+    UnknownImageFormat,
+    FontFamilyNotFound,
+    FontStyleNotFound,
+    NotTrueTypeFont,
+    UnsupportedGdiplusVersion,
+    GdiplusNotInitialized,
+    PropertyNotFound,
+    PropertyNotSupported,
+    ProfileNotFound
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
index 9c2de960..eb1c9758 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
@@ -1,20 +1,19 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum StockObject
 {
-    internal enum StockObject
-    {
-        WHITE_BRUSH,
-        LTGRAY_BRUSH,
-        GRAY_BRUSH,
-        DKGRAY_BRUSH,
-        BLACK_BRUSH,
-        NULL_BRUSH,
-        HOLLOW_BRUSH = 5,
-        WHITE_PEN,
-        BLACK_PEN,
-        NULL_PEN,
-        SYSTEM_FONT = 13,
-        DEFAULT_PALETTE = 15
-    }
-}
+    WHITE_BRUSH,
+    LTGRAY_BRUSH,
+    GRAY_BRUSH,
+    DKGRAY_BRUSH,
+    BLACK_BRUSH,
+    NULL_BRUSH,
+    HOLLOW_BRUSH = 5,
+    WHITE_PEN,
+    BLACK_PEN,
+    NULL_PEN,
+    SYSTEM_FONT = 13,
+    DEFAULT_PALETTE = 15
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
index 06c0573c..b883c541 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum TBPF
 {
-    internal enum TBPF
-    {
-        NOPROGRESS,
-        INDETERMINATE,
-        NORMAL,
-        ERROR = 4,
-        PAUSED = 8
-    }
-}
+    NOPROGRESS,
+    INDETERMINATE,
+    NORMAL,
+    ERROR = 4,
+    PAUSED = 8
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
index 0354bbfa..0032f165 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum THB : uint
 {
-    [Flags]
-    internal enum THB : uint
-    {
-        BITMAP = 1u,
-        ICON = 2u,
-        TOOLTIP = 4u,
-        FLAGS = 8u
-    }
-}
+    BITMAP = 1u,
+    ICON = 2u,
+    TOOLTIP = 4u,
+    FLAGS = 8u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
index ced924aa..79650ff3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
@@ -1,15 +1,14 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum THBF : uint
 {
-    [Flags]
-    internal enum THBF : uint
-    {
-        ENABLED = 0u,
-        DISABLED = 1u,
-        DISMISSONCLICK = 2u,
-        NOBACKGROUND = 4u,
-        HIDDEN = 8u,
-        NONINTERACTIVE = 16u
-    }
-}
+    ENABLED = 0u,
+    DISABLED = 1u,
+    DISMISSONCLICK = 2u,
+    NOBACKGROUND = 4u,
+    HIDDEN = 8u,
+    NONINTERACTIVE = 16u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
index 4385af13..3d89a0d8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
@@ -1,24 +1,23 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode, Pack = 8)]
+internal struct THUMBBUTTON
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode, Pack = 8)]
-    internal struct THUMBBUTTON
-    {
-        public const int THBN_CLICKED = 6144;
+    public const int THBN_CLICKED = 6144;
 
-        public THB dwMask;
+    public THB dwMask;
 
-        public uint iId;
+    public uint iId;
 
-        public uint iBitmap;
+    public uint iBitmap;
 
-        public IntPtr hIcon;
+    public IntPtr hIcon;
 
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
-        public string szTip;
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+    public string szTip;
 
-        public THBF dwFlags;
-    }
-}
+    public THBF dwFlags;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
index 50bc1a7a..e988de22 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
@@ -1,23 +1,22 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct TITLEBARINFO
 {
-    internal struct TITLEBARINFO
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public RECT rcTitleBar;
+    public RECT rcTitleBar;
 
-        public STATE_SYSTEM rgstate_TitleBar;
+    public STATE_SYSTEM rgstate_TitleBar;
 
-        public STATE_SYSTEM rgstate_Reserved;
+    public STATE_SYSTEM rgstate_Reserved;
 
-        public STATE_SYSTEM rgstate_MinimizeButton;
+    public STATE_SYSTEM rgstate_MinimizeButton;
 
-        public STATE_SYSTEM rgstate_MaximizeButton;
+    public STATE_SYSTEM rgstate_MaximizeButton;
 
-        public STATE_SYSTEM rgstate_HelpButton;
+    public STATE_SYSTEM rgstate_HelpButton;
 
-        public STATE_SYSTEM rgstate_CloseButton;
-    }
-}
+    public STATE_SYSTEM rgstate_CloseButton;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
index 182c9867..8642baf3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
@@ -1,35 +1,34 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct TITLEBARINFOEX
 {
-    internal struct TITLEBARINFOEX
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public RECT rcTitleBar;
+    public RECT rcTitleBar;
 
-        public STATE_SYSTEM rgstate_TitleBar;
+    public STATE_SYSTEM rgstate_TitleBar;
 
-        public STATE_SYSTEM rgstate_Reserved;
+    public STATE_SYSTEM rgstate_Reserved;
 
-        public STATE_SYSTEM rgstate_MinimizeButton;
+    public STATE_SYSTEM rgstate_MinimizeButton;
 
-        public STATE_SYSTEM rgstate_MaximizeButton;
+    public STATE_SYSTEM rgstate_MaximizeButton;
 
-        public STATE_SYSTEM rgstate_HelpButton;
+    public STATE_SYSTEM rgstate_HelpButton;
 
-        public STATE_SYSTEM rgstate_CloseButton;
+    public STATE_SYSTEM rgstate_CloseButton;
 
-        public RECT rgrect_TitleBar;
+    public RECT rgrect_TitleBar;
 
-        public RECT rgrect_Reserved;
+    public RECT rgrect_Reserved;
 
-        public RECT rgrect_MinimizeButton;
+    public RECT rgrect_MinimizeButton;
 
-        public RECT rgrect_MaximizeButton;
+    public RECT rgrect_MaximizeButton;
 
-        public RECT rgrect_HelpButton;
+    public RECT rgrect_HelpButton;
 
-        public RECT rgrect_CloseButton;
-    }
-}
+    public RECT rgrect_CloseButton;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
index 81753600..90440b38 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum ULW
 {
-    internal enum ULW
-    {
-        ALPHA = 2,
-        COLORKEY = 1,
-        OPAQUE = 4
-    }
-}
+    ALPHA = 2,
+    COLORKEY = 1,
+    OPAQUE = 4
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
index 879eee0a..2a688bdb 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
@@ -1,11 +1,10 @@
 using System;
 
-namespace Standard
-{
-    internal struct UNSIGNED_RATIO
-    {
-        public uint uiNumerator;
+namespace Standard;
 
-        public uint uiDenominator;
-    }
-}
+internal struct UNSIGNED_RATIO
+{
+    public uint uiNumerator;
+
+    public uint uiDenominator;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
index 44591365..4b2973e9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
@@ -12,811 +12,810 @@ using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 
-namespace Standard
+namespace Standard;
+
+internal static class Utility
 {
-    internal static class Utility
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    private static bool _MemCmp(IntPtr left, IntPtr right, long cb)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private static bool _MemCmp(IntPtr left, IntPtr right, long cb)
+        int num = 0;
+        while ((long) num < cb - 8L)
         {
-            int num = 0;
-            while ((long) num < cb - 8L)
-            {
-                long num2 = Marshal.ReadInt64(left, num);
-                long num3 = Marshal.ReadInt64(right, num);
-                if (num2 != num3)
-                {
-                    return false;
-                }
-                num += 8;
-            }
-            while ((long) num < cb)
-            {
-                byte b = Marshal.ReadByte(left, num);
-                byte b2 = Marshal.ReadByte(right, num);
-                if (b != b2)
-                {
-                    return false;
-                }
-                num++;
-            }
-            return true;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static int RGB(Color c)
-        {
-            return (int) c.R | (int) c.G << 8 | (int) c.B << 16;
-        }
-
-        public static Color ColorFromArgbDword(uint color)
-        {
-            return Color.FromArgb((byte) ((color & 4278190080u) >> 24), (byte) ((color & 16711680u) >> 16), (byte) ((color & 65280u) >> 8), (byte) (color & 255u));
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static int GET_X_LPARAM(IntPtr lParam)
-        {
-            return Utility.LOWORD(lParam.ToInt32());
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static int GET_Y_LPARAM(IntPtr lParam)
-        {
-            return Utility.HIWORD(lParam.ToInt32());
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static int HIWORD(int i)
-        {
-            return (int) ((short) (i >> 16));
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static int LOWORD(int i)
-        {
-            return (int) ((short) (i & 65535));
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool AreStreamsEqual(Stream left, Stream right)
-        {
-            if (left == null)
-            {
-                return right == null;
-            }
-            if (right == null)
+            long num2 = Marshal.ReadInt64(left, num);
+            long num3 = Marshal.ReadInt64(right, num);
+            if (num2 != num3)
             {
                 return false;
             }
-            if (!left.CanRead || !right.CanRead)
-            {
-                throw new NotSupportedException("The streams can't be read for comparison");
-            }
-            if (left.Length != right.Length)
+            num += 8;
+        }
+        while ((long) num < cb)
+        {
+            byte b = Marshal.ReadByte(left, num);
+            byte b2 = Marshal.ReadByte(right, num);
+            if (b != b2)
             {
                 return false;
             }
-            int num = (int) left.Length;
-            left.Position = 0L;
-            right.Position = 0L;
-            int i = 0;
-            int num2 = 0;
-            byte[] array = new byte[512];
-            byte[] array2 = new byte[512];
-            GCHandle gchandle = GCHandle.Alloc(array, GCHandleType.Pinned);
-            IntPtr left2 = gchandle.AddrOfPinnedObject();
-            GCHandle gchandle2 = GCHandle.Alloc(array2, GCHandleType.Pinned);
-            IntPtr right2 = gchandle2.AddrOfPinnedObject();
-            bool result;
-            try
-            {
-                while (i < num)
-                {
-                    int num3 = left.Read(array, 0, array.Length);
-                    int num4 = right.Read(array2, 0, array2.Length);
-                    if (num3 != num4)
-                    {
-                        return false;
-                    }
-                    if (!Utility._MemCmp(left2, right2, (long) num3))
-                    {
-                        return false;
-                    }
-                    i += num3;
-                    num2 += num4;
-                }
-                result = true;
-            }
-            finally
-            {
-                gchandle.Free();
-                gchandle2.Free();
-            }
-            return result;
+            num++;
         }
+        return true;
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool GuidTryParse(string guidString, out Guid guid)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static int RGB(Color c)
+    {
+        return (int) c.R | (int) c.G << 8 | (int) c.B << 16;
+    }
+
+    public static Color ColorFromArgbDword(uint color)
+    {
+        return Color.FromArgb((byte) ((color & 4278190080u) >> 24), (byte) ((color & 16711680u) >> 16), (byte) ((color & 65280u) >> 8), (byte) (color & 255u));
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static int GET_X_LPARAM(IntPtr lParam)
+    {
+        return Utility.LOWORD(lParam.ToInt32());
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static int GET_Y_LPARAM(IntPtr lParam)
+    {
+        return Utility.HIWORD(lParam.ToInt32());
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static int HIWORD(int i)
+    {
+        return (int) ((short) (i >> 16));
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static int LOWORD(int i)
+    {
+        return (int) ((short) (i & 65535));
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool AreStreamsEqual(Stream left, Stream right)
+    {
+        if (left == null)
+        {
+            return right == null;
+        }
+        if (right == null)
         {
-            Verify.IsNeitherNullNorEmpty(guidString, "guidString");
-            try
-            {
-                guid = new Guid(guidString);
-                return true;
-            }
-            catch (FormatException)
-            {
-            }
-            catch (OverflowException)
-            {
-            }
-            guid = default(Guid);
             return false;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsFlagSet(int value, int mask)
+        if (!left.CanRead || !right.CanRead)
         {
-            return 0 != (value & mask);
+            throw new NotSupportedException("The streams can't be read for comparison");
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsFlagSet(uint value, uint mask)
+        if (left.Length != right.Length)
         {
-            return 0u != (value & mask);
+            return false;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsFlagSet(long value, long mask)
+        int num = (int) left.Length;
+        left.Position = 0L;
+        right.Position = 0L;
+        int i = 0;
+        int num2 = 0;
+        byte[] array = new byte[512];
+        byte[] array2 = new byte[512];
+        GCHandle gchandle = GCHandle.Alloc(array, GCHandleType.Pinned);
+        IntPtr left2 = gchandle.AddrOfPinnedObject();
+        GCHandle gchandle2 = GCHandle.Alloc(array2, GCHandleType.Pinned);
+        IntPtr right2 = gchandle2.AddrOfPinnedObject();
+        bool result;
+        try
         {
-            return 0L != (value & mask);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsFlagSet(ulong value, ulong mask)
-        {
-            return 0UL != (value & mask);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsOSVistaOrNewer
-        {
-            get
+            while (i < num)
             {
-                return Utility._osVersion >= new Version(6, 0);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool IsOSWindows7OrNewer
-        {
-            get
-            {
-                return Utility._osVersion >= new Version(6, 1);
-            }
-        }
-
-        public static bool IsPresentationFrameworkVersionLessThan4
-        {
-            get
-            {
-                return Utility._presentationFrameworkVersion < new Version(4, 0);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times")]
-        public static IntPtr GenerateHICON(ImageSource image, Size dimensions)
-        {
-            if (image == null)
-            {
-                return IntPtr.Zero;
-            }
-            BitmapFrame bitmapFrame = image as BitmapFrame;
-            if (bitmapFrame != null)
-            {
-                bitmapFrame = Utility.GetBestMatch(bitmapFrame.Decoder.Frames, (int) dimensions.Width, (int) dimensions.Height);
-            }
-            else
-            {
-                Rect rectangle = new Rect(0.0, 0.0, dimensions.Width, dimensions.Height);
-                double num = dimensions.Width / dimensions.Height;
-                double num2 = image.Width / image.Height;
-                if (image.Width <= dimensions.Width && image.Height <= dimensions.Height)
+                int num3 = left.Read(array, 0, array.Length);
+                int num4 = right.Read(array2, 0, array2.Length);
+                if (num3 != num4)
                 {
-                    rectangle = new Rect((dimensions.Width - image.Width) / 2.0, (dimensions.Height - image.Height) / 2.0, image.Width, image.Height);
+                    return false;
                 }
-                else if (num > num2)
+                if (!Utility._MemCmp(left2, right2, (long) num3))
                 {
-                    double num3 = image.Width / image.Height * dimensions.Width;
-                    rectangle = new Rect((dimensions.Width - num3) / 2.0, 0.0, num3, dimensions.Height);
+                    return false;
                 }
-                else if (num < num2)
-                {
-                    double num4 = image.Height / image.Width * dimensions.Height;
-                    rectangle = new Rect(0.0, (dimensions.Height - num4) / 2.0, dimensions.Width, num4);
-                }
-                DrawingVisual drawingVisual = new DrawingVisual();
-                DrawingContext drawingContext = drawingVisual.RenderOpen();
-                drawingContext.DrawImage(image, rectangle);
-                drawingContext.Close();
-                RenderTargetBitmap renderTargetBitmap = new RenderTargetBitmap((int) dimensions.Width, (int) dimensions.Height, 96.0, 96.0, PixelFormats.Pbgra32);
-                renderTargetBitmap.Render(drawingVisual);
-                bitmapFrame = BitmapFrame.Create(renderTargetBitmap);
+                i += num3;
+                num2 += num4;
             }
-            IntPtr result;
-            using (MemoryStream memoryStream = new MemoryStream())
+            result = true;
+        }
+        finally
+        {
+            gchandle.Free();
+            gchandle2.Free();
+        }
+        return result;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool GuidTryParse(string guidString, out Guid guid)
+    {
+        Verify.IsNeitherNullNorEmpty(guidString, "guidString");
+        try
+        {
+            guid = new Guid(guidString);
+            return true;
+        }
+        catch (FormatException)
+        {
+        }
+        catch (OverflowException)
+        {
+        }
+        guid = default(Guid);
+        return false;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsFlagSet(int value, int mask)
+    {
+        return 0 != (value & mask);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsFlagSet(uint value, uint mask)
+    {
+        return 0u != (value & mask);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsFlagSet(long value, long mask)
+    {
+        return 0L != (value & mask);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsFlagSet(ulong value, ulong mask)
+    {
+        return 0UL != (value & mask);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsOSVistaOrNewer
+    {
+        get
+        {
+            return Utility._osVersion >= new Version(6, 0);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool IsOSWindows7OrNewer
+    {
+        get
+        {
+            return Utility._osVersion >= new Version(6, 1);
+        }
+    }
+
+    public static bool IsPresentationFrameworkVersionLessThan4
+    {
+        get
+        {
+            return Utility._presentationFrameworkVersion < new Version(4, 0);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times")]
+    public static IntPtr GenerateHICON(ImageSource image, Size dimensions)
+    {
+        if (image == null)
+        {
+            return IntPtr.Zero;
+        }
+        BitmapFrame bitmapFrame = image as BitmapFrame;
+        if (bitmapFrame != null)
+        {
+            bitmapFrame = Utility.GetBestMatch(bitmapFrame.Decoder.Frames, (int) dimensions.Width, (int) dimensions.Height);
+        }
+        else
+        {
+            Rect rectangle = new Rect(0.0, 0.0, dimensions.Width, dimensions.Height);
+            double num = dimensions.Width / dimensions.Height;
+            double num2 = image.Width / image.Height;
+            if (image.Width <= dimensions.Width && image.Height <= dimensions.Height)
             {
-                new PngBitmapEncoder
+                rectangle = new Rect((dimensions.Width - image.Width) / 2.0, (dimensions.Height - image.Height) / 2.0, image.Width, image.Height);
+            }
+            else if (num > num2)
+            {
+                double num3 = image.Width / image.Height * dimensions.Width;
+                rectangle = new Rect((dimensions.Width - num3) / 2.0, 0.0, num3, dimensions.Height);
+            }
+            else if (num < num2)
+            {
+                double num4 = image.Height / image.Width * dimensions.Height;
+                rectangle = new Rect(0.0, (dimensions.Height - num4) / 2.0, dimensions.Width, num4);
+            }
+            DrawingVisual drawingVisual = new DrawingVisual();
+            DrawingContext drawingContext = drawingVisual.RenderOpen();
+            drawingContext.DrawImage(image, rectangle);
+            drawingContext.Close();
+            RenderTargetBitmap renderTargetBitmap = new RenderTargetBitmap((int) dimensions.Width, (int) dimensions.Height, 96.0, 96.0, PixelFormats.Pbgra32);
+            renderTargetBitmap.Render(drawingVisual);
+            bitmapFrame = BitmapFrame.Create(renderTargetBitmap);
+        }
+        IntPtr result;
+        using (MemoryStream memoryStream = new MemoryStream())
+        {
+            new PngBitmapEncoder
+            {
+                Frames =
                 {
-                    Frames =
+                    bitmapFrame
+                }
+            }.Save(memoryStream);
+            using (ManagedIStream managedIStream = new ManagedIStream(memoryStream))
+            {
+                IntPtr zero = IntPtr.Zero;
+                try
+                {
+                    Status status = NativeMethods.GdipCreateBitmapFromStream(managedIStream, out zero);
+                    if (status != Status.Ok)
                     {
-                        bitmapFrame
+                        result = IntPtr.Zero;
                     }
-                }.Save(memoryStream);
-                using (ManagedIStream managedIStream = new ManagedIStream(memoryStream))
-                {
-                    IntPtr zero = IntPtr.Zero;
-                    try
+                    else
                     {
-                        Status status = NativeMethods.GdipCreateBitmapFromStream(managedIStream, out zero);
+                        IntPtr intPtr;
+                        status = NativeMethods.GdipCreateHICONFromBitmap(zero, out intPtr);
                         if (status != Status.Ok)
                         {
                             result = IntPtr.Zero;
                         }
                         else
                         {
-                            IntPtr intPtr;
-                            status = NativeMethods.GdipCreateHICONFromBitmap(zero, out intPtr);
-                            if (status != Status.Ok)
-                            {
-                                result = IntPtr.Zero;
-                            }
-                            else
-                            {
-                                result = intPtr;
-                            }
+                            result = intPtr;
                         }
                     }
-                    finally
+                }
+                finally
+                {
+                    Utility.SafeDisposeImage(ref zero);
+                }
+            }
+        }
+        return result;
+    }
+
+    public static BitmapFrame GetBestMatch(IList<BitmapFrame> frames, int width, int height)
+    {
+        return Utility._GetBestMatch(frames, Utility._GetBitDepth(), width, height);
+    }
+
+    private static int _MatchImage(BitmapFrame frame, int bitDepth, int width, int height, int bpp)
+    {
+        return 2 * Utility._WeightedAbs(bpp, bitDepth, false) + Utility._WeightedAbs(frame.PixelWidth, width, true) + Utility._WeightedAbs(frame.PixelHeight, height, true);
+    }
+
+    private static int _WeightedAbs(int valueHave, int valueWant, bool fPunish)
+    {
+        int num = valueHave - valueWant;
+        if (num < 0)
+        {
+            num = (fPunish ? -2 : -1) * num;
+        }
+        return num;
+    }
+
+    private static BitmapFrame _GetBestMatch(IList<BitmapFrame> frames, int bitDepth, int width, int height)
+    {
+        int num = int.MaxValue;
+        int num2 = 0;
+        int index = 0;
+        bool flag = frames[0].Decoder is IconBitmapDecoder;
+        int num3 = 0;
+        while (num3 < frames.Count && num != 0)
+        {
+            int num4 = flag ? frames[num3].Thumbnail.Format.BitsPerPixel : frames[num3].Format.BitsPerPixel;
+            if (num4 == 0)
+            {
+                num4 = 8;
+            }
+            int num5 = Utility._MatchImage(frames[num3], bitDepth, width, height, num4);
+            if (num5 < num)
+            {
+                index = num3;
+                num2 = num4;
+                num = num5;
+            }
+            else if (num5 == num && num2 < num4)
+            {
+                index = num3;
+                num2 = num4;
+            }
+            num3++;
+        }
+        return frames[index];
+    }
+
+    private static int _GetBitDepth()
+    {
+        if (Utility.s_bitDepth == 0)
+        {
+            using (SafeDC desktop = SafeDC.GetDesktop())
+            {
+                Utility.s_bitDepth = NativeMethods.GetDeviceCaps(desktop, DeviceCap.BITSPIXEL) * NativeMethods.GetDeviceCaps(desktop, DeviceCap.PLANES);
+            }
+        }
+        return Utility.s_bitDepth;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDeleteFile(string path)
+    {
+        if (!string.IsNullOrEmpty(path))
+        {
+            File.Delete(path);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDeleteObject(ref IntPtr gdiObject)
+    {
+        IntPtr intPtr = gdiObject;
+        gdiObject = IntPtr.Zero;
+        if (IntPtr.Zero != intPtr)
+        {
+            NativeMethods.DeleteObject(intPtr);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDestroyIcon(ref IntPtr hicon)
+    {
+        IntPtr intPtr = hicon;
+        hicon = IntPtr.Zero;
+        if (IntPtr.Zero != intPtr)
+        {
+            NativeMethods.DestroyIcon(intPtr);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDestroyWindow(ref IntPtr hwnd)
+    {
+        IntPtr hwnd2 = hwnd;
+        hwnd = IntPtr.Zero;
+        if (NativeMethods.IsWindow(hwnd2))
+        {
+            NativeMethods.DestroyWindow(hwnd2);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDispose<T>(ref T disposable) where T : IDisposable
+    {
+        IDisposable disposable2 = disposable;
+        disposable = default(T);
+        if (disposable2 != null)
+        {
+            disposable2.Dispose();
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeDisposeImage(ref IntPtr gdipImage)
+    {
+        IntPtr intPtr = gdipImage;
+        gdipImage = IntPtr.Zero;
+        if (IntPtr.Zero != intPtr)
+        {
+            NativeMethods.GdipDisposeImage(intPtr);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static void SafeCoTaskMemFree(ref IntPtr ptr)
+    {
+        IntPtr intPtr = ptr;
+        ptr = IntPtr.Zero;
+        if (IntPtr.Zero != intPtr)
+        {
+            Marshal.FreeCoTaskMem(intPtr);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void SafeFreeHGlobal(ref IntPtr hglobal)
+    {
+        IntPtr intPtr = hglobal;
+        hglobal = IntPtr.Zero;
+        if (IntPtr.Zero != intPtr)
+        {
+            Marshal.FreeHGlobal(intPtr);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static void SafeRelease<T>(ref T comObject) where T : class
+    {
+        T t = comObject;
+        comObject = default(T);
+        if (t != null)
+        {
+            Marshal.ReleaseComObject(t);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void GeneratePropertyString(StringBuilder source, string propertyName, string value)
+    {
+        if (source.Length != 0)
+        {
+            source.Append(' ');
+        }
+        source.Append(propertyName);
+        source.Append(": ");
+        if (string.IsNullOrEmpty(value))
+        {
+            source.Append("<null>");
+            return;
+        }
+        source.Append('"');
+        source.Append(value);
+        source.Append('"');
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [Obsolete]
+    public static string GenerateToString<T>(T @object) where T : struct
+    {
+        StringBuilder stringBuilder = new StringBuilder();
+        foreach (PropertyInfo propertyInfo in typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public))
+        {
+            if (stringBuilder.Length != 0)
+            {
+                stringBuilder.Append(", ");
+            }
+            object value = propertyInfo.GetValue(@object, null);
+            string format = (value == null) ? "{0}: <null>" : "{0}: \"{1}\"";
+            stringBuilder.AppendFormat(format, propertyInfo.Name, value);
+        }
+        return stringBuilder.ToString();
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void CopyStream(Stream destination, Stream source)
+    {
+        destination.Position = 0L;
+        if (source.CanSeek)
+        {
+            source.Position = 0L;
+            destination.SetLength(source.Length);
+        }
+        byte[] array = new byte[4096];
+        int num;
+        do
+        {
+            num = source.Read(array, 0, array.Length);
+            if (num != 0)
+            {
+                destination.Write(array, 0, num);
+            }
+        }
+        while (array.Length == num);
+        destination.Position = 0L;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static string HashStreamMD5(Stream stm)
+    {
+        stm.Position = 0L;
+        StringBuilder stringBuilder = new StringBuilder();
+        using (MD5 md = MD5.Create())
+        {
+            foreach (byte b in md.ComputeHash(stm))
+            {
+                stringBuilder.Append(b.ToString("x2", CultureInfo.InvariantCulture));
+            }
+        }
+        return stringBuilder.ToString();
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void EnsureDirectory(string path)
+    {
+        if (!Directory.Exists(Path.GetDirectoryName(path)))
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(path));
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static bool MemCmp(byte[] left, byte[] right, int cb)
+    {
+        GCHandle gchandle = GCHandle.Alloc(left, GCHandleType.Pinned);
+        IntPtr left2 = gchandle.AddrOfPinnedObject();
+        GCHandle gchandle2 = GCHandle.Alloc(right, GCHandleType.Pinned);
+        IntPtr right2 = gchandle2.AddrOfPinnedObject();
+        bool result = Utility._MemCmp(left2, right2, (long) cb);
+        gchandle.Free();
+        gchandle2.Free();
+        return result;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static string UrlDecode(string url)
+    {
+        if (url == null)
+        {
+            return null;
+        }
+        Utility._UrlDecoder urlDecoder = new Utility._UrlDecoder(url.Length, Encoding.UTF8);
+        int length = url.Length;
+        for (int i = 0; i < length; i++)
+        {
+            char c = url[i];
+            if (c == '+')
+            {
+                urlDecoder.AddByte(32);
+            }
+            else
+            {
+                if (c == '%' && i < length - 2)
+                {
+                    if (url[i + 1] == 'u' && i < length - 5)
                     {
-                        Utility.SafeDisposeImage(ref zero);
+                        int num = Utility._HexToInt(url[i + 2]);
+                        int num2 = Utility._HexToInt(url[i + 3]);
+                        int num3 = Utility._HexToInt(url[i + 4]);
+                        int num4 = Utility._HexToInt(url[i + 5]);
+                        if (num >= 0 && num2 >= 0 && num3 >= 0 && num4 >= 0)
+                        {
+                            urlDecoder.AddChar((char) (num << 12 | num2 << 8 | num3 << 4 | num4));
+                            i += 5;
+                            goto IL_12D;
+                        }
+                    }
+                    else
+                    {
+                        int num5 = Utility._HexToInt(url[i + 1]);
+                        int num6 = Utility._HexToInt(url[i + 2]);
+                        if (num5 >= 0 && num6 >= 0)
+                        {
+                            urlDecoder.AddByte((byte) (num5 << 4 | num6));
+                            i += 2;
+                            goto IL_12D;
+                        }
                     }
                 }
-            }
-            return result;
-        }
-
-        public static BitmapFrame GetBestMatch(IList<BitmapFrame> frames, int width, int height)
-        {
-            return Utility._GetBestMatch(frames, Utility._GetBitDepth(), width, height);
-        }
-
-        private static int _MatchImage(BitmapFrame frame, int bitDepth, int width, int height, int bpp)
-        {
-            return 2 * Utility._WeightedAbs(bpp, bitDepth, false) + Utility._WeightedAbs(frame.PixelWidth, width, true) + Utility._WeightedAbs(frame.PixelHeight, height, true);
-        }
-
-        private static int _WeightedAbs(int valueHave, int valueWant, bool fPunish)
-        {
-            int num = valueHave - valueWant;
-            if (num < 0)
-            {
-                num = (fPunish ? -2 : -1) * num;
-            }
-            return num;
-        }
-
-        private static BitmapFrame _GetBestMatch(IList<BitmapFrame> frames, int bitDepth, int width, int height)
-        {
-            int num = int.MaxValue;
-            int num2 = 0;
-            int index = 0;
-            bool flag = frames[0].Decoder is IconBitmapDecoder;
-            int num3 = 0;
-            while (num3 < frames.Count && num != 0)
-            {
-                int num4 = flag ? frames[num3].Thumbnail.Format.BitsPerPixel : frames[num3].Format.BitsPerPixel;
-                if (num4 == 0)
+                if ((c & 'ﾀ') == '\0')
                 {
-                    num4 = 8;
-                }
-                int num5 = Utility._MatchImage(frames[num3], bitDepth, width, height, num4);
-                if (num5 < num)
-                {
-                    index = num3;
-                    num2 = num4;
-                    num = num5;
-                }
-                else if (num5 == num && num2 < num4)
-                {
-                    index = num3;
-                    num2 = num4;
-                }
-                num3++;
-            }
-            return frames[index];
-        }
-
-        private static int _GetBitDepth()
-        {
-            if (Utility.s_bitDepth == 0)
-            {
-                using (SafeDC desktop = SafeDC.GetDesktop())
-                {
-                    Utility.s_bitDepth = NativeMethods.GetDeviceCaps(desktop, DeviceCap.BITSPIXEL) * NativeMethods.GetDeviceCaps(desktop, DeviceCap.PLANES);
-                }
-            }
-            return Utility.s_bitDepth;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDeleteFile(string path)
-        {
-            if (!string.IsNullOrEmpty(path))
-            {
-                File.Delete(path);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDeleteObject(ref IntPtr gdiObject)
-        {
-            IntPtr intPtr = gdiObject;
-            gdiObject = IntPtr.Zero;
-            if (IntPtr.Zero != intPtr)
-            {
-                NativeMethods.DeleteObject(intPtr);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDestroyIcon(ref IntPtr hicon)
-        {
-            IntPtr intPtr = hicon;
-            hicon = IntPtr.Zero;
-            if (IntPtr.Zero != intPtr)
-            {
-                NativeMethods.DestroyIcon(intPtr);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDestroyWindow(ref IntPtr hwnd)
-        {
-            IntPtr hwnd2 = hwnd;
-            hwnd = IntPtr.Zero;
-            if (NativeMethods.IsWindow(hwnd2))
-            {
-                NativeMethods.DestroyWindow(hwnd2);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDispose<T>(ref T disposable) where T : IDisposable
-        {
-            IDisposable disposable2 = disposable;
-            disposable = default(T);
-            if (disposable2 != null)
-            {
-                disposable2.Dispose();
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeDisposeImage(ref IntPtr gdipImage)
-        {
-            IntPtr intPtr = gdipImage;
-            gdipImage = IntPtr.Zero;
-            if (IntPtr.Zero != intPtr)
-            {
-                NativeMethods.GdipDisposeImage(intPtr);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static void SafeCoTaskMemFree(ref IntPtr ptr)
-        {
-            IntPtr intPtr = ptr;
-            ptr = IntPtr.Zero;
-            if (IntPtr.Zero != intPtr)
-            {
-                Marshal.FreeCoTaskMem(intPtr);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void SafeFreeHGlobal(ref IntPtr hglobal)
-        {
-            IntPtr intPtr = hglobal;
-            hglobal = IntPtr.Zero;
-            if (IntPtr.Zero != intPtr)
-            {
-                Marshal.FreeHGlobal(intPtr);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static void SafeRelease<T>(ref T comObject) where T : class
-        {
-            T t = comObject;
-            comObject = default(T);
-            if (t != null)
-            {
-                Marshal.ReleaseComObject(t);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void GeneratePropertyString(StringBuilder source, string propertyName, string value)
-        {
-            if (source.Length != 0)
-            {
-                source.Append(' ');
-            }
-            source.Append(propertyName);
-            source.Append(": ");
-            if (string.IsNullOrEmpty(value))
-            {
-                source.Append("<null>");
-                return;
-            }
-            source.Append('"');
-            source.Append(value);
-            source.Append('"');
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [Obsolete]
-        public static string GenerateToString<T>(T @object) where T : struct
-        {
-            StringBuilder stringBuilder = new StringBuilder();
-            foreach (PropertyInfo propertyInfo in typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public))
-            {
-                if (stringBuilder.Length != 0)
-                {
-                    stringBuilder.Append(", ");
-                }
-                object value = propertyInfo.GetValue(@object, null);
-                string format = (value == null) ? "{0}: <null>" : "{0}: \"{1}\"";
-                stringBuilder.AppendFormat(format, propertyInfo.Name, value);
-            }
-            return stringBuilder.ToString();
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void CopyStream(Stream destination, Stream source)
-        {
-            destination.Position = 0L;
-            if (source.CanSeek)
-            {
-                source.Position = 0L;
-                destination.SetLength(source.Length);
-            }
-            byte[] array = new byte[4096];
-            int num;
-            do
-            {
-                num = source.Read(array, 0, array.Length);
-                if (num != 0)
-                {
-                    destination.Write(array, 0, num);
-                }
-            }
-            while (array.Length == num);
-            destination.Position = 0L;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static string HashStreamMD5(Stream stm)
-        {
-            stm.Position = 0L;
-            StringBuilder stringBuilder = new StringBuilder();
-            using (MD5 md = MD5.Create())
-            {
-                foreach (byte b in md.ComputeHash(stm))
-                {
-                    stringBuilder.Append(b.ToString("x2", CultureInfo.InvariantCulture));
-                }
-            }
-            return stringBuilder.ToString();
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void EnsureDirectory(string path)
-        {
-            if (!Directory.Exists(Path.GetDirectoryName(path)))
-            {
-                Directory.CreateDirectory(Path.GetDirectoryName(path));
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static bool MemCmp(byte[] left, byte[] right, int cb)
-        {
-            GCHandle gchandle = GCHandle.Alloc(left, GCHandleType.Pinned);
-            IntPtr left2 = gchandle.AddrOfPinnedObject();
-            GCHandle gchandle2 = GCHandle.Alloc(right, GCHandleType.Pinned);
-            IntPtr right2 = gchandle2.AddrOfPinnedObject();
-            bool result = Utility._MemCmp(left2, right2, (long) cb);
-            gchandle.Free();
-            gchandle2.Free();
-            return result;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static string UrlDecode(string url)
-        {
-            if (url == null)
-            {
-                return null;
-            }
-            Utility._UrlDecoder urlDecoder = new Utility._UrlDecoder(url.Length, Encoding.UTF8);
-            int length = url.Length;
-            for (int i = 0; i < length; i++)
-            {
-                char c = url[i];
-                if (c == '+')
-                {
-                    urlDecoder.AddByte(32);
+                    urlDecoder.AddByte((byte) c);
                 }
                 else
                 {
-                    if (c == '%' && i < length - 2)
-                    {
-                        if (url[i + 1] == 'u' && i < length - 5)
-                        {
-                            int num = Utility._HexToInt(url[i + 2]);
-                            int num2 = Utility._HexToInt(url[i + 3]);
-                            int num3 = Utility._HexToInt(url[i + 4]);
-                            int num4 = Utility._HexToInt(url[i + 5]);
-                            if (num >= 0 && num2 >= 0 && num3 >= 0 && num4 >= 0)
-                            {
-                                urlDecoder.AddChar((char) (num << 12 | num2 << 8 | num3 << 4 | num4));
-                                i += 5;
-                                goto IL_12D;
-                            }
-                        }
-                        else
-                        {
-                            int num5 = Utility._HexToInt(url[i + 1]);
-                            int num6 = Utility._HexToInt(url[i + 2]);
-                            if (num5 >= 0 && num6 >= 0)
-                            {
-                                urlDecoder.AddByte((byte) (num5 << 4 | num6));
-                                i += 2;
-                                goto IL_12D;
-                            }
-                        }
-                    }
-                    if ((c & 'ﾀ') == '\0')
-                    {
-                        urlDecoder.AddByte((byte) c);
-                    }
-                    else
-                    {
-                        urlDecoder.AddChar(c);
-                    }
+                    urlDecoder.AddChar(c);
                 }
-IL_12D:;
             }
-            return urlDecoder.GetString();
+            IL_12D:;
         }
+        return urlDecoder.GetString();
+    }
 
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static string UrlEncode(string url)
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static string UrlEncode(string url)
+    {
+        if (url == null)
         {
-            if (url == null)
-            {
-                return null;
-            }
-            byte[] array = Encoding.UTF8.GetBytes(url);
-            bool flag = false;
-            int num = 0;
-            foreach (byte b in array)
-            {
-                if (b == 32)
-                {
-                    flag = true;
-                }
-                else if (!Utility._UrlEncodeIsSafe(b))
-                {
-                    num++;
-                    flag = true;
-                }
-            }
-            if (flag)
-            {
-                byte[] array3 = new byte[array.Length + num * 2];
-                int num2 = 0;
-                foreach (byte b2 in array)
-                {
-                    if (Utility._UrlEncodeIsSafe(b2))
-                    {
-                        array3[num2++] = b2;
-                    }
-                    else if (b2 == 32)
-                    {
-                        array3[num2++] = 43;
-                    }
-                    else
-                    {
-                        array3[num2++] = 37;
-                        array3[num2++] = Utility._IntToHex(b2 >> 4 & 15);
-                        array3[num2++] = Utility._IntToHex((int) (b2 & 15));
-                    }
-                }
-                array = array3;
-            }
-            return Encoding.ASCII.GetString(array);
+            return null;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private static bool _UrlEncodeIsSafe(byte b)
+        byte[] array = Encoding.UTF8.GetBytes(url);
+        bool flag = false;
+        int num = 0;
+        foreach (byte b in array)
         {
-            if (Utility._IsAsciiAlphaNumeric(b))
+            if (b == 32)
             {
-                return true;
+                flag = true;
             }
-            if (b != 33)
+            else if (!Utility._UrlEncodeIsSafe(b))
             {
-                switch (b)
+                num++;
+                flag = true;
+            }
+        }
+        if (flag)
+        {
+            byte[] array3 = new byte[array.Length + num * 2];
+            int num2 = 0;
+            foreach (byte b2 in array)
+            {
+                if (Utility._UrlEncodeIsSafe(b2))
                 {
-                    case 39:
-                    case 40:
-                    case 41:
-                    case 42:
-                    case 45:
-                    case 46:
-                        return true;
-                    case 43:
-                    case 44:
-                        break;
-                    default:
-                        if (b == 95)
-                        {
-                            return true;
-                        }
-                        break;
+                    array3[num2++] = b2;
+                }
+                else if (b2 == 32)
+                {
+                    array3[num2++] = 43;
+                }
+                else
+                {
+                    array3[num2++] = 37;
+                    array3[num2++] = Utility._IntToHex(b2 >> 4 & 15);
+                    array3[num2++] = Utility._IntToHex((int) (b2 & 15));
                 }
-                return false;
             }
+            array = array3;
+        }
+        return Encoding.ASCII.GetString(array);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    private static bool _UrlEncodeIsSafe(byte b)
+    {
+        if (Utility._IsAsciiAlphaNumeric(b))
+        {
             return true;
         }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private static bool _IsAsciiAlphaNumeric(byte b)
+        if (b != 33)
         {
-            return (b >= 97 && b <= 122) || (b >= 65 && b <= 90) || (b >= 48 && b <= 57);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private static byte _IntToHex(int n)
-        {
-            if (n <= 9)
-            {
-                return (byte) (n + 48);
-            }
-            return (byte) (n - 10 + 65);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private static int _HexToInt(char h)
-        {
-            if (h >= '0' && h <= '9')
-            {
-                return (int) (h - '0');
-            }
-            if (h >= 'a' && h <= 'f')
-            {
-                return (int) (h - 'a' + '\n');
-            }
-            if (h >= 'A' && h <= 'F')
-            {
-                return (int) (h - 'A' + '\n');
-            }
-            return -1;
-        }
-
-        public static void AddDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
-        {
-            if (component == null)
-            {
-                return;
-            }
-            DependencyPropertyDescriptor dependencyPropertyDescriptor = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
-            dependencyPropertyDescriptor.AddValueChanged(component, listener);
-        }
-
-        public static void RemoveDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
-        {
-            if (component == null)
-            {
-                return;
-            }
-            DependencyPropertyDescriptor dependencyPropertyDescriptor = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
-            dependencyPropertyDescriptor.RemoveValueChanged(component, listener);
-        }
-
-        public static bool IsThicknessNonNegative(Thickness thickness)
-        {
-            return Utility.IsDoubleFiniteAndNonNegative(thickness.Top) && Utility.IsDoubleFiniteAndNonNegative(thickness.Left) && Utility.IsDoubleFiniteAndNonNegative(thickness.Bottom) && Utility.IsDoubleFiniteAndNonNegative(thickness.Right);
-        }
-
-        public static bool IsCornerRadiusValid(CornerRadius cornerRadius)
-        {
-            return Utility.IsDoubleFiniteAndNonNegative(cornerRadius.TopLeft) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.TopRight) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.BottomLeft) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.BottomRight);
-        }
-
-        public static bool IsDoubleFiniteAndNonNegative(double d)
-        {
-            return !double.IsNaN(d) && !double.IsInfinity(d) && d >= 0.0;
-        }
-
-        private static readonly Version _osVersion = Environment.OSVersion.Version;
-
-        private static readonly Version _presentationFrameworkVersion = Assembly.GetAssembly(typeof(Window)).GetName().Version;
-
-        private static int s_bitDepth;
-
-        private class _UrlDecoder
-        {
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            public _UrlDecoder(int size, Encoding encoding)
-            {
-                this._encoding = encoding;
-                this._charBuffer = new char[size];
-                this._byteBuffer = new byte[size];
-            }
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            public void AddByte(byte b)
-            {
-                this._byteBuffer[this._byteCount++] = b;
-            }
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            public void AddChar(char ch)
-            {
-                this._FlushBytes();
-                this._charBuffer[this._charCount++] = ch;
-            }
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            private void _FlushBytes()
-            {
-                if (this._byteCount > 0)
-                {
-                    this._charCount += this._encoding.GetChars(this._byteBuffer, 0, this._byteCount, this._charBuffer, this._charCount);
-                    this._byteCount = 0;
-                }
-            }
-
-            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-            public string GetString()
-            {
-                this._FlushBytes();
-                if (this._charCount > 0)
-                {
-                    return new string(this._charBuffer, 0, this._charCount);
-                }
-                return "";
-            }
-
-            private readonly Encoding _encoding;
-
-            private readonly char[] _charBuffer;
-
-            private readonly byte[] _byteBuffer;
-
-            private int _byteCount;
-
-            private int _charCount;
+            switch (b)
+            {
+                case 39:
+                case 40:
+                case 41:
+                case 42:
+                case 45:
+                case 46:
+                    return true;
+                case 43:
+                case 44:
+                    break;
+                default:
+                    if (b == 95)
+                    {
+                        return true;
+                    }
+                    break;
+            }
+            return false;
         }
+        return true;
     }
-}
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    private static bool _IsAsciiAlphaNumeric(byte b)
+    {
+        return (b >= 97 && b <= 122) || (b >= 65 && b <= 90) || (b >= 48 && b <= 57);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    private static byte _IntToHex(int n)
+    {
+        if (n <= 9)
+        {
+            return (byte) (n + 48);
+        }
+        return (byte) (n - 10 + 65);
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    private static int _HexToInt(char h)
+    {
+        if (h >= '0' && h <= '9')
+        {
+            return (int) (h - '0');
+        }
+        if (h >= 'a' && h <= 'f')
+        {
+            return (int) (h - 'a' + '\n');
+        }
+        if (h >= 'A' && h <= 'F')
+        {
+            return (int) (h - 'A' + '\n');
+        }
+        return -1;
+    }
+
+    public static void AddDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
+    {
+        if (component == null)
+        {
+            return;
+        }
+        DependencyPropertyDescriptor dependencyPropertyDescriptor = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
+        dependencyPropertyDescriptor.AddValueChanged(component, listener);
+    }
+
+    public static void RemoveDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
+    {
+        if (component == null)
+        {
+            return;
+        }
+        DependencyPropertyDescriptor dependencyPropertyDescriptor = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
+        dependencyPropertyDescriptor.RemoveValueChanged(component, listener);
+    }
+
+    public static bool IsThicknessNonNegative(Thickness thickness)
+    {
+        return Utility.IsDoubleFiniteAndNonNegative(thickness.Top) && Utility.IsDoubleFiniteAndNonNegative(thickness.Left) && Utility.IsDoubleFiniteAndNonNegative(thickness.Bottom) && Utility.IsDoubleFiniteAndNonNegative(thickness.Right);
+    }
+
+    public static bool IsCornerRadiusValid(CornerRadius cornerRadius)
+    {
+        return Utility.IsDoubleFiniteAndNonNegative(cornerRadius.TopLeft) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.TopRight) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.BottomLeft) && Utility.IsDoubleFiniteAndNonNegative(cornerRadius.BottomRight);
+    }
+
+    public static bool IsDoubleFiniteAndNonNegative(double d)
+    {
+        return !double.IsNaN(d) && !double.IsInfinity(d) && d >= 0.0;
+    }
+
+    private static readonly Version _osVersion = Environment.OSVersion.Version;
+
+    private static readonly Version _presentationFrameworkVersion = Assembly.GetAssembly(typeof(Window)).GetName().Version;
+
+    private static int s_bitDepth;
+
+    private class _UrlDecoder
+    {
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public _UrlDecoder(int size, Encoding encoding)
+        {
+            this._encoding = encoding;
+            this._charBuffer = new char[size];
+            this._byteBuffer = new byte[size];
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public void AddByte(byte b)
+        {
+            this._byteBuffer[this._byteCount++] = b;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public void AddChar(char ch)
+        {
+            this._FlushBytes();
+            this._charBuffer[this._charCount++] = ch;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private void _FlushBytes()
+        {
+            if (this._byteCount > 0)
+            {
+                this._charCount += this._encoding.GetChars(this._byteBuffer, 0, this._byteCount, this._charBuffer, this._charCount);
+                this._byteCount = 0;
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public string GetString()
+        {
+            this._FlushBytes();
+            if (this._charCount > 0)
+            {
+                return new string(this._charBuffer, 0, this._charCount);
+            }
+            return "";
+        }
+
+        private readonly Encoding _encoding;
+
+        private readonly char[] _charBuffer;
+
+        private readonly byte[] _byteBuffer;
+
+        private int _byteCount;
+
+        private int _charCount;
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
index 728825ca..72f71991 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
@@ -5,242 +5,241 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 
-namespace Standard
+namespace Standard;
+
+internal static class Verify
 {
-    internal static class Verify
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void IsApartmentState(ApartmentState requiredState, string message)
     {
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void IsApartmentState(ApartmentState requiredState, string message)
+        if (Thread.CurrentThread.GetApartmentState() != requiredState)
         {
-            if (Thread.CurrentThread.GetApartmentState() != requiredState)
-            {
-                throw new InvalidOperationException(message);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void IsNeitherNullNorEmpty(string value, string name)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name, "The parameter can not be either null or empty.");
-            }
-            if ("" == value)
-            {
-                throw new ArgumentException("The parameter can not be either null or empty.", name);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
-        [DebuggerStepThrough]
-        public static void IsNeitherNullNorWhitespace(string value, string name)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name, "The parameter can not be either null or empty or consist only of white space characters.");
-            }
-            if ("" == value.Trim())
-            {
-                throw new ArgumentException("The parameter can not be either null or empty or consist only of white space characters.", name);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void IsNotDefault<T>(T obj, string name) where T : struct
-        {
-            T t = default(T);
-            if (t.Equals(obj))
-            {
-                throw new ArgumentException("The parameter must not be the default value.", name);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void IsNotNull<T>(T obj, string name) where T : class
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(name);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void IsNull<T>(T obj, string name) where T : class
-        {
-            if (obj != null)
-            {
-                throw new ArgumentException("The parameter must be null.", name);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void PropertyIsNotNull<T>(T obj, string name) where T : class
-        {
-            if (obj == null)
-            {
-                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} cannot be null at this time.", new object[]
-                {
-                    name
-                }));
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void PropertyIsNull<T>(T obj, string name) where T : class
-        {
-            if (obj != null)
-            {
-                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} must be null at this time.", new object[]
-                {
-                    name
-                }));
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void IsTrue(bool statement, string name)
-        {
-            if (!statement)
-            {
-                throw new ArgumentException("", name);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void IsTrue(bool statement, string name, string message)
-        {
-            if (!statement)
-            {
-                throw new ArgumentException(message, name);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void AreEqual<T>(T expected, T actual, string parameterName, string message)
-        {
-            if (expected == null)
-            {
-                if (actual != null && !actual.Equals(expected))
-                {
-                    throw new ArgumentException(message, parameterName);
-                }
-            }
-            else if (!expected.Equals(actual))
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void AreNotEqual<T>(T notExpected, T actual, string parameterName, string message)
-        {
-            if (notExpected == null)
-            {
-                if (actual == null || actual.Equals(notExpected))
-                {
-                    throw new ArgumentException(message, parameterName);
-                }
-            }
-            else if (notExpected.Equals(actual))
-            {
-                throw new ArgumentException(message, parameterName);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void UriIsAbsolute(Uri uri, string parameterName)
-        {
-            Verify.IsNotNull<Uri>(uri, parameterName);
-            if (!uri.IsAbsoluteUri)
-            {
-                throw new ArgumentException("The URI must be absolute.", parameterName);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive, string parameterName)
-        {
-            if (value < lowerBoundInclusive || value >= upperBoundExclusive)
-            {
-                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The integer value must be bounded with [{0}, {1})", new object[]
-                {
-                    lowerBoundInclusive,
-                    upperBoundExclusive
-                }), parameterName);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive, string message, string parameter)
-        {
-            if (value < lowerBoundInclusive || value > upperBoundInclusive)
-            {
-                throw new ArgumentException(message, parameter);
-            }
-        }
-
-        [DebuggerStepThrough]
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        public static void TypeSupportsInterface(Type type, Type interfaceType, string parameterName)
-        {
-            Verify.IsNotNull<Type>(type, "type");
-            Verify.IsNotNull<Type>(interfaceType, "interfaceType");
-            if (type.GetInterface(interfaceType.Name) == null)
-            {
-                throw new ArgumentException("The type of this parameter does not support a required interface", parameterName);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        public static void FileExists(string filePath, string parameterName)
-        {
-            Verify.IsNeitherNullNorEmpty(filePath, parameterName);
-            if (!File.Exists(filePath))
-            {
-                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "No file exists at \"{0}\"", new object[]
-                {
-                    filePath
-                }), parameterName);
-            }
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        [DebuggerStepThrough]
-        internal static void ImplementsInterface(object parameter, Type interfaceType, string parameterName)
-        {
-            bool flag = false;
-            foreach (Type left in parameter.GetType().GetInterfaces())
-            {
-                if (left == interfaceType)
-                {
-                    flag = true;
-                    break;
-                }
-            }
-            if (!flag)
-            {
-                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The parameter must implement interface {0}.", new object[]
-                {
-                    interfaceType.ToString()
-                }), parameterName);
-            }
+            throw new InvalidOperationException(message);
         }
     }
-}
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void IsNeitherNullNorEmpty(string value, string name)
+    {
+        if (value == null)
+        {
+            throw new ArgumentNullException(name, "The parameter can not be either null or empty.");
+        }
+        if ("" == value)
+        {
+            throw new ArgumentException("The parameter can not be either null or empty.", name);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
+    [DebuggerStepThrough]
+    public static void IsNeitherNullNorWhitespace(string value, string name)
+    {
+        if (value == null)
+        {
+            throw new ArgumentNullException(name, "The parameter can not be either null or empty or consist only of white space characters.");
+        }
+        if ("" == value.Trim())
+        {
+            throw new ArgumentException("The parameter can not be either null or empty or consist only of white space characters.", name);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void IsNotDefault<T>(T obj, string name) where T : struct
+    {
+        T t = default(T);
+        if (t.Equals(obj))
+        {
+            throw new ArgumentException("The parameter must not be the default value.", name);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void IsNotNull<T>(T obj, string name) where T : class
+    {
+        if (obj == null)
+        {
+            throw new ArgumentNullException(name);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void IsNull<T>(T obj, string name) where T : class
+    {
+        if (obj != null)
+        {
+            throw new ArgumentException("The parameter must be null.", name);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void PropertyIsNotNull<T>(T obj, string name) where T : class
+    {
+        if (obj == null)
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} cannot be null at this time.", new object[]
+            {
+                name
+            }));
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void PropertyIsNull<T>(T obj, string name) where T : class
+    {
+        if (obj != null)
+        {
+            throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} must be null at this time.", new object[]
+            {
+                name
+            }));
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void IsTrue(bool statement, string name)
+    {
+        if (!statement)
+        {
+            throw new ArgumentException("", name);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void IsTrue(bool statement, string name, string message)
+    {
+        if (!statement)
+        {
+            throw new ArgumentException(message, name);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void AreEqual<T>(T expected, T actual, string parameterName, string message)
+    {
+        if (expected == null)
+        {
+            if (actual != null && !actual.Equals(expected))
+            {
+                throw new ArgumentException(message, parameterName);
+            }
+        }
+        else if (!expected.Equals(actual))
+        {
+            throw new ArgumentException(message, parameterName);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void AreNotEqual<T>(T notExpected, T actual, string parameterName, string message)
+    {
+        if (notExpected == null)
+        {
+            if (actual == null || actual.Equals(notExpected))
+            {
+                throw new ArgumentException(message, parameterName);
+            }
+        }
+        else if (notExpected.Equals(actual))
+        {
+            throw new ArgumentException(message, parameterName);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void UriIsAbsolute(Uri uri, string parameterName)
+    {
+        Verify.IsNotNull<Uri>(uri, parameterName);
+        if (!uri.IsAbsoluteUri)
+        {
+            throw new ArgumentException("The URI must be absolute.", parameterName);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive, string parameterName)
+    {
+        if (value < lowerBoundInclusive || value >= upperBoundExclusive)
+        {
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The integer value must be bounded with [{0}, {1})", new object[]
+            {
+                lowerBoundInclusive,
+                upperBoundExclusive
+            }), parameterName);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive, string message, string parameter)
+    {
+        if (value < lowerBoundInclusive || value > upperBoundInclusive)
+        {
+            throw new ArgumentException(message, parameter);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    public static void TypeSupportsInterface(Type type, Type interfaceType, string parameterName)
+    {
+        Verify.IsNotNull<Type>(type, "type");
+        Verify.IsNotNull<Type>(interfaceType, "interfaceType");
+        if (type.GetInterface(interfaceType.Name) == null)
+        {
+            throw new ArgumentException("The type of this parameter does not support a required interface", parameterName);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    public static void FileExists(string filePath, string parameterName)
+    {
+        Verify.IsNeitherNullNorEmpty(filePath, parameterName);
+        if (!File.Exists(filePath))
+        {
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "No file exists at \"{0}\"", new object[]
+            {
+                filePath
+            }), parameterName);
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+    [DebuggerStepThrough]
+    internal static void ImplementsInterface(object parameter, Type interfaceType, string parameterName)
+    {
+        bool flag = false;
+        foreach (Type left in parameter.GetType().GetInterfaces())
+        {
+            if (left == interfaceType)
+            {
+                flag = true;
+                break;
+            }
+        }
+        if (!flag)
+        {
+            throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The parameter must implement interface {0}.", new object[]
+            {
+                interfaceType.ToString()
+            }), parameterName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
index 2fe843b7..fc5d929f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
@@ -4,33 +4,32 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 
-namespace Standard
+namespace Standard;
+
+[BestFitMapping(false)]
+[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+internal class WIN32_FIND_DATAW
 {
-    [BestFitMapping(false)]
-    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    internal class WIN32_FIND_DATAW
-    {
-        public FileAttributes dwFileAttributes;
+    public FileAttributes dwFileAttributes;
 
-        public System.Runtime.InteropServices.ComTypes.FILETIME ftCreationTime;
+    public System.Runtime.InteropServices.ComTypes.FILETIME ftCreationTime;
 
-        public System.Runtime.InteropServices.ComTypes.FILETIME ftLastAccessTime;
+    public System.Runtime.InteropServices.ComTypes.FILETIME ftLastAccessTime;
 
-        public System.Runtime.InteropServices.ComTypes.FILETIME ftLastWriteTime;
+    public System.Runtime.InteropServices.ComTypes.FILETIME ftLastWriteTime;
 
-        public int nFileSizeHigh;
+    public int nFileSizeHigh;
 
-        public int nFileSizeLow;
+    public int nFileSizeLow;
 
-        public int dwReserved0;
+    public int dwReserved0;
 
-        public int dwReserved1;
+    public int dwReserved1;
 
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
-        public string cFileName;
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+    public string cFileName;
 
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
-        public string cAlternateFileName;
-    }
-}
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
+    public string cAlternateFileName;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
index fcecee51..30535838 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
@@ -1,21 +1,20 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential)]
+internal class WINDOWPLACEMENT
 {
-    [StructLayout(LayoutKind.Sequential)]
-    internal class WINDOWPLACEMENT
-    {
-        public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
+    public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
 
-        public int flags;
+    public int flags;
 
-        public SW showCmd;
+    public SW showCmd;
 
-        public POINT ptMinPosition;
+    public POINT ptMinPosition;
 
-        public POINT ptMaxPosition;
+    public POINT ptMaxPosition;
 
-        public RECT rcNormalPosition;
-    }
-}
+    public RECT rcNormalPosition;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
index a8d47c04..d241ee73 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal struct WINDOWPOS
 {
-    internal struct WINDOWPOS
-    {
-        public IntPtr hwnd;
+    public IntPtr hwnd;
 
-        public IntPtr hwndInsertAfter;
+    public IntPtr hwndInsertAfter;
 
-        public int x;
+    public int x;
 
-        public int y;
+    public int y;
 
-        public int cx;
+    public int cx;
 
-        public int cy;
+    public int cy;
 
-        public int flags;
-    }
-}
+    public int flags;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
index efb25c87..7c1ab86f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
@@ -1,9 +1,8 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum WINDOWTHEMEATTRIBUTETYPE : uint
 {
-    internal enum WINDOWTHEMEATTRIBUTETYPE : uint
-    {
-        WTA_NONCLIENT = 1u
-    }
-}
+    WTA_NONCLIENT = 1u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
index 74f72600..4fce4f0e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
@@ -1,139 +1,138 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum WM
 {
-    internal enum WM
-    {
-        NULL,
-        CREATE,
-        DESTROY,
-        MOVE,
-        SIZE = 5,
-        ACTIVATE,
-        SETFOCUS,
-        KILLFOCUS,
-        ENABLE = 10,
-        SETREDRAW,
-        SETTEXT,
-        GETTEXT,
-        GETTEXTLENGTH,
-        PAINT,
-        CLOSE,
-        QUERYENDSESSION,
-        QUIT,
-        QUERYOPEN,
-        ERASEBKGND,
-        SYSCOLORCHANGE,
-        SHOWWINDOW = 24,
-        CTLCOLOR,
-        WININICHANGE,
-        SETTINGCHANGE = 26,
-        ACTIVATEAPP = 28,
-        SETCURSOR = 32,
-        MOUSEACTIVATE,
-        CHILDACTIVATE,
-        QUEUESYNC,
-        GETMINMAXINFO,
-        WINDOWPOSCHANGING = 70,
-        WINDOWPOSCHANGED,
-        CONTEXTMENU = 123,
-        STYLECHANGING,
-        STYLECHANGED,
-        DISPLAYCHANGE,
-        GETICON,
-        SETICON,
-        NCCREATE,
-        NCDESTROY,
-        NCCALCSIZE,
-        NCHITTEST,
-        NCPAINT,
-        NCACTIVATE,
-        GETDLGCODE,
-        SYNCPAINT,
-        NCMOUSEMOVE = 160,
-        NCLBUTTONDOWN,
-        NCLBUTTONUP,
-        NCLBUTTONDBLCLK,
-        NCRBUTTONDOWN,
-        NCRBUTTONUP,
-        NCRBUTTONDBLCLK,
-        NCMBUTTONDOWN,
-        NCMBUTTONUP,
-        NCMBUTTONDBLCLK,
-        SYSKEYDOWN = 260,
-        SYSKEYUP,
-        SYSCHAR,
-        SYSDEADCHAR,
-        COMMAND = 273,
-        SYSCOMMAND,
-        MOUSEMOVE = 512,
-        LBUTTONDOWN,
-        LBUTTONUP,
-        LBUTTONDBLCLK,
-        RBUTTONDOWN,
-        RBUTTONUP,
-        RBUTTONDBLCLK,
-        MBUTTONDOWN,
-        MBUTTONUP,
-        MBUTTONDBLCLK,
-        MOUSEWHEEL,
-        XBUTTONDOWN,
-        XBUTTONUP,
-        XBUTTONDBLCLK,
-        MOUSEHWHEEL,
-        PARENTNOTIFY = 528,
-        CAPTURECHANGED = 533,
-        POWERBROADCAST = 536,
-        DEVICECHANGE,
-        ENTERSIZEMOVE = 561,
-        EXITSIZEMOVE,
-        IME_SETCONTEXT = 641,
-        IME_NOTIFY,
-        IME_CONTROL,
-        IME_COMPOSITIONFULL,
-        IME_SELECT,
-        IME_CHAR,
-        IME_REQUEST = 648,
-        IME_KEYDOWN = 656,
-        IME_KEYUP,
-        NCMOUSELEAVE = 674,
-        TABLET_DEFBASE = 704,
-        TABLET_ADDED = 712,
-        TABLET_DELETED,
-        TABLET_FLICK = 715,
-        TABLET_QUERYSYSTEMGESTURESTATUS,
-        CUT = 768,
-        COPY,
-        PASTE,
-        CLEAR,
-        UNDO,
-        RENDERFORMAT,
-        RENDERALLFORMATS,
-        DESTROYCLIPBOARD,
-        DRAWCLIPBOARD,
-        PAINTCLIPBOARD,
-        VSCROLLCLIPBOARD,
-        SIZECLIPBOARD,
-        ASKCBFORMATNAME,
-        CHANGECBCHAIN,
-        HSCROLLCLIPBOARD,
-        QUERYNEWPALETTE,
-        PALETTEISCHANGING,
-        PALETTECHANGED,
-        HOTKEY,
-        PRINT = 791,
-        PRINTCLIENT,
-        APPCOMMAND,
-        THEMECHANGED,
-        DWMCOMPOSITIONCHANGED = 798,
-        DWMNCRENDERINGCHANGED,
-        DWMCOLORIZATIONCOLORCHANGED,
-        DWMWINDOWMAXIMIZEDCHANGE,
-        GETTITLEBARINFOEX = 831,
-        DWMSENDICONICTHUMBNAIL = 803,
-        DWMSENDICONICLIVEPREVIEWBITMAP = 806,
-        USER = 1024,
-        TRAYMOUSEMESSAGE = 2048,
-        APP = 32768
-    }
-}
+    NULL,
+    CREATE,
+    DESTROY,
+    MOVE,
+    SIZE = 5,
+    ACTIVATE,
+    SETFOCUS,
+    KILLFOCUS,
+    ENABLE = 10,
+    SETREDRAW,
+    SETTEXT,
+    GETTEXT,
+    GETTEXTLENGTH,
+    PAINT,
+    CLOSE,
+    QUERYENDSESSION,
+    QUIT,
+    QUERYOPEN,
+    ERASEBKGND,
+    SYSCOLORCHANGE,
+    SHOWWINDOW = 24,
+    CTLCOLOR,
+    WININICHANGE,
+    SETTINGCHANGE = 26,
+    ACTIVATEAPP = 28,
+    SETCURSOR = 32,
+    MOUSEACTIVATE,
+    CHILDACTIVATE,
+    QUEUESYNC,
+    GETMINMAXINFO,
+    WINDOWPOSCHANGING = 70,
+    WINDOWPOSCHANGED,
+    CONTEXTMENU = 123,
+    STYLECHANGING,
+    STYLECHANGED,
+    DISPLAYCHANGE,
+    GETICON,
+    SETICON,
+    NCCREATE,
+    NCDESTROY,
+    NCCALCSIZE,
+    NCHITTEST,
+    NCPAINT,
+    NCACTIVATE,
+    GETDLGCODE,
+    SYNCPAINT,
+    NCMOUSEMOVE = 160,
+    NCLBUTTONDOWN,
+    NCLBUTTONUP,
+    NCLBUTTONDBLCLK,
+    NCRBUTTONDOWN,
+    NCRBUTTONUP,
+    NCRBUTTONDBLCLK,
+    NCMBUTTONDOWN,
+    NCMBUTTONUP,
+    NCMBUTTONDBLCLK,
+    SYSKEYDOWN = 260,
+    SYSKEYUP,
+    SYSCHAR,
+    SYSDEADCHAR,
+    COMMAND = 273,
+    SYSCOMMAND,
+    MOUSEMOVE = 512,
+    LBUTTONDOWN,
+    LBUTTONUP,
+    LBUTTONDBLCLK,
+    RBUTTONDOWN,
+    RBUTTONUP,
+    RBUTTONDBLCLK,
+    MBUTTONDOWN,
+    MBUTTONUP,
+    MBUTTONDBLCLK,
+    MOUSEWHEEL,
+    XBUTTONDOWN,
+    XBUTTONUP,
+    XBUTTONDBLCLK,
+    MOUSEHWHEEL,
+    PARENTNOTIFY = 528,
+    CAPTURECHANGED = 533,
+    POWERBROADCAST = 536,
+    DEVICECHANGE,
+    ENTERSIZEMOVE = 561,
+    EXITSIZEMOVE,
+    IME_SETCONTEXT = 641,
+    IME_NOTIFY,
+    IME_CONTROL,
+    IME_COMPOSITIONFULL,
+    IME_SELECT,
+    IME_CHAR,
+    IME_REQUEST = 648,
+    IME_KEYDOWN = 656,
+    IME_KEYUP,
+    NCMOUSELEAVE = 674,
+    TABLET_DEFBASE = 704,
+    TABLET_ADDED = 712,
+    TABLET_DELETED,
+    TABLET_FLICK = 715,
+    TABLET_QUERYSYSTEMGESTURESTATUS,
+    CUT = 768,
+    COPY,
+    PASTE,
+    CLEAR,
+    UNDO,
+    RENDERFORMAT,
+    RENDERALLFORMATS,
+    DESTROYCLIPBOARD,
+    DRAWCLIPBOARD,
+    PAINTCLIPBOARD,
+    VSCROLLCLIPBOARD,
+    SIZECLIPBOARD,
+    ASKCBFORMATNAME,
+    CHANGECBCHAIN,
+    HSCROLLCLIPBOARD,
+    QUERYNEWPALETTE,
+    PALETTEISCHANGING,
+    PALETTECHANGED,
+    HOTKEY,
+    PRINT = 791,
+    PRINTCLIENT,
+    APPCOMMAND,
+    THEMECHANGED,
+    DWMCOMPOSITIONCHANGED = 798,
+    DWMNCRENDERINGCHANGED,
+    DWMCOLORIZATIONCOLORCHANGED,
+    DWMWINDOWMAXIMIZEDCHANGE,
+    GETTITLEBARINFOEX = 831,
+    DWMSENDICONICTHUMBNAIL = 803,
+    DWMSENDICONICLIVEPREVIEWBITMAP = 806,
+    USER = 1024,
+    TRAYMOUSEMESSAGE = 2048,
+    APP = 32768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
index e51076fb..bdc23d9a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
@@ -1,35 +1,34 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+internal struct WNDCLASSEX
 {
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    internal struct WNDCLASSEX
-    {
-        public int cbSize;
+    public int cbSize;
 
-        public CS style;
+    public CS style;
 
-        public WndProc lpfnWndProc;
+    public WndProc lpfnWndProc;
 
-        public int cbClsExtra;
+    public int cbClsExtra;
 
-        public int cbWndExtra;
+    public int cbWndExtra;
 
-        public IntPtr hInstance;
+    public IntPtr hInstance;
 
-        public IntPtr hIcon;
+    public IntPtr hIcon;
 
-        public IntPtr hCursor;
+    public IntPtr hCursor;
 
-        public IntPtr hbrBackground;
+    public IntPtr hbrBackground;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        public string lpszMenuName;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string lpszMenuName;
 
-        [MarshalAs(UnmanagedType.LPWStr)]
-        public string lpszClassName;
+    [MarshalAs(UnmanagedType.LPWStr)]
+    public string lpszClassName;
 
-        public IntPtr hIconSm;
-    }
-}
+    public IntPtr hIconSm;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
index 451158a6..13e0860c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
@@ -1,36 +1,35 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum WS : uint
 {
-    [Flags]
-    internal enum WS : uint
-    {
-        OVERLAPPED = 0u,
-        POPUP = 2147483648u,
-        CHILD = 1073741824u,
-        MINIMIZE = 536870912u,
-        VISIBLE = 268435456u,
-        DISABLED = 134217728u,
-        CLIPSIBLINGS = 67108864u,
-        CLIPCHILDREN = 33554432u,
-        MAXIMIZE = 16777216u,
-        BORDER = 8388608u,
-        DLGFRAME = 4194304u,
-        VSCROLL = 2097152u,
-        HSCROLL = 1048576u,
-        SYSMENU = 524288u,
-        THICKFRAME = 262144u,
-        GROUP = 131072u,
-        TABSTOP = 65536u,
-        MINIMIZEBOX = 131072u,
-        MAXIMIZEBOX = 65536u,
-        CAPTION = 12582912u,
-        TILED = 0u,
-        ICONIC = 536870912u,
-        SIZEBOX = 262144u,
-        TILEDWINDOW = 13565952u,
-        OVERLAPPEDWINDOW = 13565952u,
-        POPUPWINDOW = 2156396544u,
-        CHILDWINDOW = 1073741824u
-    }
-}
+    OVERLAPPED = 0u,
+    POPUP = 2147483648u,
+    CHILD = 1073741824u,
+    MINIMIZE = 536870912u,
+    VISIBLE = 268435456u,
+    DISABLED = 134217728u,
+    CLIPSIBLINGS = 67108864u,
+    CLIPCHILDREN = 33554432u,
+    MAXIMIZE = 16777216u,
+    BORDER = 8388608u,
+    DLGFRAME = 4194304u,
+    VSCROLL = 2097152u,
+    HSCROLL = 1048576u,
+    SYSMENU = 524288u,
+    THICKFRAME = 262144u,
+    GROUP = 131072u,
+    TABSTOP = 65536u,
+    MINIMIZEBOX = 131072u,
+    MAXIMIZEBOX = 65536u,
+    CAPTION = 12582912u,
+    TILED = 0u,
+    ICONIC = 536870912u,
+    SIZEBOX = 262144u,
+    TILEDWINDOW = 13565952u,
+    OVERLAPPEDWINDOW = 13565952u,
+    POPUPWINDOW = 2156396544u,
+    CHILDWINDOW = 1073741824u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
index 48621f69..da272cc1 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
@@ -1,36 +1,35 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum WS_EX : uint
 {
-    [Flags]
-    internal enum WS_EX : uint
-    {
-        None = 0u,
-        DLGMODALFRAME = 1u,
-        NOPARENTNOTIFY = 4u,
-        TOPMOST = 8u,
-        ACCEPTFILES = 16u,
-        TRANSPARENT = 32u,
-        MDICHILD = 64u,
-        TOOLWINDOW = 128u,
-        WINDOWEDGE = 256u,
-        CLIENTEDGE = 512u,
-        CONTEXTHELP = 1024u,
-        RIGHT = 4096u,
-        LEFT = 0u,
-        RTLREADING = 8192u,
-        LTRREADING = 0u,
-        LEFTSCROLLBAR = 16384u,
-        RIGHTSCROLLBAR = 0u,
-        CONTROLPARENT = 65536u,
-        STATICEDGE = 131072u,
-        APPWINDOW = 262144u,
-        LAYERED = 524288u,
-        NOINHERITLAYOUT = 1048576u,
-        LAYOUTRTL = 4194304u,
-        COMPOSITED = 33554432u,
-        NOACTIVATE = 134217728u,
-        OVERLAPPEDWINDOW = 768u,
-        PALETTEWINDOW = 392u
-    }
-}
+    None = 0u,
+    DLGMODALFRAME = 1u,
+    NOPARENTNOTIFY = 4u,
+    TOPMOST = 8u,
+    ACCEPTFILES = 16u,
+    TRANSPARENT = 32u,
+    MDICHILD = 64u,
+    TOOLWINDOW = 128u,
+    WINDOWEDGE = 256u,
+    CLIENTEDGE = 512u,
+    CONTEXTHELP = 1024u,
+    RIGHT = 4096u,
+    LEFT = 0u,
+    RTLREADING = 8192u,
+    LTRREADING = 0u,
+    LEFTSCROLLBAR = 16384u,
+    RIGHTSCROLLBAR = 0u,
+    CONTROLPARENT = 65536u,
+    STATICEDGE = 131072u,
+    APPWINDOW = 262144u,
+    LAYERED = 524288u,
+    NOINHERITLAYOUT = 1048576u,
+    LAYOUTRTL = 4194304u,
+    COMPOSITED = 33554432u,
+    NOACTIVATE = 134217728u,
+    OVERLAPPEDWINDOW = 768u,
+    PALETTEWINDOW = 392u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
index b67825ba..8ab10a08 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
@@ -2,19 +2,18 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Explicit)]
+internal struct WTA_OPTIONS
 {
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct WTA_OPTIONS
-    {
-        public const uint Size = 8u;
+    public const uint Size = 8u;
 
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
-        [FieldOffset(0)]
-        public WTNCA dwFlags;
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
+    [FieldOffset(0)]
+    public WTNCA dwFlags;
 
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
-        [FieldOffset(4)]
-        public WTNCA dwMask;
-    }
-}
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
+    [FieldOffset(4)]
+    public WTNCA dwMask;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
index 968626da..4ff6d577 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
@@ -1,14 +1,13 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+[Flags]
+internal enum WTNCA : uint
 {
-    [Flags]
-    internal enum WTNCA : uint
-    {
-        NODRAWCAPTION = 1u,
-        NODRAWICON = 2u,
-        NOSYSMENU = 4u,
-        NOMIRRORHELP = 8u,
-        VALIDBITS = 15u
-    }
-}
+    NODRAWCAPTION = 1u,
+    NODRAWICON = 2u,
+    NOSYSMENU = 4u,
+    NOMIRRORHELP = 8u,
+    VALIDBITS = 15u
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
index 22d2ef1e..b0e43174 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
@@ -1,16 +1,15 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal enum WVR
 {
-    internal enum WVR
-    {
-        ALIGNTOP = 16,
-        ALIGNLEFT = 32,
-        ALIGNBOTTOM = 64,
-        ALIGNRIGHT = 128,
-        HREDRAW = 256,
-        VREDRAW = 512,
-        VALIDRECTS = 1024,
-        REDRAW = 768
-    }
-}
+    ALIGNTOP = 16,
+    ALIGNLEFT = 32,
+    ALIGNBOTTOM = 64,
+    ALIGNRIGHT = 128,
+    HREDRAW = 256,
+    VREDRAW = 512,
+    VALIDRECTS = 1024,
+    REDRAW = 768
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
index 9de228e5..35ad7b46 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
@@ -2,126 +2,125 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Standard
+namespace Standard;
+
+[StructLayout(LayoutKind.Explicit)]
+internal struct Win32Error
 {
-    [StructLayout(LayoutKind.Explicit)]
-    internal struct Win32Error
+    public Win32Error(int i)
     {
-        public Win32Error(int i)
-        {
-            this._value = i;
-        }
-
-        public static explicit operator HRESULT(Win32Error error)
-        {
-            if (error._value <= 0)
-            {
-                return new HRESULT((uint) error._value);
-            }
-            return HRESULT.Make(true, Facility.Win32, error._value & 65535);
-        }
-
-        public HRESULT ToHRESULT()
-        {
-            return (HRESULT) this;
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        public static Win32Error GetLastError()
-        {
-            return new Win32Error(Marshal.GetLastWin32Error());
-        }
-
-        public override bool Equals(object obj)
-        {
-            bool result;
-            try
-            {
-                result = (((Win32Error) obj)._value == this._value);
-            }
-            catch (InvalidCastException)
-            {
-                result = false;
-            }
-            return result;
-        }
-
-        public override int GetHashCode()
-        {
-            return this._value.GetHashCode();
-        }
-
-        public static bool operator ==(Win32Error errLeft, Win32Error errRight)
-        {
-            return errLeft._value == errRight._value;
-        }
-
-        public static bool operator !=(Win32Error errLeft, Win32Error errRight)
-        {
-            return !(errLeft == errRight);
-        }
-
-        [FieldOffset(0)]
-        private readonly int _value;
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_SUCCESS = new Win32Error(0);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_INVALID_FUNCTION = new Win32Error(1);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_FILE_NOT_FOUND = new Win32Error(2);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_PATH_NOT_FOUND = new Win32Error(3);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_TOO_MANY_OPEN_FILES = new Win32Error(4);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_ACCESS_DENIED = new Win32Error(5);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_INVALID_HANDLE = new Win32Error(6);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_OUTOFMEMORY = new Win32Error(14);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_NO_MORE_FILES = new Win32Error(18);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_SHARING_VIOLATION = new Win32Error(32);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_INVALID_PARAMETER = new Win32Error(87);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_INSUFFICIENT_BUFFER = new Win32Error(122);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_NESTING_NOT_ALLOWED = new Win32Error(215);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_KEY_DELETED = new Win32Error(1018);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_NOT_FOUND = new Win32Error(1168);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_NO_MATCH = new Win32Error(1169);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_BAD_DEVICE = new Win32Error(1200);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_CANCELLED = new Win32Error(1223);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_CLASS_ALREADY_EXISTS = new Win32Error(1410);
-
-        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        public static readonly Win32Error ERROR_INVALID_DATATYPE = new Win32Error(1804);
+        this._value = i;
     }
-}
+
+    public static explicit operator HRESULT(Win32Error error)
+    {
+        if (error._value <= 0)
+        {
+            return new HRESULT((uint) error._value);
+        }
+        return HRESULT.Make(true, Facility.Win32, error._value & 65535);
+    }
+
+    public HRESULT ToHRESULT()
+    {
+        return (HRESULT) this;
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    public static Win32Error GetLastError()
+    {
+        return new Win32Error(Marshal.GetLastWin32Error());
+    }
+
+    public override bool Equals(object obj)
+    {
+        bool result;
+        try
+        {
+            result = (((Win32Error) obj)._value == this._value);
+        }
+        catch (InvalidCastException)
+        {
+            result = false;
+        }
+        return result;
+    }
+
+    public override int GetHashCode()
+    {
+        return this._value.GetHashCode();
+    }
+
+    public static bool operator ==(Win32Error errLeft, Win32Error errRight)
+    {
+        return errLeft._value == errRight._value;
+    }
+
+    public static bool operator !=(Win32Error errLeft, Win32Error errRight)
+    {
+        return !(errLeft == errRight);
+    }
+
+    [FieldOffset(0)]
+    private readonly int _value;
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_SUCCESS = new Win32Error(0);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_INVALID_FUNCTION = new Win32Error(1);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_FILE_NOT_FOUND = new Win32Error(2);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_PATH_NOT_FOUND = new Win32Error(3);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_TOO_MANY_OPEN_FILES = new Win32Error(4);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_ACCESS_DENIED = new Win32Error(5);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_INVALID_HANDLE = new Win32Error(6);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_OUTOFMEMORY = new Win32Error(14);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_NO_MORE_FILES = new Win32Error(18);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_SHARING_VIOLATION = new Win32Error(32);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_INVALID_PARAMETER = new Win32Error(87);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_INSUFFICIENT_BUFFER = new Win32Error(122);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_NESTING_NOT_ALLOWED = new Win32Error(215);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_KEY_DELETED = new Win32Error(1018);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_NOT_FOUND = new Win32Error(1168);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_NO_MATCH = new Win32Error(1169);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_BAD_DEVICE = new Win32Error(1200);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_CANCELLED = new Win32Error(1223);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_CLASS_ALREADY_EXISTS = new Win32Error(1410);
+
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public static readonly Win32Error ERROR_INVALID_DATATYPE = new Win32Error(1804);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
index 86de85ae..d434c256 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
@@ -1,21 +1,20 @@
 using System;
 
-namespace Standard
+namespace Standard;
+
+internal static class Win32Value
 {
-    internal static class Win32Value
-    {
-        public const uint MAX_PATH = 260u;
+    public const uint MAX_PATH = 260u;
 
-        public const uint INFOTIPSIZE = 1024u;
+    public const uint INFOTIPSIZE = 1024u;
 
-        public const uint TRUE = 1u;
+    public const uint TRUE = 1u;
 
-        public const uint FALSE = 0u;
+    public const uint FALSE = 0u;
 
-        public const uint sizeof_WCHAR = 2u;
+    public const uint sizeof_WCHAR = 2u;
 
-        public const uint sizeof_CHAR = 1u;
+    public const uint sizeof_CHAR = 1u;
 
-        public const uint sizeof_BOOL = 4u;
-    }
-}
+    public const uint sizeof_BOOL = 4u;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
index b6257520..bb9c6339 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
@@ -1,6 +1,5 @@
 using System;
 
-namespace Standard
-{
-    internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
-}
+namespace Standard;
+
+internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
index cd6c3a0e..0126491e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
@@ -1,6 +1,5 @@
 using System;
 
-namespace Standard
-{
-    internal delegate IntPtr WndProcHook(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam, ref bool handled);
-}
+namespace Standard;
+
+internal delegate IntPtr WndProcHook(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam, ref bool handled);
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs b/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
index 03b78a1e..f9d94099 100644
--- a/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
+++ b/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
@@ -4,74 +4,73 @@ using System.Windows.Input;
 using System.Windows.Interop;
 using Standard;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public static class SystemCommands
 {
-    public static class SystemCommands
+    public static RoutedCommand CloseWindowCommand { get; private set; } = new RoutedCommand("CloseWindow", typeof(SystemCommands));
+
+    public static RoutedCommand MaximizeWindowCommand { get; private set; } = new RoutedCommand("MaximizeWindow", typeof(SystemCommands));
+
+    public static RoutedCommand MinimizeWindowCommand { get; private set; } = new RoutedCommand("MinimizeWindow", typeof(SystemCommands));
+
+    public static RoutedCommand RestoreWindowCommand { get; private set; } = new RoutedCommand("RestoreWindow", typeof(SystemCommands));
+
+    public static RoutedCommand ShowSystemMenuCommand { get; private set; } = new RoutedCommand("ShowSystemMenu", typeof(SystemCommands));
+
+    private static void _PostSystemCommand(Window window, SC command)
     {
-        public static RoutedCommand CloseWindowCommand { get; private set; } = new RoutedCommand("CloseWindow", typeof(SystemCommands));
-
-        public static RoutedCommand MaximizeWindowCommand { get; private set; } = new RoutedCommand("MaximizeWindow", typeof(SystemCommands));
-
-        public static RoutedCommand MinimizeWindowCommand { get; private set; } = new RoutedCommand("MinimizeWindow", typeof(SystemCommands));
-
-        public static RoutedCommand RestoreWindowCommand { get; private set; } = new RoutedCommand("RestoreWindow", typeof(SystemCommands));
-
-        public static RoutedCommand ShowSystemMenuCommand { get; private set; } = new RoutedCommand("ShowSystemMenu", typeof(SystemCommands));
-
-        private static void _PostSystemCommand(Window window, SC command)
+        IntPtr handle = new WindowInteropHelper(window).Handle;
+        if (handle == IntPtr.Zero || !NativeMethods.IsWindow(handle))
         {
-            IntPtr handle = new WindowInteropHelper(window).Handle;
-            if (handle == IntPtr.Zero || !NativeMethods.IsWindow(handle))
-            {
-                return;
-            }
-            NativeMethods.PostMessage(handle, WM.SYSCOMMAND, new IntPtr((int) command), IntPtr.Zero);
+            return;
         }
+        NativeMethods.PostMessage(handle, WM.SYSCOMMAND, new IntPtr((int) command), IntPtr.Zero);
+    }
 
-        public static void CloseWindow(Window window)
+    public static void CloseWindow(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        SystemCommands._PostSystemCommand(window, SC.CLOSE);
+    }
+
+    public static void MaximizeWindow(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        SystemCommands._PostSystemCommand(window, SC.MAXIMIZE);
+    }
+
+    public static void MinimizeWindow(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        SystemCommands._PostSystemCommand(window, SC.MINIMIZE);
+    }
+
+    public static void RestoreWindow(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        SystemCommands._PostSystemCommand(window, SC.RESTORE);
+    }
+
+    public static void ShowSystemMenu(Window window, Point screenLocation)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        SystemCommands.ShowSystemMenuPhysicalCoordinates(window, DpiHelper.LogicalPixelsToDevice(screenLocation));
+    }
+
+    internal static void ShowSystemMenuPhysicalCoordinates(Window window, Point physicalScreenLocation)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        IntPtr handle = new WindowInteropHelper(window).Handle;
+        if (handle == IntPtr.Zero || !NativeMethods.IsWindow(handle))
         {
-            Verify.IsNotNull<Window>(window, "window");
-            SystemCommands._PostSystemCommand(window, SC.CLOSE);
+            return;
         }
-
-        public static void MaximizeWindow(Window window)
+        IntPtr systemMenu = NativeMethods.GetSystemMenu(handle, false);
+        uint num = NativeMethods.TrackPopupMenuEx(systemMenu, 256u, (int) physicalScreenLocation.X, (int) physicalScreenLocation.Y, handle, IntPtr.Zero);
+        if (num != 0u)
         {
-            Verify.IsNotNull<Window>(window, "window");
-            SystemCommands._PostSystemCommand(window, SC.MAXIMIZE);
-        }
-
-        public static void MinimizeWindow(Window window)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            SystemCommands._PostSystemCommand(window, SC.MINIMIZE);
-        }
-
-        public static void RestoreWindow(Window window)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            SystemCommands._PostSystemCommand(window, SC.RESTORE);
-        }
-
-        public static void ShowSystemMenu(Window window, Point screenLocation)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            SystemCommands.ShowSystemMenuPhysicalCoordinates(window, DpiHelper.LogicalPixelsToDevice(screenLocation));
-        }
-
-        internal static void ShowSystemMenuPhysicalCoordinates(Window window, Point physicalScreenLocation)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            IntPtr handle = new WindowInteropHelper(window).Handle;
-            if (handle == IntPtr.Zero || !NativeMethods.IsWindow(handle))
-            {
-                return;
-            }
-            IntPtr systemMenu = NativeMethods.GetSystemMenu(handle, false);
-            uint num = NativeMethods.TrackPopupMenuEx(systemMenu, 256u, (int) physicalScreenLocation.X, (int) physicalScreenLocation.Y, handle, IntPtr.Zero);
-            if (num != 0u)
-            {
-                NativeMethods.PostMessage(handle, WM.SYSCOMMAND, new IntPtr((long) ((ulong) num)), IntPtr.Zero);
-            }
+            NativeMethods.PostMessage(handle, WM.SYSCOMMAND, new IntPtr((long) ((ulong) num)), IntPtr.Zero);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs b/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
index ad372fd0..ac8c643f 100644
--- a/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
@@ -8,536 +8,535 @@ using System.Windows;
 using System.Windows.Media;
 using Standard;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+[SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
+public class SystemParameters2 : INotifyPropertyChanged
 {
-    [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
-    public class SystemParameters2 : INotifyPropertyChanged
+    private void _InitializeIsGlassEnabled()
     {
-        private void _InitializeIsGlassEnabled()
-        {
-            this.IsGlassEnabled = NativeMethods.DwmIsCompositionEnabled();
-        }
-
-        private void _UpdateIsGlassEnabled(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeIsGlassEnabled();
-        }
-
-        private void _InitializeGlassColor()
-        {
-            uint num;
-            bool flag;
-            NativeMethods.DwmGetColorizationColor(out num, out flag);
-            num |= (flag ? 4278190080u : 0u);
-            this.WindowGlassColor = Utility.ColorFromArgbDword(num);
-            SolidColorBrush solidColorBrush = new SolidColorBrush(this.WindowGlassColor);
-            solidColorBrush.Freeze();
-            this.WindowGlassBrush = solidColorBrush;
-        }
-
-        private void _UpdateGlassColor(IntPtr wParam, IntPtr lParam)
-        {
-            bool flag = lParam != IntPtr.Zero;
-            uint num = (uint) ((int) wParam.ToInt64());
-            num |= (flag ? 4278190080u : 0u);
-            this.WindowGlassColor = Utility.ColorFromArgbDword(num);
-            SolidColorBrush solidColorBrush = new SolidColorBrush(this.WindowGlassColor);
-            solidColorBrush.Freeze();
-            this.WindowGlassBrush = solidColorBrush;
-        }
-
-        private void _InitializeCaptionHeight()
-        {
-            Point devicePoint = new Point(0.0, (double) NativeMethods.GetSystemMetrics(SM.CYCAPTION));
-            this.WindowCaptionHeight = DpiHelper.DevicePixelsToLogical(devicePoint).Y;
-        }
-
-        private void _UpdateCaptionHeight(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeCaptionHeight();
-        }
-
-        private void _InitializeWindowResizeBorderThickness()
-        {
-            Size deviceSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXFRAME), (double) NativeMethods.GetSystemMetrics(SM.CYFRAME));
-            Size size = DpiHelper.DeviceSizeToLogical(deviceSize);
-            this.WindowResizeBorderThickness = new Thickness(size.Width, size.Height, size.Width, size.Height);
-        }
-
-        private void _UpdateWindowResizeBorderThickness(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeWindowResizeBorderThickness();
-        }
-
-        private void _InitializeWindowNonClientFrameThickness()
-        {
-            Size deviceSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXFRAME), (double) NativeMethods.GetSystemMetrics(SM.CYFRAME));
-            Size size = DpiHelper.DeviceSizeToLogical(deviceSize);
-            int systemMetrics = NativeMethods.GetSystemMetrics(SM.CYCAPTION);
-            double y = DpiHelper.DevicePixelsToLogical(new Point(0.0, (double) systemMetrics)).Y;
-            this.WindowNonClientFrameThickness = new Thickness(size.Width, size.Height + y, size.Width, size.Height);
-        }
-
-        private void _UpdateWindowNonClientFrameThickness(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeWindowNonClientFrameThickness();
-        }
-
-        private void _InitializeSmallIconSize()
-        {
-            this.SmallIconSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXSMICON), (double) NativeMethods.GetSystemMetrics(SM.CYSMICON));
-        }
-
-        private void _UpdateSmallIconSize(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeSmallIconSize();
-        }
-
-        private void _LegacyInitializeCaptionButtonLocation()
-        {
-            int systemMetrics = NativeMethods.GetSystemMetrics(SM.CXSIZE);
-            int systemMetrics2 = NativeMethods.GetSystemMetrics(SM.CYSIZE);
-            int num = NativeMethods.GetSystemMetrics(SM.CXFRAME) + NativeMethods.GetSystemMetrics(SM.CXEDGE);
-            int num2 = NativeMethods.GetSystemMetrics(SM.CYFRAME) + NativeMethods.GetSystemMetrics(SM.CYEDGE);
-            Rect windowCaptionButtonsLocation = new Rect(0.0, 0.0, (double) (systemMetrics * 3), (double) systemMetrics2);
-            windowCaptionButtonsLocation.Offset((double) (-(double) num) - windowCaptionButtonsLocation.Width, (double) num2);
-            this.WindowCaptionButtonsLocation = windowCaptionButtonsLocation;
-        }
-
-        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
-        private void _InitializeCaptionButtonLocation()
-        {
-            if (!Utility.IsOSVistaOrNewer || !NativeMethods.IsThemeActive())
-            {
-                this._LegacyInitializeCaptionButtonLocation();
-                return;
-            }
-            TITLEBARINFOEX titlebarinfoex = new TITLEBARINFOEX
-            {
-                cbSize = Marshal.SizeOf(typeof(TITLEBARINFOEX))
-            };
-            IntPtr intPtr = Marshal.AllocHGlobal(titlebarinfoex.cbSize);
-            try
-            {
-                Marshal.StructureToPtr(titlebarinfoex, intPtr, false);
-                NativeMethods.ShowWindow(this._messageHwnd.Handle, SW.SHOW);
-                NativeMethods.SendMessage(this._messageHwnd.Handle, WM.GETTITLEBARINFOEX, IntPtr.Zero, intPtr);
-                titlebarinfoex = (TITLEBARINFOEX) Marshal.PtrToStructure(intPtr, typeof(TITLEBARINFOEX));
-            }
-            finally
-            {
-                NativeMethods.ShowWindow(this._messageHwnd.Handle, SW.HIDE);
-                Utility.SafeFreeHGlobal(ref intPtr);
-            }
-            RECT rect = RECT.Union(titlebarinfoex.rgrect_CloseButton, titlebarinfoex.rgrect_MinimizeButton);
-            RECT windowRect = NativeMethods.GetWindowRect(this._messageHwnd.Handle);
-            Rect deviceRectangle = new Rect((double) (rect.Left - windowRect.Width - windowRect.Left), (double) (rect.Top - windowRect.Top), (double) rect.Width, (double) rect.Height);
-            Rect windowCaptionButtonsLocation = DpiHelper.DeviceRectToLogical(deviceRectangle);
-            this.WindowCaptionButtonsLocation = windowCaptionButtonsLocation;
-        }
-
-        private void _UpdateCaptionButtonLocation(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeCaptionButtonLocation();
-        }
-
-        private void _InitializeHighContrast()
-        {
-            this.HighContrast = ((NativeMethods.SystemParameterInfo_GetHIGHCONTRAST().dwFlags & HCF.HIGHCONTRASTON) != (HCF) 0);
-        }
-
-        private void _UpdateHighContrast(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeHighContrast();
-        }
-
-        private void _InitializeThemeInfo()
-        {
-            if (!NativeMethods.IsThemeActive())
-            {
-                this.UxThemeName = "Classic";
-                this.UxThemeColor = "";
-                return;
-            }
-            string path;
-            string uxThemeColor;
-            string text;
-            NativeMethods.GetCurrentThemeName(out path, out uxThemeColor, out text);
-            this.UxThemeName = Path.GetFileNameWithoutExtension(path);
-            this.UxThemeColor = uxThemeColor;
-        }
-
-        private void _UpdateThemeInfo(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeThemeInfo();
-        }
-
-        private void _InitializeWindowCornerRadius()
-        {
-            CornerRadius windowCornerRadius = default(CornerRadius);
-            string a;
-            if ((a = this.UxThemeName.ToUpperInvariant()) != null)
-            {
-                if (a == "LUNA")
-                {
-                    windowCornerRadius = new CornerRadius(6.0, 6.0, 0.0, 0.0);
-                    goto IL_E6;
-                }
-                if (!(a == "AERO"))
-                {
-                    if (!(a == "CLASSIC") && !(a == "ZUNE") && !(a == "ROYALE"))
-                    {
-                    }
-                }
-                else
-                {
-                    if (NativeMethods.DwmIsCompositionEnabled())
-                    {
-                        windowCornerRadius = new CornerRadius(8.0);
-                        goto IL_E6;
-                    }
-                    windowCornerRadius = new CornerRadius(6.0, 6.0, 0.0, 0.0);
-                    goto IL_E6;
-                }
-            }
-            windowCornerRadius = new CornerRadius(0.0);
-IL_E6:
-            this.WindowCornerRadius = windowCornerRadius;
-        }
-
-        private void _UpdateWindowCornerRadius(IntPtr wParam, IntPtr lParam)
-        {
-            this._InitializeWindowCornerRadius();
-        }
-
-        private SystemParameters2()
-        {
-            this._messageHwnd = new MessageWindow((CS) 0u, WS.DISABLED | WS.BORDER | WS.DLGFRAME | WS.SYSMENU | WS.THICKFRAME | WS.GROUP | WS.TABSTOP, WS_EX.None, new Rect(-16000.0, -16000.0, 100.0, 100.0), "", new WndProc(this._WndProc));
-            this._messageHwnd.Dispatcher.ShutdownStarted += delegate (object sender, EventArgs e)
-            {
-                Utility.SafeDispose<MessageWindow>(ref this._messageHwnd);
-            };
-            this._InitializeIsGlassEnabled();
-            this._InitializeGlassColor();
-            this._InitializeCaptionHeight();
-            this._InitializeWindowNonClientFrameThickness();
-            this._InitializeWindowResizeBorderThickness();
-            this._InitializeCaptionButtonLocation();
-            this._InitializeSmallIconSize();
-            this._InitializeHighContrast();
-            this._InitializeThemeInfo();
-            this._InitializeWindowCornerRadius();
-            this._UpdateTable = new Dictionary<WM, List<SystemParameters2._SystemMetricUpdate>>
-            {
-                {
-                    WM.THEMECHANGED,
-                    new List<SystemParameters2._SystemMetricUpdate>
-                    {
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateThemeInfo),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateHighContrast),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateWindowCornerRadius),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionButtonLocation)
-                    }
-                },
-                {
-                    WM.WININICHANGE,
-                    new List<SystemParameters2._SystemMetricUpdate>
-                    {
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionHeight),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateWindowResizeBorderThickness),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateSmallIconSize),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateHighContrast),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateWindowNonClientFrameThickness),
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionButtonLocation)
-                    }
-                },
-                {
-                    WM.DWMNCRENDERINGCHANGED,
-                    new List<SystemParameters2._SystemMetricUpdate>
-                    {
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateIsGlassEnabled)
-                    }
-                },
-                {
-                    WM.DWMCOMPOSITIONCHANGED,
-                    new List<SystemParameters2._SystemMetricUpdate>
-                    {
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateIsGlassEnabled)
-                    }
-                },
-                {
-                    WM.DWMCOLORIZATIONCOLORCHANGED,
-                    new List<SystemParameters2._SystemMetricUpdate>
-                    {
-                        new SystemParameters2._SystemMetricUpdate(this._UpdateGlassColor)
-                    }
-                }
-            };
-        }
-
-        public static SystemParameters2 Current
-        {
-            get
-            {
-                if (SystemParameters2._threadLocalSingleton == null)
-                {
-                    SystemParameters2._threadLocalSingleton = new SystemParameters2();
-                }
-                return SystemParameters2._threadLocalSingleton;
-            }
-        }
-
-        private IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
-        {
-            List<SystemParameters2._SystemMetricUpdate> list;
-            if (this._UpdateTable != null && this._UpdateTable.TryGetValue(msg, out list))
-            {
-                foreach (SystemParameters2._SystemMetricUpdate systemMetricUpdate in list)
-                {
-                    systemMetricUpdate(wParam, lParam);
-                }
-            }
-            return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
-        }
-
-        public bool IsGlassEnabled
-        {
-            get
-            {
-                return NativeMethods.DwmIsCompositionEnabled();
-            }
-            private set
-            {
-                if (value != this._isGlassEnabled)
-                {
-                    this._isGlassEnabled = value;
-                    this._NotifyPropertyChanged("IsGlassEnabled");
-                }
-            }
-        }
-
-        public Color WindowGlassColor
-        {
-            get
-            {
-                return this._glassColor;
-            }
-            private set
-            {
-                if (value != this._glassColor)
-                {
-                    this._glassColor = value;
-                    this._NotifyPropertyChanged("WindowGlassColor");
-                }
-            }
-        }
-
-        public SolidColorBrush WindowGlassBrush
-        {
-            get
-            {
-                return this._glassColorBrush;
-            }
-            private set
-            {
-                if (this._glassColorBrush == null || value.Color != this._glassColorBrush.Color)
-                {
-                    this._glassColorBrush = value;
-                    this._NotifyPropertyChanged("WindowGlassBrush");
-                }
-            }
-        }
-
-        public Thickness WindowResizeBorderThickness
-        {
-            get
-            {
-                return this._windowResizeBorderThickness;
-            }
-            private set
-            {
-                if (value != this._windowResizeBorderThickness)
-                {
-                    this._windowResizeBorderThickness = value;
-                    this._NotifyPropertyChanged("WindowResizeBorderThickness");
-                }
-            }
-        }
-
-        public Thickness WindowNonClientFrameThickness
-        {
-            get
-            {
-                return this._windowNonClientFrameThickness;
-            }
-            private set
-            {
-                if (value != this._windowNonClientFrameThickness)
-                {
-                    this._windowNonClientFrameThickness = value;
-                    this._NotifyPropertyChanged("WindowNonClientFrameThickness");
-                }
-            }
-        }
-
-        public double WindowCaptionHeight
-        {
-            get
-            {
-                return this._captionHeight;
-            }
-            private set
-            {
-                if (value != this._captionHeight)
-                {
-                    this._captionHeight = value;
-                    this._NotifyPropertyChanged("WindowCaptionHeight");
-                }
-            }
-        }
-
-        public Size SmallIconSize
-        {
-            get
-            {
-                return new Size(this._smallIconSize.Width, this._smallIconSize.Height);
-            }
-            private set
-            {
-                if (value != this._smallIconSize)
-                {
-                    this._smallIconSize = value;
-                    this._NotifyPropertyChanged("SmallIconSize");
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
-        public string UxThemeName
-        {
-            get
-            {
-                return this._uxThemeName;
-            }
-            private set
-            {
-                if (value != this._uxThemeName)
-                {
-                    this._uxThemeName = value;
-                    this._NotifyPropertyChanged("UxThemeName");
-                }
-            }
-        }
-
-        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
-        public string UxThemeColor
-        {
-            get
-            {
-                return this._uxThemeColor;
-            }
-            private set
-            {
-                if (value != this._uxThemeColor)
-                {
-                    this._uxThemeColor = value;
-                    this._NotifyPropertyChanged("UxThemeColor");
-                }
-            }
-        }
-
-        public bool HighContrast
-        {
-            get
-            {
-                return this._isHighContrast;
-            }
-            private set
-            {
-                if (value != this._isHighContrast)
-                {
-                    this._isHighContrast = value;
-                    this._NotifyPropertyChanged("HighContrast");
-                }
-            }
-        }
-
-        public CornerRadius WindowCornerRadius
-        {
-            get
-            {
-                return this._windowCornerRadius;
-            }
-            private set
-            {
-                if (value != this._windowCornerRadius)
-                {
-                    this._windowCornerRadius = value;
-                    this._NotifyPropertyChanged("WindowCornerRadius");
-                }
-            }
-        }
-
-        public Rect WindowCaptionButtonsLocation
-        {
-            get
-            {
-                return this._captionButtonLocation;
-            }
-            private set
-            {
-                if (value != this._captionButtonLocation)
-                {
-                    this._captionButtonLocation = value;
-                    this._NotifyPropertyChanged("WindowCaptionButtonsLocation");
-                }
-            }
-        }
-
-        private void _NotifyPropertyChanged(string propertyName)
-        {
-            PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if (propertyChanged != null)
-            {
-                propertyChanged(this, new PropertyChangedEventArgs(propertyName));
-            }
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        [ThreadStatic]
-        private static SystemParameters2 _threadLocalSingleton;
-
-        private MessageWindow _messageHwnd;
-
-        private bool _isGlassEnabled;
-
-        private Color _glassColor;
-
-        private SolidColorBrush _glassColorBrush;
-
-        private Thickness _windowResizeBorderThickness;
-
-        private Thickness _windowNonClientFrameThickness;
-
-        private double _captionHeight;
-
-        private Size _smallIconSize;
-
-        private string _uxThemeName;
-
-        private string _uxThemeColor;
-
-        private bool _isHighContrast;
-
-        private CornerRadius _windowCornerRadius;
-
-        private Rect _captionButtonLocation;
-
-        private readonly Dictionary<WM, List<SystemParameters2._SystemMetricUpdate>> _UpdateTable;
-
-        private delegate void _SystemMetricUpdate(IntPtr wParam, IntPtr lParam);
+        this.IsGlassEnabled = NativeMethods.DwmIsCompositionEnabled();
     }
-}
+
+    private void _UpdateIsGlassEnabled(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeIsGlassEnabled();
+    }
+
+    private void _InitializeGlassColor()
+    {
+        uint num;
+        bool flag;
+        NativeMethods.DwmGetColorizationColor(out num, out flag);
+        num |= (flag ? 4278190080u : 0u);
+        this.WindowGlassColor = Utility.ColorFromArgbDword(num);
+        SolidColorBrush solidColorBrush = new SolidColorBrush(this.WindowGlassColor);
+        solidColorBrush.Freeze();
+        this.WindowGlassBrush = solidColorBrush;
+    }
+
+    private void _UpdateGlassColor(IntPtr wParam, IntPtr lParam)
+    {
+        bool flag = lParam != IntPtr.Zero;
+        uint num = (uint) ((int) wParam.ToInt64());
+        num |= (flag ? 4278190080u : 0u);
+        this.WindowGlassColor = Utility.ColorFromArgbDword(num);
+        SolidColorBrush solidColorBrush = new SolidColorBrush(this.WindowGlassColor);
+        solidColorBrush.Freeze();
+        this.WindowGlassBrush = solidColorBrush;
+    }
+
+    private void _InitializeCaptionHeight()
+    {
+        Point devicePoint = new Point(0.0, (double) NativeMethods.GetSystemMetrics(SM.CYCAPTION));
+        this.WindowCaptionHeight = DpiHelper.DevicePixelsToLogical(devicePoint).Y;
+    }
+
+    private void _UpdateCaptionHeight(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeCaptionHeight();
+    }
+
+    private void _InitializeWindowResizeBorderThickness()
+    {
+        Size deviceSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXFRAME), (double) NativeMethods.GetSystemMetrics(SM.CYFRAME));
+        Size size = DpiHelper.DeviceSizeToLogical(deviceSize);
+        this.WindowResizeBorderThickness = new Thickness(size.Width, size.Height, size.Width, size.Height);
+    }
+
+    private void _UpdateWindowResizeBorderThickness(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeWindowResizeBorderThickness();
+    }
+
+    private void _InitializeWindowNonClientFrameThickness()
+    {
+        Size deviceSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXFRAME), (double) NativeMethods.GetSystemMetrics(SM.CYFRAME));
+        Size size = DpiHelper.DeviceSizeToLogical(deviceSize);
+        int systemMetrics = NativeMethods.GetSystemMetrics(SM.CYCAPTION);
+        double y = DpiHelper.DevicePixelsToLogical(new Point(0.0, (double) systemMetrics)).Y;
+        this.WindowNonClientFrameThickness = new Thickness(size.Width, size.Height + y, size.Width, size.Height);
+    }
+
+    private void _UpdateWindowNonClientFrameThickness(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeWindowNonClientFrameThickness();
+    }
+
+    private void _InitializeSmallIconSize()
+    {
+        this.SmallIconSize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXSMICON), (double) NativeMethods.GetSystemMetrics(SM.CYSMICON));
+    }
+
+    private void _UpdateSmallIconSize(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeSmallIconSize();
+    }
+
+    private void _LegacyInitializeCaptionButtonLocation()
+    {
+        int systemMetrics = NativeMethods.GetSystemMetrics(SM.CXSIZE);
+        int systemMetrics2 = NativeMethods.GetSystemMetrics(SM.CYSIZE);
+        int num = NativeMethods.GetSystemMetrics(SM.CXFRAME) + NativeMethods.GetSystemMetrics(SM.CXEDGE);
+        int num2 = NativeMethods.GetSystemMetrics(SM.CYFRAME) + NativeMethods.GetSystemMetrics(SM.CYEDGE);
+        Rect windowCaptionButtonsLocation = new Rect(0.0, 0.0, (double) (systemMetrics * 3), (double) systemMetrics2);
+        windowCaptionButtonsLocation.Offset((double) (-(double) num) - windowCaptionButtonsLocation.Width, (double) num2);
+        this.WindowCaptionButtonsLocation = windowCaptionButtonsLocation;
+    }
+
+    [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+    private void _InitializeCaptionButtonLocation()
+    {
+        if (!Utility.IsOSVistaOrNewer || !NativeMethods.IsThemeActive())
+        {
+            this._LegacyInitializeCaptionButtonLocation();
+            return;
+        }
+        TITLEBARINFOEX titlebarinfoex = new TITLEBARINFOEX
+        {
+            cbSize = Marshal.SizeOf(typeof(TITLEBARINFOEX))
+        };
+        IntPtr intPtr = Marshal.AllocHGlobal(titlebarinfoex.cbSize);
+        try
+        {
+            Marshal.StructureToPtr(titlebarinfoex, intPtr, false);
+            NativeMethods.ShowWindow(this._messageHwnd.Handle, SW.SHOW);
+            NativeMethods.SendMessage(this._messageHwnd.Handle, WM.GETTITLEBARINFOEX, IntPtr.Zero, intPtr);
+            titlebarinfoex = (TITLEBARINFOEX) Marshal.PtrToStructure(intPtr, typeof(TITLEBARINFOEX));
+        }
+        finally
+        {
+            NativeMethods.ShowWindow(this._messageHwnd.Handle, SW.HIDE);
+            Utility.SafeFreeHGlobal(ref intPtr);
+        }
+        RECT rect = RECT.Union(titlebarinfoex.rgrect_CloseButton, titlebarinfoex.rgrect_MinimizeButton);
+        RECT windowRect = NativeMethods.GetWindowRect(this._messageHwnd.Handle);
+        Rect deviceRectangle = new Rect((double) (rect.Left - windowRect.Width - windowRect.Left), (double) (rect.Top - windowRect.Top), (double) rect.Width, (double) rect.Height);
+        Rect windowCaptionButtonsLocation = DpiHelper.DeviceRectToLogical(deviceRectangle);
+        this.WindowCaptionButtonsLocation = windowCaptionButtonsLocation;
+    }
+
+    private void _UpdateCaptionButtonLocation(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeCaptionButtonLocation();
+    }
+
+    private void _InitializeHighContrast()
+    {
+        this.HighContrast = ((NativeMethods.SystemParameterInfo_GetHIGHCONTRAST().dwFlags & HCF.HIGHCONTRASTON) != (HCF) 0);
+    }
+
+    private void _UpdateHighContrast(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeHighContrast();
+    }
+
+    private void _InitializeThemeInfo()
+    {
+        if (!NativeMethods.IsThemeActive())
+        {
+            this.UxThemeName = "Classic";
+            this.UxThemeColor = "";
+            return;
+        }
+        string path;
+        string uxThemeColor;
+        string text;
+        NativeMethods.GetCurrentThemeName(out path, out uxThemeColor, out text);
+        this.UxThemeName = Path.GetFileNameWithoutExtension(path);
+        this.UxThemeColor = uxThemeColor;
+    }
+
+    private void _UpdateThemeInfo(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeThemeInfo();
+    }
+
+    private void _InitializeWindowCornerRadius()
+    {
+        CornerRadius windowCornerRadius = default(CornerRadius);
+        string a;
+        if ((a = this.UxThemeName.ToUpperInvariant()) != null)
+        {
+            if (a == "LUNA")
+            {
+                windowCornerRadius = new CornerRadius(6.0, 6.0, 0.0, 0.0);
+                goto IL_E6;
+            }
+            if (!(a == "AERO"))
+            {
+                if (!(a == "CLASSIC") && !(a == "ZUNE") && !(a == "ROYALE"))
+                {
+                }
+            }
+            else
+            {
+                if (NativeMethods.DwmIsCompositionEnabled())
+                {
+                    windowCornerRadius = new CornerRadius(8.0);
+                    goto IL_E6;
+                }
+                windowCornerRadius = new CornerRadius(6.0, 6.0, 0.0, 0.0);
+                goto IL_E6;
+            }
+        }
+        windowCornerRadius = new CornerRadius(0.0);
+        IL_E6:
+        this.WindowCornerRadius = windowCornerRadius;
+    }
+
+    private void _UpdateWindowCornerRadius(IntPtr wParam, IntPtr lParam)
+    {
+        this._InitializeWindowCornerRadius();
+    }
+
+    private SystemParameters2()
+    {
+        this._messageHwnd = new MessageWindow((CS) 0u, WS.DISABLED | WS.BORDER | WS.DLGFRAME | WS.SYSMENU | WS.THICKFRAME | WS.GROUP | WS.TABSTOP, WS_EX.None, new Rect(-16000.0, -16000.0, 100.0, 100.0), "", new WndProc(this._WndProc));
+        this._messageHwnd.Dispatcher.ShutdownStarted += delegate (object sender, EventArgs e)
+        {
+            Utility.SafeDispose<MessageWindow>(ref this._messageHwnd);
+        };
+        this._InitializeIsGlassEnabled();
+        this._InitializeGlassColor();
+        this._InitializeCaptionHeight();
+        this._InitializeWindowNonClientFrameThickness();
+        this._InitializeWindowResizeBorderThickness();
+        this._InitializeCaptionButtonLocation();
+        this._InitializeSmallIconSize();
+        this._InitializeHighContrast();
+        this._InitializeThemeInfo();
+        this._InitializeWindowCornerRadius();
+        this._UpdateTable = new Dictionary<WM, List<SystemParameters2._SystemMetricUpdate>>
+        {
+            {
+                WM.THEMECHANGED,
+                new List<SystemParameters2._SystemMetricUpdate>
+                {
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateThemeInfo),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateHighContrast),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateWindowCornerRadius),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionButtonLocation)
+                }
+            },
+            {
+                WM.WININICHANGE,
+                new List<SystemParameters2._SystemMetricUpdate>
+                {
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionHeight),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateWindowResizeBorderThickness),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateSmallIconSize),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateHighContrast),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateWindowNonClientFrameThickness),
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateCaptionButtonLocation)
+                }
+            },
+            {
+                WM.DWMNCRENDERINGCHANGED,
+                new List<SystemParameters2._SystemMetricUpdate>
+                {
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateIsGlassEnabled)
+                }
+            },
+            {
+                WM.DWMCOMPOSITIONCHANGED,
+                new List<SystemParameters2._SystemMetricUpdate>
+                {
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateIsGlassEnabled)
+                }
+            },
+            {
+                WM.DWMCOLORIZATIONCOLORCHANGED,
+                new List<SystemParameters2._SystemMetricUpdate>
+                {
+                    new SystemParameters2._SystemMetricUpdate(this._UpdateGlassColor)
+                }
+            }
+        };
+    }
+
+    public static SystemParameters2 Current
+    {
+        get
+        {
+            if (SystemParameters2._threadLocalSingleton == null)
+            {
+                SystemParameters2._threadLocalSingleton = new SystemParameters2();
+            }
+            return SystemParameters2._threadLocalSingleton;
+        }
+    }
+
+    private IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
+    {
+        List<SystemParameters2._SystemMetricUpdate> list;
+        if (this._UpdateTable != null && this._UpdateTable.TryGetValue(msg, out list))
+        {
+            foreach (SystemParameters2._SystemMetricUpdate systemMetricUpdate in list)
+            {
+                systemMetricUpdate(wParam, lParam);
+            }
+        }
+        return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+    }
+
+    public bool IsGlassEnabled
+    {
+        get
+        {
+            return NativeMethods.DwmIsCompositionEnabled();
+        }
+        private set
+        {
+            if (value != this._isGlassEnabled)
+            {
+                this._isGlassEnabled = value;
+                this._NotifyPropertyChanged("IsGlassEnabled");
+            }
+        }
+    }
+
+    public Color WindowGlassColor
+    {
+        get
+        {
+            return this._glassColor;
+        }
+        private set
+        {
+            if (value != this._glassColor)
+            {
+                this._glassColor = value;
+                this._NotifyPropertyChanged("WindowGlassColor");
+            }
+        }
+    }
+
+    public SolidColorBrush WindowGlassBrush
+    {
+        get
+        {
+            return this._glassColorBrush;
+        }
+        private set
+        {
+            if (this._glassColorBrush == null || value.Color != this._glassColorBrush.Color)
+            {
+                this._glassColorBrush = value;
+                this._NotifyPropertyChanged("WindowGlassBrush");
+            }
+        }
+    }
+
+    public Thickness WindowResizeBorderThickness
+    {
+        get
+        {
+            return this._windowResizeBorderThickness;
+        }
+        private set
+        {
+            if (value != this._windowResizeBorderThickness)
+            {
+                this._windowResizeBorderThickness = value;
+                this._NotifyPropertyChanged("WindowResizeBorderThickness");
+            }
+        }
+    }
+
+    public Thickness WindowNonClientFrameThickness
+    {
+        get
+        {
+            return this._windowNonClientFrameThickness;
+        }
+        private set
+        {
+            if (value != this._windowNonClientFrameThickness)
+            {
+                this._windowNonClientFrameThickness = value;
+                this._NotifyPropertyChanged("WindowNonClientFrameThickness");
+            }
+        }
+    }
+
+    public double WindowCaptionHeight
+    {
+        get
+        {
+            return this._captionHeight;
+        }
+        private set
+        {
+            if (value != this._captionHeight)
+            {
+                this._captionHeight = value;
+                this._NotifyPropertyChanged("WindowCaptionHeight");
+            }
+        }
+    }
+
+    public Size SmallIconSize
+    {
+        get
+        {
+            return new Size(this._smallIconSize.Width, this._smallIconSize.Height);
+        }
+        private set
+        {
+            if (value != this._smallIconSize)
+            {
+                this._smallIconSize = value;
+                this._NotifyPropertyChanged("SmallIconSize");
+            }
+        }
+    }
+
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
+    public string UxThemeName
+    {
+        get
+        {
+            return this._uxThemeName;
+        }
+        private set
+        {
+            if (value != this._uxThemeName)
+            {
+                this._uxThemeName = value;
+                this._NotifyPropertyChanged("UxThemeName");
+            }
+        }
+    }
+
+    [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
+    public string UxThemeColor
+    {
+        get
+        {
+            return this._uxThemeColor;
+        }
+        private set
+        {
+            if (value != this._uxThemeColor)
+            {
+                this._uxThemeColor = value;
+                this._NotifyPropertyChanged("UxThemeColor");
+            }
+        }
+    }
+
+    public bool HighContrast
+    {
+        get
+        {
+            return this._isHighContrast;
+        }
+        private set
+        {
+            if (value != this._isHighContrast)
+            {
+                this._isHighContrast = value;
+                this._NotifyPropertyChanged("HighContrast");
+            }
+        }
+    }
+
+    public CornerRadius WindowCornerRadius
+    {
+        get
+        {
+            return this._windowCornerRadius;
+        }
+        private set
+        {
+            if (value != this._windowCornerRadius)
+            {
+                this._windowCornerRadius = value;
+                this._NotifyPropertyChanged("WindowCornerRadius");
+            }
+        }
+    }
+
+    public Rect WindowCaptionButtonsLocation
+    {
+        get
+        {
+            return this._captionButtonLocation;
+        }
+        private set
+        {
+            if (value != this._captionButtonLocation)
+            {
+                this._captionButtonLocation = value;
+                this._NotifyPropertyChanged("WindowCaptionButtonsLocation");
+            }
+        }
+    }
+
+    private void _NotifyPropertyChanged(string propertyName)
+    {
+        PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
+        if (propertyChanged != null)
+        {
+            propertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    [ThreadStatic]
+    private static SystemParameters2 _threadLocalSingleton;
+
+    private MessageWindow _messageHwnd;
+
+    private bool _isGlassEnabled;
+
+    private Color _glassColor;
+
+    private SolidColorBrush _glassColorBrush;
+
+    private Thickness _windowResizeBorderThickness;
+
+    private Thickness _windowNonClientFrameThickness;
+
+    private double _captionHeight;
+
+    private Size _smallIconSize;
+
+    private string _uxThemeName;
+
+    private string _uxThemeColor;
+
+    private bool _isHighContrast;
+
+    private CornerRadius _windowCornerRadius;
+
+    private Rect _captionButtonLocation;
+
+    private readonly Dictionary<WM, List<SystemParameters2._SystemMetricUpdate>> _UpdateTable;
+
+    private delegate void _SystemMetricUpdate(IntPtr wParam, IntPtr lParam);
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs b/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
index 24007ed4..5d7bfbc6 100644
--- a/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
+++ b/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
@@ -6,622 +6,621 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using Standard;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public sealed class TaskbarItemInfo : Freezable
 {
-    public sealed class TaskbarItemInfo : Freezable
+    protected override Freezable CreateInstanceCore()
     {
-        protected override Freezable CreateInstanceCore()
-        {
-            return new TaskbarItemInfo();
-        }
+        return new TaskbarItemInfo();
+    }
 
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static TaskbarItemInfo GetTaskbarItemInfo(Window window)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            return (TaskbarItemInfo) window.GetValue(TaskbarItemInfo.TaskbarItemInfoProperty);
-        }
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static TaskbarItemInfo GetTaskbarItemInfo(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        return (TaskbarItemInfo) window.GetValue(TaskbarItemInfo.TaskbarItemInfoProperty);
+    }
 
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static void SetTaskbarItemInfo(Window window, TaskbarItemInfo value)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            window.SetValue(TaskbarItemInfo.TaskbarItemInfoProperty, value);
-        }
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static void SetTaskbarItemInfo(Window window, TaskbarItemInfo value)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        window.SetValue(TaskbarItemInfo.TaskbarItemInfoProperty, value);
+    }
 
-        private static void _OnTaskbarItemInfoChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    private static void _OnTaskbarItemInfoChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (DesignerProperties.GetIsInDesignMode(d))
         {
-            if (DesignerProperties.GetIsInDesignMode(d))
-            {
-                return;
-            }
-            Window window = (Window) d;
-            TaskbarItemInfo taskbarItemInfo = (TaskbarItemInfo) e.OldValue;
-            TaskbarItemInfo taskbarItemInfo2 = (TaskbarItemInfo) e.NewValue;
-            if (taskbarItemInfo == taskbarItemInfo2)
-            {
-                return;
-            }
-            if (!Utility.IsOSWindows7OrNewer)
-            {
-                return;
-            }
-            if (taskbarItemInfo != null && taskbarItemInfo._window != null)
-            {
-                taskbarItemInfo._DetachWindow();
-            }
-            if (taskbarItemInfo2 != null)
-            {
-                taskbarItemInfo2._SetWindow(window);
-            }
+            return;
         }
-
-        private static object _CoerceTaskbarItemInfoValue(DependencyObject d, object value)
+        Window window = (Window) d;
+        TaskbarItemInfo taskbarItemInfo = (TaskbarItemInfo) e.OldValue;
+        TaskbarItemInfo taskbarItemInfo2 = (TaskbarItemInfo) e.NewValue;
+        if (taskbarItemInfo == taskbarItemInfo2)
         {
-            if (DesignerProperties.GetIsInDesignMode(d))
-            {
-                return value;
-            }
-            Verify.IsNotNull<DependencyObject>(d, "d");
-            Window window = (Window) d;
-            TaskbarItemInfo taskbarItemInfo = (TaskbarItemInfo) value;
-            if (taskbarItemInfo != null && taskbarItemInfo._window != null && taskbarItemInfo._window != window)
-            {
-                throw new NotSupportedException();
-            }
-            window.VerifyAccess();
-            return taskbarItemInfo;
+            return;
         }
-
-        public TaskbarItemProgressState ProgressState
+        if (!Utility.IsOSWindows7OrNewer)
         {
-            get
-            {
-                return (TaskbarItemProgressState) base.GetValue(TaskbarItemInfo.ProgressStateProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.ProgressStateProperty, value);
-            }
+            return;
         }
-
-        private void _OnProgressStateChanged()
+        if (taskbarItemInfo != null && taskbarItemInfo._window != null)
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateProgressState(true);
+            taskbarItemInfo._DetachWindow();
         }
+        if (taskbarItemInfo2 != null)
+        {
+            taskbarItemInfo2._SetWindow(window);
+        }
+    }
 
-        private static TaskbarItemProgressState _CoerceProgressState(TaskbarItemProgressState value)
+    private static object _CoerceTaskbarItemInfoValue(DependencyObject d, object value)
+    {
+        if (DesignerProperties.GetIsInDesignMode(d))
         {
-            switch (value)
-            {
-                case TaskbarItemProgressState.None:
-                case TaskbarItemProgressState.Indeterminate:
-                case TaskbarItemProgressState.Normal:
-                case TaskbarItemProgressState.Error:
-                case TaskbarItemProgressState.Paused:
-                    break;
-                default:
-                    value = TaskbarItemProgressState.None;
-                    break;
-            }
             return value;
         }
-
-        public double ProgressValue
+        Verify.IsNotNull<DependencyObject>(d, "d");
+        Window window = (Window) d;
+        TaskbarItemInfo taskbarItemInfo = (TaskbarItemInfo) value;
+        if (taskbarItemInfo != null && taskbarItemInfo._window != null && taskbarItemInfo._window != window)
         {
-            get
-            {
-                return (double) base.GetValue(TaskbarItemInfo.ProgressValueProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.ProgressValueProperty, value);
-            }
+            throw new NotSupportedException();
         }
+        window.VerifyAccess();
+        return taskbarItemInfo;
+    }
 
-        private void _OnProgressValueChanged()
+    public TaskbarItemProgressState ProgressState
+    {
+        get
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateProgressValue(true);
+            return (TaskbarItemProgressState) base.GetValue(TaskbarItemInfo.ProgressStateProperty);
         }
-
-        private static double _CoerceProgressValue(double progressValue)
+        set
         {
-            if (double.IsNaN(progressValue))
-            {
-                progressValue = 0.0;
-            }
-            progressValue = Math.Max(progressValue, 0.0);
-            progressValue = Math.Min(1.0, progressValue);
-            return progressValue;
+            base.SetValue(TaskbarItemInfo.ProgressStateProperty, value);
         }
+    }
 
-        public ImageSource Overlay
+    private void _OnProgressStateChanged()
+    {
+        if (!this._isAttached)
         {
-            get
-            {
-                return (ImageSource) base.GetValue(TaskbarItemInfo.OverlayProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.OverlayProperty, value);
-            }
+            return;
         }
+        this._UpdateProgressState(true);
+    }
 
-        private void _OnOverlayChanged()
+    private static TaskbarItemProgressState _CoerceProgressState(TaskbarItemProgressState value)
+    {
+        switch (value)
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateOverlay(true);
+            case TaskbarItemProgressState.None:
+            case TaskbarItemProgressState.Indeterminate:
+            case TaskbarItemProgressState.Normal:
+            case TaskbarItemProgressState.Error:
+            case TaskbarItemProgressState.Paused:
+                break;
+            default:
+                value = TaskbarItemProgressState.None;
+                break;
         }
+        return value;
+    }
 
-        public string Description
+    public double ProgressValue
+    {
+        get
         {
-            get
-            {
-                return (string) base.GetValue(TaskbarItemInfo.DescriptionProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.DescriptionProperty, value);
-            }
+            return (double) base.GetValue(TaskbarItemInfo.ProgressValueProperty);
         }
-
-        private void _OnDescriptionChanged()
+        set
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateTooltip(true);
+            base.SetValue(TaskbarItemInfo.ProgressValueProperty, value);
         }
+    }
 
-        public Thickness ThumbnailClipMargin
+    private void _OnProgressValueChanged()
+    {
+        if (!this._isAttached)
         {
-            get
-            {
-                return (Thickness) base.GetValue(TaskbarItemInfo.ThumbnailClipMarginProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.ThumbnailClipMarginProperty, value);
-            }
+            return;
         }
+        this._UpdateProgressValue(true);
+    }
 
-        private void _OnThumbnailClipMarginChanged()
+    private static double _CoerceProgressValue(double progressValue)
+    {
+        if (double.IsNaN(progressValue))
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateThumbnailClipping(true);
+            progressValue = 0.0;
         }
+        progressValue = Math.Max(progressValue, 0.0);
+        progressValue = Math.Min(1.0, progressValue);
+        return progressValue;
+    }
 
-        private static Thickness _CoerceThumbnailClipMargin(Thickness margin)
+    public ImageSource Overlay
+    {
+        get
         {
-            if (margin.Left < 0.0 || margin.Right < 0.0 || margin.Top < 0.0 || margin.Bottom < 0.0)
-            {
-                return TaskbarItemInfo._EmptyThickness;
-            }
-            return margin;
+            return (ImageSource) base.GetValue(TaskbarItemInfo.OverlayProperty);
         }
-
-        [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Infos")]
-        public ThumbButtonInfoCollection ThumbButtonInfos
+        set
         {
-            get
-            {
-                return (ThumbButtonInfoCollection) base.GetValue(TaskbarItemInfo.ThumbButtonInfosProperty);
-            }
-            set
-            {
-                base.SetValue(TaskbarItemInfo.ThumbButtonInfosProperty, value);
-            }
+            base.SetValue(TaskbarItemInfo.OverlayProperty, value);
         }
+    }
 
-        private void _OnThumbButtonsChanged()
+    private void _OnOverlayChanged()
+    {
+        if (!this._isAttached)
         {
-            if (!this._isAttached)
-            {
-                return;
-            }
-            this._UpdateThumbButtons(true);
+            return;
         }
+        this._UpdateOverlay(true);
+    }
 
-        private IntPtr _GetHICONFromImageSource(ImageSource image, Size dimensions)
+    public string Description
+    {
+        get
         {
-            if (this._gdipToken == null)
-            {
-                this._gdipToken = SafeGdiplusStartupToken.Startup();
-            }
-            return Utility.GenerateHICON(image, dimensions);
+            return (string) base.GetValue(TaskbarItemInfo.DescriptionProperty);
         }
-
-        public TaskbarItemInfo()
+        set
         {
-            if (!DesignerProperties.GetIsInDesignMode(this))
-            {
-                ITaskbarList taskbarList = null;
-                try
-                {
-                    taskbarList = CLSID.CoCreateInstance<ITaskbarList>("56FDF344-FD6D-11d0-958A-006097C9A090");
-                    taskbarList.HrInit();
-                    this._taskbarList = (taskbarList as ITaskbarList3);
-                    taskbarList = null;
-                }
-                finally
-                {
-                    Utility.SafeRelease<ITaskbarList>(ref taskbarList);
-                }
-                this._overlaySize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXSMICON), (double) NativeMethods.GetSystemMetrics(SM.CYSMICON));
-            }
-            this.ThumbButtonInfos = new ThumbButtonInfoCollection();
+            base.SetValue(TaskbarItemInfo.DescriptionProperty, value);
         }
+    }
 
-        private void _SetWindow(Window window)
+    private void _OnDescriptionChanged()
+    {
+        if (!this._isAttached)
         {
-            if (window == null)
+            return;
+        }
+        this._UpdateTooltip(true);
+    }
+
+    public Thickness ThumbnailClipMargin
+    {
+        get
+        {
+            return (Thickness) base.GetValue(TaskbarItemInfo.ThumbnailClipMarginProperty);
+        }
+        set
+        {
+            base.SetValue(TaskbarItemInfo.ThumbnailClipMarginProperty, value);
+        }
+    }
+
+    private void _OnThumbnailClipMarginChanged()
+    {
+        if (!this._isAttached)
+        {
+            return;
+        }
+        this._UpdateThumbnailClipping(true);
+    }
+
+    private static Thickness _CoerceThumbnailClipMargin(Thickness margin)
+    {
+        if (margin.Left < 0.0 || margin.Right < 0.0 || margin.Top < 0.0 || margin.Bottom < 0.0)
+        {
+            return TaskbarItemInfo._EmptyThickness;
+        }
+        return margin;
+    }
+
+    [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Infos")]
+    public ThumbButtonInfoCollection ThumbButtonInfos
+    {
+        get
+        {
+            return (ThumbButtonInfoCollection) base.GetValue(TaskbarItemInfo.ThumbButtonInfosProperty);
+        }
+        set
+        {
+            base.SetValue(TaskbarItemInfo.ThumbButtonInfosProperty, value);
+        }
+    }
+
+    private void _OnThumbButtonsChanged()
+    {
+        if (!this._isAttached)
+        {
+            return;
+        }
+        this._UpdateThumbButtons(true);
+    }
+
+    private IntPtr _GetHICONFromImageSource(ImageSource image, Size dimensions)
+    {
+        if (this._gdipToken == null)
+        {
+            this._gdipToken = SafeGdiplusStartupToken.Startup();
+        }
+        return Utility.GenerateHICON(image, dimensions);
+    }
+
+    public TaskbarItemInfo()
+    {
+        if (!DesignerProperties.GetIsInDesignMode(this))
+        {
+            ITaskbarList taskbarList = null;
+            try
             {
-                return;
+                taskbarList = CLSID.CoCreateInstance<ITaskbarList>("56FDF344-FD6D-11d0-958A-006097C9A090");
+                taskbarList.HrInit();
+                this._taskbarList = (taskbarList as ITaskbarList3);
+                taskbarList = null;
             }
-            this._window = window;
-            if (this._taskbarList == null)
+            finally
             {
-                return;
+                Utility.SafeRelease<ITaskbarList>(ref taskbarList);
             }
-            IntPtr handle = new WindowInteropHelper(this._window).Handle;
-            if (!(handle != IntPtr.Zero))
-            {
-                this._window.SourceInitialized += this._OnWindowSourceInitialized;
-                return;
-            }
-            this._hwndSource = HwndSource.FromHwnd(handle);
-            this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
+            this._overlaySize = new Size((double) NativeMethods.GetSystemMetrics(SM.CXSMICON), (double) NativeMethods.GetSystemMetrics(SM.CYSMICON));
+        }
+        this.ThumbButtonInfos = new ThumbButtonInfoCollection();
+    }
+
+    private void _SetWindow(Window window)
+    {
+        if (window == null)
+        {
+            return;
+        }
+        this._window = window;
+        if (this._taskbarList == null)
+        {
+            return;
+        }
+        IntPtr handle = new WindowInteropHelper(this._window).Handle;
+        if (!(handle != IntPtr.Zero))
+        {
+            this._window.SourceInitialized += this._OnWindowSourceInitialized;
+            return;
+        }
+        this._hwndSource = HwndSource.FromHwnd(handle);
+        this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
+        this._OnIsAttachedChanged(true);
+    }
+
+    private void _OnWindowSourceInitialized(object sender, EventArgs e)
+    {
+        this._window.SourceInitialized -= this._OnWindowSourceInitialized;
+        IntPtr handle = new WindowInteropHelper(this._window).Handle;
+        this._hwndSource = HwndSource.FromHwnd(handle);
+        this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
+        MSGFLTINFO msgfltinfo;
+        NativeMethods.ChangeWindowMessageFilterEx(handle, TaskbarItemInfo.WM_TASKBARBUTTONCREATED, MSGFLT.ALLOW, out msgfltinfo);
+        NativeMethods.ChangeWindowMessageFilterEx(handle, WM.COMMAND, MSGFLT.ALLOW, out msgfltinfo);
+    }
+
+    private IntPtr _WndProc(IntPtr hwnd, int uMsg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        if (uMsg == (int) TaskbarItemInfo.WM_TASKBARBUTTONCREATED)
+        {
             this._OnIsAttachedChanged(true);
+            this._isAttached = true;
+            handled = false;
         }
-
-        private void _OnWindowSourceInitialized(object sender, EventArgs e)
+        else if (uMsg != 5)
         {
-            this._window.SourceInitialized -= this._OnWindowSourceInitialized;
-            IntPtr handle = new WindowInteropHelper(this._window).Handle;
-            this._hwndSource = HwndSource.FromHwnd(handle);
-            this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
-            MSGFLTINFO msgfltinfo;
-            NativeMethods.ChangeWindowMessageFilterEx(handle, TaskbarItemInfo.WM_TASKBARBUTTONCREATED, MSGFLT.ALLOW, out msgfltinfo);
-            NativeMethods.ChangeWindowMessageFilterEx(handle, WM.COMMAND, MSGFLT.ALLOW, out msgfltinfo);
-        }
-
-        private IntPtr _WndProc(IntPtr hwnd, int uMsg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            if (uMsg == (int) TaskbarItemInfo.WM_TASKBARBUTTONCREATED)
+            if (uMsg == 273 && Utility.HIWORD(wParam.ToInt32()) == 6144)
             {
-                this._OnIsAttachedChanged(true);
-                this._isAttached = true;
-                handled = false;
+                int index = Utility.LOWORD(wParam.ToInt32());
+                this.ThumbButtonInfos[index].InvokeClick();
+                handled = true;
             }
-            else if (uMsg != 5)
+        }
+        else
+        {
+            this._UpdateThumbnailClipping(this._isAttached);
+            handled = false;
+        }
+        return IntPtr.Zero;
+    }
+
+    private void _OnIsAttachedChanged(bool attached)
+    {
+        this._haveAddedButtons = false;
+        if (!attached && this._hwndSource == null)
+        {
+            return;
+        }
+        this._UpdateOverlay(attached);
+        this._UpdateProgressState(attached);
+        this._UpdateProgressValue(attached);
+        this._UpdateTooltip(attached);
+        this._UpdateThumbnailClipping(attached);
+        this._UpdateThumbButtons(attached);
+        if (!attached)
+        {
+            this._hwndSource = null;
+        }
+    }
+
+    private void _DetachWindow()
+    {
+        this._window.SourceInitialized -= this._OnWindowSourceInitialized;
+        this._isAttached = false;
+        this._OnIsAttachedChanged(false);
+        this._window = null;
+    }
+
+    private HRESULT _UpdateOverlay(bool attached)
+    {
+        ImageSource overlay = this.Overlay;
+        if (overlay == null || !attached)
+        {
+            return this._taskbarList.SetOverlayIcon(this._hwndSource.Handle, IntPtr.Zero, null);
+        }
+        IntPtr hIcon = IntPtr.Zero;
+        HRESULT result;
+        try
+        {
+            hIcon = this._GetHICONFromImageSource(overlay, this._overlaySize);
+            result = this._taskbarList.SetOverlayIcon(this._hwndSource.Handle, hIcon, null);
+        }
+        finally
+        {
+            Utility.SafeDestroyIcon(ref hIcon);
+        }
+        return result;
+    }
+
+    private HRESULT _UpdateTooltip(bool attached)
+    {
+        string pszTip = this.Description ?? "";
+        if (!attached)
+        {
+            pszTip = "";
+        }
+        return this._taskbarList.SetThumbnailTooltip(this._hwndSource.Handle, pszTip);
+    }
+
+    private HRESULT _UpdateProgressValue(bool attached)
+    {
+        if (!attached || this.ProgressState == TaskbarItemProgressState.None || this.ProgressState == TaskbarItemProgressState.Indeterminate)
+        {
+            return HRESULT.S_OK;
+        }
+        ulong ullCompleted = (ulong) (this.ProgressValue * 1000.0);
+        return this._taskbarList.SetProgressValue(this._hwndSource.Handle, ullCompleted, 1000UL);
+    }
+
+    private HRESULT _UpdateProgressState(bool attached)
+    {
+        TaskbarItemProgressState progressState = this.ProgressState;
+        TBPF tbpFlags = TBPF.NOPROGRESS;
+        if (attached)
+        {
+            tbpFlags = progressState switch
             {
-                if (uMsg == 273 && Utility.HIWORD(wParam.ToInt32()) == 6144)
-                {
-                    int index = Utility.LOWORD(wParam.ToInt32());
-                    this.ThumbButtonInfos[index].InvokeClick();
-                    handled = true;
-                }
+                TaskbarItemProgressState.None => TBPF.NOPROGRESS,
+                TaskbarItemProgressState.Indeterminate => TBPF.INDETERMINATE,
+                TaskbarItemProgressState.Normal => TBPF.NORMAL,
+                TaskbarItemProgressState.Error => TBPF.ERROR,
+                TaskbarItemProgressState.Paused => TBPF.PAUSED,
+                _ => TBPF.NOPROGRESS
+            };
+        }
+        HRESULT result = this._taskbarList.SetProgressState(this._hwndSource.Handle, tbpFlags);
+        if (result.Succeeded)
+        {
+            result = this._UpdateProgressValue(attached);
+        }
+        return result;
+    }
+
+    private HRESULT _UpdateThumbnailClipping(bool attached)
+    {
+        RefRECT prcClip = null;
+        if (attached && this.ThumbnailClipMargin != TaskbarItemInfo._EmptyThickness)
+        {
+            Thickness thumbnailClipMargin = this.ThumbnailClipMargin;
+            RECT clientRect = NativeMethods.GetClientRect(this._hwndSource.Handle);
+            Rect rect = DpiHelper.DeviceRectToLogical(new Rect((double) clientRect.Left, (double) clientRect.Top, (double) clientRect.Width, (double) clientRect.Height));
+            if (thumbnailClipMargin.Left + thumbnailClipMargin.Right >= rect.Width || thumbnailClipMargin.Top + thumbnailClipMargin.Bottom >= rect.Height)
+            {
+                prcClip = new RefRECT(0, 0, 0, 0);
             }
             else
             {
-                this._UpdateThumbnailClipping(this._isAttached);
-                handled = false;
-            }
-            return IntPtr.Zero;
-        }
-
-        private void _OnIsAttachedChanged(bool attached)
-        {
-            this._haveAddedButtons = false;
-            if (!attached && this._hwndSource == null)
-            {
-                return;
-            }
-            this._UpdateOverlay(attached);
-            this._UpdateProgressState(attached);
-            this._UpdateProgressValue(attached);
-            this._UpdateTooltip(attached);
-            this._UpdateThumbnailClipping(attached);
-            this._UpdateThumbButtons(attached);
-            if (!attached)
-            {
-                this._hwndSource = null;
+                Rect logicalRectangle = new Rect(thumbnailClipMargin.Left, thumbnailClipMargin.Top, rect.Width - thumbnailClipMargin.Left - thumbnailClipMargin.Right, rect.Height - thumbnailClipMargin.Top - thumbnailClipMargin.Bottom);
+                Rect rect2 = DpiHelper.LogicalRectToDevice(logicalRectangle);
+                prcClip = new RefRECT((int) rect2.Left, (int) rect2.Top, (int) rect2.Right, (int) rect2.Bottom);
             }
         }
+        return this._taskbarList.SetThumbnailClip(this._hwndSource.Handle, prcClip);
+    }
 
-        private void _DetachWindow()
-        {
-            this._window.SourceInitialized -= this._OnWindowSourceInitialized;
-            this._isAttached = false;
-            this._OnIsAttachedChanged(false);
-            this._window = null;
-        }
-
-        private HRESULT _UpdateOverlay(bool attached)
-        {
-            ImageSource overlay = this.Overlay;
-            if (overlay == null || !attached)
-            {
-                return this._taskbarList.SetOverlayIcon(this._hwndSource.Handle, IntPtr.Zero, null);
-            }
-            IntPtr hIcon = IntPtr.Zero;
-            HRESULT result;
-            try
-            {
-                hIcon = this._GetHICONFromImageSource(overlay, this._overlaySize);
-                result = this._taskbarList.SetOverlayIcon(this._hwndSource.Handle, hIcon, null);
-            }
-            finally
-            {
-                Utility.SafeDestroyIcon(ref hIcon);
-            }
-            return result;
-        }
-
-        private HRESULT _UpdateTooltip(bool attached)
-        {
-            string pszTip = this.Description ?? "";
-            if (!attached)
-            {
-                pszTip = "";
-            }
-            return this._taskbarList.SetThumbnailTooltip(this._hwndSource.Handle, pszTip);
-        }
-
-        private HRESULT _UpdateProgressValue(bool attached)
-        {
-            if (!attached || this.ProgressState == TaskbarItemProgressState.None || this.ProgressState == TaskbarItemProgressState.Indeterminate)
-            {
-                return HRESULT.S_OK;
-            }
-            ulong ullCompleted = (ulong) (this.ProgressValue * 1000.0);
-            return this._taskbarList.SetProgressValue(this._hwndSource.Handle, ullCompleted, 1000UL);
-        }
-
-        private HRESULT _UpdateProgressState(bool attached)
-        {
-            TaskbarItemProgressState progressState = this.ProgressState;
-            TBPF tbpFlags = TBPF.NOPROGRESS;
-            if (attached)
-            {
-                tbpFlags = progressState switch
-                {
-                    TaskbarItemProgressState.None => TBPF.NOPROGRESS,
-                    TaskbarItemProgressState.Indeterminate => TBPF.INDETERMINATE,
-                    TaskbarItemProgressState.Normal => TBPF.NORMAL,
-                    TaskbarItemProgressState.Error => TBPF.ERROR,
-                    TaskbarItemProgressState.Paused => TBPF.PAUSED,
-                    _ => TBPF.NOPROGRESS
-                };
-            }
-            HRESULT result = this._taskbarList.SetProgressState(this._hwndSource.Handle, tbpFlags);
-            if (result.Succeeded)
-            {
-                result = this._UpdateProgressValue(attached);
-            }
-            return result;
-        }
-
-        private HRESULT _UpdateThumbnailClipping(bool attached)
-        {
-            RefRECT prcClip = null;
-            if (attached && this.ThumbnailClipMargin != TaskbarItemInfo._EmptyThickness)
-            {
-                Thickness thumbnailClipMargin = this.ThumbnailClipMargin;
-                RECT clientRect = NativeMethods.GetClientRect(this._hwndSource.Handle);
-                Rect rect = DpiHelper.DeviceRectToLogical(new Rect((double) clientRect.Left, (double) clientRect.Top, (double) clientRect.Width, (double) clientRect.Height));
-                if (thumbnailClipMargin.Left + thumbnailClipMargin.Right >= rect.Width || thumbnailClipMargin.Top + thumbnailClipMargin.Bottom >= rect.Height)
-                {
-                    prcClip = new RefRECT(0, 0, 0, 0);
-                }
-                else
-                {
-                    Rect logicalRectangle = new Rect(thumbnailClipMargin.Left, thumbnailClipMargin.Top, rect.Width - thumbnailClipMargin.Left - thumbnailClipMargin.Right, rect.Height - thumbnailClipMargin.Top - thumbnailClipMargin.Bottom);
-                    Rect rect2 = DpiHelper.LogicalRectToDevice(logicalRectangle);
-                    prcClip = new RefRECT((int) rect2.Left, (int) rect2.Top, (int) rect2.Right, (int) rect2.Bottom);
-                }
-            }
-            return this._taskbarList.SetThumbnailClip(this._hwndSource.Handle, prcClip);
-        }
-
-        private HRESULT _RegisterThumbButtons()
-        {
-            HRESULT hresult = HRESULT.S_OK;
-            if (!this._haveAddedButtons)
-            {
-                THUMBBUTTON[] array = new THUMBBUTTON[7];
-                for (int i = 0; i < 7; i++)
-                {
-                    array[i] = new THUMBBUTTON
-                    {
-                        iId = (uint) i,
-                        dwFlags = (THBF.DISABLED | THBF.NOBACKGROUND | THBF.HIDDEN),
-                        dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
-                    };
-                }
-                hresult = this._taskbarList.ThumbBarAddButtons(this._hwndSource.Handle, (uint) array.Length, array);
-                if (hresult == HRESULT.E_INVALIDARG)
-                {
-                    hresult = HRESULT.S_FALSE;
-                }
-                this._haveAddedButtons = hresult.Succeeded;
-            }
-            return hresult;
-        }
-
-        private HRESULT _UpdateThumbButtons(bool attached)
+    private HRESULT _RegisterThumbButtons()
+    {
+        HRESULT hresult = HRESULT.S_OK;
+        if (!this._haveAddedButtons)
         {
             THUMBBUTTON[] array = new THUMBBUTTON[7];
-            HRESULT result = this._RegisterThumbButtons();
-            if (result.Failed)
+            for (int i = 0; i < 7; i++)
             {
-                return result;
-            }
-            ThumbButtonInfoCollection thumbButtonInfos = this.ThumbButtonInfos;
-            HRESULT result2;
-            try
-            {
-                uint num = 0u;
-                if (!attached || thumbButtonInfos == null)
+                array[i] = new THUMBBUTTON
                 {
-                    goto IL_1AE;
-                }
-                using (FreezableCollection<ThumbButtonInfo>.Enumerator enumerator = thumbButtonInfos.GetEnumerator())
-                {
-                    while (enumerator.MoveNext())
-                    {
-                        ThumbButtonInfo thumbButtonInfo = enumerator.Current;
-                        THUMBBUTTON thumbbutton = new THUMBBUTTON
-                        {
-                            iId = num,
-                            dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
-                        };
-                        switch (thumbButtonInfo.Visibility)
-                        {
-                            case Visibility.Visible:
-                                goto IL_A5;
-                            case Visibility.Hidden:
-                                thumbbutton.dwFlags = (THBF.DISABLED | THBF.NOBACKGROUND);
-                                thumbbutton.hIcon = IntPtr.Zero;
-                                break;
-                            case Visibility.Collapsed:
-                                thumbbutton.dwFlags = THBF.HIDDEN;
-                                break;
-                            default:
-                                goto IL_A5;
-                        }
-IL_146:
-                        array[(int) ((UIntPtr) num)] = thumbbutton;
-                        num += 1u;
-                        if (num != 7u)
-                        {
-                            continue;
-                        }
-                        break;
-IL_A5:
-                        thumbbutton.szTip = (thumbButtonInfo.Description ?? "");
-                        thumbbutton.hIcon = this._GetHICONFromImageSource(thumbButtonInfo.ImageSource, this._overlaySize);
-                        if (!thumbButtonInfo.IsBackgroundVisible)
-                        {
-                            thumbbutton.dwFlags |= THBF.NOBACKGROUND;
-                        }
-                        if (!thumbButtonInfo.IsEnabled)
-                        {
-                            thumbbutton.dwFlags |= THBF.DISABLED;
-                        }
-                        else
-                        {
-                            thumbbutton.dwFlags = thumbbutton.dwFlags;
-                        }
-                        if (!thumbButtonInfo.IsInteractive)
-                        {
-                            thumbbutton.dwFlags |= THBF.NONINTERACTIVE;
-                        }
-                        if (thumbButtonInfo.DismissWhenClicked)
-                        {
-                            thumbbutton.dwFlags |= THBF.DISMISSONCLICK;
-                            goto IL_146;
-                        }
-                        goto IL_146;
-                    }
-                    goto IL_1AE;
-                }
-IL_179:
-                array[(int) ((UIntPtr) num)] = new THUMBBUTTON
-                {
-                    iId = num,
+                    iId = (uint) i,
                     dwFlags = (THBF.DISABLED | THBF.NOBACKGROUND | THBF.HIDDEN),
                     dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
                 };
-                num += 1u;
-IL_1AE:
-                if (num < 7u)
-                {
-                    goto IL_179;
-                }
-                result2 = this._taskbarList.ThumbBarUpdateButtons(this._hwndSource.Handle, (uint) array.Length, array);
             }
-            finally
+            hresult = this._taskbarList.ThumbBarAddButtons(this._hwndSource.Handle, (uint) array.Length, array);
+            if (hresult == HRESULT.E_INVALIDARG)
             {
-                foreach (THUMBBUTTON thumbbutton2 in array)
+                hresult = HRESULT.S_FALSE;
+            }
+            this._haveAddedButtons = hresult.Succeeded;
+        }
+        return hresult;
+    }
+
+    private HRESULT _UpdateThumbButtons(bool attached)
+    {
+        THUMBBUTTON[] array = new THUMBBUTTON[7];
+        HRESULT result = this._RegisterThumbButtons();
+        if (result.Failed)
+        {
+            return result;
+        }
+        ThumbButtonInfoCollection thumbButtonInfos = this.ThumbButtonInfos;
+        HRESULT result2;
+        try
+        {
+            uint num = 0u;
+            if (!attached || thumbButtonInfos == null)
+            {
+                goto IL_1AE;
+            }
+            using (FreezableCollection<ThumbButtonInfo>.Enumerator enumerator = thumbButtonInfos.GetEnumerator())
+            {
+                while (enumerator.MoveNext())
                 {
-                    IntPtr hIcon = thumbbutton2.hIcon;
-                    if (IntPtr.Zero != hIcon)
+                    ThumbButtonInfo thumbButtonInfo = enumerator.Current;
+                    THUMBBUTTON thumbbutton = new THUMBBUTTON
                     {
-                        Utility.SafeDestroyIcon(ref hIcon);
+                        iId = num,
+                        dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
+                    };
+                    switch (thumbButtonInfo.Visibility)
+                    {
+                        case Visibility.Visible:
+                            goto IL_A5;
+                        case Visibility.Hidden:
+                            thumbbutton.dwFlags = (THBF.DISABLED | THBF.NOBACKGROUND);
+                            thumbbutton.hIcon = IntPtr.Zero;
+                            break;
+                        case Visibility.Collapsed:
+                            thumbbutton.dwFlags = THBF.HIDDEN;
+                            break;
+                        default:
+                            goto IL_A5;
                     }
+                    IL_146:
+                    array[(int) ((UIntPtr) num)] = thumbbutton;
+                    num += 1u;
+                    if (num != 7u)
+                    {
+                        continue;
+                    }
+                    break;
+                    IL_A5:
+                    thumbbutton.szTip = (thumbButtonInfo.Description ?? "");
+                    thumbbutton.hIcon = this._GetHICONFromImageSource(thumbButtonInfo.ImageSource, this._overlaySize);
+                    if (!thumbButtonInfo.IsBackgroundVisible)
+                    {
+                        thumbbutton.dwFlags |= THBF.NOBACKGROUND;
+                    }
+                    if (!thumbButtonInfo.IsEnabled)
+                    {
+                        thumbbutton.dwFlags |= THBF.DISABLED;
+                    }
+                    else
+                    {
+                        thumbbutton.dwFlags = thumbbutton.dwFlags;
+                    }
+                    if (!thumbButtonInfo.IsInteractive)
+                    {
+                        thumbbutton.dwFlags |= THBF.NONINTERACTIVE;
+                    }
+                    if (thumbButtonInfo.DismissWhenClicked)
+                    {
+                        thumbbutton.dwFlags |= THBF.DISMISSONCLICK;
+                        goto IL_146;
+                    }
+                    goto IL_146;
+                }
+                goto IL_1AE;
+            }
+            IL_179:
+            array[(int) ((UIntPtr) num)] = new THUMBBUTTON
+            {
+                iId = num,
+                dwFlags = (THBF.DISABLED | THBF.NOBACKGROUND | THBF.HIDDEN),
+                dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
+            };
+            num += 1u;
+            IL_1AE:
+            if (num < 7u)
+            {
+                goto IL_179;
+            }
+            result2 = this._taskbarList.ThumbBarUpdateButtons(this._hwndSource.Handle, (uint) array.Length, array);
+        }
+        finally
+        {
+            foreach (THUMBBUTTON thumbbutton2 in array)
+            {
+                IntPtr hIcon = thumbbutton2.hIcon;
+                if (IntPtr.Zero != hIcon)
+                {
+                    Utility.SafeDestroyIcon(ref hIcon);
                 }
             }
-            return result2;
         }
-
-        private const int c_MaximumThumbButtons = 7;
-
-        private static readonly WM WM_TASKBARBUTTONCREATED = NativeMethods.RegisterWindowMessage("TaskbarButtonCreated");
-
-        private static readonly Thickness _EmptyThickness = default(Thickness);
-
-        private SafeGdiplusStartupToken _gdipToken;
-
-        private bool _haveAddedButtons;
-
-        private Window _window;
-
-        private HwndSource _hwndSource;
-
-        private ITaskbarList3 _taskbarList;
-
-        private readonly Size _overlaySize;
-
-        private bool _isAttached;
-
-        public static readonly DependencyProperty TaskbarItemInfoProperty = DependencyProperty.RegisterAttached("TaskbarItemInfo", typeof(TaskbarItemInfo), typeof(TaskbarItemInfo), new PropertyMetadata(null, new PropertyChangedCallback(TaskbarItemInfo._OnTaskbarItemInfoChanged), new CoerceValueCallback(TaskbarItemInfo._CoerceTaskbarItemInfoValue)));
-
-        public static readonly DependencyProperty ProgressStateProperty = DependencyProperty.Register("ProgressState", typeof(TaskbarItemProgressState), typeof(TaskbarItemInfo), new PropertyMetadata(TaskbarItemProgressState.None, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnProgressStateChanged();
-        }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceProgressState((TaskbarItemProgressState) e)));
-
-        public static readonly DependencyProperty ProgressValueProperty = DependencyProperty.Register("ProgressValue", typeof(double), typeof(TaskbarItemInfo), new PropertyMetadata(0.0, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnProgressValueChanged();
-        }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceProgressValue((double) e)));
-
-        public static readonly DependencyProperty OverlayProperty = DependencyProperty.Register("Overlay", typeof(ImageSource), typeof(TaskbarItemInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnOverlayChanged();
-        }));
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register("Description", typeof(string), typeof(TaskbarItemInfo), new PropertyMetadata(string.Empty, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnDescriptionChanged();
-        }));
-
-        public static readonly DependencyProperty ThumbnailClipMarginProperty = DependencyProperty.Register("ThumbnailClipMargin", typeof(Thickness), typeof(TaskbarItemInfo), new PropertyMetadata(default(Thickness), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnThumbnailClipMarginChanged();
-        }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceThumbnailClipMargin((Thickness) e)));
-
-        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Infos")]
-        public static readonly DependencyProperty ThumbButtonInfosProperty = DependencyProperty.Register("ThumbButtonInfos", typeof(ThumbButtonInfoCollection), typeof(TaskbarItemInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((TaskbarItemInfo) d)._OnThumbButtonsChanged();
-        }));
+        return result2;
     }
-}
+
+    private const int c_MaximumThumbButtons = 7;
+
+    private static readonly WM WM_TASKBARBUTTONCREATED = NativeMethods.RegisterWindowMessage("TaskbarButtonCreated");
+
+    private static readonly Thickness _EmptyThickness = default(Thickness);
+
+    private SafeGdiplusStartupToken _gdipToken;
+
+    private bool _haveAddedButtons;
+
+    private Window _window;
+
+    private HwndSource _hwndSource;
+
+    private ITaskbarList3 _taskbarList;
+
+    private readonly Size _overlaySize;
+
+    private bool _isAttached;
+
+    public static readonly DependencyProperty TaskbarItemInfoProperty = DependencyProperty.RegisterAttached("TaskbarItemInfo", typeof(TaskbarItemInfo), typeof(TaskbarItemInfo), new PropertyMetadata(null, new PropertyChangedCallback(TaskbarItemInfo._OnTaskbarItemInfoChanged), new CoerceValueCallback(TaskbarItemInfo._CoerceTaskbarItemInfoValue)));
+
+    public static readonly DependencyProperty ProgressStateProperty = DependencyProperty.Register("ProgressState", typeof(TaskbarItemProgressState), typeof(TaskbarItemInfo), new PropertyMetadata(TaskbarItemProgressState.None, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnProgressStateChanged();
+    }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceProgressState((TaskbarItemProgressState) e)));
+
+    public static readonly DependencyProperty ProgressValueProperty = DependencyProperty.Register("ProgressValue", typeof(double), typeof(TaskbarItemInfo), new PropertyMetadata(0.0, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnProgressValueChanged();
+    }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceProgressValue((double) e)));
+
+    public static readonly DependencyProperty OverlayProperty = DependencyProperty.Register("Overlay", typeof(ImageSource), typeof(TaskbarItemInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnOverlayChanged();
+    }));
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register("Description", typeof(string), typeof(TaskbarItemInfo), new PropertyMetadata(string.Empty, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnDescriptionChanged();
+    }));
+
+    public static readonly DependencyProperty ThumbnailClipMarginProperty = DependencyProperty.Register("ThumbnailClipMargin", typeof(Thickness), typeof(TaskbarItemInfo), new PropertyMetadata(default(Thickness), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnThumbnailClipMarginChanged();
+    }, (DependencyObject d, object e) => TaskbarItemInfo._CoerceThumbnailClipMargin((Thickness) e)));
+
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Infos")]
+    public static readonly DependencyProperty ThumbButtonInfosProperty = DependencyProperty.Register("ThumbButtonInfos", typeof(ThumbButtonInfoCollection), typeof(TaskbarItemInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((TaskbarItemInfo) d)._OnThumbButtonsChanged();
+    }));
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs b/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
index 33a5d286..212f24d0 100644
--- a/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
+++ b/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
@@ -1,13 +1,12 @@
 using System;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public enum TaskbarItemProgressState
 {
-    public enum TaskbarItemProgressState
-    {
-        None,
-        Indeterminate,
-        Normal,
-        Error,
-        Paused
-    }
-}
+    None,
+    Indeterminate,
+    Normal,
+    Error,
+    Paused
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
index 5bbff01f..717c8ace 100644
--- a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
+++ b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
@@ -4,286 +4,285 @@ using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+[DefaultEvent("Click")]
+public sealed class ThumbButtonInfo : Freezable, ICommandSource
 {
-    [DefaultEvent("Click")]
-    public sealed class ThumbButtonInfo : Freezable, ICommandSource
+    protected override Freezable CreateInstanceCore()
     {
-        protected override Freezable CreateInstanceCore()
+        return new ThumbButtonInfo();
+    }
+
+    public Visibility Visibility
+    {
+        get
         {
-            return new ThumbButtonInfo();
+            return (Visibility) base.GetValue(ThumbButtonInfo.VisibilityProperty);
         }
-
-        public Visibility Visibility
+        set
         {
-            get
-            {
-                return (Visibility) base.GetValue(ThumbButtonInfo.VisibilityProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.VisibilityProperty, value);
-            }
+            base.SetValue(ThumbButtonInfo.VisibilityProperty, value);
         }
+    }
 
-        public bool DismissWhenClicked
+    public bool DismissWhenClicked
+    {
+        get
         {
-            get
-            {
-                return (bool) base.GetValue(ThumbButtonInfo.DismissWhenClickedProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.DismissWhenClickedProperty, value);
-            }
+            return (bool) base.GetValue(ThumbButtonInfo.DismissWhenClickedProperty);
         }
-
-        public ImageSource ImageSource
+        set
         {
-            get
-            {
-                return (ImageSource) base.GetValue(ThumbButtonInfo.ImageSourceProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.ImageSourceProperty, value);
-            }
+            base.SetValue(ThumbButtonInfo.DismissWhenClickedProperty, value);
         }
+    }
 
-        public bool IsBackgroundVisible
+    public ImageSource ImageSource
+    {
+        get
         {
-            get
-            {
-                return (bool) base.GetValue(ThumbButtonInfo.IsBackgroundVisibleProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.IsBackgroundVisibleProperty, value);
-            }
+            return (ImageSource) base.GetValue(ThumbButtonInfo.ImageSourceProperty);
         }
-
-        public string Description
+        set
         {
-            get
-            {
-                return (string) base.GetValue(ThumbButtonInfo.DescriptionProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.DescriptionProperty, value);
-            }
+            base.SetValue(ThumbButtonInfo.ImageSourceProperty, value);
         }
+    }
 
-        private static object _CoerceDescription(DependencyObject d, object value)
+    public bool IsBackgroundVisible
+    {
+        get
         {
-            string text = (string) value;
-            if (text != null && text.Length >= 260)
-            {
-                text = text.Substring(0, 259);
-            }
-            return text;
+            return (bool) base.GetValue(ThumbButtonInfo.IsBackgroundVisibleProperty);
         }
-
-        private object _CoerceIsEnabledValue(object value)
+        set
         {
-            bool flag = (bool) value;
-            return flag && this._CanExecute;
+            base.SetValue(ThumbButtonInfo.IsBackgroundVisibleProperty, value);
         }
+    }
 
-        public bool IsEnabled
+    public string Description
+    {
+        get
         {
-            get
-            {
-                return (bool) base.GetValue(ThumbButtonInfo.IsEnabledProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.IsEnabledProperty, value);
-            }
+            return (string) base.GetValue(ThumbButtonInfo.DescriptionProperty);
         }
-
-        public bool IsInteractive
+        set
         {
-            get
-            {
-                return (bool) base.GetValue(ThumbButtonInfo.IsInteractiveProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.IsInteractiveProperty, value);
-            }
+            base.SetValue(ThumbButtonInfo.DescriptionProperty, value);
         }
+    }
 
-        private void _OnCommandChanged(DependencyPropertyChangedEventArgs e)
+    private static object _CoerceDescription(DependencyObject d, object value)
+    {
+        string text = (string) value;
+        if (text != null && text.Length >= 260)
         {
-            ICommand command = (ICommand) e.OldValue;
-            ICommand command2 = (ICommand) e.NewValue;
-            if (command == command2)
-            {
-                return;
-            }
-            if (command != null)
-            {
-                this._UnhookCommand(command);
-            }
-            if (command2 != null)
-            {
-                this._HookCommand(command2);
-            }
+            text = text.Substring(0, 259);
         }
+        return text;
+    }
 
-        private bool _CanExecute
+    private object _CoerceIsEnabledValue(object value)
+    {
+        bool flag = (bool) value;
+        return flag && this._CanExecute;
+    }
+
+    public bool IsEnabled
+    {
+        get
         {
-            get
-            {
-                return (bool) base.GetValue(ThumbButtonInfo._CanExecuteProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo._CanExecuteProperty, value);
-            }
+            return (bool) base.GetValue(ThumbButtonInfo.IsEnabledProperty);
         }
-
-        public event EventHandler Click;
-
-        internal void InvokeClick()
+        set
         {
-            EventHandler click = this.Click;
-            if (click != null)
-            {
-                click(this, EventArgs.Empty);
-            }
-            this._InvokeCommand();
+            base.SetValue(ThumbButtonInfo.IsEnabledProperty, value);
         }
+    }
 
-        private void _InvokeCommand()
+    public bool IsInteractive
+    {
+        get
         {
-            ICommand command = this.Command;
-            if (command != null)
-            {
-                object commandParameter = this.CommandParameter;
-                IInputElement commandTarget = this.CommandTarget;
-                RoutedCommand routedCommand = command as RoutedCommand;
-                if (routedCommand != null)
-                {
-                    if (routedCommand.CanExecute(commandParameter, commandTarget))
-                    {
-                        routedCommand.Execute(commandParameter, commandTarget);
-                        return;
-                    }
-                }
-                else if (command.CanExecute(commandParameter))
-                {
-                    command.Execute(commandParameter);
-                }
-            }
+            return (bool) base.GetValue(ThumbButtonInfo.IsInteractiveProperty);
         }
-
-        private void _UnhookCommand(ICommand command)
+        set
         {
-            command.CanExecuteChanged -= this._commandEvent;
-            this._commandEvent = null;
-            this._UpdateCanExecute();
+            base.SetValue(ThumbButtonInfo.IsInteractiveProperty, value);
         }
+    }
 
-        private void _HookCommand(ICommand command)
+    private void _OnCommandChanged(DependencyPropertyChangedEventArgs e)
+    {
+        ICommand command = (ICommand) e.OldValue;
+        ICommand command2 = (ICommand) e.NewValue;
+        if (command == command2)
         {
-            this._commandEvent = delegate (object sender, EventArgs e)
-            {
-                this._UpdateCanExecute();
-            };
-            command.CanExecuteChanged += this._commandEvent;
-            this._UpdateCanExecute();
+            return;
         }
+        if (command != null)
+        {
+            this._UnhookCommand(command);
+        }
+        if (command2 != null)
+        {
+            this._HookCommand(command2);
+        }
+    }
 
-        private void _UpdateCanExecute()
+    private bool _CanExecute
+    {
+        get
+        {
+            return (bool) base.GetValue(ThumbButtonInfo._CanExecuteProperty);
+        }
+        set
+        {
+            base.SetValue(ThumbButtonInfo._CanExecuteProperty, value);
+        }
+    }
+
+    public event EventHandler Click;
+
+    internal void InvokeClick()
+    {
+        EventHandler click = this.Click;
+        if (click != null)
+        {
+            click(this, EventArgs.Empty);
+        }
+        this._InvokeCommand();
+    }
+
+    private void _InvokeCommand()
+    {
+        ICommand command = this.Command;
+        if (command != null)
         {
-            if (this.Command == null)
-            {
-                this._CanExecute = true;
-                return;
-            }
             object commandParameter = this.CommandParameter;
             IInputElement commandTarget = this.CommandTarget;
-            RoutedCommand routedCommand = this.Command as RoutedCommand;
+            RoutedCommand routedCommand = command as RoutedCommand;
             if (routedCommand != null)
             {
-                this._CanExecute = routedCommand.CanExecute(commandParameter, commandTarget);
-                return;
+                if (routedCommand.CanExecute(commandParameter, commandTarget))
+                {
+                    routedCommand.Execute(commandParameter, commandTarget);
+                    return;
+                }
             }
-            this._CanExecute = this.Command.CanExecute(commandParameter);
-        }
-
-        public ICommand Command
-        {
-            get
+            else if (command.CanExecute(commandParameter))
             {
-                return (ICommand) base.GetValue(ThumbButtonInfo.CommandProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.CommandProperty, value);
+                command.Execute(commandParameter);
             }
         }
-
-        public object CommandParameter
-        {
-            get
-            {
-                return base.GetValue(ThumbButtonInfo.CommandParameterProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.CommandParameterProperty, value);
-            }
-        }
-
-        public IInputElement CommandTarget
-        {
-            get
-            {
-                return (IInputElement) base.GetValue(ThumbButtonInfo.CommandTargetProperty);
-            }
-            set
-            {
-                base.SetValue(ThumbButtonInfo.CommandTargetProperty, value);
-            }
-        }
-
-        private EventHandler _commandEvent;
-
-        public static readonly DependencyProperty VisibilityProperty = DependencyProperty.Register("Visibility", typeof(Visibility), typeof(ThumbButtonInfo), new PropertyMetadata(Visibility.Visible));
-
-        public static readonly DependencyProperty DismissWhenClickedProperty = DependencyProperty.Register("DismissWhenClicked", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(false));
-
-        public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register("ImageSource", typeof(ImageSource), typeof(ThumbButtonInfo), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty IsBackgroundVisibleProperty = DependencyProperty.Register("IsBackgroundVisible", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true));
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register("Description", typeof(string), typeof(ThumbButtonInfo), new PropertyMetadata(string.Empty, null, new CoerceValueCallback(ThumbButtonInfo._CoerceDescription)));
-
-        public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.Register("IsEnabled", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true, null, (DependencyObject d, object e) => ((ThumbButtonInfo) d)._CoerceIsEnabledValue(e)));
-
-        public static readonly DependencyProperty IsInteractiveProperty = DependencyProperty.Register("IsInteractive", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true));
-
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ThumbButtonInfo) d)._OnCommandChanged(e);
-        }));
-
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ThumbButtonInfo) d)._UpdateCanExecute();
-        }));
-
-        public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget", typeof(IInputElement), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((ThumbButtonInfo) d)._UpdateCanExecute();
-        }));
-
-        private static readonly DependencyProperty _CanExecuteProperty = DependencyProperty.Register("_CanExecute", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            d.CoerceValue(ThumbButtonInfo.IsEnabledProperty);
-        }));
     }
-}
+
+    private void _UnhookCommand(ICommand command)
+    {
+        command.CanExecuteChanged -= this._commandEvent;
+        this._commandEvent = null;
+        this._UpdateCanExecute();
+    }
+
+    private void _HookCommand(ICommand command)
+    {
+        this._commandEvent = delegate (object sender, EventArgs e)
+        {
+            this._UpdateCanExecute();
+        };
+        command.CanExecuteChanged += this._commandEvent;
+        this._UpdateCanExecute();
+    }
+
+    private void _UpdateCanExecute()
+    {
+        if (this.Command == null)
+        {
+            this._CanExecute = true;
+            return;
+        }
+        object commandParameter = this.CommandParameter;
+        IInputElement commandTarget = this.CommandTarget;
+        RoutedCommand routedCommand = this.Command as RoutedCommand;
+        if (routedCommand != null)
+        {
+            this._CanExecute = routedCommand.CanExecute(commandParameter, commandTarget);
+            return;
+        }
+        this._CanExecute = this.Command.CanExecute(commandParameter);
+    }
+
+    public ICommand Command
+    {
+        get
+        {
+            return (ICommand) base.GetValue(ThumbButtonInfo.CommandProperty);
+        }
+        set
+        {
+            base.SetValue(ThumbButtonInfo.CommandProperty, value);
+        }
+    }
+
+    public object CommandParameter
+    {
+        get
+        {
+            return base.GetValue(ThumbButtonInfo.CommandParameterProperty);
+        }
+        set
+        {
+            base.SetValue(ThumbButtonInfo.CommandParameterProperty, value);
+        }
+    }
+
+    public IInputElement CommandTarget
+    {
+        get
+        {
+            return (IInputElement) base.GetValue(ThumbButtonInfo.CommandTargetProperty);
+        }
+        set
+        {
+            base.SetValue(ThumbButtonInfo.CommandTargetProperty, value);
+        }
+    }
+
+    private EventHandler _commandEvent;
+
+    public static readonly DependencyProperty VisibilityProperty = DependencyProperty.Register("Visibility", typeof(Visibility), typeof(ThumbButtonInfo), new PropertyMetadata(Visibility.Visible));
+
+    public static readonly DependencyProperty DismissWhenClickedProperty = DependencyProperty.Register("DismissWhenClicked", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(false));
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register("ImageSource", typeof(ImageSource), typeof(ThumbButtonInfo), new PropertyMetadata(null));
+
+    public static readonly DependencyProperty IsBackgroundVisibleProperty = DependencyProperty.Register("IsBackgroundVisible", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true));
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register("Description", typeof(string), typeof(ThumbButtonInfo), new PropertyMetadata(string.Empty, null, new CoerceValueCallback(ThumbButtonInfo._CoerceDescription)));
+
+    public static readonly DependencyProperty IsEnabledProperty = DependencyProperty.Register("IsEnabled", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true, null, (DependencyObject d, object e) => ((ThumbButtonInfo) d)._CoerceIsEnabledValue(e)));
+
+    public static readonly DependencyProperty IsInteractiveProperty = DependencyProperty.Register("IsInteractive", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true));
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((ThumbButtonInfo) d)._OnCommandChanged(e);
+    }));
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((ThumbButtonInfo) d)._UpdateCanExecute();
+    }));
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget", typeof(IInputElement), typeof(ThumbButtonInfo), new PropertyMetadata(null, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((ThumbButtonInfo) d)._UpdateCanExecute();
+    }));
+
+    private static readonly DependencyProperty _CanExecuteProperty = DependencyProperty.Register("_CanExecute", typeof(bool), typeof(ThumbButtonInfo), new PropertyMetadata(true, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        d.CoerceValue(ThumbButtonInfo.IsEnabledProperty);
+    }));
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
index cb08dc05..b7391907 100644
--- a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
+++ b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
@@ -1,29 +1,28 @@
 using System;
 using System.Windows;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public class ThumbButtonInfoCollection : FreezableCollection<ThumbButtonInfo>
 {
-    public class ThumbButtonInfoCollection : FreezableCollection<ThumbButtonInfo>
+    protected override Freezable CreateInstanceCore()
     {
-        protected override Freezable CreateInstanceCore()
-        {
-            return new ThumbButtonInfoCollection();
-        }
-
-        internal static ThumbButtonInfoCollection Empty
-        {
-            get
-            {
-                if (ThumbButtonInfoCollection.s_empty == null)
-                {
-                    ThumbButtonInfoCollection thumbButtonInfoCollection = new ThumbButtonInfoCollection();
-                    thumbButtonInfoCollection.Freeze();
-                    ThumbButtonInfoCollection.s_empty = thumbButtonInfoCollection;
-                }
-                return ThumbButtonInfoCollection.s_empty;
-            }
-        }
-
-        private static ThumbButtonInfoCollection s_empty;
+        return new ThumbButtonInfoCollection();
     }
-}
+
+    internal static ThumbButtonInfoCollection Empty
+    {
+        get
+        {
+            if (ThumbButtonInfoCollection.s_empty == null)
+            {
+                ThumbButtonInfoCollection thumbButtonInfoCollection = new ThumbButtonInfoCollection();
+                thumbButtonInfoCollection.Freeze();
+                ThumbButtonInfoCollection.s_empty = thumbButtonInfoCollection;
+            }
+            return ThumbButtonInfoCollection.s_empty;
+        }
+    }
+
+    private static ThumbButtonInfoCollection s_empty;
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs b/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
index 34836f32..26ce6a25 100644
--- a/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
+++ b/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
@@ -6,214 +6,213 @@ using System.Windows;
 using System.Windows.Data;
 using Standard;
 
-namespace Microsoft.Windows.Shell
+namespace Microsoft.Windows.Shell;
+
+public class WindowChrome : Freezable
 {
-    public class WindowChrome : Freezable
+    public static Thickness GlassFrameCompleteThickness
     {
-        public static Thickness GlassFrameCompleteThickness
+        get
         {
-            get
-            {
-                return new Thickness(-1.0);
-            }
-        }
-
-        private static void _OnChromeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (DesignerProperties.GetIsInDesignMode(d))
-            {
-                return;
-            }
-            Window window = (Window) d;
-            WindowChrome windowChrome = (WindowChrome) e.NewValue;
-            WindowChromeWorker windowChromeWorker = WindowChromeWorker.GetWindowChromeWorker(window);
-            if (windowChromeWorker == null)
-            {
-                windowChromeWorker = new WindowChromeWorker();
-                WindowChromeWorker.SetWindowChromeWorker(window, windowChromeWorker);
-            }
-            windowChromeWorker.SetWindowChrome(windowChrome);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static WindowChrome GetWindowChrome(Window window)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            return (WindowChrome) window.GetValue(WindowChrome.WindowChromeProperty);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static void SetWindowChrome(Window window, WindowChrome chrome)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            window.SetValue(WindowChrome.WindowChromeProperty, chrome);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static bool GetIsHitTestVisibleInChrome(IInputElement inputElement)
-        {
-            Verify.IsNotNull<IInputElement>(inputElement, "inputElement");
-            DependencyObject dependencyObject = inputElement as DependencyObject;
-            if (dependencyObject == null)
-            {
-                throw new ArgumentException("The element must be a DependencyObject", "inputElement");
-            }
-            return (bool) dependencyObject.GetValue(WindowChrome.IsHitTestVisibleInChromeProperty);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
-        public static void SetIsHitTestVisibleInChrome(IInputElement inputElement, bool hitTestVisible)
-        {
-            Verify.IsNotNull<IInputElement>(inputElement, "inputElement");
-            DependencyObject dependencyObject = inputElement as DependencyObject;
-            if (dependencyObject == null)
-            {
-                throw new ArgumentException("The element must be a DependencyObject", "inputElement");
-            }
-            dependencyObject.SetValue(WindowChrome.IsHitTestVisibleInChromeProperty, hitTestVisible);
-        }
-
-        public double CaptionHeight
-        {
-            get
-            {
-                return (double) base.GetValue(WindowChrome.CaptionHeightProperty);
-            }
-            set
-            {
-                base.SetValue(WindowChrome.CaptionHeightProperty, value);
-            }
-        }
-
-        public Thickness ResizeBorderThickness
-        {
-            get
-            {
-                return (Thickness) base.GetValue(WindowChrome.ResizeBorderThicknessProperty);
-            }
-            set
-            {
-                base.SetValue(WindowChrome.ResizeBorderThicknessProperty, value);
-            }
-        }
-
-        private static object _CoerceGlassFrameThickness(Thickness thickness)
-        {
-            if (!Utility.IsThicknessNonNegative(thickness))
-            {
-                return WindowChrome.GlassFrameCompleteThickness;
-            }
-            return thickness;
-        }
-
-        public Thickness GlassFrameThickness
-        {
-            get
-            {
-                return (Thickness) base.GetValue(WindowChrome.GlassFrameThicknessProperty);
-            }
-            set
-            {
-                base.SetValue(WindowChrome.GlassFrameThicknessProperty, value);
-            }
-        }
-
-        public CornerRadius CornerRadius
-        {
-            get
-            {
-                return (CornerRadius) base.GetValue(WindowChrome.CornerRadiusProperty);
-            }
-            set
-            {
-                base.SetValue(WindowChrome.CornerRadiusProperty, value);
-            }
-        }
-
-        protected override Freezable CreateInstanceCore()
-        {
-            return new WindowChrome();
-        }
-
-        public WindowChrome()
-        {
-            foreach (WindowChrome._SystemParameterBoundProperty systemParameterBoundProperty in WindowChrome._BoundProperties)
-            {
-                BindingOperations.SetBinding(this, systemParameterBoundProperty.DependencyProperty, new Binding
-                {
-                    Source = SystemParameters2.Current,
-                    Path = new PropertyPath(systemParameterBoundProperty.SystemParameterPropertyName, new object[0]),
-                    Mode = BindingMode.OneWay,
-                    UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
-                });
-            }
-        }
-
-        private void _OnPropertyChangedThatRequiresRepaint()
-        {
-            EventHandler propertyChangedThatRequiresRepaint = this.PropertyChangedThatRequiresRepaint;
-            if (propertyChangedThatRequiresRepaint != null)
-            {
-                propertyChangedThatRequiresRepaint(this, EventArgs.Empty);
-            }
-        }
-
-        internal event EventHandler PropertyChangedThatRequiresRepaint;
-
-        public static readonly DependencyProperty WindowChromeProperty = DependencyProperty.RegisterAttached("WindowChrome", typeof(WindowChrome), typeof(WindowChrome), new PropertyMetadata(null, new PropertyChangedCallback(WindowChrome._OnChromeChanged)));
-
-        public static readonly DependencyProperty IsHitTestVisibleInChromeProperty = DependencyProperty.RegisterAttached("IsHitTestVisibleInChrome", typeof(bool), typeof(WindowChrome), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
-
-        public static readonly DependencyProperty CaptionHeightProperty = DependencyProperty.Register("CaptionHeight", typeof(double), typeof(WindowChrome), new PropertyMetadata(0.0, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
-        }), (object value) => (double) value >= 0.0);
-
-        public static readonly DependencyProperty ResizeBorderThicknessProperty = DependencyProperty.Register("ResizeBorderThickness", typeof(Thickness), typeof(WindowChrome), new PropertyMetadata(default(Thickness)), (object value) => Utility.IsThicknessNonNegative((Thickness) value));
-
-        public static readonly DependencyProperty GlassFrameThicknessProperty = DependencyProperty.Register("GlassFrameThickness", typeof(Thickness), typeof(WindowChrome), new PropertyMetadata(default(Thickness), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
-        }, (DependencyObject d, object o) => WindowChrome._CoerceGlassFrameThickness((Thickness) o)));
-
-        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register("CornerRadius", typeof(CornerRadius), typeof(WindowChrome), new PropertyMetadata(default(CornerRadius), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
-        }), (object value) => Utility.IsCornerRadiusValid((CornerRadius) value));
-
-        private static readonly List<WindowChrome._SystemParameterBoundProperty> _BoundProperties = new List<WindowChrome._SystemParameterBoundProperty>
-        {
-            new WindowChrome._SystemParameterBoundProperty
-            {
-                DependencyProperty = WindowChrome.CornerRadiusProperty,
-                SystemParameterPropertyName = "WindowCornerRadius"
-            },
-            new WindowChrome._SystemParameterBoundProperty
-            {
-                DependencyProperty = WindowChrome.CaptionHeightProperty,
-                SystemParameterPropertyName = "WindowCaptionHeight"
-            },
-            new WindowChrome._SystemParameterBoundProperty
-            {
-                DependencyProperty = WindowChrome.ResizeBorderThicknessProperty,
-                SystemParameterPropertyName = "WindowResizeBorderThickness"
-            },
-            new WindowChrome._SystemParameterBoundProperty
-            {
-                DependencyProperty = WindowChrome.GlassFrameThicknessProperty,
-                SystemParameterPropertyName = "WindowNonClientFrameThickness"
-            }
-        };
-
-        private struct _SystemParameterBoundProperty
-        {
-            public string SystemParameterPropertyName { get; set; }
-
-            public DependencyProperty DependencyProperty { get; set; }
+            return new Thickness(-1.0);
         }
     }
-}
+
+    private static void _OnChromeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (DesignerProperties.GetIsInDesignMode(d))
+        {
+            return;
+        }
+        Window window = (Window) d;
+        WindowChrome windowChrome = (WindowChrome) e.NewValue;
+        WindowChromeWorker windowChromeWorker = WindowChromeWorker.GetWindowChromeWorker(window);
+        if (windowChromeWorker == null)
+        {
+            windowChromeWorker = new WindowChromeWorker();
+            WindowChromeWorker.SetWindowChromeWorker(window, windowChromeWorker);
+        }
+        windowChromeWorker.SetWindowChrome(windowChrome);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static WindowChrome GetWindowChrome(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        return (WindowChrome) window.GetValue(WindowChrome.WindowChromeProperty);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static void SetWindowChrome(Window window, WindowChrome chrome)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        window.SetValue(WindowChrome.WindowChromeProperty, chrome);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static bool GetIsHitTestVisibleInChrome(IInputElement inputElement)
+    {
+        Verify.IsNotNull<IInputElement>(inputElement, "inputElement");
+        DependencyObject dependencyObject = inputElement as DependencyObject;
+        if (dependencyObject == null)
+        {
+            throw new ArgumentException("The element must be a DependencyObject", "inputElement");
+        }
+        return (bool) dependencyObject.GetValue(WindowChrome.IsHitTestVisibleInChromeProperty);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+    public static void SetIsHitTestVisibleInChrome(IInputElement inputElement, bool hitTestVisible)
+    {
+        Verify.IsNotNull<IInputElement>(inputElement, "inputElement");
+        DependencyObject dependencyObject = inputElement as DependencyObject;
+        if (dependencyObject == null)
+        {
+            throw new ArgumentException("The element must be a DependencyObject", "inputElement");
+        }
+        dependencyObject.SetValue(WindowChrome.IsHitTestVisibleInChromeProperty, hitTestVisible);
+    }
+
+    public double CaptionHeight
+    {
+        get
+        {
+            return (double) base.GetValue(WindowChrome.CaptionHeightProperty);
+        }
+        set
+        {
+            base.SetValue(WindowChrome.CaptionHeightProperty, value);
+        }
+    }
+
+    public Thickness ResizeBorderThickness
+    {
+        get
+        {
+            return (Thickness) base.GetValue(WindowChrome.ResizeBorderThicknessProperty);
+        }
+        set
+        {
+            base.SetValue(WindowChrome.ResizeBorderThicknessProperty, value);
+        }
+    }
+
+    private static object _CoerceGlassFrameThickness(Thickness thickness)
+    {
+        if (!Utility.IsThicknessNonNegative(thickness))
+        {
+            return WindowChrome.GlassFrameCompleteThickness;
+        }
+        return thickness;
+    }
+
+    public Thickness GlassFrameThickness
+    {
+        get
+        {
+            return (Thickness) base.GetValue(WindowChrome.GlassFrameThicknessProperty);
+        }
+        set
+        {
+            base.SetValue(WindowChrome.GlassFrameThicknessProperty, value);
+        }
+    }
+
+    public CornerRadius CornerRadius
+    {
+        get
+        {
+            return (CornerRadius) base.GetValue(WindowChrome.CornerRadiusProperty);
+        }
+        set
+        {
+            base.SetValue(WindowChrome.CornerRadiusProperty, value);
+        }
+    }
+
+    protected override Freezable CreateInstanceCore()
+    {
+        return new WindowChrome();
+    }
+
+    public WindowChrome()
+    {
+        foreach (WindowChrome._SystemParameterBoundProperty systemParameterBoundProperty in WindowChrome._BoundProperties)
+        {
+            BindingOperations.SetBinding(this, systemParameterBoundProperty.DependencyProperty, new Binding
+            {
+                Source = SystemParameters2.Current,
+                Path = new PropertyPath(systemParameterBoundProperty.SystemParameterPropertyName, new object[0]),
+                Mode = BindingMode.OneWay,
+                UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged
+            });
+        }
+    }
+
+    private void _OnPropertyChangedThatRequiresRepaint()
+    {
+        EventHandler propertyChangedThatRequiresRepaint = this.PropertyChangedThatRequiresRepaint;
+        if (propertyChangedThatRequiresRepaint != null)
+        {
+            propertyChangedThatRequiresRepaint(this, EventArgs.Empty);
+        }
+    }
+
+    internal event EventHandler PropertyChangedThatRequiresRepaint;
+
+    public static readonly DependencyProperty WindowChromeProperty = DependencyProperty.RegisterAttached("WindowChrome", typeof(WindowChrome), typeof(WindowChrome), new PropertyMetadata(null, new PropertyChangedCallback(WindowChrome._OnChromeChanged)));
+
+    public static readonly DependencyProperty IsHitTestVisibleInChromeProperty = DependencyProperty.RegisterAttached("IsHitTestVisibleInChrome", typeof(bool), typeof(WindowChrome), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static readonly DependencyProperty CaptionHeightProperty = DependencyProperty.Register("CaptionHeight", typeof(double), typeof(WindowChrome), new PropertyMetadata(0.0, delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
+    }), (object value) => (double) value >= 0.0);
+
+    public static readonly DependencyProperty ResizeBorderThicknessProperty = DependencyProperty.Register("ResizeBorderThickness", typeof(Thickness), typeof(WindowChrome), new PropertyMetadata(default(Thickness)), (object value) => Utility.IsThicknessNonNegative((Thickness) value));
+
+    public static readonly DependencyProperty GlassFrameThicknessProperty = DependencyProperty.Register("GlassFrameThickness", typeof(Thickness), typeof(WindowChrome), new PropertyMetadata(default(Thickness), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
+    }, (DependencyObject d, object o) => WindowChrome._CoerceGlassFrameThickness((Thickness) o)));
+
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register("CornerRadius", typeof(CornerRadius), typeof(WindowChrome), new PropertyMetadata(default(CornerRadius), delegate (DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ((WindowChrome) d)._OnPropertyChangedThatRequiresRepaint();
+    }), (object value) => Utility.IsCornerRadiusValid((CornerRadius) value));
+
+    private static readonly List<WindowChrome._SystemParameterBoundProperty> _BoundProperties = new List<WindowChrome._SystemParameterBoundProperty>
+    {
+        new WindowChrome._SystemParameterBoundProperty
+        {
+            DependencyProperty = WindowChrome.CornerRadiusProperty,
+            SystemParameterPropertyName = "WindowCornerRadius"
+        },
+        new WindowChrome._SystemParameterBoundProperty
+        {
+            DependencyProperty = WindowChrome.CaptionHeightProperty,
+            SystemParameterPropertyName = "WindowCaptionHeight"
+        },
+        new WindowChrome._SystemParameterBoundProperty
+        {
+            DependencyProperty = WindowChrome.ResizeBorderThicknessProperty,
+            SystemParameterPropertyName = "WindowResizeBorderThickness"
+        },
+        new WindowChrome._SystemParameterBoundProperty
+        {
+            DependencyProperty = WindowChrome.GlassFrameThicknessProperty,
+            SystemParameterPropertyName = "WindowNonClientFrameThickness"
+        }
+    };
+
+    private struct _SystemParameterBoundProperty
+    {
+        public string SystemParameterPropertyName { get; set; }
+
+        public DependencyProperty DependencyProperty { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs b/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
index 522c4292..5112c6c9 100644
--- a/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
+++ b/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
@@ -9,805 +9,804 @@ using System.Windows.Media;
 using System.Windows.Threading;
 using Standard;
 
-namespace Microsoft.Windows.Shell
-{
-    internal class WindowChromeWorker : DependencyObject
-    {
-        public WindowChromeWorker()
-        {
-            this._messageTable = new List<KeyValuePair<WM, MessageHandler>>
-            {
-                new KeyValuePair<WM, MessageHandler>(WM.SETTEXT, new MessageHandler(this._HandleSetTextOrIcon)),
-                new KeyValuePair<WM, MessageHandler>(WM.SETICON, new MessageHandler(this._HandleSetTextOrIcon)),
-                new KeyValuePair<WM, MessageHandler>(WM.NCACTIVATE, new MessageHandler(this._HandleNCActivate)),
-                new KeyValuePair<WM, MessageHandler>(WM.NCCALCSIZE, new MessageHandler(this._HandleNCCalcSize)),
-                new KeyValuePair<WM, MessageHandler>(WM.NCHITTEST, new MessageHandler(this._HandleNCHitTest)),
-                new KeyValuePair<WM, MessageHandler>(WM.NCRBUTTONUP, new MessageHandler(this._HandleNCRButtonUp)),
-                new KeyValuePair<WM, MessageHandler>(WM.SIZE, new MessageHandler(this._HandleSize)),
-                new KeyValuePair<WM, MessageHandler>(WM.WINDOWPOSCHANGED, new MessageHandler(this._HandleWindowPosChanged)),
-                new KeyValuePair<WM, MessageHandler>(WM.DWMCOMPOSITIONCHANGED, new MessageHandler(this._HandleDwmCompositionChanged))
-            };
-            if (Utility.IsPresentationFrameworkVersionLessThan4)
-            {
-                this._messageTable.AddRange(new KeyValuePair<WM, MessageHandler>[]
-                {
-                    new KeyValuePair<WM, MessageHandler>(WM.WININICHANGE, new MessageHandler(this._HandleSettingChange)),
-                    new KeyValuePair<WM, MessageHandler>(WM.ENTERSIZEMOVE, new MessageHandler(this._HandleEnterSizeMove)),
-                    new KeyValuePair<WM, MessageHandler>(WM.EXITSIZEMOVE, new MessageHandler(this._HandleExitSizeMove)),
-                    new KeyValuePair<WM, MessageHandler>(WM.MOVE, new MessageHandler(this._HandleMove))
-                });
-            }
-        }
+namespace Microsoft.Windows.Shell;
 
-        public void SetWindowChrome(WindowChrome newChrome)
+internal class WindowChromeWorker : DependencyObject
+{
+    public WindowChromeWorker()
+    {
+        this._messageTable = new List<KeyValuePair<WM, MessageHandler>>
         {
-            base.VerifyAccess();
-            if (newChrome == this._chromeInfo)
+            new KeyValuePair<WM, MessageHandler>(WM.SETTEXT, new MessageHandler(this._HandleSetTextOrIcon)),
+            new KeyValuePair<WM, MessageHandler>(WM.SETICON, new MessageHandler(this._HandleSetTextOrIcon)),
+            new KeyValuePair<WM, MessageHandler>(WM.NCACTIVATE, new MessageHandler(this._HandleNCActivate)),
+            new KeyValuePair<WM, MessageHandler>(WM.NCCALCSIZE, new MessageHandler(this._HandleNCCalcSize)),
+            new KeyValuePair<WM, MessageHandler>(WM.NCHITTEST, new MessageHandler(this._HandleNCHitTest)),
+            new KeyValuePair<WM, MessageHandler>(WM.NCRBUTTONUP, new MessageHandler(this._HandleNCRButtonUp)),
+            new KeyValuePair<WM, MessageHandler>(WM.SIZE, new MessageHandler(this._HandleSize)),
+            new KeyValuePair<WM, MessageHandler>(WM.WINDOWPOSCHANGED, new MessageHandler(this._HandleWindowPosChanged)),
+            new KeyValuePair<WM, MessageHandler>(WM.DWMCOMPOSITIONCHANGED, new MessageHandler(this._HandleDwmCompositionChanged))
+        };
+        if (Utility.IsPresentationFrameworkVersionLessThan4)
+        {
+            this._messageTable.AddRange(new KeyValuePair<WM, MessageHandler>[]
             {
+                new KeyValuePair<WM, MessageHandler>(WM.WININICHANGE, new MessageHandler(this._HandleSettingChange)),
+                new KeyValuePair<WM, MessageHandler>(WM.ENTERSIZEMOVE, new MessageHandler(this._HandleEnterSizeMove)),
+                new KeyValuePair<WM, MessageHandler>(WM.EXITSIZEMOVE, new MessageHandler(this._HandleExitSizeMove)),
+                new KeyValuePair<WM, MessageHandler>(WM.MOVE, new MessageHandler(this._HandleMove))
+            });
+        }
+    }
+
+    public void SetWindowChrome(WindowChrome newChrome)
+    {
+        base.VerifyAccess();
+        if (newChrome == this._chromeInfo)
+        {
+            return;
+        }
+        if (this._chromeInfo != null)
+        {
+            this._chromeInfo.PropertyChangedThatRequiresRepaint -= this._OnChromePropertyChangedThatRequiresRepaint;
+        }
+        this._chromeInfo = newChrome;
+        if (this._chromeInfo != null)
+        {
+            this._chromeInfo.PropertyChangedThatRequiresRepaint += this._OnChromePropertyChangedThatRequiresRepaint;
+        }
+        this._ApplyNewCustomChrome();
+    }
+
+    private void _OnChromePropertyChangedThatRequiresRepaint(object sender, EventArgs e)
+    {
+        this._UpdateFrameState(true);
+    }
+
+    private static void _OnChromeWorkerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        Window window = (Window) d;
+        WindowChromeWorker windowChromeWorker = (WindowChromeWorker) e.NewValue;
+        windowChromeWorker._SetWindow(window);
+    }
+
+    private void _SetWindow(Window window)
+    {
+        this._window = window;
+        this._hwnd = new WindowInteropHelper(this._window).Handle;
+        if (Utility.IsPresentationFrameworkVersionLessThan4)
+        {
+            Utility.AddDependencyPropertyChangeListener(this._window, Control.TemplateProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
+            Utility.AddDependencyPropertyChangeListener(this._window, FrameworkElement.FlowDirectionProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
+        }
+        this._window.Closed += this._UnsetWindow;
+        if (IntPtr.Zero != this._hwnd)
+        {
+            this._hwndSource = HwndSource.FromHwnd(this._hwnd);
+            this._window.ApplyTemplate();
+            if (this._chromeInfo != null)
+            {
+                this._ApplyNewCustomChrome();
                 return;
             }
-            if (this._chromeInfo != null)
-            {
-                this._chromeInfo.PropertyChangedThatRequiresRepaint -= this._OnChromePropertyChangedThatRequiresRepaint;
-            }
-            this._chromeInfo = newChrome;
-            if (this._chromeInfo != null)
-            {
-                this._chromeInfo.PropertyChangedThatRequiresRepaint += this._OnChromePropertyChangedThatRequiresRepaint;
-            }
-            this._ApplyNewCustomChrome();
         }
-
-        private void _OnChromePropertyChangedThatRequiresRepaint(object sender, EventArgs e)
+        else
         {
-            this._UpdateFrameState(true);
-        }
-
-        private static void _OnChromeWorkerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            Window window = (Window) d;
-            WindowChromeWorker windowChromeWorker = (WindowChromeWorker) e.NewValue;
-            windowChromeWorker._SetWindow(window);
-        }
-
-        private void _SetWindow(Window window)
-        {
-            this._window = window;
-            this._hwnd = new WindowInteropHelper(this._window).Handle;
-            if (Utility.IsPresentationFrameworkVersionLessThan4)
-            {
-                Utility.AddDependencyPropertyChangeListener(this._window, Control.TemplateProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
-                Utility.AddDependencyPropertyChangeListener(this._window, FrameworkElement.FlowDirectionProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
-            }
-            this._window.Closed += this._UnsetWindow;
-            if (IntPtr.Zero != this._hwnd)
+            this._window.SourceInitialized += delegate (object sender, EventArgs e)
             {
+                this._hwnd = new WindowInteropHelper(this._window).Handle;
                 this._hwndSource = HwndSource.FromHwnd(this._hwnd);
-                this._window.ApplyTemplate();
                 if (this._chromeInfo != null)
                 {
                     this._ApplyNewCustomChrome();
-                    return;
                 }
-            }
-            else
-            {
-                this._window.SourceInitialized += delegate (object sender, EventArgs e)
-                {
-                    this._hwnd = new WindowInteropHelper(this._window).Handle;
-                    this._hwndSource = HwndSource.FromHwnd(this._hwnd);
-                    if (this._chromeInfo != null)
-                    {
-                        this._ApplyNewCustomChrome();
-                    }
-                };
-            }
+            };
         }
+    }
 
-        private void _UnsetWindow(object sender, EventArgs e)
+    private void _UnsetWindow(object sender, EventArgs e)
+    {
+        if (Utility.IsPresentationFrameworkVersionLessThan4)
         {
-            if (Utility.IsPresentationFrameworkVersionLessThan4)
+            Utility.RemoveDependencyPropertyChangeListener(this._window, Control.TemplateProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
+            Utility.RemoveDependencyPropertyChangeListener(this._window, FrameworkElement.FlowDirectionProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
+        }
+        if (this._chromeInfo != null)
+        {
+            this._chromeInfo.PropertyChangedThatRequiresRepaint -= this._OnChromePropertyChangedThatRequiresRepaint;
+        }
+        this._RestoreStandardChromeState(true);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    public static WindowChromeWorker GetWindowChromeWorker(Window window)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        return (WindowChromeWorker) window.GetValue(WindowChromeWorker.WindowChromeWorkerProperty);
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    public static void SetWindowChromeWorker(Window window, WindowChromeWorker chrome)
+    {
+        Verify.IsNotNull<Window>(window, "window");
+        window.SetValue(WindowChromeWorker.WindowChromeWorkerProperty, chrome);
+    }
+
+    private void _OnWindowPropertyChangedThatRequiresTemplateFixup(object sender, EventArgs e)
+    {
+        if (this._chromeInfo != null && this._hwnd != IntPtr.Zero)
+        {
+            this._window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupFrameworkIssues));
+        }
+    }
+
+    private void _ApplyNewCustomChrome()
+    {
+        if (this._hwnd == IntPtr.Zero)
+        {
+            return;
+        }
+        if (this._chromeInfo == null)
+        {
+            this._RestoreStandardChromeState(false);
+            return;
+        }
+        if (!this._isHooked)
+        {
+            this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
+            this._isHooked = true;
+        }
+        this._FixupFrameworkIssues();
+        this._UpdateSystemMenu(new WindowState?(this._window.WindowState));
+        this._UpdateFrameState(true);
+        NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
+    }
+
+    private void _FixupFrameworkIssues()
+    {
+        if (!Utility.IsPresentationFrameworkVersionLessThan4)
+        {
+            return;
+        }
+        if (this._window.Template == null)
+        {
+            return;
+        }
+        if (VisualTreeHelper.GetChildrenCount(this._window) == 0)
+        {
+            this._window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupFrameworkIssues));
+            return;
+        }
+        FrameworkElement frameworkElement = (FrameworkElement) VisualTreeHelper.GetChild(this._window, 0);
+        RECT windowRect = NativeMethods.GetWindowRect(this._hwnd);
+        RECT rect = this._GetAdjustedWindowRect(windowRect);
+        Rect rect2 = DpiHelper.DeviceRectToLogical(new Rect((double) windowRect.Left, (double) windowRect.Top, (double) windowRect.Width, (double) windowRect.Height));
+        Rect rect3 = DpiHelper.DeviceRectToLogical(new Rect((double) rect.Left, (double) rect.Top, (double) rect.Width, (double) rect.Height));
+        Thickness thickness = new Thickness(rect2.Left - rect3.Left, rect2.Top - rect3.Top, rect3.Right - rect2.Right, rect3.Bottom - rect2.Bottom);
+        frameworkElement.Margin = new Thickness(0.0, 0.0, -(thickness.Left + thickness.Right), -(thickness.Top + thickness.Bottom));
+        if (this._window.FlowDirection == FlowDirection.RightToLeft)
+        {
+            frameworkElement.RenderTransform = new MatrixTransform(1.0, 0.0, 0.0, 1.0, -(thickness.Left + thickness.Right), 0.0);
+        }
+        else
+        {
+            frameworkElement.RenderTransform = null;
+        }
+        if (!this._isFixedUp)
+        {
+            this._hasUserMovedWindow = false;
+            this._window.StateChanged += this._FixupRestoreBounds;
+            this._isFixedUp = true;
+        }
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+    private void _FixupWindows7Issues()
+    {
+        if (this._blackGlassFixupAttemptCount > 5)
+        {
+            return;
+        }
+        if (Utility.IsOSWindows7OrNewer && NativeMethods.DwmIsCompositionEnabled())
+        {
+            this._blackGlassFixupAttemptCount++;
+            bool flag = false;
+            try
             {
-                Utility.RemoveDependencyPropertyChangeListener(this._window, Control.TemplateProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
-                Utility.RemoveDependencyPropertyChangeListener(this._window, FrameworkElement.FlowDirectionProperty, new EventHandler(this._OnWindowPropertyChangedThatRequiresTemplateFixup));
+                flag = (NativeMethods.DwmGetCompositionTimingInfo(this._hwnd) != null);
             }
-            if (this._chromeInfo != null)
+            catch (Exception)
             {
-                this._chromeInfo.PropertyChangedThatRequiresRepaint -= this._OnChromePropertyChangedThatRequiresRepaint;
             }
-            this._RestoreStandardChromeState(true);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public static WindowChromeWorker GetWindowChromeWorker(Window window)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            return (WindowChromeWorker) window.GetValue(WindowChromeWorker.WindowChromeWorkerProperty);
-        }
-
-        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
-        public static void SetWindowChromeWorker(Window window, WindowChromeWorker chrome)
-        {
-            Verify.IsNotNull<Window>(window, "window");
-            window.SetValue(WindowChromeWorker.WindowChromeWorkerProperty, chrome);
-        }
-
-        private void _OnWindowPropertyChangedThatRequiresTemplateFixup(object sender, EventArgs e)
-        {
-            if (this._chromeInfo != null && this._hwnd != IntPtr.Zero)
-            {
-                this._window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupFrameworkIssues));
-            }
-        }
-
-        private void _ApplyNewCustomChrome()
-        {
-            if (this._hwnd == IntPtr.Zero)
+            if (!flag)
             {
+                base.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupWindows7Issues));
                 return;
             }
-            if (this._chromeInfo == null)
-            {
-                this._RestoreStandardChromeState(false);
-                return;
-            }
-            if (!this._isHooked)
-            {
-                this._hwndSource.AddHook(new HwndSourceHook(this._WndProc));
-                this._isHooked = true;
-            }
-            this._FixupFrameworkIssues();
-            this._UpdateSystemMenu(new WindowState?(this._window.WindowState));
-            this._UpdateFrameState(true);
-            NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
+            this._blackGlassFixupAttemptCount = 0;
         }
+    }
 
-        private void _FixupFrameworkIssues()
+    private void _FixupRestoreBounds(object sender, EventArgs e)
+    {
+        if ((this._window.WindowState == WindowState.Maximized || this._window.WindowState == WindowState.Minimized) && this._hasUserMovedWindow)
         {
-            if (!Utility.IsPresentationFrameworkVersionLessThan4)
+            this._hasUserMovedWindow = false;
+            WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
+            RECT rect = this._GetAdjustedWindowRect(new RECT
             {
-                return;
+                Bottom = 100,
+                Right = 100
+            });
+            Point point = DpiHelper.DevicePixelsToLogical(new Point((double) (windowPlacement.rcNormalPosition.Left - rect.Left), (double) (windowPlacement.rcNormalPosition.Top - rect.Top)));
+            this._window.Top = point.Y;
+            this._window.Left = point.X;
+        }
+    }
+
+    private RECT _GetAdjustedWindowRect(RECT rcWindow)
+    {
+        WS dwStyle = (WS) ((int) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE));
+        WS_EX dwExStyle = (WS_EX) ((int) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.EXSTYLE));
+        return NativeMethods.AdjustWindowRectEx(rcWindow, dwStyle, false, dwExStyle);
+    }
+
+    private bool _IsWindowDocked
+    {
+        get
+        {
+            if (this._window.WindowState != WindowState.Normal)
+            {
+                return false;
             }
-            if (this._window.Template == null)
+            RECT rect = this._GetAdjustedWindowRect(new RECT
             {
-                return;
-            }
-            if (VisualTreeHelper.GetChildrenCount(this._window) == 0)
+                Bottom = 100,
+                Right = 100
+            });
+            Point point = new Point(this._window.Left, this._window.Top);
+            point -= (Vector) DpiHelper.DevicePixelsToLogical(new Point((double) rect.Left, (double) rect.Top));
+            return this._window.RestoreBounds.Location != point;
+        }
+    }
+
+    private IntPtr _WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+    {
+        foreach (KeyValuePair<WM, MessageHandler> keyValuePair in this._messageTable)
+        {
+            if (keyValuePair.Key == (WM) msg)
             {
-                this._window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupFrameworkIssues));
-                return;
-            }
-            FrameworkElement frameworkElement = (FrameworkElement) VisualTreeHelper.GetChild(this._window, 0);
-            RECT windowRect = NativeMethods.GetWindowRect(this._hwnd);
-            RECT rect = this._GetAdjustedWindowRect(windowRect);
-            Rect rect2 = DpiHelper.DeviceRectToLogical(new Rect((double) windowRect.Left, (double) windowRect.Top, (double) windowRect.Width, (double) windowRect.Height));
-            Rect rect3 = DpiHelper.DeviceRectToLogical(new Rect((double) rect.Left, (double) rect.Top, (double) rect.Width, (double) rect.Height));
-            Thickness thickness = new Thickness(rect2.Left - rect3.Left, rect2.Top - rect3.Top, rect3.Right - rect2.Right, rect3.Bottom - rect2.Bottom);
-            frameworkElement.Margin = new Thickness(0.0, 0.0, -(thickness.Left + thickness.Right), -(thickness.Top + thickness.Bottom));
-            if (this._window.FlowDirection == FlowDirection.RightToLeft)
-            {
-                frameworkElement.RenderTransform = new MatrixTransform(1.0, 0.0, 0.0, 1.0, -(thickness.Left + thickness.Right), 0.0);
-            }
-            else
-            {
-                frameworkElement.RenderTransform = null;
-            }
-            if (!this._isFixedUp)
-            {
-                this._hasUserMovedWindow = false;
-                this._window.StateChanged += this._FixupRestoreBounds;
-                this._isFixedUp = true;
+                return keyValuePair.Value((WM) msg, wParam, lParam, out handled);
             }
         }
+        return IntPtr.Zero;
+    }
 
-        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
-        private void _FixupWindows7Issues()
+    private IntPtr _HandleSetTextOrIcon(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        bool flag = this._ModifyStyle(WS.VISIBLE, WS.OVERLAPPED);
+        IntPtr result = NativeMethods.DefWindowProc(this._hwnd, uMsg, wParam, lParam);
+        if (flag)
         {
-            if (this._blackGlassFixupAttemptCount > 5)
-            {
-                return;
-            }
-            if (Utility.IsOSWindows7OrNewer && NativeMethods.DwmIsCompositionEnabled())
-            {
-                this._blackGlassFixupAttemptCount++;
-                bool flag = false;
-                try
-                {
-                    flag = (NativeMethods.DwmGetCompositionTimingInfo(this._hwnd) != null);
-                }
-                catch (Exception)
-                {
-                }
-                if (!flag)
-                {
-                    base.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new WindowChromeWorker._Action(this._FixupWindows7Issues));
-                    return;
-                }
-                this._blackGlassFixupAttemptCount = 0;
-            }
+            this._ModifyStyle(WS.OVERLAPPED, WS.VISIBLE);
         }
+        handled = true;
+        return result;
+    }
 
-        private void _FixupRestoreBounds(object sender, EventArgs e)
+    private IntPtr _HandleNCActivate(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        IntPtr result = NativeMethods.DefWindowProc(this._hwnd, WM.NCACTIVATE, wParam, new IntPtr(-1));
+        handled = true;
+        return result;
+    }
+
+    private IntPtr _HandleNCCalcSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        handled = true;
+        return new IntPtr(768);
+    }
+
+    private IntPtr _HandleNCHitTest(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        IntPtr intPtr = IntPtr.Zero;
+        handled = false;
+        if (Utility.IsOSVistaOrNewer && this._chromeInfo.GlassFrameThickness != default(Thickness) && this._isGlassEnabled)
         {
-            if ((this._window.WindowState == WindowState.Maximized || this._window.WindowState == WindowState.Minimized) && this._hasUserMovedWindow)
-            {
-                this._hasUserMovedWindow = false;
-                WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
-                RECT rect = this._GetAdjustedWindowRect(new RECT
-                {
-                    Bottom = 100,
-                    Right = 100
-                });
-                Point point = DpiHelper.DevicePixelsToLogical(new Point((double) (windowPlacement.rcNormalPosition.Left - rect.Left), (double) (windowPlacement.rcNormalPosition.Top - rect.Top)));
-                this._window.Top = point.Y;
-                this._window.Left = point.X;
-            }
+            handled = NativeMethods.DwmDefWindowProc(this._hwnd, uMsg, wParam, lParam, out intPtr);
         }
-
-        private RECT _GetAdjustedWindowRect(RECT rcWindow)
+        if (IntPtr.Zero == intPtr)
         {
-            WS dwStyle = (WS) ((int) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE));
-            WS_EX dwExStyle = (WS_EX) ((int) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.EXSTYLE));
-            return NativeMethods.AdjustWindowRectEx(rcWindow, dwStyle, false, dwExStyle);
-        }
-
-        private bool _IsWindowDocked
-        {
-            get
+            Point point = new Point((double) Utility.GET_X_LPARAM(lParam), (double) Utility.GET_Y_LPARAM(lParam));
+            Rect deviceRectangle = this._GetWindowRect();
+            HT ht = this._HitTestNca(DpiHelper.DeviceRectToLogical(deviceRectangle), DpiHelper.DevicePixelsToLogical(point));
+            if (ht != HT.CLIENT)
             {
-                if (this._window.WindowState != WindowState.Normal)
+                Point point2 = point;
+                point2.Offset(-deviceRectangle.X, -deviceRectangle.Y);
+                point2 = DpiHelper.DevicePixelsToLogical(point2);
+                IInputElement inputElement = this._window.InputHitTest(point2);
+                if (inputElement != null && WindowChrome.GetIsHitTestVisibleInChrome(inputElement))
                 {
-                    return false;
-                }
-                RECT rect = this._GetAdjustedWindowRect(new RECT
-                {
-                    Bottom = 100,
-                    Right = 100
-                });
-                Point point = new Point(this._window.Left, this._window.Top);
-                point -= (Vector) DpiHelper.DevicePixelsToLogical(new Point((double) rect.Left, (double) rect.Top));
-                return this._window.RestoreBounds.Location != point;
-            }
-        }
-
-        private IntPtr _WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            foreach (KeyValuePair<WM, MessageHandler> keyValuePair in this._messageTable)
-            {
-                if (keyValuePair.Key == (WM) msg)
-                {
-                    return keyValuePair.Value((WM) msg, wParam, lParam, out handled);
+                    ht = HT.CLIENT;
                 }
             }
-            return IntPtr.Zero;
+            handled = true;
+            intPtr = new IntPtr((int) ht);
         }
+        return intPtr;
+    }
 
-        private IntPtr _HandleSetTextOrIcon(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    private IntPtr _HandleNCRButtonUp(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        if (2 == wParam.ToInt32())
         {
+            SystemCommands.ShowSystemMenuPhysicalCoordinates(this._window, new Point((double) Utility.GET_X_LPARAM(lParam), (double) Utility.GET_Y_LPARAM(lParam)));
+        }
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        WindowState? assumeState = null;
+        if (wParam.ToInt32() == 2)
+        {
+            assumeState = new WindowState?(WindowState.Maximized);
+        }
+        this._UpdateSystemMenu(assumeState);
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleWindowPosChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        this._UpdateSystemMenu(null);
+        if (!this._isGlassEnabled)
+        {
+            WINDOWPOS value = (WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(WINDOWPOS));
+            this._SetRoundingRegion(new WINDOWPOS?(value));
+        }
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleDwmCompositionChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        this._UpdateFrameState(false);
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleSettingChange(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        this._FixupFrameworkIssues();
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleEnterSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        this._isUserResizing = true;
+        if (this._window.WindowState != WindowState.Maximized && !this._IsWindowDocked)
+        {
+            this._windowPosAtStartOfUserMove = new Point(this._window.Left, this._window.Top);
+        }
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleExitSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        this._isUserResizing = false;
+        if (this._window.WindowState == WindowState.Maximized)
+        {
+            this._window.Top = this._windowPosAtStartOfUserMove.Y;
+            this._window.Left = this._windowPosAtStartOfUserMove.X;
+        }
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private IntPtr _HandleMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    {
+        if (this._isUserResizing)
+        {
+            this._hasUserMovedWindow = true;
+        }
+        handled = false;
+        return IntPtr.Zero;
+    }
+
+    private bool _ModifyStyle(WS removeStyle, WS addStyle)
+    {
+        WS ws = (WS) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE).ToInt32();
+        WS ws2 = (ws & ~removeStyle) | addStyle;
+        if (ws == ws2)
+        {
+            return false;
+        }
+        NativeMethods.SetWindowLongPtr(this._hwnd, GWL.STYLE, new IntPtr((int) ws2));
+        return true;
+    }
+
+    private WindowState _GetHwndState()
+    {
+        WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
+        return windowPlacement.showCmd switch
+        {
+            SW.SHOWMINIMIZED => WindowState.Minimized,
+            SW.SHOWMAXIMIZED => WindowState.Maximized,
+            _ => WindowState.Normal
+        };
+    }
+
+    private Rect _GetWindowRect()
+    {
+        RECT windowRect = NativeMethods.GetWindowRect(this._hwnd);
+        return new Rect((double) windowRect.Left, (double) windowRect.Top, (double) windowRect.Width, (double) windowRect.Height);
+    }
+
+    private void _UpdateSystemMenu(WindowState? assumeState)
+    {
+        WindowState windowState = assumeState ?? this._GetHwndState();
+        if (assumeState != null || this._lastMenuState != windowState)
+        {
+            this._lastMenuState = windowState;
             bool flag = this._ModifyStyle(WS.VISIBLE, WS.OVERLAPPED);
-            IntPtr result = NativeMethods.DefWindowProc(this._hwnd, uMsg, wParam, lParam);
+            IntPtr systemMenu = NativeMethods.GetSystemMenu(this._hwnd, false);
+            if (IntPtr.Zero != systemMenu)
+            {
+                WS value = (WS) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE).ToInt32();
+                bool flag2 = Utility.IsFlagSet((int) value, 131072);
+                bool flag3 = Utility.IsFlagSet((int) value, 65536);
+                bool flag4 = Utility.IsFlagSet((int) value, 262144);
+                switch (windowState)
+                {
+                    case WindowState.Minimized:
+                        NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.ENABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, flag3 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
+                        break;
+                    case WindowState.Maximized:
+                        NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.ENABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, flag2 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, MF.GRAYED | MF.DISABLED);
+                        break;
+                    default:
+                        NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.GRAYED | MF.DISABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.ENABLED);
+                        NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, flag4 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, flag2 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
+                        NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, flag3 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
+                        break;
+                }
+            }
             if (flag)
             {
                 this._ModifyStyle(WS.OVERLAPPED, WS.VISIBLE);
             }
-            handled = true;
-            return result;
         }
+    }
 
-        private IntPtr _HandleNCActivate(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+    private void _UpdateFrameState(bool force)
+    {
+        if (IntPtr.Zero == this._hwnd)
         {
-            IntPtr result = NativeMethods.DefWindowProc(this._hwnd, WM.NCACTIVATE, wParam, new IntPtr(-1));
-            handled = true;
-            return result;
+            return;
         }
-
-        private IntPtr _HandleNCCalcSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        bool flag = NativeMethods.DwmIsCompositionEnabled();
+        if (force || flag != this._isGlassEnabled)
         {
-            handled = true;
-            return new IntPtr(768);
-        }
-
-        private IntPtr _HandleNCHitTest(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            IntPtr intPtr = IntPtr.Zero;
-            handled = false;
-            if (Utility.IsOSVistaOrNewer && this._chromeInfo.GlassFrameThickness != default(Thickness) && this._isGlassEnabled)
-            {
-                handled = NativeMethods.DwmDefWindowProc(this._hwnd, uMsg, wParam, lParam, out intPtr);
-            }
-            if (IntPtr.Zero == intPtr)
-            {
-                Point point = new Point((double) Utility.GET_X_LPARAM(lParam), (double) Utility.GET_Y_LPARAM(lParam));
-                Rect deviceRectangle = this._GetWindowRect();
-                HT ht = this._HitTestNca(DpiHelper.DeviceRectToLogical(deviceRectangle), DpiHelper.DevicePixelsToLogical(point));
-                if (ht != HT.CLIENT)
-                {
-                    Point point2 = point;
-                    point2.Offset(-deviceRectangle.X, -deviceRectangle.Y);
-                    point2 = DpiHelper.DevicePixelsToLogical(point2);
-                    IInputElement inputElement = this._window.InputHitTest(point2);
-                    if (inputElement != null && WindowChrome.GetIsHitTestVisibleInChrome(inputElement))
-                    {
-                        ht = HT.CLIENT;
-                    }
-                }
-                handled = true;
-                intPtr = new IntPtr((int) ht);
-            }
-            return intPtr;
-        }
-
-        private IntPtr _HandleNCRButtonUp(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            if (2 == wParam.ToInt32())
-            {
-                SystemCommands.ShowSystemMenuPhysicalCoordinates(this._window, new Point((double) Utility.GET_X_LPARAM(lParam), (double) Utility.GET_Y_LPARAM(lParam)));
-            }
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            WindowState? assumeState = null;
-            if (wParam.ToInt32() == 2)
-            {
-                assumeState = new WindowState?(WindowState.Maximized);
-            }
-            this._UpdateSystemMenu(assumeState);
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleWindowPosChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            this._UpdateSystemMenu(null);
+            this._isGlassEnabled = (flag && this._chromeInfo.GlassFrameThickness != default(Thickness));
             if (!this._isGlassEnabled)
             {
-                WINDOWPOS value = (WINDOWPOS) Marshal.PtrToStructure(lParam, typeof(WINDOWPOS));
-                this._SetRoundingRegion(new WINDOWPOS?(value));
-            }
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleDwmCompositionChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            this._UpdateFrameState(false);
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleSettingChange(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            this._FixupFrameworkIssues();
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleEnterSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            this._isUserResizing = true;
-            if (this._window.WindowState != WindowState.Maximized && !this._IsWindowDocked)
-            {
-                this._windowPosAtStartOfUserMove = new Point(this._window.Left, this._window.Top);
-            }
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleExitSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            this._isUserResizing = false;
-            if (this._window.WindowState == WindowState.Maximized)
-            {
-                this._window.Top = this._windowPosAtStartOfUserMove.Y;
-                this._window.Left = this._windowPosAtStartOfUserMove.X;
-            }
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private IntPtr _HandleMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
-        {
-            if (this._isUserResizing)
-            {
-                this._hasUserMovedWindow = true;
-            }
-            handled = false;
-            return IntPtr.Zero;
-        }
-
-        private bool _ModifyStyle(WS removeStyle, WS addStyle)
-        {
-            WS ws = (WS) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE).ToInt32();
-            WS ws2 = (ws & ~removeStyle) | addStyle;
-            if (ws == ws2)
-            {
-                return false;
-            }
-            NativeMethods.SetWindowLongPtr(this._hwnd, GWL.STYLE, new IntPtr((int) ws2));
-            return true;
-        }
-
-        private WindowState _GetHwndState()
-        {
-            WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
-            return windowPlacement.showCmd switch
-            {
-                SW.SHOWMINIMIZED => WindowState.Minimized,
-                SW.SHOWMAXIMIZED => WindowState.Maximized,
-                _ => WindowState.Normal
-            };
-        }
-
-        private Rect _GetWindowRect()
-        {
-            RECT windowRect = NativeMethods.GetWindowRect(this._hwnd);
-            return new Rect((double) windowRect.Left, (double) windowRect.Top, (double) windowRect.Width, (double) windowRect.Height);
-        }
-
-        private void _UpdateSystemMenu(WindowState? assumeState)
-        {
-            WindowState windowState = assumeState ?? this._GetHwndState();
-            if (assumeState != null || this._lastMenuState != windowState)
-            {
-                this._lastMenuState = windowState;
-                bool flag = this._ModifyStyle(WS.VISIBLE, WS.OVERLAPPED);
-                IntPtr systemMenu = NativeMethods.GetSystemMenu(this._hwnd, false);
-                if (IntPtr.Zero != systemMenu)
-                {
-                    WS value = (WS) NativeMethods.GetWindowLongPtr(this._hwnd, GWL.STYLE).ToInt32();
-                    bool flag2 = Utility.IsFlagSet((int) value, 131072);
-                    bool flag3 = Utility.IsFlagSet((int) value, 65536);
-                    bool flag4 = Utility.IsFlagSet((int) value, 262144);
-                    switch (windowState)
-                    {
-                        case WindowState.Minimized:
-                            NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.ENABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, flag3 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
-                            break;
-                        case WindowState.Maximized:
-                            NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.ENABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, flag2 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, MF.GRAYED | MF.DISABLED);
-                            break;
-                        default:
-                            NativeMethods.EnableMenuItem(systemMenu, SC.RESTORE, MF.GRAYED | MF.DISABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MOVE, MF.ENABLED);
-                            NativeMethods.EnableMenuItem(systemMenu, SC.SIZE, flag4 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MINIMIZE, flag2 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
-                            NativeMethods.EnableMenuItem(systemMenu, SC.MAXIMIZE, flag3 ? MF.ENABLED : (MF.GRAYED | MF.DISABLED));
-                            break;
-                    }
-                }
-                if (flag)
-                {
-                    this._ModifyStyle(WS.OVERLAPPED, WS.VISIBLE);
-                }
-            }
-        }
-
-        private void _UpdateFrameState(bool force)
-        {
-            if (IntPtr.Zero == this._hwnd)
-            {
-                return;
-            }
-            bool flag = NativeMethods.DwmIsCompositionEnabled();
-            if (force || flag != this._isGlassEnabled)
-            {
-                this._isGlassEnabled = (flag && this._chromeInfo.GlassFrameThickness != default(Thickness));
-                if (!this._isGlassEnabled)
-                {
-                    this._SetRoundingRegion(null);
-                }
-                else
-                {
-                    this._ClearRoundingRegion();
-                    this._ExtendGlassFrame();
-                    this._FixupWindows7Issues();
-                }
-                NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
-            }
-        }
-
-        private void _ClearRoundingRegion()
-        {
-            NativeMethods.SetWindowRgn(this._hwnd, IntPtr.Zero, NativeMethods.IsWindowVisible(this._hwnd));
-        }
-
-        private void _SetRoundingRegion(WINDOWPOS? wp)
-        {
-            WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
-            if (windowPlacement.showCmd == SW.SHOWMAXIMIZED)
-            {
-                int num;
-                int num2;
-                if (wp != null)
-                {
-                    num = wp.Value.x;
-                    num2 = wp.Value.y;
-                }
-                else
-                {
-                    Rect rect = this._GetWindowRect();
-                    num = (int) rect.Left;
-                    num2 = (int) rect.Top;
-                }
-                IntPtr hMonitor = NativeMethods.MonitorFromWindow(this._hwnd, 2u);
-                MONITORINFO monitorInfo = NativeMethods.GetMonitorInfo(hMonitor);
-                RECT rcWork = monitorInfo.rcWork;
-                rcWork.Offset(-num, -num2);
-                IntPtr hRgn = IntPtr.Zero;
-                try
-                {
-                    hRgn = NativeMethods.CreateRectRgnIndirect(rcWork);
-                    NativeMethods.SetWindowRgn(this._hwnd, hRgn, NativeMethods.IsWindowVisible(this._hwnd));
-                    hRgn = IntPtr.Zero;
-                    return;
-                }
-                finally
-                {
-                    Utility.SafeDeleteObject(ref hRgn);
-                }
-            }
-            Size size;
-            if (wp != null && !Utility.IsFlagSet(wp.Value.flags, 1))
-            {
-                size = new Size((double) wp.Value.cx, (double) wp.Value.cy);
+                this._SetRoundingRegion(null);
             }
             else
             {
-                if (wp != null && this._lastRoundingState == this._window.WindowState)
-                {
-                    return;
-                }
-                size = this._GetWindowRect().Size;
+                this._ClearRoundingRegion();
+                this._ExtendGlassFrame();
+                this._FixupWindows7Issues();
             }
-            this._lastRoundingState = this._window.WindowState;
-            IntPtr intPtr = IntPtr.Zero;
+            NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
+        }
+    }
+
+    private void _ClearRoundingRegion()
+    {
+        NativeMethods.SetWindowRgn(this._hwnd, IntPtr.Zero, NativeMethods.IsWindowVisible(this._hwnd));
+    }
+
+    private void _SetRoundingRegion(WINDOWPOS? wp)
+    {
+        WINDOWPLACEMENT windowPlacement = NativeMethods.GetWindowPlacement(this._hwnd);
+        if (windowPlacement.showCmd == SW.SHOWMAXIMIZED)
+        {
+            int num;
+            int num2;
+            if (wp != null)
+            {
+                num = wp.Value.x;
+                num2 = wp.Value.y;
+            }
+            else
+            {
+                Rect rect = this._GetWindowRect();
+                num = (int) rect.Left;
+                num2 = (int) rect.Top;
+            }
+            IntPtr hMonitor = NativeMethods.MonitorFromWindow(this._hwnd, 2u);
+            MONITORINFO monitorInfo = NativeMethods.GetMonitorInfo(hMonitor);
+            RECT rcWork = monitorInfo.rcWork;
+            rcWork.Offset(-num, -num2);
+            IntPtr hRgn = IntPtr.Zero;
             try
             {
-                double num3 = Math.Min(size.Width, size.Height);
-                double num4 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.TopLeft, 0.0)).X;
-                num4 = Math.Min(num4, num3 / 2.0);
-                if (WindowChromeWorker._IsUniform(this._chromeInfo.CornerRadius))
-                {
-                    intPtr = WindowChromeWorker._CreateRoundRectRgn(new Rect(size), num4);
-                }
-                else
-                {
-                    intPtr = WindowChromeWorker._CreateRoundRectRgn(new Rect(0.0, 0.0, size.Width / 2.0 + num4, size.Height / 2.0 + num4), num4);
-                    double num5 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.TopRight, 0.0)).X;
-                    num5 = Math.Min(num5, num3 / 2.0);
-                    Rect region = new Rect(0.0, 0.0, size.Width / 2.0 + num5, size.Height / 2.0 + num5);
-                    region.Offset(size.Width / 2.0 - num5, 0.0);
-                    WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region, num5);
-                    double num6 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.BottomLeft, 0.0)).X;
-                    num6 = Math.Min(num6, num3 / 2.0);
-                    Rect region2 = new Rect(0.0, 0.0, size.Width / 2.0 + num6, size.Height / 2.0 + num6);
-                    region2.Offset(0.0, size.Height / 2.0 - num6);
-                    WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region2, num6);
-                    double num7 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.BottomRight, 0.0)).X;
-                    num7 = Math.Min(num7, num3 / 2.0);
-                    Rect region3 = new Rect(0.0, 0.0, size.Width / 2.0 + num7, size.Height / 2.0 + num7);
-                    region3.Offset(size.Width / 2.0 - num7, size.Height / 2.0 - num7);
-                    WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region3, num7);
-                }
-                NativeMethods.SetWindowRgn(this._hwnd, intPtr, NativeMethods.IsWindowVisible(this._hwnd));
-                intPtr = IntPtr.Zero;
+                hRgn = NativeMethods.CreateRectRgnIndirect(rcWork);
+                NativeMethods.SetWindowRgn(this._hwnd, hRgn, NativeMethods.IsWindowVisible(this._hwnd));
+                hRgn = IntPtr.Zero;
+                return;
             }
             finally
             {
-                Utility.SafeDeleteObject(ref intPtr);
+                Utility.SafeDeleteObject(ref hRgn);
             }
         }
-
-        private static IntPtr _CreateRoundRectRgn(Rect region, double radius)
+        Size size;
+        if (wp != null && !Utility.IsFlagSet(wp.Value.flags, 1))
         {
-            if (DoubleUtilities.AreClose(0.0, radius))
-            {
-                return NativeMethods.CreateRectRgn((int) Math.Floor(region.Left), (int) Math.Floor(region.Top), (int) Math.Ceiling(region.Right), (int) Math.Ceiling(region.Bottom));
-            }
-            return NativeMethods.CreateRoundRectRgn((int) Math.Floor(region.Left), (int) Math.Floor(region.Top), (int) Math.Ceiling(region.Right) + 1, (int) Math.Ceiling(region.Bottom) + 1, (int) Math.Ceiling(radius), (int) Math.Ceiling(radius));
+            size = new Size((double) wp.Value.cx, (double) wp.Value.cy);
         }
-
-        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "HRGNs")]
-        private static void _CreateAndCombineRoundRectRgn(IntPtr hrgnSource, Rect region, double radius)
+        else
         {
-            IntPtr hrgnSrc = IntPtr.Zero;
-            try
-            {
-                hrgnSrc = WindowChromeWorker._CreateRoundRectRgn(region, radius);
-                if (NativeMethods.CombineRgn(hrgnSource, hrgnSource, hrgnSrc, RGN.OR) == CombineRgnResult.ERROR)
-                {
-                    throw new InvalidOperationException("Unable to combine two HRGNs.");
-                }
-            }
-            catch
-            {
-                Utility.SafeDeleteObject(ref hrgnSrc);
-                throw;
-            }
-        }
-
-        private static bool _IsUniform(CornerRadius cornerRadius)
-        {
-            return DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.BottomRight) && DoubleUtilities.AreClose(cornerRadius.TopLeft, cornerRadius.TopRight) && DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.TopRight);
-        }
-
-        private void _ExtendGlassFrame()
-        {
-            if (!Utility.IsOSVistaOrNewer)
+            if (wp != null && this._lastRoundingState == this._window.WindowState)
             {
                 return;
             }
-            if (IntPtr.Zero == this._hwnd)
+            size = this._GetWindowRect().Size;
+        }
+        this._lastRoundingState = this._window.WindowState;
+        IntPtr intPtr = IntPtr.Zero;
+        try
+        {
+            double num3 = Math.Min(size.Width, size.Height);
+            double num4 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.TopLeft, 0.0)).X;
+            num4 = Math.Min(num4, num3 / 2.0);
+            if (WindowChromeWorker._IsUniform(this._chromeInfo.CornerRadius))
             {
-                return;
+                intPtr = WindowChromeWorker._CreateRoundRectRgn(new Rect(size), num4);
             }
-            if (!NativeMethods.DwmIsCompositionEnabled())
+            else
             {
-                this._hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
-                return;
+                intPtr = WindowChromeWorker._CreateRoundRectRgn(new Rect(0.0, 0.0, size.Width / 2.0 + num4, size.Height / 2.0 + num4), num4);
+                double num5 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.TopRight, 0.0)).X;
+                num5 = Math.Min(num5, num3 / 2.0);
+                Rect region = new Rect(0.0, 0.0, size.Width / 2.0 + num5, size.Height / 2.0 + num5);
+                region.Offset(size.Width / 2.0 - num5, 0.0);
+                WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region, num5);
+                double num6 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.BottomLeft, 0.0)).X;
+                num6 = Math.Min(num6, num3 / 2.0);
+                Rect region2 = new Rect(0.0, 0.0, size.Width / 2.0 + num6, size.Height / 2.0 + num6);
+                region2.Offset(0.0, size.Height / 2.0 - num6);
+                WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region2, num6);
+                double num7 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.CornerRadius.BottomRight, 0.0)).X;
+                num7 = Math.Min(num7, num3 / 2.0);
+                Rect region3 = new Rect(0.0, 0.0, size.Width / 2.0 + num7, size.Height / 2.0 + num7);
+                region3.Offset(size.Width / 2.0 - num7, size.Height / 2.0 - num7);
+                WindowChromeWorker._CreateAndCombineRoundRectRgn(intPtr, region3, num7);
             }
-            this._hwndSource.CompositionTarget.BackgroundColor = Colors.Transparent;
-            Point point = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.GlassFrameThickness.Left, this._chromeInfo.GlassFrameThickness.Top));
-            Point point2 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.GlassFrameThickness.Right, this._chromeInfo.GlassFrameThickness.Bottom));
-            MARGINS margins = new MARGINS
+            NativeMethods.SetWindowRgn(this._hwnd, intPtr, NativeMethods.IsWindowVisible(this._hwnd));
+            intPtr = IntPtr.Zero;
+        }
+        finally
+        {
+            Utility.SafeDeleteObject(ref intPtr);
+        }
+    }
+
+    private static IntPtr _CreateRoundRectRgn(Rect region, double radius)
+    {
+        if (DoubleUtilities.AreClose(0.0, radius))
+        {
+            return NativeMethods.CreateRectRgn((int) Math.Floor(region.Left), (int) Math.Floor(region.Top), (int) Math.Ceiling(region.Right), (int) Math.Ceiling(region.Bottom));
+        }
+        return NativeMethods.CreateRoundRectRgn((int) Math.Floor(region.Left), (int) Math.Floor(region.Top), (int) Math.Ceiling(region.Right) + 1, (int) Math.Ceiling(region.Bottom) + 1, (int) Math.Ceiling(radius), (int) Math.Ceiling(radius));
+    }
+
+    [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "HRGNs")]
+    private static void _CreateAndCombineRoundRectRgn(IntPtr hrgnSource, Rect region, double radius)
+    {
+        IntPtr hrgnSrc = IntPtr.Zero;
+        try
+        {
+            hrgnSrc = WindowChromeWorker._CreateRoundRectRgn(region, radius);
+            if (NativeMethods.CombineRgn(hrgnSource, hrgnSource, hrgnSrc, RGN.OR) == CombineRgnResult.ERROR)
             {
-                cxLeftWidth = (int) Math.Ceiling(point.X),
-                cxRightWidth = (int) Math.Ceiling(point2.X),
-                cyTopHeight = (int) Math.Ceiling(point.Y),
-                cyBottomHeight = (int) Math.Ceiling(point2.Y)
-            };
+                throw new InvalidOperationException("Unable to combine two HRGNs.");
+            }
+        }
+        catch
+        {
+            Utility.SafeDeleteObject(ref hrgnSrc);
+            throw;
+        }
+    }
+
+    private static bool _IsUniform(CornerRadius cornerRadius)
+    {
+        return DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.BottomRight) && DoubleUtilities.AreClose(cornerRadius.TopLeft, cornerRadius.TopRight) && DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.TopRight);
+    }
+
+    private void _ExtendGlassFrame()
+    {
+        if (!Utility.IsOSVistaOrNewer)
+        {
+            return;
+        }
+        if (IntPtr.Zero == this._hwnd)
+        {
+            return;
+        }
+        if (!NativeMethods.DwmIsCompositionEnabled())
+        {
+            this._hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
+            return;
+        }
+        this._hwndSource.CompositionTarget.BackgroundColor = Colors.Transparent;
+        Point point = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.GlassFrameThickness.Left, this._chromeInfo.GlassFrameThickness.Top));
+        Point point2 = DpiHelper.LogicalPixelsToDevice(new Point(this._chromeInfo.GlassFrameThickness.Right, this._chromeInfo.GlassFrameThickness.Bottom));
+        MARGINS margins = new MARGINS
+        {
+            cxLeftWidth = (int) Math.Ceiling(point.X),
+            cxRightWidth = (int) Math.Ceiling(point2.X),
+            cyTopHeight = (int) Math.Ceiling(point.Y),
+            cyBottomHeight = (int) Math.Ceiling(point2.Y)
+        };
+        NativeMethods.DwmExtendFrameIntoClientArea(this._hwnd, ref margins);
+    }
+
+    private HT _HitTestNca(Rect windowPosition, Point mousePosition)
+    {
+        int num = 1;
+        int num2 = 1;
+        bool flag = false;
+        if (mousePosition.Y >= windowPosition.Top && mousePosition.Y < windowPosition.Top + this._chromeInfo.ResizeBorderThickness.Top + this._chromeInfo.CaptionHeight)
+        {
+            flag = (mousePosition.Y < windowPosition.Top + this._chromeInfo.ResizeBorderThickness.Top);
+            num = 0;
+        }
+        else if (mousePosition.Y < windowPosition.Bottom && mousePosition.Y >= windowPosition.Bottom - (double) ((int) this._chromeInfo.ResizeBorderThickness.Bottom))
+        {
+            num = 2;
+        }
+        if (mousePosition.X >= windowPosition.Left && mousePosition.X < windowPosition.Left + (double) ((int) this._chromeInfo.ResizeBorderThickness.Left))
+        {
+            num2 = 0;
+        }
+        else if (mousePosition.X < windowPosition.Right && mousePosition.X >= windowPosition.Right - this._chromeInfo.ResizeBorderThickness.Right)
+        {
+            num2 = 2;
+        }
+        if (num == 0 && num2 != 1 && !flag)
+        {
+            num = 1;
+        }
+        HT ht = WindowChromeWorker._HitTestBorders[num, num2];
+        if (ht == HT.TOP && !flag)
+        {
+            ht = HT.CAPTION;
+        }
+        return ht;
+    }
+
+    private void _RestoreStandardChromeState(bool isClosing)
+    {
+        base.VerifyAccess();
+        this._UnhookCustomChrome();
+        if (!isClosing)
+        {
+            this._RestoreFrameworkIssueFixups();
+            this._RestoreGlassFrame();
+            this._RestoreHrgn();
+            this._window.InvalidateMeasure();
+        }
+    }
+
+    private void _UnhookCustomChrome()
+    {
+        if (this._isHooked)
+        {
+            this._hwndSource.RemoveHook(new HwndSourceHook(this._WndProc));
+            this._isHooked = false;
+        }
+    }
+
+    private void _RestoreFrameworkIssueFixups()
+    {
+        if (Utility.IsPresentationFrameworkVersionLessThan4)
+        {
+            FrameworkElement frameworkElement = (FrameworkElement) VisualTreeHelper.GetChild(this._window, 0);
+            frameworkElement.Margin = default(Thickness);
+            this._window.StateChanged -= this._FixupRestoreBounds;
+            this._isFixedUp = false;
+        }
+    }
+
+    private void _RestoreGlassFrame()
+    {
+        if (!Utility.IsOSVistaOrNewer || this._hwnd == IntPtr.Zero)
+        {
+            return;
+        }
+        this._hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
+        if (NativeMethods.DwmIsCompositionEnabled())
+        {
+            MARGINS margins = default(MARGINS);
             NativeMethods.DwmExtendFrameIntoClientArea(this._hwnd, ref margins);
         }
-
-        private HT _HitTestNca(Rect windowPosition, Point mousePosition)
-        {
-            int num = 1;
-            int num2 = 1;
-            bool flag = false;
-            if (mousePosition.Y >= windowPosition.Top && mousePosition.Y < windowPosition.Top + this._chromeInfo.ResizeBorderThickness.Top + this._chromeInfo.CaptionHeight)
-            {
-                flag = (mousePosition.Y < windowPosition.Top + this._chromeInfo.ResizeBorderThickness.Top);
-                num = 0;
-            }
-            else if (mousePosition.Y < windowPosition.Bottom && mousePosition.Y >= windowPosition.Bottom - (double) ((int) this._chromeInfo.ResizeBorderThickness.Bottom))
-            {
-                num = 2;
-            }
-            if (mousePosition.X >= windowPosition.Left && mousePosition.X < windowPosition.Left + (double) ((int) this._chromeInfo.ResizeBorderThickness.Left))
-            {
-                num2 = 0;
-            }
-            else if (mousePosition.X < windowPosition.Right && mousePosition.X >= windowPosition.Right - this._chromeInfo.ResizeBorderThickness.Right)
-            {
-                num2 = 2;
-            }
-            if (num == 0 && num2 != 1 && !flag)
-            {
-                num = 1;
-            }
-            HT ht = WindowChromeWorker._HitTestBorders[num, num2];
-            if (ht == HT.TOP && !flag)
-            {
-                ht = HT.CAPTION;
-            }
-            return ht;
-        }
-
-        private void _RestoreStandardChromeState(bool isClosing)
-        {
-            base.VerifyAccess();
-            this._UnhookCustomChrome();
-            if (!isClosing)
-            {
-                this._RestoreFrameworkIssueFixups();
-                this._RestoreGlassFrame();
-                this._RestoreHrgn();
-                this._window.InvalidateMeasure();
-            }
-        }
-
-        private void _UnhookCustomChrome()
-        {
-            if (this._isHooked)
-            {
-                this._hwndSource.RemoveHook(new HwndSourceHook(this._WndProc));
-                this._isHooked = false;
-            }
-        }
-
-        private void _RestoreFrameworkIssueFixups()
-        {
-            if (Utility.IsPresentationFrameworkVersionLessThan4)
-            {
-                FrameworkElement frameworkElement = (FrameworkElement) VisualTreeHelper.GetChild(this._window, 0);
-                frameworkElement.Margin = default(Thickness);
-                this._window.StateChanged -= this._FixupRestoreBounds;
-                this._isFixedUp = false;
-            }
-        }
-
-        private void _RestoreGlassFrame()
-        {
-            if (!Utility.IsOSVistaOrNewer || this._hwnd == IntPtr.Zero)
-            {
-                return;
-            }
-            this._hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
-            if (NativeMethods.DwmIsCompositionEnabled())
-            {
-                MARGINS margins = default(MARGINS);
-                NativeMethods.DwmExtendFrameIntoClientArea(this._hwnd, ref margins);
-            }
-        }
-
-        private void _RestoreHrgn()
-        {
-            this._ClearRoundingRegion();
-            NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
-        }
-
-        // Note: this type is marked as 'beforefieldinit'.
-        static WindowChromeWorker()
-        {
-            HT[,] array = new HT[3, 3];
-            array[0, 0] = HT.TOPLEFT;
-            array[0, 1] = HT.TOP;
-            array[0, 2] = HT.TOPRIGHT;
-            array[1, 0] = HT.LEFT;
-            array[1, 1] = HT.CLIENT;
-            array[1, 2] = HT.RIGHT;
-            array[2, 0] = HT.BOTTOMLEFT;
-            array[2, 1] = HT.BOTTOM;
-            array[2, 2] = HT.BOTTOMRIGHT;
-            WindowChromeWorker._HitTestBorders = array;
-        }
-
-        private const SWP _SwpFlags = SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER;
-
-        private readonly List<KeyValuePair<WM, MessageHandler>> _messageTable;
-
-        private Window _window;
-
-        private IntPtr _hwnd;
-
-        private HwndSource _hwndSource;
-
-        private bool _isHooked;
-
-        private bool _isFixedUp;
-
-        private bool _isUserResizing;
-
-        private bool _hasUserMovedWindow;
-
-        private Point _windowPosAtStartOfUserMove = default(Point);
-
-        private int _blackGlassFixupAttemptCount;
-
-        private WindowChrome _chromeInfo;
-
-        private WindowState _lastRoundingState;
-
-        private WindowState _lastMenuState;
-
-        private bool _isGlassEnabled;
-
-        public static readonly DependencyProperty WindowChromeWorkerProperty = DependencyProperty.RegisterAttached("WindowChromeWorker", typeof(WindowChromeWorker), typeof(WindowChromeWorker), new PropertyMetadata(null, new PropertyChangedCallback(WindowChromeWorker._OnChromeWorkerChanged)));
-
-        [SuppressMessage("Microsoft.Performance", "CA1814:PreferJaggedArraysOverMultidimensional", MessageId = "Member")]
-        private static readonly HT[,] _HitTestBorders;
-
-        private delegate void _Action();
     }
-}
+
+    private void _RestoreHrgn()
+    {
+        this._ClearRoundingRegion();
+        NativeMethods.SetWindowPos(this._hwnd, IntPtr.Zero, 0, 0, 0, 0, SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER);
+    }
+
+    // Note: this type is marked as 'beforefieldinit'.
+    static WindowChromeWorker()
+    {
+        HT[,] array = new HT[3, 3];
+        array[0, 0] = HT.TOPLEFT;
+        array[0, 1] = HT.TOP;
+        array[0, 2] = HT.TOPRIGHT;
+        array[1, 0] = HT.LEFT;
+        array[1, 1] = HT.CLIENT;
+        array[1, 2] = HT.RIGHT;
+        array[2, 0] = HT.BOTTOMLEFT;
+        array[2, 1] = HT.BOTTOM;
+        array[2, 2] = HT.BOTTOMRIGHT;
+        WindowChromeWorker._HitTestBorders = array;
+    }
+
+    private const SWP _SwpFlags = SWP.DRAWFRAME | SWP.NOACTIVATE | SWP.NOMOVE | SWP.NOOWNERZORDER | SWP.NOSIZE | SWP.NOZORDER;
+
+    private readonly List<KeyValuePair<WM, MessageHandler>> _messageTable;
+
+    private Window _window;
+
+    private IntPtr _hwnd;
+
+    private HwndSource _hwndSource;
+
+    private bool _isHooked;
+
+    private bool _isFixedUp;
+
+    private bool _isUserResizing;
+
+    private bool _hasUserMovedWindow;
+
+    private Point _windowPosAtStartOfUserMove = default(Point);
+
+    private int _blackGlassFixupAttemptCount;
+
+    private WindowChrome _chromeInfo;
+
+    private WindowState _lastRoundingState;
+
+    private WindowState _lastMenuState;
+
+    private bool _isGlassEnabled;
+
+    public static readonly DependencyProperty WindowChromeWorkerProperty = DependencyProperty.RegisterAttached("WindowChromeWorker", typeof(WindowChromeWorker), typeof(WindowChromeWorker), new PropertyMetadata(null, new PropertyChangedCallback(WindowChromeWorker._OnChromeWorkerChanged)));
+
+    [SuppressMessage("Microsoft.Performance", "CA1814:PreferJaggedArraysOverMultidimensional", MessageId = "Member")]
+    private static readonly HT[,] _HitTestBorders;
+
+    private delegate void _Action();
+}
\ No newline at end of file

From 0da287564112921392abead8fb6aaec629851b6e Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 21:26:27 +0800
Subject: [PATCH 21/32] chore: separated Microsoft.Expression.Drawing code

---
 src/HandyControl.sln                          | 10 ++++-
 .../HandyControl_Net_40.csproj                |  1 +
 .../HandyControl_Net_GE45.csproj              |  1 +
 .../HandyControl_Shared.projitems             | 32 -------------
 .../Drawing/BezierCurveFlattener.cs           |  0
 .../Drawing/CommonExtensions.cs               |  0
 .../Drawing/ExceptionStringTable.cs           |  0
 .../Drawing/GeometryHelper.cs                 |  0
 .../Drawing/MarchLocation.cs                  |  0
 .../Drawing/MarchStopReason.cs                |  0
 .../Drawing/MathHelper.cs                     |  0
 .../Drawing/PathFigureHelper.cs               |  0
 .../Drawing/PathGeometryHelper.cs             |  0
 .../Drawing/PathSegmentData.cs                |  0
 .../Drawing/PathSegmentHelper.cs              |  0
 .../Drawing/PolylineData.cs                   |  0
 .../Drawing/PolylineHelper.cs                 |  0
 .../Drawing/RandomEngine.cs                   |  0
 .../Drawing/SimpleSegment.cs                  |  0
 .../Media/ArcGeometrySource.cs                |  0
 .../Media/DrawingPropertyChangedEventArgs.cs  |  0
 .../Media/DrawingPropertyMetadata.cs          |  0
 .../Media/DrawingPropertyMetadataOptions.cs   |  0
 .../Media/GeometryEffect.cs                   |  0
 .../Media/GeometryEffectConverter.cs          |  0
 .../Media/GeometrySource`1.cs                 |  0
 .../Media/IArcGeometrySourceParameters.cs     |  0
 .../Media/IGeometrySource.cs                  |  0
 .../Media/IGeometrySourceExtensions.cs        |  0
 .../Media/IGeometrySourceParameters.cs        |  0
 .../Media/IShape.cs                           |  0
 .../Media/InvalidateGeometryReasons.cs        |  0
 .../Media/SketchGeometryEffect.cs             |  0
 .../Media/UnitType.cs                         |  0
 .../Microsoft.Expression.Drawing.projitems    | 45 +++++++++++++++++++
 .../Microsoft.Expression.Drawing.shproj       | 13 ++++++
 .../Shapes/Arc.cs                             |  0
 .../Shapes/PrimitiveShape.cs                  |  0
 38 files changed, 68 insertions(+), 34 deletions(-)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/BezierCurveFlattener.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/CommonExtensions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/ExceptionStringTable.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/GeometryHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MarchLocation.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MarchStopReason.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/MathHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathFigureHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathGeometryHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathSegmentData.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PathSegmentHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PolylineData.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/PolylineHelper.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/RandomEngine.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Drawing/SimpleSegment.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/ArcGeometrySource.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyChangedEventArgs.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyMetadata.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/DrawingPropertyMetadataOptions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometryEffect.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometryEffectConverter.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/GeometrySource`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IArcGeometrySourceParameters.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySource.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySourceExtensions.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IGeometrySourceParameters.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/IShape.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/InvalidateGeometryReasons.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/SketchGeometryEffect.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Media/UnitType.cs (100%)
 create mode 100644 src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
 create mode 100644 src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Shapes/Arc.cs (100%)
 rename src/Shared/{HandyControl_Shared/Expression => Microsoft.Expression.Drawing}/Shapes/PrimitiveShape.cs (100%)

diff --git a/src/HandyControl.sln b/src/HandyControl.sln
index 1459e713..94a13bfa 100644
--- a/src/HandyControl.sln
+++ b/src/HandyControl.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl_Net_GE45", "Net_GE45\HandyControl_Net_GE45\HandyControl_Net_GE45.csproj", "{DC966E3D-BCFF-4652-98CF-070E5494749A}"
 EndProject
@@ -30,9 +30,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.Props = Directory.Build.Props
 	EndProjectSection
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13
@@ -40,6 +43,8 @@ Global
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{c4694269-c9b8-45d5-87f8-d0088c532510}*SharedItemsImports = 13
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,6 +98,7 @@ Global
 		{D8AE88F8-C36B-4D10-A7F9-22FFCFBA5231} = {35E3F9C0-8924-4536-BE09-F3761FDBF066}
 		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index c88b6d26..3117a430 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -80,6 +80,7 @@
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 1881b318..3f780096 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -80,6 +80,7 @@
     </Content>
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index ecd496ef..85820b3a 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -282,38 +282,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\ResourceToken.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Info\SystemVersionInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ValueBoxes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\BezierCurveFlattener.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\CommonExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\ExceptionStringTable.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\GeometryHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MarchLocation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MarchStopReason.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\MathHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathFigureHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathGeometryHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathSegmentData.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PathSegmentHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PolylineData.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\PolylineHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\RandomEngine.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Drawing\SimpleSegment.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\ArcGeometrySource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyChangedEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyMetadata.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\DrawingPropertyMetadataOptions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometryEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometryEffectConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\GeometrySource`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IArcGeometrySourceParameters.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySourceExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IGeometrySourceParameters.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\InvalidateGeometryReasons.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\IShape.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\SketchGeometryEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Media\UnitType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Shapes\Arc.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Expression\Shapes\PrimitiveShape.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AdornerContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AttachableCollection`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior`1.cs" />
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/BezierCurveFlattener.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/CommonExtensions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/ExceptionStringTable.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/GeometryHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MarchLocation.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MarchStopReason.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/MathHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathFigureHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathGeometryHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentData.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PathSegmentHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PolylineData.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/PolylineHelper.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/RandomEngine.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Drawing/SimpleSegment.cs
rename to src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/ArcGeometrySource.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyChangedEventArgs.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadata.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/DrawingPropertyMetadataOptions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometryEffect.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometryEffectConverter.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/GeometrySource`1.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IArcGeometrySourceParameters.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySource.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceExtensions.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IGeometrySourceParameters.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/IShape.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/IShape.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs b/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/InvalidateGeometryReasons.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/SketchGeometryEffect.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs b/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Media/UnitType.cs
rename to src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
diff --git a/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
new file mode 100644
index 00000000..d00f4235
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.projitems
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>e5dc7c25-6293-4660-b5fb-186496386b90</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Expression.Drawing</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\BezierCurveFlattener.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\CommonExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\ExceptionStringTable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\GeometryHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MarchLocation.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MarchStopReason.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\MathHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathFigureHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathGeometryHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathSegmentData.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PathSegmentHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PolylineData.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\PolylineHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\RandomEngine.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Drawing\SimpleSegment.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\ArcGeometrySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyChangedEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyMetadata.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\DrawingPropertyMetadataOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometryEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometryEffectConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\GeometrySource`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IArcGeometrySourceParameters.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySource.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySourceExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IGeometrySourceParameters.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\InvalidateGeometryReasons.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\IShape.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\SketchGeometryEffect.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Media\UnitType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\Arc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Shapes\PrimitiveShape.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
new file mode 100644
index 00000000..32c81158
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Drawing/Microsoft.Expression.Drawing.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>e5dc7c25-6293-4660-b5fb-186496386b90</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Shapes/Arc.cs
rename to src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
diff --git a/src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Expression/Shapes/PrimitiveShape.cs
rename to src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs

From ef4226ddf9fe7b32881f45020b8ade0d2ff7e5ea Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 21:40:09 +0800
Subject: [PATCH 22/32] chore: separated System.Windows.Interactivity code

---
 src/HandyControl.sln                          |  6 ++++
 .../HandyControl_Net_40.csproj                |  1 +
 .../HandyControl_Net_GE45.csproj              |  1 +
 .../HandyControl_Shared.projitems             | 20 -----------
 .../AttachableCollection`1.cs                 |  0
 .../Behavior.cs                               |  0
 .../BehaviorCollection.cs                     |  0
 .../Behavior`1.cs                             |  0
 .../DefaultTriggerAttribute.cs                |  0
 .../EventTrigger.cs                           |  0
 .../EventTriggerBase.cs                       |  0
 .../EventTriggerBase`1.cs                     |  0
 .../IAttachedObject.cs                        |  0
 .../Interaction.cs                            |  0
 .../InvokeCommandAction.cs                    |  0
 .../NameResolvedEventArgs.cs                  |  0
 .../NameResolver.cs                           |  0
 .../PreviewInvokeEventArgs.cs                 |  0
 .../System.Windows.Interactivity.projitems    | 33 +++++++++++++++++++
 .../System.Windows.Interactivity.shproj       | 13 ++++++++
 .../TriggerAction.cs                          |  0
 .../TriggerActionCollection.cs                |  0
 .../TriggerAction`1.cs                        |  0
 .../TriggerBase.cs                            |  0
 .../TriggerCollection.cs                      |  0
 .../TypeConstraintAttribute.cs                |  0
 26 files changed, 54 insertions(+), 20 deletions(-)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/AttachableCollection`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => System.Windows.Interactivity}/Behavior.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => System.Windows.Interactivity}/BehaviorCollection.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => System.Windows.Interactivity}/Behavior`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/DefaultTriggerAttribute.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/EventTrigger.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/EventTriggerBase.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/EventTriggerBase`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/IAttachedObject.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/Interaction.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/InvokeCommandAction.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/NameResolvedEventArgs.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/NameResolver.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/PreviewInvokeEventArgs.cs (100%)
 create mode 100644 src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems
 create mode 100644 src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TriggerAction.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TriggerActionCollection.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TriggerAction`1.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TriggerBase.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TriggerCollection.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => System.Windows.Interactivity}/TypeConstraintAttribute.cs (100%)

diff --git a/src/HandyControl.sln b/src/HandyControl.sln
index 94a13bfa..e49211f0 100644
--- a/src/HandyControl.sln
+++ b/src/HandyControl.sln
@@ -32,11 +32,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawing", "Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.shproj", "{E5DC7C25-6293-4660-B5FB-186496386B90}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{bbe51380-8b21-49ff-9cfc-b29447a40999}*SharedItemsImports = 13
@@ -44,6 +48,7 @@ Global
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
+		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -99,6 +104,7 @@ Global
 		{D8A4748C-0500-4F63-BC47-3506658C68F7} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 3117a430..042da097 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -81,6 +81,7 @@
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index 3f780096..c10442ca 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -81,6 +81,7 @@
   </ItemGroup>
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index 85820b3a..ca7ddf4e 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -283,40 +283,20 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\Info\SystemVersionInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ValueBoxes.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AdornerContainer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AttachableCollection`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\Behavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\BehaviorCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ControlCommands.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\DefaultTriggerAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTrigger.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTriggerBase`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventTriggerBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExceptionStringTable.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExtendedVisualStateManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehaviorBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\FluidMoveScope.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IAttachedObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IEventArgsConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Interaction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\InvokeCommandAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\MouseDragElementBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolvedEventArgs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\NameResolver.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\PreviewInvokeEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\PushMainWindow2TopCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\RoutedEventTrigger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ShutdownAppCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TagType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TransitionEffect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerAction`1.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerAction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerActionCollection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TriggerCollection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TypeConstraintAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2BooleanReConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2StrConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2VisibilityReConverter.cs" />
diff --git a/src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs b/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/AttachableCollection`1.cs
rename to src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs b/src/Shared/System.Windows.Interactivity/Behavior.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior.cs
rename to src/Shared/System.Windows.Interactivity/Behavior.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs b/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/BehaviorCollection.cs
rename to src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs b/src/Shared/System.Windows.Interactivity/Behavior`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/Behavior`1.cs
rename to src/Shared/System.Windows.Interactivity/Behavior`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs b/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/DefaultTriggerAttribute.cs
rename to src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs b/src/Shared/System.Windows.Interactivity/EventTrigger.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTrigger.cs
rename to src/Shared/System.Windows.Interactivity/EventTrigger.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase.cs
rename to src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/EventTriggerBase`1.cs
rename to src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs b/src/Shared/System.Windows.Interactivity/IAttachedObject.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/IAttachedObject.cs
rename to src/Shared/System.Windows.Interactivity/IAttachedObject.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Interaction.cs b/src/Shared/System.Windows.Interactivity/Interaction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Interaction.cs
rename to src/Shared/System.Windows.Interactivity/Interaction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs b/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/InvokeCommandAction.cs
rename to src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs b/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/NameResolvedEventArgs.cs
rename to src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs b/src/Shared/System.Windows.Interactivity/NameResolver.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/NameResolver.cs
rename to src/Shared/System.Windows.Interactivity/NameResolver.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs b/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/PreviewInvokeEventArgs.cs
rename to src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
diff --git a/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems
new file mode 100644
index 00000000..3323238f
--- /dev/null
+++ b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.projitems
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>6f0c9cff-2269-46a7-9664-478354c582a4</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>System.Windows.Interactivity</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AttachableCollection`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)BehaviorCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Behavior`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)DefaultTriggerAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTrigger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTriggerBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)EventTriggerBase`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IAttachedObject.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interaction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)InvokeCommandAction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NameResolvedEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NameResolver.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PreviewInvokeEventArgs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerAction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerActionCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerAction`1.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TriggerCollection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TypeConstraintAttribute.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj
new file mode 100644
index 00000000..a5a44c6e
--- /dev/null
+++ b/src/Shared/System.Windows.Interactivity/System.Windows.Interactivity.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6f0c9cff-2269-46a7-9664-478354c582a4</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="System.Windows.Interactivity.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs b/src/Shared/System.Windows.Interactivity/TriggerAction.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerAction.cs
rename to src/Shared/System.Windows.Interactivity/TriggerAction.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerActionCollection.cs
rename to src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs b/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerAction`1.cs
rename to src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs b/src/Shared/System.Windows.Interactivity/TriggerBase.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerBase.cs
rename to src/Shared/System.Windows.Interactivity/TriggerBase.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerCollection.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TriggerCollection.cs
rename to src/Shared/System.Windows.Interactivity/TriggerCollection.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs b/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TypeConstraintAttribute.cs
rename to src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs

From ed41aabdef3d77fe45de52ae5435423ef1f4cbb4 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 13 Mar 2022 22:24:40 +0800
Subject: [PATCH 23/32] chore: separated Microsoft.Expression.Interactions code

---
 src/HandyControl.sln                          |  6 +++++
 .../HandyControl_Net_40.csproj                |  1 +
 .../HandyControl_Net_GE45.csproj              |  1 +
 .../HandyControl_Shared.projitems             | 15 +++----------
 .../MouseDragElementBehaviorEx.cs             |  0
 .../AdornerContainer.cs                       |  0
 .../ExceptionStringTable.cs                   |  0
 .../ExtendedVisualStateManager.cs             |  0
 .../FluidMoveBehavior.cs                      |  0
 .../FluidMoveBehaviorBase.cs                  |  0
 .../FluidMoveScope.cs                         |  0
 ...icrosoft.Expression.Interactions.projitems | 22 +++++++++++++++++++
 .../Microsoft.Expression.Interactions.shproj  | 13 +++++++++++
 .../MouseDragElementBehavior.cs               |  0
 .../TagType.cs                                |  0
 .../TransitionEffect.cs                       |  0
 16 files changed, 46 insertions(+), 12 deletions(-)
 rename src/Shared/HandyControl_Shared/Interactivity/{Behavior => }/MouseDragElementBehaviorEx.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/AdornerContainer.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/ExceptionStringTable.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/ExtendedVisualStateManager.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => Microsoft.Expression.Interactions}/FluidMoveBehavior.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => Microsoft.Expression.Interactions}/FluidMoveBehaviorBase.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/FluidMoveScope.cs (100%)
 create mode 100644 src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems
 create mode 100644 src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj
 rename src/Shared/{HandyControl_Shared/Interactivity/Behavior => Microsoft.Expression.Interactions}/MouseDragElementBehavior.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/TagType.cs (100%)
 rename src/Shared/{HandyControl_Shared/Interactivity => Microsoft.Expression.Interactions}/TransitionEffect.cs (100%)

diff --git a/src/HandyControl.sln b/src/HandyControl.sln
index e49211f0..bdeea6fc 100644
--- a/src/HandyControl.sln
+++ b/src/HandyControl.sln
@@ -34,12 +34,16 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Drawin
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "System.Windows.Interactivity", "Shared\System.Windows.Interactivity\System.Windows.Interactivity.shproj", "{6F0C9CFF-2269-46A7-9664-478354C582A4}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.Expression.Interactions", "Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.shproj", "{3531857C-28FC-4E0F-82D9-BFBB70740E04}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
 		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{32204503-2ef0-4681-ae13-aa1feb6c658a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{3531857c-28fc-4e0f-82d9-bfbb70740e04}*SharedItemsImports = 13
 		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{9a7b52e6-94bb-4e7e-bb6a-7cf6761b79a7}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13
@@ -48,6 +52,7 @@ Global
 		Shared\HandyControlDemo_Shared\HandyControlDemo_Shared.projitems*{d8ae88f8-c36b-4d10-a7f9-22ffcfba5231}*SharedItemsImports = 5
 		Shared\HandyControl_Shared\HandyControl_Shared.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
+		Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{dc966e3d-bcff-4652-98cf-070e5494749a}*SharedItemsImports = 5
 		Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
@@ -105,6 +110,7 @@ Global
 		{BBE51380-8B21-49FF-9CFC-B29447A40999} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{E5DC7C25-6293-4660-B5FB-186496386B90} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 		{6F0C9CFF-2269-46A7-9664-478354C582A4} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
+		{3531857C-28FC-4E0F-82D9-BFBB70740E04} = {0938270D-E9F0-489B-AF9E-5C5AD7C69897}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D4636382-1A18-4079-A3E7-054DD970F179}
diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
index 042da097..c4f2666c 100644
--- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
+++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj
@@ -82,6 +82,7 @@
   <Import Project="..\..\Shared\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
index c10442ca..df50d316 100644
--- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
+++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj
@@ -82,6 +82,7 @@
   <Import Project="..\..\Shared\HandyControl_Shared\HandyControl_Shared.projitems" Label="Shared" />
   <Import Project="..\..\Shared\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems" Label="Shared" />
   <Import Project="..\..\Shared\System.Windows.Interactivity\System.Windows.Interactivity.projitems" Label="Shared" />
+  <Import Project="..\..\Shared\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems" Label="Shared" />
   <ItemGroup>
     <Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
       <Link>Resources\dropper.cur</Link>
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index ca7ddf4e..1ed903e5 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -86,6 +86,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\HighlightTextBlock.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Text\SimpleText.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Enum\LinearLayout.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IEventArgsConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\MouseDragElementBehaviorEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Helper\FullScreenHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Window\GlowWindow.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\EnumItem.cs" />
@@ -282,21 +285,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)Data\ResourceToken.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\Info\SystemVersionInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Data\ValueBoxes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\AdornerContainer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ControlCommands.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExceptionStringTable.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\ExtendedVisualStateManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehavior.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\FluidMoveBehaviorBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\FluidMoveScope.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\IEventArgsConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\MouseDragElementBehavior.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\PushMainWindow2TopCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\RoutedEventTrigger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\ShutdownAppCommand.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TagType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\TransitionEffect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2BooleanReConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2StrConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Boolean2VisibilityReConverter.cs" />
@@ -353,7 +345,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\InteropValues.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\SafeFileMappingHandle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Interop\Handle\WpfSafeHandle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Behavior\MouseDragElementBehaviorEx.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\Pool\IPool`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\Pool\SimplePool`1.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Collections\Pool\SynchronizedPool`1.cs" />
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehaviorEx.cs
rename to src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs b/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/AdornerContainer.cs
rename to src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/ExceptionStringTable.cs
rename to src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs b/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/ExtendedVisualStateManager.cs
rename to src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehavior.cs
rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/FluidMoveBehaviorBase.cs
rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/FluidMoveScope.cs
rename to src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs
diff --git a/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems
new file mode 100644
index 00000000..a1b33d6d
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.projitems
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>3531857c-28fc-4e0f-82d9-bfbb70740e04</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Microsoft.Expression.Interactions</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)AdornerContainer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ExceptionStringTable.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ExtendedVisualStateManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FluidMoveBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FluidMoveBehaviorBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FluidMoveScope.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MouseDragElementBehavior.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TagType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TransitionEffect.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj
new file mode 100644
index 00000000..dfd71b72
--- /dev/null
+++ b/src/Shared/Microsoft.Expression.Interactions/Microsoft.Expression.Interactions.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>3531857c-28fc-4e0f-82d9-bfbb70740e04</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Microsoft.Expression.Interactions.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/Behavior/MouseDragElementBehavior.cs
rename to src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TagType.cs b/src/Shared/Microsoft.Expression.Interactions/TagType.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TagType.cs
rename to src/Shared/Microsoft.Expression.Interactions/TagType.cs
diff --git a/src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs b/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs
similarity index 100%
rename from src/Shared/HandyControl_Shared/Interactivity/TransitionEffect.cs
rename to src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs

From 4cb300574c6bf4a1182fe33706f1704e6aae2047 Mon Sep 17 00:00:00 2001
From: "github-actions-dotnet-formatter[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 13 Mar 2022 14:27:46 +0000
Subject: [PATCH 24/32] Automated dotnet-format update

---
 .../HandyControlDemo_Shared/App.xaml.cs       | 18 ++--
 .../HandyControlDemo_Shared/Data/AppConfig.cs |  2 +-
 .../Data/Enum/DemoType.cs                     |  2 +-
 .../Data/GlobalData.cs                        |  2 +-
 .../Data/MessageToken.cs                      |  2 +-
 .../Data/Model/AvatarModel.cs                 |  2 +-
 .../Data/Model/CardModel.cs                   |  2 +-
 .../Data/Model/ChatInfoModel.cs               |  2 +-
 .../Data/Model/CoverViewDemoModel.cs          |  2 +-
 .../Data/Model/DemoDataModel.cs               |  2 +-
 .../Data/Model/DemoInfoModel.cs               |  2 +-
 .../Data/Model/DemoItemModel.cs               |  6 +-
 .../Data/Model/GeometryItemModel.cs           |  2 +-
 .../Data/Model/PropertyGridDemoModel.cs       |  2 +-
 .../Data/Model/StepBarDemoModel.cs            |  2 +-
 .../Data/Model/TabControlDemoModel.cs         |  2 +-
 .../MainWindow.xaml.cs                        |  2 +-
 .../Properties/Langs/LangProvider.cs          |  2 +-
 .../Resources/DemoTheme.cs                    |  2 +-
 .../Service/Data/DataService.cs               |  2 +-
 .../Tools/Converter/HatchBrushConverter.cs    |  2 +-
 .../Tools/Converter/String2BrushConverter.cs  |  2 +-
 .../Tools/Converter/StringRepeatConverter.cs  |  2 +-
 .../Tools/Extension/LangExtension.cs          |  2 +-
 .../Tools/Helper/AssemblyHelper.cs            |  2 +-
 .../Tools/Helper/VersionHelper.cs             |  4 +-
 .../Tools/Helper/Win32Helper.cs               |  2 +-
 .../Tools/HighlightingProvider.cs             |  2 +-
 .../UserControl/Basic/Avatar.xaml.cs          |  2 +-
 .../UserControl/Basic/ChatBox.xaml.cs         |  2 +-
 .../UserControl/Basic/GeometryItem.xaml.cs    |  2 +-
 .../UserControl/Basic/IFull.cs                |  2 +-
 .../Basic/InteractiveDialog.xaml.cs           |  2 +-
 .../UserControl/Basic/TextDialog.xaml.cs      |  2 +-
 .../Basic/TextDialogWithTimer.xaml.cs         |  2 +-
 .../Controls/AnimationPathDemoCtl.xaml.cs     |  2 +-
 .../AutoCompleteTextBoxDemoCtl.xaml.cs        |  2 +-
 .../UserControl/Controls/BadgeDemoCtl.xaml.cs |  2 +-
 .../Controls/ButtonGroupDemoCtl.xaml.cs       |  2 +-
 .../Controls/CalendarWithClockDemoCtl.xaml.cs |  2 +-
 .../UserControl/Controls/CardDemoCtl.xaml.cs  |  2 +-
 .../Controls/CarouselDemoCtl.xaml.cs          |  2 +-
 .../Controls/ChatBubbleDemoCtl.xaml.cs        |  2 +-
 .../Controls/CheckComboBoxDemoCtl.xaml.cs     |  2 +-
 .../Controls/CirclePanelDemoCtl.xaml.cs       |  2 +-
 .../UserControl/Controls/ClockDemoCtl.xaml.cs |  2 +-
 .../Controls/ColorPickerDemoCtl.xaml.cs       |  2 +-
 .../Controls/ComboBoxDemoCtl.xaml.cs          |  2 +-
 .../Controls/CompareSliderDemoCtl.xaml.cs     |  2 +-
 .../Controls/CoverFlowDemoCtl.xaml.cs         |  2 +-
 .../Controls/CoverViewDemoCtl.xaml.cs         |  2 +-
 .../Controls/DatePickerDemoCtl.xaml.cs        |  2 +-
 .../Controls/DateTimePickerDemoCtl.xaml.cs    |  2 +-
 .../Controls/DialogDemoCtl.xaml.cs            |  2 +-
 .../Controls/DividerDemoCtl.xaml.cs           |  2 +-
 .../Controls/DrawerDemoCtl.xaml.cs            |  2 +-
 .../Controls/ElementGroupDemoCtl.xaml.cs      |  2 +-
 .../Controls/FlexPanelDemoCtl.xaml.cs         |  2 +-
 .../Controls/FlipClockDemoCtl.xaml.cs         |  2 +-
 .../Controls/FloatingBlockDemoCtl.xaml.cs     |  2 +-
 .../Controls/GifImageDemoCtl.xaml.cs          |  2 +-
 .../Controls/GotoTopDemoCtl.xaml.cs           |  2 +-
 .../Controls/GravatarDemoCtl.xaml.cs          |  2 +-
 .../UserControl/Controls/GridDemoCtl.xaml.cs  |  2 +-
 .../UserControl/Controls/GrowlDemoCtl.xaml.cs |  2 +-
 .../Controls/HoneycombPanelDemoCtl.xaml.cs    |  2 +-
 .../Controls/ImageBlockDemoCtl.xaml.cs        |  2 +-
 .../Controls/ImageBrowserDemoCtl.xaml.cs      |  2 +-
 .../Controls/ImageSelectorDemoCtl.xaml.cs     |  2 +-
 .../Controls/LoadingDemoCtl.xaml.cs           |  2 +-
 .../Controls/MagnifierDemoCtl.xaml.cs         |  2 +-
 .../Controls/NotificationDemoCtl.xaml.cs      |  2 +-
 .../Controls/NotifyIconDemoCtl.xaml.cs        |  2 +-
 .../Controls/NumericUpDownDemoCtl.xaml.cs     |  2 +-
 .../Controls/OutlineTextDemoCtl.xaml.cs       |  2 +-
 .../Controls/PaginationDemoCtl.xaml.cs        |  2 +-
 .../Controls/PasswordBoxDemoCtl.xaml.cs       |  2 +-
 .../Controls/PinBoxDemoCtl.xaml.cs            |  2 +-
 .../Controls/PoptipDemoCtl.xaml.cs            |  2 +-
 .../Controls/PreviewSliderDemoCtl.xaml.cs     |  2 +-
 .../Controls/ProgressBarDemoCtl.xaml.cs       |  2 +-
 .../Controls/ProgressButtonDemoCtl.xaml.cs    |  2 +-
 .../Controls/PropertyGridDemoCtl.xaml.cs      |  2 +-
 .../Controls/RangeSliderDemoCtl.xaml.cs       |  2 +-
 .../UserControl/Controls/RateDemoCtl.xaml.cs  |  2 +-
 .../Controls/RelativePanelDemoCtl.xaml.cs     |  2 +-
 .../Controls/RunningBlockDemoCtl.xaml.cs      |  2 +-
 .../Controls/ScreenshotDemoCtl.xaml.cs        |  2 +-
 .../Controls/ScrollViewerDemoCtl.xaml.cs      |  2 +-
 .../Controls/SearchBarDemoCtl.xaml.cs         |  2 +-
 .../Controls/ShieldDemoCtl.xaml.cs            |  2 +-
 .../Controls/SideMenuDemoCtl.xaml.cs          |  2 +-
 .../Controls/SplitButtonDemoCtl.xaml.cs       |  2 +-
 .../Controls/SpriteDemoCtl.xaml.cs            |  2 +-
 .../Controls/StepBarDemoCtl.xaml.cs           |  2 +-
 .../Controls/TabControlDemoCtl.xaml.cs        |  2 +-
 .../UserControl/Controls/TagDemoCtl.xaml.cs   |  2 +-
 .../Controls/TextBoxDemoCtl.xaml.cs           |  2 +-
 .../Controls/TimeBarDemoCtl.xaml.cs           |  2 +-
 .../Controls/TimePickerDemoCtl.xaml.cs        |  2 +-
 .../Controls/TransferDemoCtl.xaml.cs          |  2 +-
 ...TransitioningContentControlDemoCtl.xaml.cs |  2 +-
 .../UniformSpacingPanelDemoCtl.xaml.cs        |  2 +-
 .../Controls/WaterfallPanelDemoCtl.xaml.cs    |  2 +-
 .../Controls/WindowDemoCtl.xaml.cs            |  2 +-
 .../UserControl/Main/AppNotification.xaml.cs  |  2 +-
 .../UserControl/Main/AppSprite.xaml.cs        |  2 +-
 .../UserControl/Main/BlogsView.xaml.cs        |  2 +-
 .../UserControl/Main/ContributorsView.xaml.cs |  2 +-
 .../UserControl/Main/LeftMainContent.xaml.cs  |  2 +-
 .../UserControl/Main/MainContent.xaml.cs      |  2 +-
 .../Main/MainWindowContent.xaml.cs            |  2 +-
 .../UserControl/Main/NonClientAreaContent.cs  |  2 +-
 .../UserControl/Main/PracticalDemo.cs         |  2 +-
 .../UserControl/Main/ProjectsView.xaml.cs     |  2 +-
 .../Main/UnderConstruction.xaml.cs            |  2 +-
 .../UserControl/Main/WebsitesView.xaml.cs     |  2 +-
 .../UserControl/Practical/Login.xaml.cs       |  2 +-
 .../UserControl/Styles/BorderDemoCtl.xaml.cs  |  2 +-
 .../UserControl/Styles/BrushDemoCtl.xaml.cs   |  2 +-
 .../UserControl/Styles/ButtonDemoCtl.xaml.cs  |  2 +-
 .../Styles/CalendarDemoCtl.xaml.cs            |  2 +-
 .../Styles/CheckBoxDemoCtl.xaml.cs            |  2 +-
 .../Styles/DataGridDemoCtl.xaml.cs            |  2 +-
 .../Styles/ExpanderDemoCtl.xaml.cs            |  2 +-
 .../Styles/FlowDocumentDemoCtl.xaml.cs        |  2 +-
 .../UserControl/Styles/FrameDemoCtl.xaml.cs   |  2 +-
 .../Styles/GeometryDemoCtl.xaml.cs            |  2 +-
 .../Styles/GroupBoxDemoCtl.xaml.cs            |  2 +-
 .../UserControl/Styles/LabelDemoCtl.xaml.cs   |  2 +-
 .../UserControl/Styles/ListBoxDemoCtl.xaml.cs |  2 +-
 .../Styles/ListViewDemoCtl.xaml.cs            |  2 +-
 .../UserControl/Styles/MenuDemoCtl.xaml.cs    |  2 +-
 .../Styles/NativeComboBoxDemoCtl.xaml.cs      |  2 +-
 .../Styles/NativeDatePickerDemoCtl.xaml.cs    |  2 +-
 .../Styles/NativePasswordBoxDemoCtl.xaml.cs   |  2 +-
 .../Styles/NativeProgressBarDemoCtl.xaml.cs   |  2 +-
 .../Styles/NativeScrollViewerDemoCtl.xaml.cs  |  2 +-
 .../Styles/NativeTabControlDemoCtl.xaml.cs    |  2 +-
 .../Styles/NativeTextBoxDemoCtl.xaml.cs       |  2 +-
 .../Styles/NativeWindowDemoCtl.xaml.cs        |  2 +-
 .../Styles/RadioButtonDemoCtl.xaml.cs         |  2 +-
 .../Styles/RepeatButtonDemoCtl.xaml.cs        |  2 +-
 .../Styles/RichTextBoxDemoCtl.xaml.cs         |  2 +-
 .../UserControl/Styles/SliderDemoCtl.xaml.cs  |  2 +-
 .../Styles/TextBlockDemoCtl.xaml.cs           |  2 +-
 .../Styles/ToggleButtonDemoCtl.xaml.cs        |  2 +-
 .../UserControl/Styles/ToolBarDemoCtl.xaml.cs |  2 +-
 .../Styles/TreeViewDemoCtl.xaml.cs            |  2 +-
 .../UserControl/Tools/EffectsDemoCtl.xaml.cs  |  2 +-
 .../Tools/GeometryAnimationDemoCtl.xaml.cs    |  2 +-
 .../Tools/HatchBrushGeneratorDemoCtl.xaml.cs  |  2 +-
 .../ViewModel/Basic/ChatBoxViewModel.cs       |  4 +-
 .../Basic/InteractiveDialogViewModel.cs       |  6 +-
 .../AutoCompleteTextBoxDemoViewModel.cs       | 12 +--
 .../ViewModel/Controls/BadgeDemoViewModel.cs  |  4 +-
 .../ViewModel/Controls/CardDemoViewModel.cs   |  2 +-
 .../ViewModel/Controls/CoverViewModel.cs      |  2 +-
 .../ViewModel/Controls/DialogDemoViewModel.cs | 28 +++----
 .../ViewModel/Controls/GrowlDemoViewModel.cs  |  2 +-
 .../Controls/ImageBrowserDemoViewModel.cs     |  2 +-
 .../Controls/NotificationDemoViewModel.cs     |  6 +-
 .../Controls/NotifyIconDemoViewModel.cs       |  2 +-
 .../Controls/PaginationDemoViewModel.cs       |  2 +-
 .../Controls/SideMenuDemoViewModel.cs         |  2 +-
 .../Controls/SplitButtonDemoViewModel.cs      |  2 +-
 .../ViewModel/Controls/SpriteDemoViewModel.cs |  2 +-
 .../Controls/StepBarDemoViewModel.cs          |  4 +-
 .../Controls/TabControlDemoViewModel.cs       |  2 +-
 .../ViewModel/Controls/TagDemoViewModel.cs    |  4 +-
 .../ViewModel/Controls/WindowDemoViewModel.cs |  2 +-
 .../ViewModel/DemoViewModelBase`1.cs          |  4 +-
 .../ViewModel/Main/ItemsDisplayViewModel.cs   |  2 +-
 .../ViewModel/Main/MainViewModel.cs           |  8 +-
 .../ViewModel/Main/NonClientAreaViewModel.cs  |  4 +-
 .../ViewModel/ViewModelLocator.cs             |  2 +-
 .../Window/AboutWindow.xaml.cs                |  2 +-
 .../Window/BlurWindow.xaml.cs                 |  2 +-
 .../Window/CommonWindow.xaml.cs               |  2 +-
 .../Window/CustomNonClientAreaWindow.xaml.cs  |  2 +-
 .../Window/DialogDemoWindow.xaml.cs           |  2 +-
 .../Window/GlowWindow.xaml.cs                 |  2 +-
 .../Window/GrowlDemoWindow.xaml.cs            |  2 +-
 .../Window/NativeCommonWindow.xaml.cs         |  2 +-
 .../Window/NavigationWindow.xaml.cs           |  2 +-
 .../NoNonClientAreaDragableWindow.xaml.cs     |  2 +-
 .../Window/TouchDragMoveWindow.xaml.cs        |  2 +-
 .../ManualObservableCollection`1.cs           |  2 +-
 .../Collections/Pool/IPool`1.cs               |  2 +-
 .../Collections/Pool/SimplePool`1.cs          |  2 +-
 .../Collections/Pool/SynchronizedPool`1.cs    |  2 +-
 .../Collections/Queue/Deque`1.cs              |  2 +-
 .../Attach/BackgroundSwitchElement.cs         |  2 +-
 .../Controls/Attach/BorderElement.cs          |  2 +-
 .../Controls/Attach/DataGridAttach.cs         |  2 +-
 .../Controls/Attach/DropDownElement.cs        |  2 +-
 .../Controls/Attach/EdgeElement.cs            |  2 +-
 .../Controls/Attach/GridAttach.cs             |  2 +-
 .../Controls/Attach/IconElement.cs            |  2 +-
 .../Controls/Attach/IconSwitchElement.cs      |  2 +-
 .../Controls/Attach/ImageAttach.cs            |  2 +-
 .../Controls/Attach/InfoElement.cs            |  2 +-
 .../Controls/Attach/MenuTopLineAttach.cs      |  2 +-
 .../Controls/Attach/PanelElement.cs           |  2 +-
 .../Controls/Attach/PasswordBoxAttach.cs      |  2 +-
 .../Controls/Attach/RectangleAttach.cs        |  2 +-
 .../Controls/Attach/ScrollViewerAttach.cs     |  2 +-
 .../Controls/Attach/StatusSwitchElement.cs    |  2 +-
 .../Controls/Attach/TextBlockAttach.cs        |  2 +-
 .../Controls/Attach/TipElement.cs             |  2 +-
 .../Controls/Attach/TitleElement.cs           |  2 +-
 .../Controls/Attach/VisualElement.cs          |  2 +-
 .../Controls/Attach/WindowAttach.cs           |  2 +-
 .../Controls/Base/AdornerElement.cs           |  2 +-
 .../Controls/Base/HeaderedSelectableItem.cs   |  2 +-
 .../Base/HeaderedSimpleItemsControl.cs        |  2 +-
 .../Controls/Base/IGravatarGenerator.cs       |  2 +-
 .../Controls/Base/ISelectable.cs              |  2 +-
 .../Controls/Base/ISingleOpen.cs              |  2 +-
 .../Controls/Base/RegularItemsControl.cs      |  2 +-
 .../Controls/Base/SelectableItem.cs           |  2 +-
 .../Controls/Base/SimpleItemsControl.cs       |  2 +-
 .../Controls/Block/FloatingBlock.cs           |  2 +-
 .../Block/RunningBlock/RunningBlock.cs        |  2 +-
 .../Block/RunningBlock/RunningBorder.cs       |  2 +-
 .../Controls/Block/ToggleBlock.cs             |  2 +-
 .../Controls/Button/ButtonGroup.cs            |  2 +-
 .../Controls/Button/ContextMenuButton.cs      |  2 +-
 .../Button/ContextMenuToggleButton.cs         |  2 +-
 .../Controls/Button/ProgressButton.cs         |  2 +-
 .../Controls/Button/SplitButton.cs            |  2 +-
 .../Controls/Carousel/Carousel.cs             |  2 +-
 .../Controls/Carousel/CarouselItem.cs         |  2 +-
 .../Controls/ColorPicker/ColorDropper.cs      |  2 +-
 .../Controls/ColorPicker/ColorPicker.cs       |  2 +-
 .../Controls/Cover/CoverFlow/CoverFlow.cs     |  2 +-
 .../Controls/Cover/CoverFlow/CoverFlowItem.cs |  2 +-
 .../Controls/Cover/CoverView/CoverView.cs     |  2 +-
 .../Cover/CoverView/CoverViewContent.cs       |  2 +-
 .../Controls/Cover/CoverView/CoverViewItem.cs |  2 +-
 .../Controls/Dialog/Dialog.cs                 |  2 +-
 .../Controls/Dialog/DialogContainer.cs        |  2 +-
 .../Controls/Drawer/Drawer.cs                 |  2 +-
 .../Controls/Drawer/DrawerContainer.cs        |  2 +-
 .../Controls/Growl/Growl.cs                   |  2 +-
 .../Controls/Growl/GrowlWindow.cs             |  2 +-
 .../Controls/Image/GifImage.cs                |  2 +-
 .../Controls/Image/ImageBlock.cs              |  2 +-
 .../Controls/Image/ImageViewer.cs             |  2 +-
 .../AutoCompleteTextBox.cs                    |  2 +-
 .../AutoCompleteTextBoxItem.cs                |  2 +-
 .../Input/CheckComboBox/CheckComboBox.cs      |  2 +-
 .../Input/CheckComboBox/CheckComboBoxItem.cs  |  2 +-
 .../Controls/Input/ComboBox.cs                | 32 +++----
 .../Controls/Input/DatePicker.cs              | 18 ++--
 .../Controls/Input/DateTimePicker.cs          | 50 +++++------
 .../Controls/Input/IDataInput.cs              |  2 +-
 .../Controls/Input/ImageSelector.cs           |  2 +-
 .../Controls/Input/NumericUpDown.cs           | 18 ++--
 .../Controls/Input/PasswordBox.cs             | 24 +++---
 .../Controls/Input/PinBox.cs                  | 18 ++--
 .../Controls/Input/SearchBar.cs               |  2 +-
 .../Controls/Input/TextBox.cs                 |  2 +-
 .../Controls/Input/TimePicker.cs              | 50 +++++------
 .../Controls/Input/WatermarkTextBox.cs        |  2 +-
 .../Controls/Loading/LoadingBase.cs           |  2 +-
 .../Controls/Loading/LoadingCircle.cs         |  2 +-
 .../Controls/Loading/LoadingLine.cs           |  2 +-
 .../Controls/Other/AnimationPath.cs           |  2 +-
 .../Controls/Other/Badge.cs                   |  2 +-
 .../Controls/Other/BlendEffectBox.cs          |  2 +-
 .../Controls/Other/Card.cs                    |  2 +-
 .../Controls/Other/ChatBubble.cs              |  2 +-
 .../Controls/Other/DashedBorder.cs            |  2 +-
 .../Controls/Other/Divider.cs                 |  2 +-
 .../Controls/Other/Empty.cs                   |  2 +-
 .../Controls/Other/GotoTop.cs                 |  2 +-
 .../Controls/Other/Gravatar.cs                |  2 +-
 .../Controls/Other/Magnifier.cs               |  2 +-
 .../Controls/Other/Notification.cs            | 44 +++++-----
 .../Controls/Other/NotifyIcon.cs              |  2 +-
 .../Controls/Other/Pagination.cs              |  2 +-
 .../Controls/Other/Poptip.cs                  |  2 +-
 .../Controls/Other/ScrollViewer.cs            |  2 +-
 .../Controls/Other/Shield.cs                  |  2 +-
 .../Controls/Other/Sprite.cs                  |  2 +-
 .../Other/TransitioningContentControl.cs      |  2 +-
 .../Controls/Other/Watermark.cs               |  2 +-
 .../Controls/Panel/AxleCanvas.cs              |  2 +-
 .../Controls/Panel/CirclePanel.cs             |  2 +-
 .../Controls/Panel/ElementGroup.cs            |  2 +-
 .../Controls/Panel/FlexPanel.cs               |  2 +-
 .../Controls/Panel/Grid/Col.cs                |  2 +-
 .../Controls/Panel/Grid/Row.cs                |  2 +-
 .../Controls/Panel/HoneycombPanel.cs          |  2 +-
 .../Controls/Panel/RelativePanel.cs           |  2 +-
 .../Controls/Panel/SimplePanel.cs             |  2 +-
 .../Controls/Panel/SimpleStackPanel.cs        |  2 +-
 .../Controls/Panel/UniformSpacingPanel.cs     |  2 +-
 .../Controls/Panel/WaterfallPanel.cs          |  2 +-
 .../Controls/ProgressBar/CircleProgressBar.cs |  2 +-
 .../Controls/ProgressBar/WaveProgressBar.cs   |  2 +-
 .../Editors/DatePropertyEditor.cs             |  2 +-
 .../Editors/DateTimePropertyEditor.cs         |  2 +-
 .../Editors/EnumPropertyEditor.cs             |  2 +-
 .../HorizontalAlignmentPropertyEditor.cs      |  2 +-
 .../Editors/ImagePropertyEditor.cs            |  2 +-
 .../Editors/NumberPropertyEditor.cs           |  2 +-
 .../Editors/PlainTextPropertyEditor.cs        |  2 +-
 .../Editors/PropertyEditorBase.cs             |  2 +-
 .../Editors/ReadOnlyTextPropertyEditor.cs     |  2 +-
 .../Editors/SwitchPropertyEditor.cs           |  2 +-
 .../Editors/TimePropertyEditor.cs             |  2 +-
 .../VerticalAlignmentPropertyEditor.cs        |  2 +-
 .../Controls/PropertyGrid/PropertyGrid.cs     |  2 +-
 .../Controls/PropertyGrid/PropertyItem.cs     |  2 +-
 .../PropertyGrid/PropertyItemsControl.cs      |  6 +-
 .../Controls/PropertyGrid/PropertyResolver.cs |  2 +-
 .../HandyControl_Shared/Controls/Rate/Rate.cs |  2 +-
 .../Controls/Rate/RateItem.cs                 |  2 +-
 .../Controls/Screenshot/Screenshot.cs         |  2 +-
 .../Controls/Screenshot/ScreenshotWindow.cs   | 26 +++---
 .../Controls/SideMenu/SideMenu.cs             |  2 +-
 .../Controls/SideMenu/SideMenuItem.cs         |  2 +-
 .../Slider/CompareSlider/CompareSlider.cs     |  2 +-
 .../Slider/CompareSlider/CompareTrack.cs      |  2 +-
 .../Controls/Slider/PreviewSlider.cs          |  2 +-
 .../Slider/RangeSlider/RangeSlider.cs         |  2 +-
 .../Controls/Slider/RangeSlider/RangeThumb.cs |  2 +-
 .../Controls/Slider/RangeSlider/RangeTrack.cs |  2 +-
 .../Slider/RangeSlider/TwoWayRangeBase.cs     |  2 +-
 .../Controls/StepBar/StepBar.cs               |  2 +-
 .../Controls/StepBar/StepBarItem.cs           |  2 +-
 .../Controls/TabControl/TabControl.cs         |  2 +-
 .../Controls/TabControl/TabItem.cs            |  2 +-
 .../Controls/TabControl/TabPanel.cs           |  2 +-
 .../HandyControl_Shared/Controls/Tag/Tag.cs   |  2 +-
 .../Controls/Tag/TagContainer.cs              |  2 +-
 .../Controls/Text/HighlightTextBlock.cs       | 12 +--
 .../Controls/Text/OutlineText.cs              |  2 +-
 .../Controls/Text/SimpleText.cs               |  2 +-
 .../Controls/Time/CalendarWithClock.cs        |  2 +-
 .../Controls/Time/Clock/Clock.cs              |  2 +-
 .../Controls/Time/Clock/ClockBase.cs          |  2 +-
 .../Controls/Time/Clock/ClockRadioButton.cs   |  2 +-
 .../Controls/Time/Clock/ListClock.cs          |  2 +-
 .../Controls/Time/FlipClock/FlipClock.cs      |  2 +-
 .../Controls/Time/FlipClock/FlipNumber.cs     |  2 +-
 .../Controls/Time/TimeBar/SpeTextBlock.cs     |  2 +-
 .../Controls/Time/TimeBar/TimeBar.cs          |  2 +-
 .../Controls/Transfer/Transfer.cs             |  2 +-
 .../Controls/Transfer/TransferGroup.cs        |  2 +-
 .../Controls/Transfer/TransferItem.cs         |  2 +-
 .../Controls/Window/BlurWindow.cs             |  2 +-
 .../Controls/Window/GlowWindow.cs             |  2 +-
 .../Controls/Window/ImageBrowser.cs           |  2 +-
 .../Controls/Window/MessageBox.cs             |  2 +-
 .../Controls/Window/PopupWindow.cs            |  2 +-
 .../Data/Args/CancelRoutedEventArgs.cs        |  2 +-
 .../Data/Args/FunctionEventArgs`1.cs          |  2 +-
 .../Data/Args/KeyboardHookEventArgs.cs        |  2 +-
 .../Data/Args/MouseHookEventArgs.cs           |  2 +-
 .../Data/DisposableObject.cs                  |  2 +-
 .../Data/Enum/BadgeStatus.cs                  |  2 +-
 .../Data/Enum/ChatMessageType.cs              |  2 +-
 .../Data/Enum/ChatRoleType.cs                 |  2 +-
 .../Data/Enum/ColLayoutStatus.cs              |  2 +-
 .../Data/Enum/DrawerShowMode.cs               |  2 +-
 .../Data/Enum/EnumDataProvider.cs             |  2 +-
 .../Data/Enum/ExpandMode.cs                   |  2 +-
 .../Data/Enum/HatchStyle.cs                   |  2 +-
 .../HandyControl_Shared/Data/Enum/HitMode.cs  |  2 +-
 .../Data/Enum/ImageCodecFlags.cs              |  2 +-
 .../HandyControl_Shared/Data/Enum/InfoType.cs |  2 +-
 .../HandyControl_Shared/Data/Enum/IpType.cs   |  2 +-
 .../Data/Enum/LinearLayout.cs                 |  2 +-
 .../Data/Enum/MouseHookMessageType.cs         |  2 +-
 .../Data/Enum/NotifyIconInfoType.cs           |  2 +-
 .../Data/Enum/PlacementType.cs                |  2 +-
 .../Data/Enum/ResultType.cs                   |  2 +-
 .../Data/Enum/ShowAnimation.cs                |  2 +-
 .../Data/Enum/SideMenuItemRole.cs             |  2 +-
 .../HandyControl_Shared/Data/Enum/SkinType.cs |  2 +-
 .../Data/Enum/StepStatus.cs                   |  2 +-
 .../Data/Enum/StrokePosition.cs               |  2 +-
 .../HandyControl_Shared/Data/Enum/TextType.cs |  2 +-
 .../Data/Enum/TitlePlacementType.cs           |  2 +-
 .../Data/Enum/TransitionMode.cs               |  2 +-
 .../Data/Enum/VisualWrapping.cs               |  2 +-
 .../HandyControl_Shared/Data/EnumItem.cs      |  2 +-
 .../Data/Flex/FlexContentAlignment.cs         |  2 +-
 .../Data/Flex/FlexContentJustify.cs           |  2 +-
 .../Data/Flex/FlexDirection.cs                |  2 +-
 .../Data/Flex/FlexItemAlignment.cs            |  2 +-
 .../Data/Flex/FlexItemsAlignment.cs           |  2 +-
 .../HandyControl_Shared/Data/Flex/FlexWrap.cs |  2 +-
 .../HandyControl_Shared/Data/Gif/GPStream.cs  |  2 +-
 .../Data/Gif/GifFrameDimension.cs             |  2 +-
 .../Data/Gif/GifImageInfo.cs                  |  2 +-
 .../Data/Gif/GifPropertyItem.cs               |  2 +-
 .../Data/Gif/GifPropertyItemInternal.cs       |  2 +-
 .../Data/GlowWindow/ChangeScope.cs            |  2 +-
 .../Data/GlowWindow/GlowBitmap.cs             |  2 +-
 .../Data/GlowWindow/GlowBitmapPart.cs         |  2 +-
 .../Data/GlowWindow/GlowDrawingContext.cs     |  2 +-
 .../Data/GlowWindow/GlowEdge.cs               | 14 ++--
 .../Data/HandyControlConfig.cs                |  2 +-
 .../HandyControl_Shared/Data/HwndWrapper.cs   |  2 +-
 .../Data/Info/GrowlInfo.cs                    |  2 +-
 .../Data/Info/ImageCodecInfo.cs               |  2 +-
 .../Data/Info/MessageBoxInfo.cs               |  2 +-
 .../Data/Info/SystemVersionInfo.cs            |  2 +-
 .../Data/Operation/OperationResult.cs         |  2 +-
 .../Data/Operation/OperationResult`1.cs       |  2 +-
 .../HandyControl_Shared/Data/PanelUvSize.cs   |  2 +-
 .../Data/Range/ColorRange.cs                  |  2 +-
 .../Data/Range/DateTimeRange.cs               |  2 +-
 .../Data/Range/DoubleRange.cs                 |  2 +-
 .../Data/Range/IValueRange.cs                 |  2 +-
 .../HandyControl_Shared/Data/ResourceToken.cs |  2 +-
 .../HandyControl_Shared/Data/ValueBoxes.cs    |  2 +-
 .../Commands/CloseWindowCommand.cs            |  2 +-
 .../Interactivity/Commands/ControlCommands.cs |  2 +-
 .../Interactivity/Commands/OpenLinkCommand.cs |  2 +-
 .../Commands/PushMainWindow2TopCommand.cs     |  2 +-
 .../Commands/ShutdownAppCommand.cs            |  2 +-
 .../Commands/StartScreenshotCommand.cs        |  2 +-
 .../Interactivity/EventToCommand.cs           |  2 +-
 .../Interactivity/IEventArgsConverter.cs      |  2 +-
 .../MouseDragElementBehaviorEx.cs             |  2 +-
 .../Interactivity/RoutedEventTrigger.cs       |  2 +-
 .../Animation/DiscreteGeometryKeyFrame.cs     |  2 +-
 .../Media/Animation/EasingGeometryKeyFrame.cs |  2 +-
 .../Media/Animation/GeometryAnimation.cs      |  2 +-
 .../Media/Animation/GeometryAnimationBase.cs  |  2 +-
 .../GeometryAnimationUsingKeyFrames.cs        |  2 +-
 .../Animation/GeometryKeyFrameCollection.cs   |  2 +-
 .../Media/Animation/LinearGeometryKeyFrame.cs |  2 +-
 .../Media/Animation/ResolvedKeyFrameEntry.cs  |  2 +-
 .../Media/Animation/SplineGeometryKeyFrame.cs |  2 +-
 .../Media/Effects/BrightnessEffect.cs         |  2 +-
 .../Media/Effects/ColorComplementEffect.cs    |  2 +-
 .../Media/Effects/ColorMatrixEffect.cs        |  2 +-
 .../Media/Effects/ContrastEffect.cs           |  2 +-
 .../Media/Effects/EffectBase.cs               |  2 +-
 .../Media/Effects/GrayScaleEffect.cs          |  2 +-
 .../Properties/Langs/LangProvider.cs          |  2 +-
 .../Themes/SharedResourceDictionary.cs        |  2 +-
 .../HandyControl_Shared/Themes/Theme.cs       |  2 +-
 .../Converter/Boolean2BooleanReConverter.cs   |  2 +-
 .../Tools/Converter/Boolean2StrConverter.cs   |  2 +-
 .../Boolean2VisibilityReConverter.cs          |  2 +-
 .../Converter/BooleanArr2BooleanConverter.cs  |  2 +-
 .../BooleanArr2VisibilityConverter.cs         |  2 +-
 .../Converter/BorderCircularClipConverter.cs  |  2 +-
 .../Converter/BorderCircularConverter.cs      |  2 +-
 .../Tools/Converter/BorderClipConverter.cs    |  2 +-
 .../Tools/Converter/ColLayoutConverter.cs     |  2 +-
 .../Converter/Color2ChannelAConverter.cs      |  2 +-
 .../Tools/Converter/Color2HexStrConverter.cs  |  2 +-
 .../Converter/CornerRadiusSplitConverter.cs   |  2 +-
 ...aGridSelectAllButtonVisibilityConverter.cs |  2 +-
 .../Converter/Double2GridLengthConverter.cs   |  2 +-
 .../Tools/Converter/DoubleMinConverter.cs     |  2 +-
 .../Tools/Converter/Int2StrConverter.cs       |  2 +-
 .../Tools/Converter/Long2FileSizeConverter.cs |  2 +-
 .../Converter/Number2PercentageConverter.cs   |  2 +-
 .../Converter/Object2BooleanConverter.cs      |  2 +-
 .../Tools/Converter/Object2StringConverter.cs |  2 +-
 .../Converter/Object2VisibilityConverter.cs   |  2 +-
 .../Converter/Object2VisibilityReConverter.cs |  2 +-
 .../Converter/RectangleCircularConverter.cs   |  2 +-
 .../Converter/String2VisibilityConverter.cs   |  2 +-
 .../Converter/String2VisibilityReConverter.cs |  2 +-
 .../Converter/ThicknessSplitConverter.cs      |  2 +-
 .../Converter/TreeViewItemMarginConverter.cs  |  2 +-
 .../Tools/Extension/ColLayout.cs              |  2 +-
 .../Tools/Extension/ColorExtension.cs         |  2 +-
 .../Extension/DependencyObjectExtension.cs    |  2 +-
 .../Tools/Extension/DialogExtension.cs        |  2 +-
 .../Tools/Extension/EnumerableExtension.cs    |  2 +-
 .../Extension/FrameworkElementExtension.cs    |  2 +-
 .../Tools/Extension/GeometryExtension.cs      |  2 +-
 .../Tools/Extension/LangExtension.cs          | 84 +++++++++----------
 .../Tools/Extension/StringExtension.cs        |  2 +-
 .../Tools/Extension/UIElementExtension.cs     |  2 +-
 .../Tools/Extension/ValueExtension.cs         |  2 +-
 .../Tools/Generator/ComparerGenerator.cs      |  2 +-
 .../Tools/Generator/DateTimeRangeComparer.cs  |  2 +-
 .../Generator/GithubGravatarGenerator.cs      |  2 +-
 .../Tools/Generator/HatchBrushGenerator.cs    |  2 +-
 .../Tools/GlobalShortcut.cs                   |  2 +-
 .../Tools/Helper/AnimationHelper.cs           |  2 +-
 .../Tools/Helper/ArithmeticHelper.cs          |  2 +-
 .../Tools/Helper/BindingHelper.cs             |  2 +-
 .../Tools/Helper/ColorHelper.cs               |  2 +-
 .../Tools/Helper/ConfigHelper.cs              | 10 +--
 .../Tools/Helper/DesignerHelper.cs            |  2 +-
 .../Tools/Helper/DpiHelper.cs                 |  2 +-
 .../Tools/Helper/FullScreenHelper.cs          |  2 +-
 .../Tools/Helper/IconHelper.cs                |  2 +-
 .../Tools/Helper/InputClickHelper.cs          |  2 +-
 .../Tools/Helper/ResourceHelper.cs            |  2 +-
 .../Tools/Helper/ScreenHelper.cs              |  2 +-
 .../Tools/Helper/SecurityHelper.cs            |  2 +-
 .../Tools/Helper/SingleOpenHelper.cs          |  2 +-
 .../Tools/Helper/SystemHelper.cs              |  2 +-
 .../Tools/Helper/TextHelper.cs                | 14 ++--
 .../Tools/Helper/TokenizerHelper.cs           |  2 +-
 .../Tools/Helper/TouchDragMoveWindowHelper.cs |  2 +-
 .../Tools/Helper/ValidateHelper.cs            |  2 +-
 .../Tools/Helper/VisualHelper.cs              |  2 +-
 .../Tools/Helper/WindowHelper.cs              | 10 +--
 .../Tools/Hook/ClipboardHook.cs               |  2 +-
 .../Tools/Hook/KeyboardHook.cs                |  2 +-
 .../Tools/Hook/MouseHook.cs                   |  2 +-
 .../Tools/Hook/SystemMenuHook.cs              |  2 +-
 .../Tools/Interop/Handle/BitmapHandle.cs      |  2 +-
 .../Tools/Interop/Handle/CommonHandles.cs     |  2 +-
 .../Tools/Interop/Handle/HandleCollector.cs   |  2 +-
 .../Tools/Interop/Handle/IconHandle.cs        |  2 +-
 .../Interop/Handle/SafeFileMappingHandle.cs   |  2 +-
 .../Tools/Interop/Handle/WpfSafeHandle.cs     |  2 +-
 .../Tools/Interop/InteropMethods.cs           |  2 +-
 .../Tools/Interop/InteropValues.cs            |  2 +-
 .../Tools/RegexJudgment.cs                    |  2 +-
 .../Tools/RegexPatterns.cs                    |  2 +-
 .../ButtonGroupItemStyleSelector.cs           |  2 +-
 .../ComboBoxItemCapsuleStyleSelector.cs       |  2 +-
 .../TabItemCapsuleStyleSelector.cs            |  2 +-
 .../Drawing/BezierCurveFlattener.cs           |  2 +-
 .../Drawing/CommonExtensions.cs               |  2 +-
 .../Drawing/ExceptionStringTable.cs           |  2 +-
 .../Drawing/GeometryHelper.cs                 |  2 +-
 .../Drawing/MarchLocation.cs                  |  2 +-
 .../Drawing/MarchStopReason.cs                |  2 +-
 .../Drawing/MathHelper.cs                     |  2 +-
 .../Drawing/PathFigureHelper.cs               |  2 +-
 .../Drawing/PathGeometryHelper.cs             |  2 +-
 .../Drawing/PathSegmentData.cs                |  2 +-
 .../Drawing/PathSegmentHelper.cs              |  2 +-
 .../Drawing/PolylineData.cs                   |  2 +-
 .../Drawing/PolylineHelper.cs                 |  2 +-
 .../Drawing/RandomEngine.cs                   |  2 +-
 .../Drawing/SimpleSegment.cs                  |  2 +-
 .../Media/ArcGeometrySource.cs                |  2 +-
 .../Media/DrawingPropertyChangedEventArgs.cs  |  2 +-
 .../Media/DrawingPropertyMetadata.cs          |  2 +-
 .../Media/DrawingPropertyMetadataOptions.cs   |  2 +-
 .../Media/GeometryEffect.cs                   |  2 +-
 .../Media/GeometryEffectConverter.cs          |  2 +-
 .../Media/GeometrySource`1.cs                 |  2 +-
 .../Media/IArcGeometrySourceParameters.cs     |  2 +-
 .../Media/IGeometrySource.cs                  |  2 +-
 .../Media/IGeometrySourceExtensions.cs        |  2 +-
 .../Media/IGeometrySourceParameters.cs        |  2 +-
 .../Media/IShape.cs                           |  2 +-
 .../Media/InvalidateGeometryReasons.cs        |  2 +-
 .../Media/SketchGeometryEffect.cs             | 14 ++--
 .../Media/UnitType.cs                         |  2 +-
 .../Shapes/Arc.cs                             |  2 +-
 .../Shapes/PrimitiveShape.cs                  |  2 +-
 .../AdornerContainer.cs                       |  2 +-
 .../ExceptionStringTable.cs                   |  2 +-
 .../ExtendedVisualStateManager.cs             |  2 +-
 .../FluidMoveBehavior.cs                      |  2 +-
 .../FluidMoveBehaviorBase.cs                  |  2 +-
 .../FluidMoveScope.cs                         |  2 +-
 .../MouseDragElementBehavior.cs               |  2 +-
 .../TagType.cs                                |  2 +-
 .../TransitionEffect.cs                       |  2 +-
 .../Microsoft.Windows.Shell/JumpItem.cs       |  2 +-
 .../JumpItemRejectionReason.cs                |  2 +-
 .../JumpItemsRejectedEventArgs.cs             |  2 +-
 .../JumpItemsRemovedEventArgs.cs              |  2 +-
 .../Microsoft.Windows.Shell/JumpList.cs       |  2 +-
 .../Microsoft.Windows.Shell/JumpPath.cs       |  2 +-
 .../Microsoft.Windows.Shell/JumpTask.cs       |  2 +-
 .../Microsoft.Windows.Shell/Standard/AC.cs    |  2 +-
 .../Standard/APPDOCLISTTYPE.cs                |  2 +-
 .../Standard/Assert.cs                        |  2 +-
 .../Microsoft.Windows.Shell/Standard/BI.cs    |  2 +-
 .../Standard/BITMAPINFO.cs                    |  2 +-
 .../Standard/BITMAPINFOHEADER.cs              |  2 +-
 .../Standard/BLENDFUNCTION.cs                 |  2 +-
 .../Standard/CHANGEFILTERSTRUCT.cs            |  2 +-
 .../Microsoft.Windows.Shell/Standard/CLSID.cs |  2 +-
 .../Standard/CREATESTRUCT.cs                  |  2 +-
 .../Microsoft.Windows.Shell/Standard/CS.cs    |  2 +-
 .../Standard/CombineRgnResult.cs              |  2 +-
 .../Microsoft.Windows.Shell/Standard/DOGIF.cs |  2 +-
 .../Standard/DWMFLIP3D.cs                     |  2 +-
 .../Standard/DWMNCRP.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/DWMWA.cs |  2 +-
 .../Standard/DWM_SIT.cs                       |  2 +-
 .../Standard/DWM_TIMING_INFO.cs               |  2 +-
 .../Standard/DeviceCap.cs                     |  2 +-
 .../Standard/DoubleUtilities.cs               |  2 +-
 .../Standard/DpiHelper.cs                     |  2 +-
 .../Standard/ErrorModes.cs                    |  2 +-
 .../Microsoft.Windows.Shell/Standard/FO.cs    |  2 +-
 .../Microsoft.Windows.Shell/Standard/FOF.cs   |  2 +-
 .../Standard/Facility.cs                      |  2 +-
 .../Microsoft.Windows.Shell/Standard/GCLP.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/GPS.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/GWL.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/HCF.cs   |  2 +-
 .../Standard/HIGHCONTRAST.cs                  |  2 +-
 .../Standard/HRESULT.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/HT.cs    |  2 +-
 .../Standard/IApplicationDestinations.cs      |  2 +-
 .../Standard/IApplicationDocumentLists.cs     |  2 +-
 .../Standard/ICustomDestinationList.cs        |  2 +-
 .../Standard/IEnumIDList.cs                   |  2 +-
 .../Standard/IEnumObjects.cs                  |  2 +-
 .../Microsoft.Windows.Shell/Standard/IID.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/INPUT.cs |  2 +-
 .../Standard/INPUT_TYPE.cs                    |  2 +-
 .../Standard/IObjectArray.cs                  |  2 +-
 .../Standard/IObjectCollection.cs             |  2 +-
 .../Standard/IObjectWithAppUserModelId.cs     |  2 +-
 .../Standard/IObjectWithProgId.cs             |  2 +-
 .../Standard/IPropertyStore.cs                |  2 +-
 .../Standard/IShellFolder.cs                  |  2 +-
 .../Standard/IShellItem.cs                    |  2 +-
 .../Standard/IShellItem2.cs                   |  2 +-
 .../Standard/IShellItemArray.cs               |  2 +-
 .../Standard/IShellLinkW.cs                   |  2 +-
 .../Standard/ITaskbarList.cs                  |  2 +-
 .../Standard/ITaskbarList2.cs                 |  2 +-
 .../Standard/ITaskbarList3.cs                 |  2 +-
 .../Standard/ITaskbarList4.cs                 |  2 +-
 .../Microsoft.Windows.Shell/Standard/KDC.cs   |  2 +-
 .../Standard/LOGFONT.cs                       |  2 +-
 .../Standard/MARGINS.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/MF.cs    |  2 +-
 .../Standard/MINMAXINFO.cs                    |  2 +-
 .../Standard/MONITORINFO.cs                   |  2 +-
 .../Standard/MOUSEEVENTF.cs                   |  2 +-
 .../Standard/MOUSEINPUT.cs                    |  2 +-
 .../Standard/MSGFLT.cs                        |  2 +-
 .../Standard/MSGFLTINFO.cs                    |  2 +-
 .../Standard/ManagedIStream.cs                |  2 +-
 .../Standard/MessageHandler.cs                |  2 +-
 .../Standard/MessageWindow.cs                 |  2 +-
 .../Microsoft.Windows.Shell/Standard/NIF.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/NIIF.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/NIM.cs   |  2 +-
 .../Standard/NONCLIENTMETRICS.cs              |  2 +-
 .../Standard/NOTIFYICONDATA.cs                |  2 +-
 .../Standard/NativeMethods.cs                 |  2 +-
 .../Standard/OLECMDEXECOPT.cs                 |  2 +-
 .../Standard/OLECMDF.cs                       |  2 +-
 .../Standard/OLECMDID.cs                      |  2 +-
 .../Microsoft.Windows.Shell/Standard/PKEY.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/POINT.cs |  2 +-
 .../Standard/PROPVARIANT.cs                   |  2 +-
 .../Standard/READYSTATE.cs                    |  2 +-
 .../Microsoft.Windows.Shell/Standard/RECT.cs  |  2 +-
 .../Standard/RGBQUAD.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/RGN.cs   |  2 +-
 .../Standard/RefPOINT.cs                      |  2 +-
 .../Standard/RefRECT.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/SC.cs    |  2 +-
 .../Microsoft.Windows.Shell/Standard/SFGAO.cs |  2 +-
 .../Microsoft.Windows.Shell/Standard/SHARD.cs |  2 +-
 .../Standard/SHARDAPPIDINFO.cs                |  2 +-
 .../Standard/SHARDAPPIDINFOIDLIST.cs          |  2 +-
 .../Standard/SHARDAPPIDINFOLINK.cs            |  2 +-
 .../Standard/SHCONTF.cs                       |  2 +-
 .../Standard/SHFILEOPSTRUCT.cs                |  2 +-
 .../Microsoft.Windows.Shell/Standard/SHGDN.cs |  2 +-
 .../Standard/SIATTRIBFLAGS.cs                 |  2 +-
 .../Standard/SICHINT.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/SIGDN.cs |  2 +-
 .../Microsoft.Windows.Shell/Standard/SIZE.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/SLGP.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/SM.cs    |  2 +-
 .../Microsoft.Windows.Shell/Standard/SPI.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/SPIF.cs  |  2 +-
 .../Standard/STATE_SYSTEM.cs                  |  2 +-
 .../Microsoft.Windows.Shell/Standard/STPF.cs  |  2 +-
 .../Standard/STR_GPS.cs                       |  2 +-
 .../Microsoft.Windows.Shell/Standard/SW.cs    |  2 +-
 .../Microsoft.Windows.Shell/Standard/SWP.cs   |  2 +-
 .../Standard/SafeConnectionPointCookie.cs     |  2 +-
 .../Standard/SafeDC.cs                        |  2 +-
 .../Standard/SafeFindHandle.cs                |  2 +-
 .../Standard/SafeGdiplusStartupToken.cs       |  2 +-
 .../Standard/SafeHBITMAP.cs                   |  2 +-
 .../Standard/StartupInput.cs                  |  2 +-
 .../Standard/StartupOutput.cs                 |  2 +-
 .../Standard/Status.cs                        |  2 +-
 .../Standard/StockObject.cs                   |  2 +-
 .../Microsoft.Windows.Shell/Standard/TBPF.cs  |  2 +-
 .../Microsoft.Windows.Shell/Standard/THB.cs   |  2 +-
 .../Microsoft.Windows.Shell/Standard/THBF.cs  |  2 +-
 .../Standard/THUMBBUTTON.cs                   |  2 +-
 .../Standard/TITLEBARINFO.cs                  |  2 +-
 .../Standard/TITLEBARINFOEX.cs                |  2 +-
 .../Microsoft.Windows.Shell/Standard/ULW.cs   |  2 +-
 .../Standard/UNSIGNED_RATIO.cs                |  2 +-
 .../Standard/Utility.cs                       |  4 +-
 .../Standard/Verify.cs                        |  2 +-
 .../Standard/WIN32_FIND_DATAW.cs              |  2 +-
 .../Standard/WINDOWPLACEMENT.cs               |  2 +-
 .../Standard/WINDOWPOS.cs                     |  2 +-
 .../Standard/WINDOWTHEMEATTRIBUTETYPE.cs      |  2 +-
 .../Microsoft.Windows.Shell/Standard/WM.cs    |  2 +-
 .../Standard/WNDCLASSEX.cs                    |  2 +-
 .../Microsoft.Windows.Shell/Standard/WS.cs    |  2 +-
 .../Microsoft.Windows.Shell/Standard/WS_EX.cs |  2 +-
 .../Standard/WTA_OPTIONS.cs                   |  2 +-
 .../Microsoft.Windows.Shell/Standard/WTNCA.cs |  2 +-
 .../Microsoft.Windows.Shell/Standard/WVR.cs   |  2 +-
 .../Standard/Win32Error.cs                    |  2 +-
 .../Standard/Win32Value.cs                    |  2 +-
 .../Standard/WndProc.cs                       |  2 +-
 .../Standard/WndProcHook.cs                   |  2 +-
 .../Microsoft.Windows.Shell/SystemCommands.cs |  2 +-
 .../SystemParameters2.cs                      |  4 +-
 .../TaskbarItemInfo.cs                        | 10 +--
 .../TaskbarItemProgressState.cs               |  2 +-
 .../ThumbButtonInfo.cs                        |  2 +-
 .../ThumbButtonInfoCollection.cs              |  2 +-
 .../Microsoft.Windows.Shell/WindowChrome.cs   |  2 +-
 .../WindowChromeWorker.cs                     |  2 +-
 .../AttachableCollection`1.cs                 |  2 +-
 .../System.Windows.Interactivity/Behavior.cs  |  2 +-
 .../BehaviorCollection.cs                     |  2 +-
 .../Behavior`1.cs                             |  2 +-
 .../DefaultTriggerAttribute.cs                |  2 +-
 .../EventTrigger.cs                           |  2 +-
 .../EventTriggerBase.cs                       |  2 +-
 .../EventTriggerBase`1.cs                     |  2 +-
 .../IAttachedObject.cs                        |  2 +-
 .../Interaction.cs                            |  2 +-
 .../InvokeCommandAction.cs                    |  2 +-
 .../NameResolvedEventArgs.cs                  |  2 +-
 .../NameResolver.cs                           |  2 +-
 .../PreviewInvokeEventArgs.cs                 |  2 +-
 .../TriggerAction.cs                          |  2 +-
 .../TriggerActionCollection.cs                |  2 +-
 .../TriggerAction`1.cs                        |  2 +-
 .../TriggerBase.cs                            |  2 +-
 .../TriggerCollection.cs                      |  2 +-
 .../TypeConstraintAttribute.cs                |  2 +-
 747 files changed, 1000 insertions(+), 1000 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
index 07cb8e23..54db7684 100644
--- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs
@@ -27,13 +27,13 @@ public partial class App
     public App()
     {
 #if !NET40
-            var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
-            if (!Directory.Exists(cachePath))
-            {
-                Directory.CreateDirectory(cachePath);
-            }
-            ProfileOptimization.SetProfileRoot(cachePath);
-            ProfileOptimization.StartProfile("Profile");
+        var cachePath = $"{AppDomain.CurrentDomain.BaseDirectory}Cache";
+        if (!Directory.Exists(cachePath))
+        {
+            Directory.CreateDirectory(cachePath);
+        }
+        ProfileOptimization.SetProfileRoot(cachePath);
+        ProfileOptimization.StartProfile("Profile");
 #endif
     }
 
@@ -80,7 +80,7 @@ public partial class App
 #if NET40
             ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
 #else
-                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
 #endif
         }
     }
@@ -136,4 +136,4 @@ public partial class App
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs b/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
index 03b456d4..9f565c7d 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/AppConfig.cs
@@ -10,4 +10,4 @@ internal class AppConfig
     public string Lang { get; set; } = "zh-cn";
 
     public SkinType Skin { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs b/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
index b2221317..22fe300b 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Enum/DemoType.cs
@@ -9,4 +9,4 @@ public enum DemoType
     Type4,
     Type5,
     Type6
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs b/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
index 276ec339..dd0d4e91 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/GlobalData.cs
@@ -34,4 +34,4 @@ internal class GlobalData
     public static AppConfig Config { get; set; }
 
     public static bool NotifyIconIsShow { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
index 71651e81..6be766d0 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/MessageToken.cs
@@ -54,4 +54,4 @@ public class MessageToken
 
     public static readonly string SkinUpdated = nameof(SkinUpdated);
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
index 75cc2a50..2b4db4eb 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/AvatarModel.cs
@@ -8,4 +8,4 @@ public class AvatarModel
     public string Link { get; set; }
 
     public string AvatarUri { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
index 3e8ff759..0c9b7feb 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/CardModel.cs
@@ -7,4 +7,4 @@ public class CardModel
     public string Content { get; set; }
 
     public string Footer { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
index 9e137151..c066a908 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/ChatInfoModel.cs
@@ -13,4 +13,4 @@ public struct ChatInfoModel
     public ChatMessageType Type { get; set; }
 
     public object Enclosure { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
index b407c3c9..bda5145a 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/CoverViewDemoModel.cs
@@ -5,4 +5,4 @@ public class CoverViewDemoModel
     public string ImgPath { get; set; }
 
     public string BackgroundToken { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
index 0cfbcae0..c6959889 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoDataModel.cs
@@ -18,4 +18,4 @@ public class DemoDataModel
     public string ImgPath { get; set; }
 
     public List<DemoDataModel> DataList { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
index f25a0746..0f1847db 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoInfoModel.cs
@@ -34,4 +34,4 @@ public class DemoInfoModel : ViewModelBase
     public bool IsGroupEnabled { get; set; }
 
     public IList<DemoItemModel> DemoItemList { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
index e06440b5..a685b132 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/DemoItemModel.cs
@@ -23,7 +23,7 @@ public class DemoItemModel : ObservableObject
 #if NET40
         set => Set(nameof(QueriesText), ref _queriesText, value);
 #else
-            set => Set(ref _queriesText, value);
+        set => Set(ref _queriesText, value);
 #endif
     }
 
@@ -33,7 +33,7 @@ public class DemoItemModel : ObservableObject
 #if NET40
         set => Set(nameof(IsVisible), ref _isVisible, value);
 #else
-            set => Set(ref _isVisible, value);
+        set => Set(ref _isVisible, value);
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
index 53727ce9..c9f6939c 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/GeometryItemModel.cs
@@ -9,4 +9,4 @@ public class GeometryItemModel
     public string Key { get; set; }
 
     public bool Line { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
index a5f9e2bc..073453e1 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/PropertyGridDemoModel.cs
@@ -29,4 +29,4 @@ public enum Gender
 {
     Male,
     Female
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
index a9c97244..fa59a930 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/StepBarDemoModel.cs
@@ -5,4 +5,4 @@ public class StepBarDemoModel
     public string Header { get; set; }
 
     public string Content { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs b/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
index 89b5fa1d..d7637cc2 100644
--- a/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/Data/Model/TabControlDemoModel.cs
@@ -5,4 +5,4 @@ public class TabControlDemoModel
     public string Header { get; set; }
 
     public string BackgroundToken { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
index 6121e2a4..502ea268 100644
--- a/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/MainWindow.xaml.cs
@@ -50,4 +50,4 @@ public partial class MainWindow
             base.OnClosing(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
index e1538e95..ca04a1bf 100644
--- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/LangProvider.cs
@@ -2556,4 +2556,4 @@ public class LangKeys
     /// </summary>
     public static string Window = nameof(Window);
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
index 155ac909..b9294fc4 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
+++ b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs
@@ -15,4 +15,4 @@ public class DemoTheme : Theme
     {
         Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml")
     };
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
index b6549001..e4424361 100644
--- a/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
+++ b/src/Shared/HandyControlDemo_Shared/Service/Data/DataService.cs
@@ -438,4 +438,4 @@ public class DataService
             : "ghost1372";
         return $"https://{domainName}.github.io/handycontrol/{key}/{demoItem.Name[0].ToString().ToLower()}{demoItem.Name.Substring(1)}";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
index caf07363..10fd810a 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/HatchBrushConverter.cs
@@ -29,4 +29,4 @@ public class HatchBrushConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
index 676807c9..346a8cd5 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/String2BrushConverter.cs
@@ -17,4 +17,4 @@ public class String2BrushConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs b/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
index 4a8db1cf..4144619c 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Converter/StringRepeatConverter.cs
@@ -41,4 +41,4 @@ public class StringRepeatConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs b/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
index 3722b133..e3080f9d 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Extension/LangExtension.cs
@@ -8,4 +8,4 @@ public class LangExtension : HandyControl.Tools.Extension.LangExtension
     {
         Source = LangProvider.Instance;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
index 849d9111..8e831fac 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/AssemblyHelper.cs
@@ -33,4 +33,4 @@ internal class AssemblyHelper
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
index adfccb0f..062e601c 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/VersionHelper.cs
@@ -35,7 +35,7 @@ internal class VersionHelper
 #elif NET6_0
             var netVersion = "NET 60";
 #elif NETCOREAPP3_0
-            var netVersion = "CORE 30";
+        var netVersion = "CORE 30";
 #elif NETCOREAPP3_1
             var netVersion = "CORE 31";
 #endif
@@ -44,4 +44,4 @@ internal class VersionHelper
 
     internal static string GetCopyright() =>
         FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).LegalCopyright;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
index 1b5b3ac6..cc1ac22f 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/Win32Helper.cs
@@ -10,4 +10,4 @@ internal class Win32Helper
 
     [DllImport("winmm.dll", EntryPoint = "mciSendString", CharSet = CharSet.Auto)]
     public static extern int MciSendString(string lpstrCommand, string lpstrReturnString, int uReturnLength, int hwndCallback);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs b/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
index 9a6a519c..078ea8de 100644
--- a/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
+++ b/src/Shared/HandyControlDemo_Shared/Tools/HighlightingProvider.cs
@@ -76,4 +76,4 @@ internal class HighlightingProviderDark : HighlightingProvider
             ["C#"] = new(() => LoadDefinition("CSharp-Dark")),
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
index 6309f694..1a3502da 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/Avatar.xaml.cs
@@ -36,4 +36,4 @@ public partial class Avatar
         get => (string) GetValue(LinkProperty);
         set => SetValue(LinkProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
index 4507049e..9645bed6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/ChatBox.xaml.cs
@@ -18,4 +18,4 @@ public partial class ChatBox
         _scrollViewer ??= VisualHelper.GetChild<ScrollViewer>(ListBoxChat);
         _scrollViewer?.ScrollToBottom();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
index d7fe1cf0..6849200c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/GeometryItem.xaml.cs
@@ -15,4 +15,4 @@ public partial class GeometryItem
         get => (GeometryItemModel) GetValue(InfoProperty);
         set => SetValue(InfoProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
index 781f1960..f11afea5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/IFull.cs
@@ -3,4 +3,4 @@
 internal interface IFull
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
index e63fb04f..7ac4c7a4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/InteractiveDialog.xaml.cs
@@ -6,4 +6,4 @@ public partial class InteractiveDialog
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
index 4a0fb073..6a38b274 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialog.xaml.cs
@@ -6,4 +6,4 @@ public partial class TextDialog
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
index c2dbbe6a..9db2627b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Basic/TextDialogWithTimer.xaml.cs
@@ -20,4 +20,4 @@ public partial class TextDialogWithTimer
     {
         ButtonClose.Command.Execute(null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
index c21e1e0f..ed36b01c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AnimationPathDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class AnimationPathDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
index 2d7c0b57..277f839c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/AutoCompleteTextBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class AutoCompleteTextBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
index 29d86bba..1093cda5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class BadgeDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
index 464b40f5..5fd591be 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml.cs
@@ -36,4 +36,4 @@ public partial class ButtonGroupDemoCtl
         get => (string) GetValue(LinkProperty);
         set => SetValue(LinkProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
index 5d98c916..7ad76d4b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CalendarWithClockDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CalendarWithClockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
index e11d66c0..8d1c52da 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CardDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
index f4b283c6..d0a44b92 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class CarouselDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
index faae0b96..d2084f0d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ChatBubbleDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
index 02b162dc..40ac094e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CheckComboBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
index 86f3e060..44fe0902 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CirclePanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CirclePanelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
index 4029c869..fdb30a1e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ClockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
index cdaaa8de..e0ffbc82 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ColorPickerDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ColorPickerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
index 732861b7..17100254 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ComboBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
index 6f95f6a0..2e1681b2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class CompareSliderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
index 055c0647..2d997aba 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml.cs
@@ -24,4 +24,4 @@ public partial class CoverFlowDemoCtl
 
         CoverFlowMain.PageIndex = 2;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
index cd236e23..b0533530 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CoverViewDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
index 92c3311d..22370b5a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class DatePickerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
index 7a1158ff..4516e027 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class DateTimePickerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
index 1f2bdab3..a0ca5ee2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DialogDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class DialogDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
index 80858209..a729a1ef 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class DividerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
index a465d301..d5035402 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DrawerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class DrawerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
index cdcaeee8..bfffd2f8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ElementGroupDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
index 0108f042..edbf80f8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class FlexPanelDemoCtl : IFull
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
index f551b19a..1bf77c65 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class FlipClockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
index 2483dd02..91e2b19f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FloatingBlockDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class FloatingBlockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
index 11cd210c..ced84c6b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GifImageDemoCtl.xaml.cs
@@ -13,4 +13,4 @@ public partial class GifImageDemoCtl : IDisposable
     {
         GifImageMain.Dispose();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
index fb97c5b1..6a7916f2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class GotoTopDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
index 2c8e5957..3361fe1c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class GravatarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
index a19b3137..1581bf0b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class GridDemoCtl : IFull
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
index 3dcb6714..7862f170 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GrowlDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class GrowlDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
index d52f881d..4c2f3f59 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/HoneycombPanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class HoneycombPanelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
index 62ee9dc0..3f949fa5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ImageBlockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
index 50c047d6..f7699802 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ImageBrowserDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
index f2a4c8ee..a631ecf6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ImageSelectorDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
index 7e36a7d5..f0db3031 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/LoadingDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class LoadingDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
index ddbf7a80..be76bdbc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class MagnifierDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
index 8142824e..1aaed8c8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotificationDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NotificationDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
index cd461a9b..bcf9032f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemoCtl.xaml.cs
@@ -17,4 +17,4 @@ public partial class NotifyIconDemoCtl
     private void NotifyIconDemoCtl_Unloaded(object sender, RoutedEventArgs e) => ViewModelLocator.Instance.NotifyIconDemo.Cleanup();
 
     private void ButtonPush_OnClick(object sender, RoutedEventArgs e) => NotifyIconContextContent.CloseContextControl();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
index 6e8097bd..611e7385 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NumericUpDownDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
index a4afac74..123b0241 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class OutlineTextDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
index 43280026..4e9c8607 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class PaginationDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
index 3c30f019..3697d19f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class PasswordBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
index 8d367028..17b3a149 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PinBoxDemoCtl.xaml.cs
@@ -17,4 +17,4 @@ public partial class PinBoxDemoCtl
             Growl.Info(pinBox.Password);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
index 3ae529d7..beb08430 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class PoptipDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
index c7de6e22..0313ee00 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PreviewSliderDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class PreviewSliderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
index 8e63b600..a6af0224 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressBarDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ProgressBarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
index 1db731a7..5ff7442c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml.cs
@@ -61,4 +61,4 @@ public partial class ProgressButtonDemoCtl
             _timer.Start();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
index bfc235ac..bcdda5fb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PropertyGridDemoCtl.xaml.cs
@@ -27,4 +27,4 @@ public partial class PropertyGridDemoCtl
         get => (PropertyGridDemoModel) GetValue(DemoModelProperty);
         set => SetValue(DemoModelProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
index dfb64cc0..8b918850 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RangeSliderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
index 17770b5a..f14957e7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RateDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RateDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
index c905890f..cf514cbb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RelativePanelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
index 1a7e1291..4365c90f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RunningBlockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
index 107719b8..7d605777 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScreenshotDemoCtl.xaml.cs
@@ -29,4 +29,4 @@ public partial class ScreenshotDemoCtl : IDisposable
     }
 
     public void Dispose() => Screenshot.Snapped -= Screenshot_Snapped;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
index 8c43ec1f..0f8fc047 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ScrollViewerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
index ec99efd4..a36f374e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class SearchBarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
index 04c7a55e..345bae9e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ShieldDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ShieldDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
index 7283c25e..e00177ff 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SideMenuDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class SideMenuDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
index b5f7011d..62646b8b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SplitButtonDemoCtl.xaml.cs
@@ -13,4 +13,4 @@ public partial class SplitButtonDemoCtl
     {
         MessageBox.Show("123");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
index 607e5cf3..a5fcf899 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SpriteDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class SpriteDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
index d6305143..7adeb054 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/StepBarDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class StepBarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
index 9bb07a7e..1cb6625a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TabControlDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
index 9b0f5056..f48d959a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TagDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
index 30b7a3aa..1eedb806 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TextBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
index 5f65974e..46686525 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimeBarDemoCtl.xaml.cs
@@ -16,4 +16,4 @@ public partial class TimeBarDemoCtl
             TimeBarDemo.Hotspots.Add(new DateTimeRange(DateTime.Today.AddHours(-hour), DateTime.Today.AddHours(-hour + 1)));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
index 4fdd4b89..6ae08ea0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TimePickerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
index a708d975..00b3c4c7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransferDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TransferDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
index 5bfd12bb..0a0a909a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class TransitioningContentControlDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
index 14b3700b..eaf7dc8c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class UniformSpacingPanelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
index 442ab8d1..3fd985c0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class WaterfallPanelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
index fe8108cd..64cf4855 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml.cs
@@ -60,4 +60,4 @@ public partial class WindowDemoCtl
         picker.Canceled += delegate { window.Close(); };
         window.Show();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
index 53887f7b..63ebcf0a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppNotification.xaml.cs
@@ -6,4 +6,4 @@ public partial class AppNotification
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
index bee165cc..f9db9155 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/AppSprite.xaml.cs
@@ -6,4 +6,4 @@ public partial class AppSprite
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
index a47ba05f..2f40d7e4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/BlogsView.xaml.cs
@@ -6,4 +6,4 @@ public partial class BlogsView
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
index 00592399..50b71a3c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ContributorsView.xaml.cs
@@ -7,4 +7,4 @@ public partial class ContributorsView
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
index 6a06b8ac..ad2c645b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/LeftMainContent.xaml.cs
@@ -118,4 +118,4 @@ public partial class LeftMainContent
             }), DispatcherPriority.Background);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
index d54fa484..6b489f06 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainContent.xaml.cs
@@ -179,4 +179,4 @@ public partial class MainContent
 
         public const string Xml = "XML";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
index 675f6a93..c6e0480b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/MainWindowContent.xaml.cs
@@ -6,4 +6,4 @@ public partial class MainWindowContent
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
index 197feca9..201b8017 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/NonClientAreaContent.cs
@@ -62,4 +62,4 @@ public partial class NonClientAreaContent
             Owner = Application.Current.MainWindow
         }.ShowDialog();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
index 7e2af7de..c31eb92e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/PracticalDemo.cs
@@ -6,4 +6,4 @@ public partial class PracticalDemo
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
index 39fcf149..7723c2a5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/ProjectsView.xaml.cs
@@ -6,4 +6,4 @@ public partial class ProjectsView
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
index ac28ff73..9727a497 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/UnderConstruction.xaml.cs
@@ -6,4 +6,4 @@ public partial class UnderConstruction
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
index e2a68e28..5ff66010 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Main/WebsitesView.xaml.cs
@@ -6,4 +6,4 @@ public partial class WebsitesView
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
index a8271f8c..3fe42a62 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Practical/Login.xaml.cs
@@ -6,4 +6,4 @@ public partial class Login
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
index 231d3a1b..88addbac 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class BorderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
index addd1278..c2547840 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class BrushDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
index c970655e..f71bea38 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ButtonDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ButtonDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
index b04019c7..603cb6f2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CalendarDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class CalendarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
index 1ee63b49..0d3355d7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class CheckBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
index 2e9dbc21..e90984a9 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/DataGridDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class DataGridDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
index 4dc492a2..8619d31f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml.cs
@@ -8,4 +8,4 @@ public partial class ExpanderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
index f0fb2f4b..512be919 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class FlowDocumentDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
index 0dd5752a..75e04776 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FrameDemoCtl.xaml.cs
@@ -53,4 +53,4 @@ public partial class FrameDemoCtl
             FrameDemo.Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
index 6f21308d..287c2633 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GeometryDemoCtl.xaml.cs
@@ -37,4 +37,4 @@ public partial class GeometryDemoCtl
             });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
index 3e917bed..552e18b1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class GroupBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
index 20b85fcb..a583c036 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/LabelDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class LabelDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
index dcb10ff2..ac6f366d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListBoxDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ListBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
index 12aee505..cc97cffe 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ListViewDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ListViewDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
index d6e8e409..c830bee6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/MenuDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class MenuDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
index 0d722523..52a8b334 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NativeComboBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
index 3b95c3cf..6afc5e1c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NativeDatePickerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
index 055898e5..f45d57f1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NativePasswordBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
index 45facae8..a722f92f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class NativeProgressBarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
index 9eff2bcb..2eb77efd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class NativeScrollViewerDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
index b5289d4f..5b2abc06 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class NativeTabControlDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
index 45f34839..24d51778 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class NativeTextBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
index 17bcdecb..b0ad717a 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class NativeWindowDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
index 43e3335e..bdeafb43 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class RadioButtonDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
index 5a963bc0..40f11714 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RepeatButtonDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RepeatButtonDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
index 5cf4fa5b..64c8c74b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RichTextBoxDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class RichTextBoxDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
index 4e55df28..7b91fed4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class SliderDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
index 4c6f539c..e4d8f7bc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class TextBlockDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
index 322ef41c..0bdd5ac9 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class ToggleButtonDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
index f4e32fcd..a04ea31e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToolBarDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class ToolBarDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
index f773d8a1..9e0ec36b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TreeViewDemoCtl.xaml.cs
@@ -7,4 +7,4 @@ public partial class TreeViewDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
index a81115f8..219fcb11 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class EffectsDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
index e3fe188e..ff009535 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/GeometryAnimationDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class GeometryAnimationDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
index 395b40af..7476e125 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/HatchBrushGeneratorDemoCtl.xaml.cs
@@ -6,4 +6,4 @@ public partial class HatchBrushGeneratorDemoCtl
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
index 0df7bbef..743186cb 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/ChatBoxViewModel.cs
@@ -46,7 +46,7 @@ public class ChatBoxViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(ChatString), ref _chatString, value);
 #else
-            set => Set(ref _chatString, value);
+        set => Set(ref _chatString, value);
 #endif
     }
 
@@ -168,4 +168,4 @@ public class ChatBoxViewModel : ViewModelBase
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
index 83e1eba3..ca6b63a2 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Basic/InteractiveDialogViewModel.cs
@@ -17,7 +17,7 @@ public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<strin
 #if NET40
         set => Set(nameof(Result), ref _result, value);
 #else
-            set => Set(ref _result, value);
+        set => Set(ref _result, value);
 #endif
     }
 
@@ -29,9 +29,9 @@ public class InteractiveDialogViewModel : ViewModelBase, IDialogResultable<strin
 #if NET40
         set => Set(nameof(Message), ref _message, value);
 #else
-            set => Set(ref _message, value);
+        set => Set(ref _message, value);
 #endif
     }
 
     public RelayCommand CloseCmd => new(() => CloseAction?.Invoke());
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
index dd3f2446..f655aadc 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/AutoCompleteTextBoxDemoViewModel.cs
@@ -20,11 +20,11 @@ public class AutoCompleteTextBoxDemoViewModel : ViewModelBase
             FilterItems(value);
         }
 #else
-            set
-            {
-                Set(ref _searchText, value);
-                FilterItems(value);
-            }
+        set
+        {
+            Set(ref _searchText, value);
+            FilterItems(value);
+        }
 #endif
     }
 
@@ -53,4 +53,4 @@ public class AutoCompleteTextBoxDemoViewModel : ViewModelBase
 
         Items.CanNotify = true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
index a12b7a5c..290e6f88 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/BadgeDemoViewModel.cs
@@ -13,9 +13,9 @@ public class BadgeDemoViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(Count), ref _count, value);
 #else
-            set => Set(ref _count, value);
+        set => Set(ref _count, value);
 #endif
     }
 
     public RelayCommand CountCmd => new(() => Count++);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
index 8e6157eb..42377b57 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CardDemoViewModel.cs
@@ -23,4 +23,4 @@ public class CardDemoViewModel : DemoViewModelBase<CardModel>
             DataList.RemoveAt(0);
         }
     });
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
index 35ba2198..9b0d099a 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/CoverViewModel.cs
@@ -6,4 +6,4 @@ namespace HandyControlDemo.ViewModel;
 public class CoverViewModel : DemoViewModelBase<CoverViewDemoModel>
 {
     public CoverViewModel(DataService dataService) => DataList = dataService.GetCoverViewDemoDataList();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
index 1f308be7..dbff46d1 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/DialogDemoViewModel.cs
@@ -23,7 +23,7 @@ public class DialogDemoViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(DialogResult), ref _dialogResult, value);
 #else
-            set => Set(ref _dialogResult, value);
+        set => Set(ref _dialogResult, value);
 #endif
     }
 
@@ -58,21 +58,21 @@ public class DialogDemoViewModel : ViewModelBase
         }
     }
 #else
-        public RelayCommand<bool> ShowInteractiveDialogCmd => new(async withTimer => await ShowInteractiveDialog(withTimer));
+    public RelayCommand<bool> ShowInteractiveDialogCmd => new(async withTimer => await ShowInteractiveDialog(withTimer));
 
-        private async Task ShowInteractiveDialog(bool withTimer)
+    private async Task ShowInteractiveDialog(bool withTimer)
+    {
+        if (!withTimer)
         {
-            if (!withTimer)
-            {
-                DialogResult = await Dialog.Show<InteractiveDialog>()
-                    .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
-                    .GetResultAsync<string>();
-            }
-            else
-            {
-                await Dialog.Show<TextDialogWithTimer>(MessageToken.MainWindow).GetResultAsync<string>();
-            }
+            DialogResult = await Dialog.Show<InteractiveDialog>()
+                .Initialize<InteractiveDialogViewModel>(vm => vm.Message = DialogResult)
+                .GetResultAsync<string>();
         }
+        else
+        {
+            await Dialog.Show<TextDialogWithTimer>(MessageToken.MainWindow).GetResultAsync<string>();
+        }
+    }
 #endif
 
     public RelayCommand NewWindowCmd => new(() => new DialogDemoWindow
@@ -81,4 +81,4 @@ public class DialogDemoViewModel : ViewModelBase
     }.Show());
 
     public RelayCommand<string> ShowWithTokenCmd => new(token => Dialog.Show(new TextDialog(), token));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
index f5144690..6d31554f 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/GrowlDemoViewModel.cs
@@ -96,4 +96,4 @@ public class GrowlDemoViewModel
     {
         Owner = Application.Current.MainWindow
     }.Show());
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
index 13c34579..677621d4 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/ImageBrowserDemoViewModel.cs
@@ -8,4 +8,4 @@ public class ImageBrowserDemoViewModel
 {
     public RelayCommand OpenImgCmd => new(() =>
         new ImageBrowser(new Uri("pack://application:,,,/Resources/Img/1.jpg")).Show());
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
index 5f278c71..d9b292c1 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotificationDemoViewModel.cs
@@ -18,7 +18,7 @@ public class NotificationDemoViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(ShowAnimation) ,ref _showAnimation, value);
 #else
-            set => Set(ref _showAnimation, value);
+        set => Set(ref _showAnimation, value);
 #endif
     }
 
@@ -30,7 +30,7 @@ public class NotificationDemoViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(StaysOpen) ,ref _staysOpen, value);
 #else
-            set => Set(ref _staysOpen, value);
+        set => Set(ref _staysOpen, value);
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
index abd00ae5..f45cc02d 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/NotifyIconDemoViewModel.cs
@@ -114,4 +114,4 @@ public class NotifyIconDemoViewModel : ViewModelBase
         GlobalData.NotifyIconIsShow = false;
         _isCleanup = false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
index c3665958..80de3dfe 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/PaginationDemoViewModel.cs
@@ -50,4 +50,4 @@ public class PaginationDemoViewModel : DemoViewModelBase<DemoDataModel>
     {
         DataList = _totalDataList.Skip((info.Info - 1) * 10).Take(10).ToList();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
index 8fc78147..becc47d5 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SideMenuDemoViewModel.cs
@@ -14,4 +14,4 @@ public class SideMenuDemoViewModel : ViewModelBase
     public RelayCommand<string> SelectCmd => new(Select);
 
     private void Select(string header) => Growl.Success(header);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
index 7fd615c4..993f1257 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SplitButtonDemoViewModel.cs
@@ -7,4 +7,4 @@ namespace HandyControlDemo.ViewModel;
 public class SplitButtonDemoViewModel : ViewModelBase
 {
     public RelayCommand<string> SelectCmd => new(str => Growl.Info(str));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
index 195a2774..978bcb49 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/SpriteDemoViewModel.cs
@@ -7,4 +7,4 @@ namespace HandyControlDemo.ViewModel;
 public class SpriteDemoViewModel
 {
     public RelayCommand OpenCmd => new(() => Sprite.Show(new AppSprite()));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
index 24ddc640..288cbfff 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/StepBarDemoViewModel.cs
@@ -19,7 +19,7 @@ public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
 #if NET40
         set => Set(nameof(StepIndex), ref _stepIndex, value);
 #else
-            set => Set(ref _stepIndex, value);
+        set => Set(ref _stepIndex, value);
 #endif
     }
 
@@ -48,4 +48,4 @@ public class StepBarDemoViewModel : DemoViewModelBase<StepBarDemoModel>
             stepBar.Prev();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
index 06e05db7..72c817dd 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TabControlDemoViewModel.cs
@@ -24,4 +24,4 @@ public class TabControlDemoViewModel : DemoViewModelBase<TabControlDemoModel>
     {
         Growl.Info($"{(args.OriginalSource as TabItem)?.Header} Closed");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
index 8c65b98a..32ca67d7 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/TagDemoViewModel.cs
@@ -25,7 +25,7 @@ public class TagDemoViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(TagName), ref _tagName, value);
 #else
-            set => Set(ref _tagName, value);
+        set => Set(ref _tagName, value);
 #endif
     }
 
@@ -44,4 +44,4 @@ public class TagDemoViewModel : ViewModelBase
         });
         TagName = string.Empty;
     });
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
index bef40e81..a168aab7 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Controls/WindowDemoViewModel.cs
@@ -16,4 +16,4 @@ public class WindowDemoViewModel
             window.ShowDialog();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
index 349c78b8..721b26f1 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/DemoViewModelBase`1.cs
@@ -19,7 +19,7 @@ public class DemoViewModelBase<T> : ViewModelBase
 #if NET40
         set => Set(nameof(DataList), ref _dataList, value);
 #else
-            set => Set(ref _dataList, value);
+        set => Set(ref _dataList, value);
 #endif       
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
index b4b6021e..4999eb18 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/ItemsDisplayViewModel.cs
@@ -27,4 +27,4 @@ public class ItemsDisplayViewModel : DemoViewModelBase<AvatarModel>
         set => Set(ref _dataGot, value);
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
index 849ff600..6c97dddd 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/MainViewModel.cs
@@ -60,7 +60,7 @@ public class MainViewModel : DemoViewModelBase<DemoDataModel>
 #if NET40
         set => Set(nameof(SubContent), ref _subContent, value);
 #else
-            set => Set(ref _subContent, value);
+        set => Set(ref _subContent, value);
 #endif
     }
 
@@ -73,7 +73,7 @@ public class MainViewModel : DemoViewModelBase<DemoDataModel>
 #if NET40
         set => Set(nameof(ContentTitle), ref _contentTitle, value);
 #else
-            set => Set(ref _contentTitle, value);
+        set => Set(ref _contentTitle, value);
 #endif
     }
 
@@ -141,7 +141,7 @@ public class MainViewModel : DemoViewModelBase<DemoDataModel>
 #if NET40
         Task.Factory.StartNew(() =>
 #else
-            Task.Run(() =>
+        Task.Run(() =>
 #endif
         {
             DataList = _dataService.GetDemoDataList();
@@ -187,4 +187,4 @@ public class MainViewModel : DemoViewModelBase<DemoDataModel>
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
index c5b07bc6..a3f5ef51 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/Main/NonClientAreaViewModel.cs
@@ -30,7 +30,7 @@ public class NonClientAreaViewModel : ViewModelBase
 #if NET40
         set => Set(nameof(VersionInfo), ref _versionInfo, value);
 #else
-            set => Set(ref _versionInfo, value);
+        set => Set(ref _versionInfo, value);
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
index e21a46a0..761e2eaa 100644
--- a/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
+++ b/src/Shared/HandyControlDemo_Shared/ViewModel/ViewModelLocator.cs
@@ -101,4 +101,4 @@ public class ViewModelLocator
     public InputElementDemoViewModel InputElementDemo => new();
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
index 892ced07..9c8b3d5f 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/AboutWindow.xaml.cs
@@ -31,4 +31,4 @@ public partial class AboutWindow
         get => (string) GetValue(VersionProperty);
         set => SetValue(VersionProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
index a15f0882..a89461e7 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/BlurWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class BlurWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
index 06dbfe90..170f895b 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/CommonWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class CommonWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
index 0c1641f4..8c03012a 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/CustomNonClientAreaWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class CustomNonClientAreaWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
index 79e9d734..da286df7 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/DialogDemoWindow.xaml.cs
@@ -24,4 +24,4 @@ public partial class DialogDemoWindow
         get => (string) GetValue(DialogTokenProperty);
         set => SetValue(DialogTokenProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
index 81501c45..9a2aca14 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/GlowWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class GlowWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
index 59646aa1..45c1b3dd 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/GrowlDemoWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class GrowlDemoWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
index eb7bdb61..36e346d9 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NativeCommonWindow.xaml.cs
@@ -6,4 +6,4 @@ public partial class NativeCommonWindow
     {
         InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
index d5a46d82..c47317b3 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NavigationWindow.xaml.cs
@@ -52,4 +52,4 @@ public partial class NavigationWindow
             Navigate(index >= _pageList.Count ? _pageList[0] : _pageList[index]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
index 79103871..62c31d2e 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/NoNonClientAreaDragableWindow.xaml.cs
@@ -10,4 +10,4 @@ public partial class NoNonClientAreaDragableWindow
     }
 
     private void ButtonClose_OnClick(object sender, RoutedEventArgs e) => Close();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
index 42b1606b..aaf2e416 100644
--- a/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
+++ b/src/Shared/HandyControlDemo_Shared/Window/TouchDragMoveWindow.xaml.cs
@@ -28,4 +28,4 @@ public partial class TouchDragMoveWindow
 
         _currentTouchCount++;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs b/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
index b4133ee5..6e5a6a5a 100644
--- a/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/ManualObservableCollection`1.cs
@@ -81,4 +81,4 @@ public class ManualObservableCollection<T> : ObservableCollection<T>
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
index a43eb0af..bd9ff785 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/IPool`1.cs
@@ -5,4 +5,4 @@ public interface IPool<T>
     T Acquire();
 
     bool Release(T instance);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
index 835b8408..4a030287 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/SimplePool`1.cs
@@ -60,4 +60,4 @@ public class SimplePool<T> : IPool<T>
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs b/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
index 907acdd6..7345b677 100644
--- a/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Pool/SynchronizedPool`1.cs
@@ -24,4 +24,4 @@ public class SynchronizedPool<T> : SimplePool<T>
             return base.Release(element);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs b/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
index 1ff655c9..a67342d5 100644
--- a/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
+++ b/src/Shared/HandyControl_Shared/Collections/Queue/Deque`1.cs
@@ -332,4 +332,4 @@ public class Deque<T> : IEnumerable<T>, ICollection
     void ICollection.CopyTo(Array array, int index) => CopyTo((T[]) array, index);
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
index 3084a2be..d135caa1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/BackgroundSwitchElement.cs
@@ -18,4 +18,4 @@ public class BackgroundSwitchElement
     public static void SetMouseDownBackground(DependencyObject element, Brush value) => element.SetValue(MouseDownBackgroundProperty, value);
 
     public static Brush GetMouseDownBackground(DependencyObject element) => (Brush) element.GetValue(MouseDownBackgroundProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
index 15cc91b8..1a53af60 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/BorderElement.cs
@@ -46,4 +46,4 @@ public class BorderElement
 
     public static bool GetCircular(DependencyObject element)
         => (bool) element.GetValue(CircularProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
index b5de3463..ad1788ed 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DataGridAttach.cs
@@ -345,4 +345,4 @@ public class DataGridAttach
 
     public static bool GetShowSelectAllButton(DependencyObject element)
         => (bool) element.GetValue(ShowSelectAllButtonProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
index 67b11a60..20d80110 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/DropDownElement.cs
@@ -24,4 +24,4 @@ public class DropDownElement
 
     public static bool GetAutoWidth(DependencyObject element)
         => (bool) element.GetValue(AutoWidthProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
index b99261de..dfac33c6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/EdgeElement.cs
@@ -43,4 +43,4 @@ public class EdgeElement
     private static void OnEdgeContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) =>
         SetShowEdgeContent(d, !(GetLeftContent(d) == null && GetTopContent(d) == null &&
                                 GetRightContent(d) == null && GetBottomContent(d) == null));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
index 24690922..1584989e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/GridAttach.cs
@@ -92,4 +92,4 @@ public class GridAttach
 
     public static string GetColumnName(DependencyObject element)
         => (string) element.GetValue(ColumnNameProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
index 3a7d9223..176cb5e6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/IconElement.cs
@@ -31,4 +31,4 @@ public class IconElement
 
     public static double GetHeight(DependencyObject element)
         => (double) element.GetValue(HeightProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
index f286b985..91d79f82 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/IconSwitchElement.cs
@@ -17,4 +17,4 @@ public class IconSwitchElement : IconElement
     {
         return (Geometry) element.GetValue(GeometrySelectedProperty);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
index da6cce4e..43bbe72e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ImageAttach.cs
@@ -38,4 +38,4 @@ public class ImageAttach
 
     public static ImageSource GetSourceFailed(DependencyObject element)
         => (ImageSource) element.GetValue(SourceFailedProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
index e7b3562f..ff6c5422 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/InfoElement.cs
@@ -89,4 +89,4 @@ public class InfoElement : TitleElement
 
     public static bool GetShowClearButton(DependencyObject element)
         => (bool) element.GetValue(ShowClearButtonProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
index 042100d5..0dc9f683 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/MenuTopLineAttach.cs
@@ -103,4 +103,4 @@ public class MenuTopLineAttach
 
     internal static FrameworkElement GetTopLine(DependencyObject element)
         => (FrameworkElement) element.GetValue(TopLineProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
index 3ad90a89..c0fa668e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/PanelElement.cs
@@ -40,4 +40,4 @@ public class PanelElement
 
     private static FluidMoveBehavior GetTempFluidMoveBehavior(DependencyObject element)
         => (FluidMoveBehavior) element.GetValue(TempFluidMoveBehaviorProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
index b1df3a4c..86d365ce 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/PasswordBoxAttach.cs
@@ -50,4 +50,4 @@ public class PasswordBoxAttach
             SetPasswordLength(passwordBox, passwordBox.Password.Length);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
index 1e4e1dbd..b51ca297 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/RectangleAttach.cs
@@ -41,4 +41,4 @@ public class RectangleAttach
 
     public static bool GetCircular(DependencyObject element)
         => (bool) element.GetValue(CircularProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
index 76fb78b6..1f35f9c0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/ScrollViewerAttach.cs
@@ -52,4 +52,4 @@ public class ScrollViewerAttach
 
     public static Orientation GetOrientation(DependencyObject element)
         => (Orientation) element.GetValue(OrientationProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
index 1d3aba30..d423dc88 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/StatusSwitchElement.cs
@@ -24,4 +24,4 @@ public class StatusSwitchElement
     public static void SetHideUncheckedElement(DependencyObject element, bool value) => element.SetValue(HideUncheckedElementProperty, ValueBoxes.BooleanBox(value));
 
     public static bool GetHideUncheckedElement(DependencyObject element) => (bool) element.GetValue(HideUncheckedElementProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
index 44cd3a53..7b25ba03 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TextBlockAttach.cs
@@ -67,4 +67,4 @@ public class TextBlockAttach
 
         return formattedText.WidthIncludingTrailingWhitespace;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
index eac798fd..b6ea774d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TipElement.cs
@@ -27,4 +27,4 @@ public class TipElement
 
     public static string GetStringFormat(DependencyObject element)
         => (string) element.GetValue(StringFormatProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
index 03bd1b0e..b84d0c48 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/TitleElement.cs
@@ -84,4 +84,4 @@ public class TitleElement
 
     public static Thickness GetMarginOnTheLeft(DependencyObject element)
         => (Thickness) element.GetValue(MarginOnTheLeftProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
index 865303c3..cb36d6e8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
@@ -49,4 +49,4 @@ public class VisualElement
 
     public static string GetText(DependencyObject element)
         => (string) element.GetValue(TextProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
index 02c0c911..bec87f0b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/WindowAttach.cs
@@ -145,4 +145,4 @@ public static class WindowAttach
 
     public static bool GetHideWhenClosing(DependencyObject element)
         => (bool) element.GetValue(HideWhenClosingProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
index 788c1fe4..0a5c3bb8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/AdornerElement.cs
@@ -83,4 +83,4 @@ public abstract class AdornerElement : Control, IDisposable
     protected abstract void Dispose();
 
     void IDisposable.Dispose() => Dispose();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
index 4eb968f9..e76a0b2c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSelectableItem.cs
@@ -21,4 +21,4 @@ public class HeaderedSelectableItem : SelectableItem
         get => (DataTemplate) GetValue(HeaderTemplateProperty);
         set => SetValue(HeaderTemplateProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
index c732d81e..48db14c8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/HeaderedSimpleItemsControl.cs
@@ -12,4 +12,4 @@ public class HeaderedSimpleItemsControl : SimpleItemsControl
         get => GetValue(HeaderProperty);
         set => SetValue(HeaderProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
index bb1afdd1..e3923394 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/IGravatarGenerator.cs
@@ -3,4 +3,4 @@
 public interface IGravatarGenerator
 {
     object GetGravatar(string id);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
index 86eeff68..e6f3b4ba 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/ISelectable.cs
@@ -7,4 +7,4 @@ public interface ISelectable
     event RoutedEventHandler Selected;
 
     bool IsSelected { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs b/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
index acc656ac..64385240 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/ISingleOpen.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public interface ISingleOpen : IDisposable
 {
     bool CanDispose { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
index 6c401965..8dc00f9a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/RegularItemsControl.cs
@@ -37,4 +37,4 @@ public class RegularItemsControl : SimpleItemsControl
         get => (Thickness) GetValue(ItemMarginProperty);
         set => SetValue(ItemMarginProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
index 8d8bd1fe..07df5d67 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/SelectableItem.cs
@@ -107,4 +107,4 @@ public class SelectableItem : ContentControl, ISelectable
         add => AddHandler(DeselectedEvent, value);
         remove => RemoveHandler(DeselectedEvent, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
index c8e68096..a6de57b5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Base/SimpleItemsControl.cs
@@ -163,4 +163,4 @@ public class SimpleItemsControl : Control
     protected virtual void UpdateItems()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
index 858a5ba7..a20069ca 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/FloatingBlock.cs
@@ -191,4 +191,4 @@ public class FloatingBlock : Control
 
         return block;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
index 13dc8a4c..3dbc02f4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBlock.cs
@@ -195,4 +195,4 @@ public class RunningBlock : ContentControl
         _storyboard.Children.Add(animation);
         _storyboard.Begin();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
index e282e6a9..2f1b296b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/RunningBlock/RunningBorder.cs
@@ -61,4 +61,4 @@ public class RunningBorder : Border
     }
 
     private static Size ConvertThickness2Size(Thickness th) => new(th.Left + th.Right, th.Top + th.Bottom);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
index afc287c9..ff0997c1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Block/ToggleBlock.cs
@@ -55,4 +55,4 @@ public class ToggleBlock : Control
         get => GetValue(IndeterminateContentProperty);
         set => SetValue(IndeterminateContentProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
index 43613419..9b569b42 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ButtonGroup.cs
@@ -37,4 +37,4 @@ public class ButtonGroup : ItemsControl
             item.Style = ItemContainerStyleSelector?.SelectStyle(item, this);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
index c04a3a5b..6174821b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuButton.cs
@@ -19,4 +19,4 @@ public class ContextMenuButton : Button
             Menu.IsOpen = true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
index 6f54616e..47c6c7fd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ContextMenuToggleButton.cs
@@ -27,4 +27,4 @@ public class ContextMenuToggleButton : ToggleButton
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
index 2a858866..7cf680ea 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/ProgressButton.cs
@@ -23,4 +23,4 @@ public class ProgressButton : ToggleButton
         get => (double) GetValue(ProgressProperty);
         set => SetValue(ProgressProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
index 0488bfc5..acb762a9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Button/SplitButton.cs
@@ -77,4 +77,4 @@ public class SplitButton : ButtonBase
             SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
index e7b1dc03..d2c689c1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Carousel/Carousel.cs
@@ -452,4 +452,4 @@ public class Carousel : SimpleItemsControl, IDisposable
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs b/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
index 3b1d4aba..a9fe44c4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Carousel/CarouselItem.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public class CarouselItem : ContentControl
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
index 2eed1227..ac3870e3 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorDropper.cs
@@ -102,4 +102,4 @@ internal class ColorDropper
         InteropMethods.ReleaseDC(desk, dc);
         return Color.FromArgb(255, (byte) ((a >> 0) & 0xff), (byte) ((a >> 8) & 0xff), (byte) ((a >> 16) & 0xff));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
index df7e568f..6d6060a5 100644
--- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs
@@ -739,4 +739,4 @@ public class ColorPicker : Control, ISingleOpen
     }
 
     public bool CanDispose => true;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
index 3162c61a..3bb26bf5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlow.cs
@@ -294,4 +294,4 @@ public class CoverFlow : Control
             Content = content
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
index 9d0ab657..b1738f74 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverFlow/CoverFlowItem.cs
@@ -153,4 +153,4 @@ public class CoverFlowItem : ModelVisual3D
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
index d0a3b70d..5cb9c9b7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
@@ -420,4 +420,4 @@ public class CoverView : RegularItemsControl
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
index 9bed6cae..4615324b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewContent.cs
@@ -118,4 +118,4 @@ public class CoverViewContent : ContentControl
         CanSwitch = false;
         _content.BeginAnimation(HeightProperty, animation);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
index 3b9d8ed3..22f8fd64 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverViewItem.cs
@@ -3,4 +3,4 @@
 public class CoverViewItem : HeaderedSelectableItem
 {
     internal int Index { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
index 01982ad2..0b949b40 100644
--- a/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Dialog/Dialog.cs
@@ -172,4 +172,4 @@ public class Dialog : ContentControl
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs b/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
index e12b7215..a045a5c3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Dialog/DialogContainer.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public class DialogContainer : AdornerDecorator
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs b/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
index 72283303..ed3834a4 100644
--- a/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Drawer/Drawer.cs
@@ -425,4 +425,4 @@ public class Drawer : FrameworkElement
             target.DataContext = newValue ?? this;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs b/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
index 89381a86..3a05bb1e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Drawer/DrawerContainer.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public class DrawerContainer : AdornerDecorator
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
index e5af6f77..12be5cc9 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/Growl.cs
@@ -917,4 +917,4 @@ public class Growl : Control
     private void ButtonCancel_OnClick(object sender, RoutedEventArgs e) => Close(false);
 
     private void ButtonOk_OnClick(object sender, RoutedEventArgs e) => Close(true);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
index b7deb68e..bbc38297 100644
--- a/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Growl/GrowlWindow.cs
@@ -38,4 +38,4 @@ public sealed class GrowlWindow : Window
 
     protected override void OnSourceInitialized(EventArgs e)
         => InteropMethods.IntDestroyMenu(this.GetHwndSource().CreateHandleRef());
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
index 318246a5..63c9829d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/GifImage.cs
@@ -514,4 +514,4 @@ public class GifImage : Image, IDisposable
             InvalidateVisual();
         }));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
index 0b6daaca..6b6f469b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageBlock.cs
@@ -228,4 +228,4 @@ public class ImageBlock : FrameworkElement
         _currentIndex++;
         return rect;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
index 13ce2fcd..5795131d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -923,4 +923,4 @@ public class ImageViewer : Control
     private void CanvasSmallImg_OnMouseLeftButtonUp(object sender, MouseButtonEventArgs e) => _imgSmallIsMouseLeftButtonDown = false;
 
     private void CanvasSmallImg_OnMouseMove(object sender, MouseEventArgs e) => MoveSmallImg();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
index 54ccaec5..178989da 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBox.cs
@@ -155,4 +155,4 @@ public class AutoCompleteTextBox : ComboBox
             SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
index 520814bc..08b07142 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/AutoCompleteTextBox/AutoCompleteTextBoxItem.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public class AutoCompleteTextBoxItem : ComboBoxItem
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
index 01f4d432..b5f01c3b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBox.cs
@@ -289,4 +289,4 @@ public class CheckComboBox : ListBox, IDataInput
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
index 5f1cb89e..b85211b1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/CheckComboBox/CheckComboBoxItem.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Controls;
 public class CheckComboBoxItem : ListBoxItem
 {
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
index e34e40a8..ebfc4410 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/ComboBox.cs
@@ -72,7 +72,7 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
 
                 _editableTextBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                    _editableTextBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+                _editableTextBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
                 _editableTextBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
                 _editableTextBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -93,7 +93,7 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
                         UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
                         Mode = BindingMode.OneWayToSource,
 #if !NET40
-                            Delay = 500,
+                        Delay = 500,
 #endif
                         Source = this
                     });
@@ -128,12 +128,12 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
     }
 
 #if !NET40
-        protected override void OnDropDownClosed(EventArgs e)
-        {
-            base.OnDropDownClosed(e);
+    protected override void OnDropDownClosed(EventArgs e)
+    {
+        base.OnDropDownClosed(e);
 
-            _isAutoCompleteAction = false;
-        }
+        _isAutoCompleteAction = false;
+    }
 #endif
 
     private void EditableTextBox_GotFocus(object sender, RoutedEventArgs e)
@@ -271,7 +271,7 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
             ctl._autoCompleteTimer.Stop();
             ctl._autoCompleteTimer.Start();
 #else
-                ctl.UpdateSearchItems(e.NewValue as string);
+            ctl.UpdateSearchItems(e.NewValue as string);
 #endif
         }
 
@@ -298,14 +298,14 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(ComboBox));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(ComboBox));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -442,4 +442,4 @@ public class ComboBox : System.Windows.Controls.ComboBox, IDataInput
             SelectedValue = comboBoxItem.Content;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
index 95db140e..f1077bea 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/DatePicker.cs
@@ -40,7 +40,7 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
         {
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -100,14 +100,14 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(DatePicker));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(DatePicker));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -174,4 +174,4 @@ public class DatePicker : System.Windows.Controls.DatePicker, IDataInput
         }
         return !isError;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
index 83b05e3c..f20e7ad0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
@@ -289,14 +289,14 @@ public class DateTimePicker : Control, IDataInput
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(DateTimePicker));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(DateTimePicker));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -378,7 +378,7 @@ public class DateTimePicker : Control, IDataInput
 
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -542,29 +542,29 @@ public class DateTimePicker : Control, IDataInput
         switch (e.Key)
         {
             case Key.System:
-            {
-                switch (e.SystemKey)
                 {
-                    case Key.Down:
+                    switch (e.SystemKey)
                     {
-                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                        {
-                            TogglePopup();
-                            return true;
-                        }
+                        case Key.Down:
+                            {
+                                if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
+                                {
+                                    TogglePopup();
+                                    return true;
+                                }
 
-                        break;
+                                break;
+                            }
                     }
+
+                    break;
                 }
 
-                break;
-            }
-
             case Key.Enter:
-            {
-                SetSelectedDateTime();
-                return true;
-            }
+                {
+                    SetSelectedDateTime();
+                    return true;
+                }
         }
 
         return false;
@@ -762,4 +762,4 @@ public class DateTimePicker : Control, IDataInput
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs b/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
index d1a1fd2d..0ec375c0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/IDataInput.cs
@@ -39,4 +39,4 @@ public interface IDataInput
     ///     是否显示清除按钮
     /// </summary>
     bool ShowClearButton { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
index 2d8e965f..b97d5cc1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/ImageSelector.cs
@@ -133,4 +133,4 @@ public class ImageSelector : Control
         get => (bool) GetValue(HasValueProperty);
         set => SetValue(HasValueProperty, ValueBoxes.BooleanBox(value));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
index fce25db2..a8aa262d 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/NumericUpDown.cs
@@ -53,7 +53,7 @@ public class NumericUpDown : Control
         {
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -311,14 +311,14 @@ public class NumericUpDown : Control
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(NumericUpDown));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(NumericUpDown));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -339,4 +339,4 @@ public class NumericUpDown : Control
         get => (Brush) GetValue(CaretBrushProperty);
         set => SetValue(CaretBrushProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
index 62072d09..0794949b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PasswordBox.cs
@@ -160,14 +160,14 @@ public class PasswordBox : Control, IDataInput
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(PasswordBox));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(PasswordBox));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -191,10 +191,10 @@ public class PasswordBox : Control, IDataInput
 
 #if !NET40
 
-        public static readonly DependencyProperty IsSelectionActiveProperty =
-            TextBoxBase.IsSelectionActiveProperty.AddOwner(typeof(PasswordBox));
+    public static readonly DependencyProperty IsSelectionActiveProperty =
+        TextBoxBase.IsSelectionActiveProperty.AddOwner(typeof(PasswordBox));
 
-        public bool IsSelectionActive => ActualPasswordBox != null && (bool) ActualPasswordBox.GetValue(IsSelectionActiveProperty);
+    public bool IsSelectionActive => ActualPasswordBox != null && (bool) ActualPasswordBox.GetValue(IsSelectionActiveProperty);
 
 #endif
 
@@ -314,7 +314,7 @@ public class PasswordBox : Control, IDataInput
             ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.MaxLengthProperty, new Binding(MaxLengthProperty.Name) { Source = this });
             ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             ActualPasswordBox.SetBinding(System.Windows.Controls.PasswordBox.CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -390,4 +390,4 @@ public class PasswordBox : Control, IDataInput
 
         VerifyData();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
index 7990dce9..b22795ff 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/PinBox.cs
@@ -292,14 +292,14 @@ public class PinBox : Control
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(PinBox));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(PinBox));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -361,7 +361,7 @@ public class PinBox : Control
 
         passwordBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-            passwordBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+        passwordBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
         passwordBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
         passwordBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -407,4 +407,4 @@ public class PinBox : Control
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
index fa6156f1..cda2231f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/SearchBar.cs
@@ -127,4 +127,4 @@ public class SearchBar : TextBox, ICommandSource
             ? command.CanExecute(CommandParameter, CommandTarget)
             : Command.CanExecute(CommandParameter);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
index cbaf593f..293435f6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TextBox.cs
@@ -12,4 +12,4 @@ public class TextBox : System.Windows.Controls.TextBox
             SetCurrentValue(TextProperty, string.Empty);
         }));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
index 896278f3..2c144eb6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
@@ -311,14 +311,14 @@ public class TimePicker : Control, IDataInput
 
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
 
-        public static readonly DependencyProperty SelectionTextBrushProperty =
-            TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(TimePicker));
+    public static readonly DependencyProperty SelectionTextBrushProperty =
+        TextBoxBase.SelectionTextBrushProperty.AddOwner(typeof(TimePicker));
 
-        public Brush SelectionTextBrush
-        {
-            get => (Brush) GetValue(SelectionTextBrushProperty);
-            set => SetValue(SelectionTextBrushProperty, value);
-        }
+    public Brush SelectionTextBrush
+    {
+        get => (Brush) GetValue(SelectionTextBrushProperty);
+        set => SetValue(SelectionTextBrushProperty, value);
+    }
 
 #endif
 
@@ -473,7 +473,7 @@ public class TimePicker : Control, IDataInput
 
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-                _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -574,29 +574,29 @@ public class TimePicker : Control, IDataInput
         switch (e.Key)
         {
             case Key.System:
-            {
-                switch (e.SystemKey)
                 {
-                    case Key.Down:
+                    switch (e.SystemKey)
                     {
-                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                        {
-                            TogglePopup();
-                            return true;
-                        }
+                        case Key.Down:
+                            {
+                                if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
+                                {
+                                    TogglePopup();
+                                    return true;
+                                }
 
-                        break;
+                                break;
+                            }
                     }
+
+                    break;
                 }
 
-                break;
-            }
-
             case Key.Enter:
-            {
-                SetSelectedTime();
-                return true;
-            }
+                {
+                    SetSelectedTime();
+                    return true;
+                }
         }
 
         return false;
@@ -793,4 +793,4 @@ public class TimePicker : Control, IDataInput
     }
 
     #endregion Private Methods
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs b/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
index 2e1b055e..e8e274f6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Input/WatermarkTextBox.cs
@@ -32,4 +32,4 @@ public class WatermarkTextBox : TextBox
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
index 1ae6cc5f..8b35a4fc 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingBase.cs
@@ -132,4 +132,4 @@ public abstract class LoadingBase : ContentControl
         ellipse.SetBinding(Shape.StrokeProperty, new Binding(DotBorderBrushProperty.Name) { Source = this });
         return ellipse;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
index 68454025..988bafbe 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingCircle.cs
@@ -209,4 +209,4 @@ public class LoadingCircle : LoadingBase
 
         return border;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
index 20810367..d4822d26 100644
--- a/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Loading/LoadingLine.cs
@@ -112,4 +112,4 @@ public class LoadingLine : LoadingBase
         ellipse.Margin = new Thickness(-(dotInterval + dotDiameter) * index, 0, 0, 0);
         return ellipse;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
index 1e083f31..8686615f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/AnimationPath.cs
@@ -167,4 +167,4 @@ public class AnimationPath : Shape
     }
 
     private void Storyboard_Completed(object sender, EventArgs e) => RaiseEvent(new RoutedEventArgs(CompletedEvent));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
index 45fb1b3e..f34f4628 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Badge.cs
@@ -97,4 +97,4 @@ public class Badge : ContentControl
     }
 
     protected override Geometry GetLayoutClip(Size layoutSlotSize) => null;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
index 94c9c320..dd2497d6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/BlendEffectBox.cs
@@ -112,4 +112,4 @@ public class BlendEffectBox : Control
         get => (FrameworkElement) GetValue(ActualContentProperty);
         set => SetValue(ActualContentProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Card.cs b/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
index 4da0db8f..61e08053 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Card.cs
@@ -83,4 +83,4 @@ public class Card : ContentControl
         get => (string) GetValue(FooterStringFormatProperty);
         set => SetValue(FooterStringFormatProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
index a75994e6..a7a603b5 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ChatBubble.cs
@@ -42,4 +42,4 @@ public class ChatBubble : SelectableItem
         IsRead = true;
         ReadAction?.Invoke(Content);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs b/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
index 504d4adc..52649324 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/DashedBorder.cs
@@ -666,4 +666,4 @@ public class DashedBorder : Decorator
         internal readonly double BottomLeft;
         internal readonly double LeftBottom;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs b/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
index d5304fd8..94f4cf99 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Divider.cs
@@ -78,4 +78,4 @@ public class Divider : Control
         get => (DoubleCollection) GetValue(LineStrokeDashArrayProperty);
         set => SetValue(LineStrokeDashArrayProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
index f0e5d9d7..88ba029e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Empty.cs
@@ -32,4 +32,4 @@ public class Empty : ContentControl
 
     public static bool GetShowEmpty(DependencyObject element)
         => (bool) element.GetValue(ShowEmptyProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
index 4d564d12..d49a381f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/GotoTop.cs
@@ -96,4 +96,4 @@ public class GotoTop : Button
 
         _gotoTopAction?.Invoke();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
index d361f828..89e8dcaa 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Gravatar.cs
@@ -54,4 +54,4 @@ public class Gravatar : ContentControl
         get => (ImageSource) GetValue(SourceProperty);
         set => SetValue(SourceProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
index 5d51b0cb..d323b01c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Magnifier.cs
@@ -156,4 +156,4 @@ public class Magnifier : AdornerElement
         }
         this.Show();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
index a9d54868..42d11380 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Notification.cs
@@ -97,31 +97,31 @@ public sealed class Notification : System.Windows.Window
             case ShowAnimation.None:
                 break;
             case ShowAnimation.HorizontalMove:
-            {
-                var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Width);
-                animation.Completed += Animation_Completed;
-                BeginAnimation(LeftProperty, animation);
-                e.Cancel = true;
-                _shouldBeClosed = true;
-            }
+                {
+                    var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Width);
+                    animation.Completed += Animation_Completed;
+                    BeginAnimation(LeftProperty, animation);
+                    e.Cancel = true;
+                    _shouldBeClosed = true;
+                }
                 break;
             case ShowAnimation.VerticalMove:
-            {
-                var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Height);
-                animation.Completed += Animation_Completed;
-                BeginAnimation(TopProperty, animation);
-                e.Cancel = true;
-                _shouldBeClosed = true;
-            }
+                {
+                    var animation = AnimationHelper.CreateAnimation(desktopWorkingArea.Height);
+                    animation.Completed += Animation_Completed;
+                    BeginAnimation(TopProperty, animation);
+                    e.Cancel = true;
+                    _shouldBeClosed = true;
+                }
                 break;
             case ShowAnimation.Fade:
-            {
-                var animation = AnimationHelper.CreateAnimation(0);
-                animation.Completed += Animation_Completed;
-                BeginAnimation(OpacityProperty, animation);
-                e.Cancel = true;
-                _shouldBeClosed = true;
-            }
+                {
+                    var animation = AnimationHelper.CreateAnimation(0);
+                    animation.Completed += Animation_Completed;
+                    BeginAnimation(OpacityProperty, animation);
+                    e.Cancel = true;
+                    _shouldBeClosed = true;
+                }
                 break;
         }
     }
@@ -150,4 +150,4 @@ public sealed class Notification : System.Windows.Window
         };
         _timerClose.Start();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
index c9d0e17c..7e66e618 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs
@@ -718,4 +718,4 @@ public class NotifyIcon : FrameworkElement, IDisposable
 
         _isDisposed = true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
index de94f289..19b47a97 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs
@@ -398,4 +398,4 @@ public class Pagination : Control
     }
 
     #endregion Private Methods       
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
index 62b5925c..344e7a8f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Poptip.cs
@@ -325,4 +325,4 @@ public class Poptip : AdornerElement
 
         SwitchPoptip(false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
index c12aedbf..29676dd3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/ScrollViewer.cs
@@ -208,4 +208,4 @@ public class ScrollViewer : System.Windows.Controls.ScrollViewer
         get => (double) GetValue(CurrentHorizontalOffsetProperty);
         set => SetValue(CurrentHorizontalOffsetProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs b/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
index ab88ae75..be6deea7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Shield.cs
@@ -34,4 +34,4 @@ public class Shield : ButtonBase
         get => (Brush) GetValue(ColorProperty);
         set => SetValue(ColorProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs b/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
index da6380a7..8ca6c798 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Sprite.cs
@@ -25,4 +25,4 @@ public sealed class Sprite : System.Windows.Window
 
         return sprite;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
index 6468cad3..cf5129bb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/TransitioningContentControl.cs
@@ -104,4 +104,4 @@ public class TransitioningContentControl : ContentControl
 
         StartTransition();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
index 67b0dcf0..23ebe00c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Other/Watermark.cs
@@ -161,4 +161,4 @@ public class Watermark : Control
     }
 
     protected override void OnRender(DrawingContext drawingContext) => EnsureBrush();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs b/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
index 63cbf64e..3501b4fc 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/AxleCanvas.cs
@@ -60,4 +60,4 @@ public class AxleCanvas : Canvas
         }
         return arrangeSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
index fbc714aa..2d61506b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/CirclePanel.cs
@@ -86,4 +86,4 @@ public class CirclePanel : Panel
 
         return finalSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
index 20f1232b..4623dd04 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/ElementGroup.cs
@@ -149,4 +149,4 @@ public class ElementGroup : ItemsControl
         Middle,
         Last
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
index 09301afd..80082d87 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/FlexPanel.cs
@@ -729,4 +729,4 @@ public class FlexPanel : Panel
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
index 08dbf10d..41abe100 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Col.cs
@@ -92,4 +92,4 @@ public class Col : ContentControl
 
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
index 0f9a3551..aad5de3a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/Grid/Row.cs
@@ -95,4 +95,4 @@ public class Row : Panel
 
         return finalSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
index 4a5666c2..a57263f8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/HoneycombPanel.cs
@@ -162,4 +162,4 @@ public class HoneycombPanel : Panel
             return _childBounds;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index d117daa9..2d379b18 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -685,4 +685,4 @@ public class RelativePanel : Panel
             return boundingSize;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
index 3b58fec1..35c940bf 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/SimplePanel.cs
@@ -38,4 +38,4 @@ public class SimplePanel : Panel
 
         return arrangeSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
index bd69c73e..fb7d704b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/SimpleStackPanel.cs
@@ -97,4 +97,4 @@ public class SimpleStackPanel : Panel
 
         return arrangeSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
index c8be6cd1..1bab5b0e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
@@ -381,4 +381,4 @@ public class UniformSpacingPanel : Panel
 
         return finalSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
index 854f9837..59022afd 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/WaterfallPanel.cs
@@ -145,4 +145,4 @@ public class WaterfallPanel : Panel
 
         return uvConstraint.ScreenSize;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
index caf19139..0d953cc8 100644
--- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/CircleProgressBar.cs
@@ -98,4 +98,4 @@ public class CircleProgressBar : RangeBase
         base.OnValueChanged(oldValue, newValue);
         SetProgressBarIndicatorAngle();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
index 414c73cd..35e125a4 100644
--- a/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/ProgressBar/WaveProgressBar.cs
@@ -118,4 +118,4 @@ public class WaveProgressBar : RangeBase
         get => (Brush) GetValue(WaveStrokeProperty);
         set => SetValue(WaveStrokeProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
index c1bdd279..dac2412e 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DatePropertyEditor.cs
@@ -10,4 +10,4 @@ public class DatePropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.DatePicker.SelectedDateProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
index 149b5942..4363ab5c 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/DateTimePropertyEditor.cs
@@ -10,4 +10,4 @@ public class DateTimePropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => DateTimePicker.SelectedDateTimeProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
index a12cf7a9..070b634b 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/EnumPropertyEditor.cs
@@ -13,4 +13,4 @@ public class EnumPropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => Selector.SelectedValueProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
index cc81c327..25f64533 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/HorizontalAlignmentPropertyEditor.cs
@@ -67,4 +67,4 @@ public class HorizontalAlignmentPathTemplateSelector : DataTemplateSelector
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
index ca413b23..0bc1f3db 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ImagePropertyEditor.cs
@@ -59,4 +59,4 @@ public class ImagePropertyEditor : PropertyEditorBase
             });
 
     public override DependencyProperty GetDependencyProperty() => SourceProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
index 78801ef1..19aa39a4 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/NumberPropertyEditor.cs
@@ -27,4 +27,4 @@ public class NumberPropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => NumericUpDown.ValueProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
index 69248be0..de962f10 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PlainTextPropertyEditor.cs
@@ -10,4 +10,4 @@ public class PlainTextPropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => System.Windows.Controls.TextBox.TextProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
index b153e281..4147e8ff 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/PropertyEditorBase.cs
@@ -24,4 +24,4 @@ public abstract class PropertyEditorBase : DependencyObject
     public virtual UpdateSourceTrigger GetUpdateSourceTrigger(PropertyItem propertyItem) => UpdateSourceTrigger.PropertyChanged;
 
     protected virtual IValueConverter GetConverter(PropertyItem propertyItem) => null;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
index 9629832a..897e641a 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/ReadOnlyTextPropertyEditor.cs
@@ -16,4 +16,4 @@ public class ReadOnlyTextPropertyEditor : PropertyEditorBase
     public override BindingMode GetBindingMode(PropertyItem propertyItem) => BindingMode.OneWay;
 
     protected override IValueConverter GetConverter(PropertyItem propertyItem) => ResourceHelper.GetResourceInternal<IValueConverter>("Object2StringConverter");
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
index 9f5994eb..6d577da8 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/SwitchPropertyEditor.cs
@@ -14,4 +14,4 @@ public class SwitchPropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => ToggleButton.IsCheckedProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
index 205fc658..5050c946 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/TimePropertyEditor.cs
@@ -10,4 +10,4 @@ public class TimePropertyEditor : PropertyEditorBase
     };
 
     public override DependencyProperty GetDependencyProperty() => TimePicker.SelectedTimeProperty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
index 08fdc70a..a49f20bf 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/Editors/VerticalAlignmentPropertyEditor.cs
@@ -67,4 +67,4 @@ public class VerticalAlignmentPathTemplateSelector : DataTemplateSelector
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
index 6f122703..6ded8504 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyGrid.cs
@@ -200,4 +200,4 @@ public class PropertyGrid : Control
         base.OnRenderSizeChanged(sizeInfo);
         TitleElement.SetTitleWidth(this, new GridLength(Math.Max(MinTitleWidth, Math.Min(MaxTitleWidth, ActualWidth / 3))));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
index 9352e50d..c4efcfcd 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItem.cs
@@ -124,4 +124,4 @@ public class PropertyItem : ListBoxItem
         EditorElement = Editor.CreateElement(this);
         Editor.CreateBinding(this, EditorElement);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
index e292fbf5..b1501dee 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyItemsControl.cs
@@ -9,8 +9,8 @@ public class PropertyItemsControl : ListBox
     public PropertyItemsControl()
     {
 #if !NET40
-            VirtualizingPanel.SetIsVirtualizingWhenGrouping(this, true);
-            VirtualizingPanel.SetScrollUnit(this, ScrollUnit.Pixel);
+        VirtualizingPanel.SetIsVirtualizingWhenGrouping(this, true);
+        VirtualizingPanel.SetScrollUnit(this, ScrollUnit.Pixel);
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
index 509974cb..265df293 100644
--- a/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
+++ b/src/Shared/HandyControl_Shared/Controls/PropertyGrid/PropertyResolver.cs
@@ -123,4 +123,4 @@ public class PropertyResolver
         VerticalAlignment,
         ImageSource
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
index b4ee2e0b..d43f3565 100644
--- a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
@@ -267,4 +267,4 @@ public class Rate : RegularItemsControl
     }
 
     public void Reset() => Value = DefaultValue;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
index d6779cb9..002fff7b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Rate/RateItem.cs
@@ -217,4 +217,4 @@ public class RateItem : Control
             _isMouseLeftButtonDown = false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
index 8945b908..852db370 100644
--- a/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/Screenshot.cs
@@ -11,4 +11,4 @@ public class Screenshot
     public void Start() => new ScreenshotWindow(this).Show();
 
     internal void OnSnapped(ImageSource source) => Snapped?.Invoke(this, new FunctionEventArgs<ImageSource>(source));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
index ab3752e0..fcb6e09a 100644
--- a/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Screenshot/ScreenshotWindow.cs
@@ -233,24 +233,24 @@ public class ScreenshotWindow : System.Windows.Window
             switch (e.Key)
             {
                 case Key.Left:
-                {
-                    MoveTargetArea(MoveRect(_targetWindowRect, -1, rightFlag: -1));
-                }
+                    {
+                        MoveTargetArea(MoveRect(_targetWindowRect, -1, rightFlag: -1));
+                    }
                     break;
                 case Key.Up:
-                {
-                    MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: -1, topFlag: -1));
-                }
+                    {
+                        MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: -1, topFlag: -1));
+                    }
                     break;
                 case Key.Right:
-                {
-                    MoveTargetArea(MoveRect(_targetWindowRect, 1, rightFlag: 1));
-                }
+                    {
+                        MoveTargetArea(MoveRect(_targetWindowRect, 1, rightFlag: 1));
+                    }
                     break;
                 case Key.Down:
-                {
-                    MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: 1, topFlag: 1));
-                }
+                    {
+                        MoveTargetArea(MoveRect(_targetWindowRect, bottomFlag: 1, topFlag: 1));
+                    }
                     break;
                 case Key.Enter:
                     _saveScreenshot = true;
@@ -719,4 +719,4 @@ public class ScreenshotWindow : System.Windows.Window
         _magnifier.Margin = new Thickness(point.X + 4, point.Y + 26, 0, 0);
         _visualPreview.Viewbox = new Rect(new Point(point.X - _viewboxSize.Width / 2 + 0.5, point.Y - _viewboxSize.Height / 2 + 0.5), _viewboxSize);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
index c302451a..bda1b585 100644
--- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenu.cs
@@ -255,4 +255,4 @@ public class SideMenu : HeaderedSimpleItemsControl
         add => AddHandler(SelectionChangedEvent, value);
         remove => RemoveHandler(SelectionChangedEvent, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
index 3cfb955a..f821057b 100644
--- a/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/SideMenu/SideMenuItem.cs
@@ -213,4 +213,4 @@ public class SideMenuItem : HeaderedSimpleItemsControl, ISelectable, ICommandSou
             ? command.CanExecute(CommandParameter, CommandTarget)
             : Command.CanExecute(CommandParameter);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
index cf716c55..ced5334f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareSlider.cs
@@ -22,4 +22,4 @@ public class CompareSlider : Slider
         get => GetValue(SourceContentProperty);
         set => SetValue(SourceContentProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
index 59d61e33..421f9ee2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/CompareSlider/CompareTrack.cs
@@ -113,4 +113,4 @@ public class CompareTrack : Track
         else if (componentLength > trackLength || double.IsNaN(componentLength))
             componentLength = trackLength;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
index fbbd0526..6eaa6b17 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/PreviewSlider.cs
@@ -200,4 +200,4 @@ public class PreviewSlider : Slider
             _previewContent.RenderTransform = _transform;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
index 75dc825d..2824981e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeSlider.cs
@@ -642,4 +642,4 @@ public class RangeSlider : TwoWayRangeBase
 
         _thumbCurrent = null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
index 8da6ee39..0f76dfa6 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeThumb.cs
@@ -42,4 +42,4 @@ public class RangeThumb : Thumb
             RoutedEvent = PreviewMouseLeftButtonUpEvent
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
index bda84b87..2b951b4e 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/RangeTrack.cs
@@ -455,4 +455,4 @@ public class RangeTrack : FrameworkElement
             InvalidateArrange();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
index 95fcb9f6..beca31ca 100644
--- a/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Slider/RangeSlider/TwoWayRangeBase.cs
@@ -170,4 +170,4 @@ public class TwoWayRangeBase : Control
         add => AddHandler(ValueChangedEvent, value);
         remove => RemoveHandler(ValueChangedEvent, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
index 520d91dd..9ab49db9 100644
--- a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBar.cs
@@ -180,4 +180,4 @@ public class StepBar : ItemsControl
     public void Next() => StepIndex++;
 
     public void Prev() => StepIndex--;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
index 740dcddb..9b708a6b 100644
--- a/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/StepBar/StepBarItem.cs
@@ -38,4 +38,4 @@ public class StepBarItem : ContentControl
         get => (StepStatus) GetValue(StatusProperty);
         internal set => SetValue(StatusProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
index 0d7b2031..b2f02a71 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabControl.cs
@@ -425,4 +425,4 @@ public class TabControl : System.Windows.Controls.TabControl
     protected override bool IsItemItsOwnContainerOverride(object item) => item is TabItem;
 
     protected override DependencyObject GetContainerForItemOverride() => new TabItem();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
index c336417e..b045b7dc 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabItem.cs
@@ -487,4 +487,4 @@ public class TabItem : System.Windows.Controls.TabItem
         add => AddHandler(ClosedEvent, value);
         remove => RemoveHandler(ClosedEvent, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
index 86dab975..a3d5b1ed 100644
--- a/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/TabControl/TabPanel.cs
@@ -175,4 +175,4 @@ public class TabPanel : Panel
             _isLoaded = true;
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
index e8e328c9..4d6f31d1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Tag/Tag.cs
@@ -144,4 +144,4 @@ public class Tag : ContentControl
             IsSelected = true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs b/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
index 29e52e1d..39354ce3 100644
--- a/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Tag/TagContainer.cs
@@ -49,4 +49,4 @@ public class TagContainer : ItemsControl
     protected override DependencyObject GetContainerForItemOverride() => new Tag();
 
     protected override bool IsItemItsOwnContainerOverride(object item) => item is Tag;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
index fa85bd10..7537263c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/HighlightTextBlock.cs
@@ -86,8 +86,8 @@ public class HighlightTextBlock : TextBlock
         var sourceText = SourceText;
         var queries = QueriesText.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
         var intervals = from query in queries.Distinct()
-            from interval in GetQueryIntervals(sourceText, query)
-            select interval;
+                        from interval in GetQueryIntervals(sourceText, query)
+                        select interval;
         var mergedIntervals = MergeIntervals(intervals.ToList());
         var fragments = SplitTextByOrderedDisjointIntervals(sourceText, mergedIntervals);
 
@@ -97,9 +97,9 @@ public class HighlightTextBlock : TextBlock
     private IEnumerable GenerateRunElement(IEnumerable<Fragment> fragments)
     {
         return from item in fragments
-            select item.IsQuery
-                ? GetHighlightRun(item.Text)
-                : new Run(item.Text);
+               select item.IsQuery
+                   ? GetHighlightRun(item.Text)
+                   : new Run(item.Text);
     }
 
     private Run GetHighlightRun(string highlightText)
@@ -206,4 +206,4 @@ public class HighlightTextBlock : TextBlock
 
         public int End { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
index 43818a45..8a51ad0f 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/OutlineText.cs
@@ -278,4 +278,4 @@ public class OutlineText : FrameworkElement
         // return the desired size
         return new Size(_formattedText.Width, _formattedText.Height);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
index 421e0a4a..df94a03b 100644
--- a/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Text/SimpleText.cs
@@ -181,4 +181,4 @@ public class SimpleText : FrameworkElement
 
         return new Size(_formattedText.Width, _formattedText.Height);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
index 21bbc85f..98f54044 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/CalendarWithClock.cs
@@ -253,4 +253,4 @@ public class CalendarWithClock : Control
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
index 4f19b290..7b1c9919 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/Clock.cs
@@ -330,4 +330,4 @@ public class Clock : ClockBase
     private void ButtonPm_OnClick(object sender, RoutedEventArgs e) => Update();
 
     #endregion Private Methods       
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
index cf869e44..988f540c 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockBase.cs
@@ -102,4 +102,4 @@ public abstract class ClockBase : Control
     internal abstract void Update(DateTime time);
 
     protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
index 170e9998..0ded5db7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ClockRadioButton.cs
@@ -6,4 +6,4 @@ namespace HandyControl.Controls;
 public class ClockRadioButton : RadioButton
 {
     public int Num { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
index 545e4b61..c08a8deb 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/Clock/ListClock.cs
@@ -146,4 +146,4 @@ public class ListClock : ClockBase
 
         DisplayTime = time;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
index a1598fcc..cee951a2 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipClock.cs
@@ -84,4 +84,4 @@ public class FlipClock : Control
     }
 
     private void DispatcherTimer_Tick(object sender, EventArgs e) => DisplayTime = DateTime.Now;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
index 641b8ac8..2f7a1d96 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/FlipClock/FlipNumber.cs
@@ -280,4 +280,4 @@ public class FlipNumber : Viewport3D
 
         return child;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
index ee9b8471..600fe3da 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/SpeTextBlock.cs
@@ -47,4 +47,4 @@ internal class SpeTextBlock : TextBlock
     /// </summary>
     /// <param name="offsetX"></param>
     public void MoveX(double offsetX) => Canvas.SetLeft(this, X + offsetX);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
index b08929bb..23a9d1f1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Time/TimeBar/TimeBar.cs
@@ -588,4 +588,4 @@ public class TimeBar : Control
             };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
index ab2ce568..2241e739 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/Transfer.cs
@@ -285,4 +285,4 @@ public class Transfer : SimpleItemsControl
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
index 569621de..c227e555 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferGroup.cs
@@ -61,4 +61,4 @@ public class TransferGroup : SimpleItemsControl
                 break;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
index 1fd01ca5..d76ac608 100644
--- a/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Transfer/TransferItem.cs
@@ -22,4 +22,4 @@ public class TransferItem : SelectableItem
         get => (bool) GetValue(IsOriginProperty);
         internal set => SetValue(IsOriginProperty, ValueBoxes.BooleanBox(value));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
index d8948eef..97086556 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/BlurWindow.cs
@@ -86,4 +86,4 @@ public class BlurWindow : Window
 
         Marshal.FreeHGlobal(accentPtr);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
index eba8f68a..72eefe15 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/GlowWindow.cs
@@ -462,4 +462,4 @@ public class GlowWindow : Window
 
     #endregion
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
index ea4055f8..ba697435 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
@@ -126,4 +126,4 @@ public class ImageBrowser : Window
             DragMove();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
index 780b9e27..a0cdaac1 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/MessageBox.cs
@@ -650,4 +650,4 @@ public sealed class MessageBox : Window
                || value == MessageBoxResult.OK
                || value == MessageBoxResult.Yes;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
index feefd561..3416d7b0 100644
--- a/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Window/PopupWindow.cs
@@ -231,4 +231,4 @@ public class PopupWindow : System.Windows.Window
         base.OnClosed(e);
         PopupElement = null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
index 2fa3d025..24311709 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/CancelRoutedEventArgs.cs
@@ -9,4 +9,4 @@ public class CancelRoutedEventArgs : RoutedEventArgs
     }
 
     public bool Cancel { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs b/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
index 279d0d4d..31d2c3a8 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/FunctionEventArgs`1.cs
@@ -15,4 +15,4 @@ public class FunctionEventArgs<T> : RoutedEventArgs
     }
 
     public T Info { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
index 1d591109..edbbdb21 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/KeyboardHookEventArgs.cs
@@ -14,4 +14,4 @@ public class KeyboardHookEventArgs : EventArgs
         IsSystemKey = isSystemKey;
         Key = KeyInterop.KeyFromVirtualKey(virtualKey);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
index 4887d481..bc49d13a 100644
--- a/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
+++ b/src/Shared/HandyControl_Shared/Data/Args/MouseHookEventArgs.cs
@@ -8,4 +8,4 @@ internal class MouseHookEventArgs : EventArgs
     public MouseHookMessageType MessageType { get; set; }
 
     public InteropValues.POINT Point { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/DisposableObject.cs b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
index d89aaee1..f2ea2df5 100644
--- a/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
+++ b/src/Shared/HandyControl_Shared/Data/DisposableObject.cs
@@ -65,4 +65,4 @@ public class DisposableObject : IDisposable
     protected virtual void DisposeNativeResources()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
index 91b36fa5..417a4116 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/BadgeStatus.cs
@@ -5,4 +5,4 @@ public enum BadgeStatus
     Text,
     Dot,
     Processing
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
index 5090808b..0dabc102 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ChatMessageType.cs
@@ -6,4 +6,4 @@ public enum ChatMessageType
     Image,
     Audio,
     Custom
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
index 72f05148..5ca4a26d 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ChatRoleType.cs
@@ -4,4 +4,4 @@ public enum ChatRoleType
 {
     Sender,
     Receiver
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
index 600c7fbe..ca770d1e 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ColLayoutStatus.cs
@@ -9,4 +9,4 @@ public enum ColLayoutStatus
     Xl,
     Xxl,
     Auto
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
index edd0d8a6..2e2964cc 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/DrawerShowMode.cs
@@ -5,4 +5,4 @@ public enum DrawerShowMode
     Cover,
     Push,
     Press
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs b/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
index a07f287d..6e55b237 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/EnumDataProvider.cs
@@ -74,4 +74,4 @@ public class EnumDataProvider : ObjectDataProvider
 
         return resultList;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
index e9b11023..c7831162 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ExpandMode.cs
@@ -21,4 +21,4 @@ public enum ExpandMode
     ///     没有任何限制
     /// </summary>
     Freedom
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs b/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
index 454ed25c..599fb307 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/HatchStyle.cs
@@ -55,4 +55,4 @@ public enum HatchStyle
     LargeCheckerBoard,
     OutlinedDiamond,
     SolidDiamond
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
index 1bf1f2ea..1165264e 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/HitMode.cs
@@ -6,4 +6,4 @@ public enum HitMode
     Hover,
     Focus,
     None
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs b/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
index 5d27e636..c608ecbc 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ImageCodecFlags.cs
@@ -14,4 +14,4 @@ internal enum ImageCodecFlags
     Builtin = 0x00010000,
     System = 0x00020000,
     User = 0x00040000
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs b/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
index e5380cdb..d046eebf 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/InfoType.cs
@@ -9,4 +9,4 @@ public enum InfoType
     Error,
     Fatal,
     Ask
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs b/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
index 7fd8d7d4..267f5f29 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/IpType.cs
@@ -26,4 +26,4 @@ public enum IpType
     /// E类IP地址
     /// </summary>
     E
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
index 2193f66a..cd970c30 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/LinearLayout.cs
@@ -5,4 +5,4 @@ public enum LinearLayout
     Stack,
 
     Uniform
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs b/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
index 453a24c7..065630fb 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/MouseHookMessageType.cs
@@ -8,4 +8,4 @@ public enum MouseHookMessageType
     MouseWheel = 0x020A,
     RightButtonDown = 0x0204,
     RightButtonUp = 0x0205
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs b/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
index 9ce26a3a..c9f9e0e9 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/NotifyIconInfoType.cs
@@ -21,4 +21,4 @@ public enum NotifyIconInfoType
     ///  A Error Icon.
     /// </summary>
     Error
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs b/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
index a739b61e..63109b6f 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/PlacementType.cs
@@ -62,4 +62,4 @@ public enum PlacementType
     /// 下右
     /// </summary>
     BottomRight,
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs b/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
index 38f39194..4ee70216 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ResultType.cs
@@ -20,4 +20,4 @@ public enum ResultType
     ///     无数据
     /// </summary>
     None
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
index 4238ed12..caa8fed8 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/ShowAnimation.cs
@@ -6,4 +6,4 @@ public enum ShowAnimation
     HorizontalMove,
     VerticalMove,
     Fade
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs b/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
index 870b356b..4c48c2e9 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/SideMenuItemRole.cs
@@ -4,4 +4,4 @@ public enum SideMenuItemRole
 {
     Header,
     Item
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs b/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
index 4c37d8c5..79e64d3b 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/SkinType.cs
@@ -6,4 +6,4 @@ public enum SkinType
     Default,
     Dark,
     Violet
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs b/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
index e979cdf6..59178edd 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/StepStatus.cs
@@ -19,4 +19,4 @@ public enum StepStatus
     ///     等待中
     /// </summary>
     Waiting
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
index 7be77f34..35a13407 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/StrokePosition.cs
@@ -5,4 +5,4 @@ public enum StrokePosition
     Center,
     Outside,
     Inside
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs b/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
index 61132b77..594cc35d 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TextType.cs
@@ -23,4 +23,4 @@ public enum TextType
     Double,
     NnDouble,
     NpDouble
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs b/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
index 6386f83f..ab511d96 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TitlePlacementType.cs
@@ -8,4 +8,4 @@ public enum TitlePlacementType
 {
     Left,
     Top
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs b/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
index 0d96a718..3e8c5925 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/TransitionMode.cs
@@ -12,4 +12,4 @@ public enum TransitionMode
     Top2BottomWithFade,
     Fade,
     Custom
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs b/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
index 702ef2ae..d744c97c 100644
--- a/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
+++ b/src/Shared/HandyControl_Shared/Data/Enum/VisualWrapping.cs
@@ -4,4 +4,4 @@ public enum VisualWrapping
 {
     NoWrap,
     Wrap
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/EnumItem.cs b/src/Shared/HandyControl_Shared/Data/EnumItem.cs
index d0f340cf..38ac4b63 100644
--- a/src/Shared/HandyControl_Shared/Data/EnumItem.cs
+++ b/src/Shared/HandyControl_Shared/Data/EnumItem.cs
@@ -5,4 +5,4 @@ public class EnumItem
     public string Description { get; set; }
 
     public System.Enum Value { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
index 3e40977a..9e5722b9 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentAlignment.cs
@@ -8,4 +8,4 @@ public enum FlexContentAlignment
     Center,
     SpaceBetween,
     SpaceAround
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
index 67ac711d..397cbaa7 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexContentJustify.cs
@@ -7,4 +7,4 @@ public enum FlexContentJustify
     Center,
     SpaceBetween,
     SpaceAround
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
index 8af6afa8..45feebe6 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexDirection.cs
@@ -6,4 +6,4 @@ public enum FlexDirection
     RowReverse,
     Column,
     ColumnReverse
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
index 99c332a6..72144850 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemAlignment.cs
@@ -8,4 +8,4 @@ public enum FlexItemAlignment
     Center,
     Baseline,
     Stretch
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
index ffe13439..fdccfbe0 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexItemsAlignment.cs
@@ -7,4 +7,4 @@ public enum FlexItemsAlignment
     FlexEnd,
     Center,
     Baseline
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs b/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
index 650c93f8..f73fd07c 100644
--- a/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
+++ b/src/Shared/HandyControl_Shared/Data/Flex/FlexWrap.cs
@@ -5,4 +5,4 @@ public enum FlexWrap
     NoWrap,
     Wrap,
     WrapReverse
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs b/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
index 324b8577..d4f90a3b 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GPStream.cs
@@ -267,4 +267,4 @@ internal class GPStream : InteropValues.IStream
         [MarshalAs(UnmanagedType.I4)]
         public int reserved;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
index 91daf735..5291e8a8 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifFrameDimension.cs
@@ -25,4 +25,4 @@ internal class GifFrameDimension
         if (Equals(this, Page)) return "Page";
         return "[FrameDimension: " + Guid + "]";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
index 5aa0fda6..07749f46 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifImageInfo.cs
@@ -92,4 +92,4 @@ public class GifImageInfo
     }
 
     protected void OnFrameChanged(EventArgs e) => FrameChangedHandler?.Invoke(Image, e);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
index 1ef4dcc0..50bf7a11 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItem.cs
@@ -9,4 +9,4 @@ public class GifPropertyItem
     public short Type { get; set; }
 
     public byte[] Value { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
index 020ae038..71a95c03 100644
--- a/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
+++ b/src/Shared/HandyControl_Shared/Data/Gif/GifPropertyItemInternal.cs
@@ -110,4 +110,4 @@ public class GifPropertyItemInternal : IDisposable
 
         return props;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
index 8efe87f3..5948247c 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/ChangeScope.cs
@@ -17,4 +17,4 @@ internal class ChangeScope : DisposableObject
         _window.DeferGlowChangesCount--;
         if (_window.DeferGlowChangesCount == 0) _window.EndDeferGlowChanges();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
index cdeef002..a6874a83 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmap.cs
@@ -110,4 +110,4 @@ internal class GlowBitmap : DisposableObject
             DIBits = diBits;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
index cd838b1d..b5b1ae98 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowBitmapPart.cs
@@ -18,4 +18,4 @@ internal enum GlowBitmapPart
     RightTop,
     Right,
     RightBottom
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
index aa770a87..8c7fca6f 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowDrawingContext.cs
@@ -47,4 +47,4 @@ internal class GlowDrawingContext : DisposableObject
         if (WindowDC != IntPtr.Zero) InteropMethods.DeleteDC(WindowDC);
         if (BackgroundDC != IntPtr.Zero) InteropMethods.DeleteDC(BackgroundDC);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
index c9a04e7d..89b8a83a 100644
--- a/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
+++ b/src/Shared/HandyControl_Shared/Data/GlowWindow/GlowEdge.cs
@@ -203,12 +203,12 @@ internal class GlowEdge : HwndWrapper
                     case 169:
                     case 171:
                     case 173:
-                    {
-                        var targetWindowHandle = TargetWindowHandle;
-                        InteropMethods.SendMessage(targetWindowHandle, 6, new IntPtr(2), IntPtr.Zero);
-                        InteropMethods.SendMessage(targetWindowHandle, msg, wParam, IntPtr.Zero);
-                        return IntPtr.Zero;
-                    }
+                        {
+                            var targetWindowHandle = TargetWindowHandle;
+                            InteropMethods.SendMessage(targetWindowHandle, 6, new IntPtr(2), IntPtr.Zero);
+                            InteropMethods.SendMessage(targetWindowHandle, msg, wParam, IntPtr.Zero);
+                            return IntPtr.Zero;
+                        }
                 }
             }
             else
@@ -583,4 +583,4 @@ internal class GlowEdge : HwndWrapper
         Render = 16,
         Visibility = 32
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
index ca6fd743..43c9d956 100644
--- a/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
+++ b/src/Shared/HandyControl_Shared/Data/HandyControlConfig.cs
@@ -5,4 +5,4 @@ public class HandyControlConfig
     public string Lang { get; set; }
 
     public int TimelineFrameRate { get; set; } = 60;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
index 239bb221..b2561fb2 100644
--- a/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
+++ b/src/Shared/HandyControl_Shared/Data/HwndWrapper.cs
@@ -98,4 +98,4 @@ public abstract class HwndWrapper : DisposableObject
         DestroyWindowCore();
         DestroyWindowClassCore();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
index 1c5e1cc3..78a113f5 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/GrowlInfo.cs
@@ -37,4 +37,4 @@ public class GrowlInfo
     public string Token { get; set; }
 
     public FlowDirection FlowDirection { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
index 9263a5c2..ba5aa9bc 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/ImageCodecInfo.cs
@@ -154,4 +154,4 @@ internal sealed class ImageCodecInfo
 
         return codecs;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
index 66fb57de..d33f4b9b 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/MessageBoxInfo.cs
@@ -24,4 +24,4 @@ public class MessageBoxInfo
     public Style Style { get; set; }
 
     public string StyleKey { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs b/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
index 1af033f6..b6c4e165 100644
--- a/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
+++ b/src/Shared/HandyControl_Shared/Data/Info/SystemVersionInfo.cs
@@ -75,4 +75,4 @@ public readonly struct SystemVersionInfo
     public static bool operator >=(SystemVersionInfo left, SystemVersionInfo right) => left.CompareTo(right) >= 0;
 
     public override string ToString() => $"{Major}.{Minor}.{Build}";
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
index a196584c..858f2e15 100644
--- a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
+++ b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult.cs
@@ -21,4 +21,4 @@ public class OperationResult
             Data = true
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
index f6cad51d..804a5b8c 100644
--- a/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
+++ b/src/Shared/HandyControl_Shared/Data/Operation/OperationResult`1.cs
@@ -19,4 +19,4 @@ public class OperationResult<T> : OperationResult
     ///     操作消息（包含错误原因等数据）
     /// </summary>
     public string Message { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs b/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
index c1df851d..1a03af0a 100644
--- a/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
+++ b/src/Shared/HandyControl_Shared/Data/PanelUvSize.cs
@@ -66,4 +66,4 @@ internal struct PanelUvSize
         U = V = 0d;
         _orientation = orientation;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs b/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
index d89584c5..a2762481 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/ColorRange.cs
@@ -59,4 +59,4 @@ public class ColorRange : IValueRange<Color>
         return Color.FromArgb((byte) (_start.A - _subColorArr[0] * range), (byte) (_start.R - _subColorArr[1] * range),
             (byte) (_start.G - _subColorArr[2] * range), (byte) (_start.B - _subColorArr[3] * range));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs b/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
index bd15e86b..d25a4718 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/DateTimeRange.cs
@@ -21,4 +21,4 @@ public struct DateTimeRange : IValueRange<DateTime>
     public DateTime End { get; set; }
 
     public double TotalMilliseconds => (End - Start).TotalMilliseconds;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs b/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
index 5081c9ff..b3b5013b 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/DoubleRange.cs
@@ -5,4 +5,4 @@ public struct DoubleRange : IValueRange<double>
     public double Start { get; set; }
 
     public double End { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs b/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
index baf71755..af9770a8 100644
--- a/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
+++ b/src/Shared/HandyControl_Shared/Data/Range/IValueRange.cs
@@ -5,4 +5,4 @@ public interface IValueRange<T>
     T Start { get; set; }
 
     T End { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
index b3e244d9..21e929a5 100644
--- a/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
+++ b/src/Shared/HandyControl_Shared/Data/ResourceToken.cs
@@ -371,4 +371,4 @@ public class ResourceToken
     internal const string ComboBoxItemCapsuleVerticalLast = nameof(ComboBoxItemCapsuleVerticalLast);
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
index ef197c4a..8e216bec 100644
--- a/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
+++ b/src/Shared/HandyControl_Shared/Data/ValueBoxes.cs
@@ -47,4 +47,4 @@ internal static class ValueBoxes
 
     internal static object OrientationBox(Orientation value) =>
         value == Orientation.Horizontal ? HorizontalBox : VerticalBox;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
index b01d4403..822e4045 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/CloseWindowCommand.cs
@@ -20,4 +20,4 @@ public class CloseWindowCommand : ICommand
     }
 
     public event EventHandler CanExecuteChanged;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
index 1c18fb4d..bea450e0 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ControlCommands.cs
@@ -181,4 +181,4 @@ public static class ControlCommands
     ///     按照名称排序
     /// </summary>
     public static RoutedCommand SortByName { get; } = new(nameof(SortByName), typeof(ControlCommands));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
index 7d666516..cd3a429b 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/OpenLinkCommand.cs
@@ -29,4 +29,4 @@ public class OpenLinkCommand : ICommand
     }
 
     public event EventHandler CanExecuteChanged;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
index 9c1a95c9..aef16665 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/PushMainWindow2TopCommand.cs
@@ -19,4 +19,4 @@ public class PushMainWindow2TopCommand : ICommand
     }
 
     public event EventHandler CanExecuteChanged;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
index ce34a41c..23ca77c1 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/ShutdownAppCommand.cs
@@ -11,4 +11,4 @@ public class ShutdownAppCommand : ICommand
     public void Execute(object parameter) => Application.Current.Shutdown();
 
     public event EventHandler CanExecuteChanged;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
index fdd7b379..1a126065 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/Commands/StartScreenshotCommand.cs
@@ -11,4 +11,4 @@ public class StartScreenshotCommand : ICommand
     public void Execute(object parameter) => new Screenshot().Start();
 
     public event EventHandler CanExecuteChanged;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
index 2c565100..52d32729 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/EventToCommand.cs
@@ -191,4 +191,4 @@ public class EventToCommand : TriggerAction<DependencyObject>
     }
 
     private void OnCommandCanExecuteChanged(object sender, EventArgs e) => EnableDisableElement();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs b/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
index a704cded..0329f0f1 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/IEventArgsConverter.cs
@@ -27,4 +27,4 @@ namespace HandyControl.Interactivity;
 public interface IEventArgsConverter
 {
     object Convert(object value, object parameter);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
index 1b3287c0..a96c94e7 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/MouseDragElementBehaviorEx.cs
@@ -364,4 +364,4 @@ internal class MouseDragElementBehaviorEx : Behavior<FrameworkElement>
         AssociatedObject.RemoveHandler(UIElement.MouseLeftButtonDownEvent,
             new MouseButtonEventHandler(OnMouseLeftButtonDown));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs b/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
index 757c08da..aee11558 100644
--- a/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
+++ b/src/Shared/HandyControl_Shared/Interactivity/RoutedEventTrigger.cs
@@ -25,4 +25,4 @@ public class RoutedEventTrigger : EventTriggerBase<DependencyObject>
     {
         return RoutedEvent.Name;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
index f7ed1112..689e57f1 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/DiscreteGeometryKeyFrame.cs
@@ -21,4 +21,4 @@ public class DiscreteGeometryKeyFrame : GeometryKeyFrame
     protected override Freezable CreateInstanceCore() => new DiscreteGeometryKeyFrame();
 
     protected override double[] InterpolateValueCore(double[] baseValue, double keyFrameProgress) => keyFrameProgress < 1.0 ? baseValue : Numbers;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
index 726c03a5..81f41ab4 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/EasingGeometryKeyFrame.cs
@@ -59,4 +59,4 @@ public class EasingGeometryKeyFrame : GeometryKeyFrame
         get => (IEasingFunction) GetValue(EasingFunctionProperty);
         set => SetValue(EasingFunctionProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
index 497f847f..572602ee 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimation.cs
@@ -176,4 +176,4 @@ public class GeometryAnimation : GeometryAnimationBase
         get => (bool) GetValue(IsCumulativeProperty);
         set => SetValue(IsCumulativeProperty, ValueBoxes.BooleanBox(value));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
index 82efee27..d9e929b2 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationBase.cs
@@ -56,4 +56,4 @@ public abstract class GeometryAnimationBase : AnimationTimeline
     }
 
     protected abstract Geometry GetCurrentValueCore(Geometry defaultOriginValue, Geometry defaultDestinationValue, AnimationClock animationClock);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
index 11d0636a..47c04b4f 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryAnimationUsingKeyFrames.cs
@@ -517,4 +517,4 @@ public class GeometryAnimationUsingKeyFrames : GeometryAnimationBase, IKeyFrameA
         }
         while (index < maxKeyFrameIndex);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs b/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
index 32ee9f89..be54d0aa 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/GeometryKeyFrameCollection.cs
@@ -319,4 +319,4 @@ public class GeometryKeyFrameCollection : Freezable, IList
             return IsFrozen;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
index 445a1437..cc015f68 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/LinearGeometryKeyFrame.cs
@@ -39,4 +39,4 @@ public class LinearGeometryKeyFrame : GeometryKeyFrame
 
         return AnimationHelper.InterpolateGeometryValue(baseValue, Numbers, keyFrameProgress);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs b/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
index b9311576..584f84da 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/ResolvedKeyFrameEntry.cs
@@ -34,4 +34,4 @@ internal struct ResolvedKeyFrameEntry : IComparable
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs b/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
index e64a06c2..5884af9b 100644
--- a/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
+++ b/src/Shared/HandyControl_Shared/Media/Animation/SplineGeometryKeyFrame.cs
@@ -55,4 +55,4 @@ public class SplineGeometryKeyFrame : GeometryKeyFrame
         get => (KeySpline) GetValue(KeySplineProperty);
         set => SetValue(KeySplineProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
index f0ee1481..531bb4a8 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/BrightnessEffect.cs
@@ -33,4 +33,4 @@ public class BrightnessEffect : EffectBase
         get => (double) GetValue(BrightnessProperty);
         set => SetValue(BrightnessProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
index ff5889ae..dbeb242f 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ColorComplementEffect.cs
@@ -21,4 +21,4 @@ public class ColorComplementEffect : EffectBase
 
         UpdateShaderValue(InputProperty);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
index 4d9a5ed6..b97684fd 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ColorMatrixEffect.cs
@@ -243,4 +243,4 @@ public class ColorMatrixEffect : EffectBase
     }
 
     #endregion
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
index 2558537b..b17b802d 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/ContrastEffect.cs
@@ -33,4 +33,4 @@ public class ContrastEffect : EffectBase
         get => (double) GetValue(ContrastProperty);
         set => SetValue(ContrastProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs b/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
index c0dd2011..97c12d88 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/EffectBase.cs
@@ -13,4 +13,4 @@ public abstract class EffectBase : ShaderEffect
         get => (Brush) GetValue(InputProperty);
         set => SetValue(InputProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs b/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
index 5535cb56..671a20e6 100644
--- a/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
+++ b/src/Shared/HandyControl_Shared/Media/Effects/GrayScaleEffect.cs
@@ -33,4 +33,4 @@ public class GrayScaleEffect : EffectBase
         get => (double) GetValue(ScaleProperty);
         set => SetValue(ScaleProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
index cdc5f4cb..3bb79527 100644
--- a/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
+++ b/src/Shared/HandyControl_Shared/Properties/Langs/LangProvider.cs
@@ -488,4 +488,4 @@ public class LangKeys
     /// </summary>
     public static string ZoomOut = nameof(ZoomOut);
 
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs b/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
index 9c0f67d3..222f9220 100644
--- a/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
+++ b/src/Shared/HandyControl_Shared/Themes/SharedResourceDictionary.cs
@@ -35,4 +35,4 @@ public class SharedResourceDictionary : ResourceDictionary
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.cs b/src/Shared/HandyControl_Shared/Themes/Theme.cs
index ac8a707c..07ab534a 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.cs
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.cs
@@ -243,4 +243,4 @@ public class Theme : ResourceDictionary
 public class StandaloneTheme : Theme
 {
     public override ResourceDictionary GetTheme() => ResourceHelper.GetStandaloneTheme();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
index 5938d564..1af3fdf5 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2BooleanReConverter.cs
@@ -23,4 +23,4 @@ public class Boolean2BooleanReConverter : IValueConverter
         }
         return value;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
index c81a1e7e..3177a8cb 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2StrConverter.cs
@@ -28,4 +28,4 @@ public class Boolean2StringConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
index 0c173e94..b94627f8 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Boolean2VisibilityReConverter.cs
@@ -16,4 +16,4 @@ public class Boolean2VisibilityReConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
index c24781d3..89c83351 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2BooleanConverter.cs
@@ -36,4 +36,4 @@ public class BooleanArr2BooleanConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
index 3c93217a..19714766 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BooleanArr2VisibilityConverter.cs
@@ -35,4 +35,4 @@ public class BooleanArr2VisibilityConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
index ca6aa5de..8eb83de5 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularClipConverter.cs
@@ -32,4 +32,4 @@ public class BorderCircularClipConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
index ceead447..2d556de2 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderCircularConverter.cs
@@ -27,4 +27,4 @@ public class BorderCircularConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
index 404e4d54..a27fab6a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/BorderClipConverter.cs
@@ -46,4 +46,4 @@ public class BorderClipConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
index cf226a43..7c054342 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/ColLayoutConverter.cs
@@ -131,4 +131,4 @@ public class ColLayoutConverter : TypeConverter
             _ => throw new FormatException("InvalidStringColLayout")
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
index c25f91b7..e4c3828d 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Color2ChannelAConverter.cs
@@ -35,4 +35,4 @@ public class Color2ChannelAConverter : IValueConverter
         }
         return parameter;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
index 150c6d60..b58392e6 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Color2HexStrConverter.cs
@@ -36,4 +36,4 @@ public class Color2HexStringConverter : IValueConverter
         }
         return new SolidColorBrush(default);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
index 3bbf7209..6923ee18 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/CornerRadiusSplitConverter.cs
@@ -30,4 +30,4 @@ public class CornerRadiusSplitConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
index 2febc984..ea0514a0 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DataGridSelectAllButtonVisibilityConverter.cs
@@ -56,4 +56,4 @@ public class DataGridSelectAllButtonVisibilityConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
index 9c2c8b5c..62538ead 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Double2GridLengthConverter.cs
@@ -25,4 +25,4 @@ public class Double2GridLengthConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
index 200690db..713af864 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/DoubleMinConverter.cs
@@ -27,4 +27,4 @@ public class DoubleMinConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
index 53c97cfb..e90d8051 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Int2StrConverter.cs
@@ -34,4 +34,4 @@ public class Int2StringConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
index f28c6a6b..315b7bd7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Long2FileSizeConverter.cs
@@ -48,4 +48,4 @@ public class Long2FileSizeConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
index 3eae416a..d4fe7b4b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
@@ -32,4 +32,4 @@ public class Number2PercentageConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
index 4a5dc520..892ce2c3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2BooleanConverter.cs
@@ -12,4 +12,4 @@ public class Object2BooleanConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
index 641fec1d..88be78cb 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2StringConverter.cs
@@ -12,4 +12,4 @@ public class Object2StringConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
index 5e37b618..d8432dbe 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityConverter.cs
@@ -16,4 +16,4 @@ public class Object2VisibilityConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
index 2ed99ba4..9b4205e6 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Object2VisibilityReConverter.cs
@@ -16,4 +16,4 @@ public class Object2VisibilityReConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
index 22910714..af08f6f0 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/RectangleCircularConverter.cs
@@ -27,4 +27,4 @@ public class RectangleCircularConverter : IMultiValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
index c6991e1c..e8fe4310 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityConverter.cs
@@ -16,4 +16,4 @@ public class String2VisibilityConverter : IValueConverter
     {
         return value != null && (Visibility) value == Visibility.Collapsed;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
index 5d829835..cc9fddbb 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/String2VisibilityReConverter.cs
@@ -16,4 +16,4 @@ public class String2VisibilityReConverter : IValueConverter
     {
         return value != null && (Visibility) value == Visibility.Collapsed;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
index 00399d92..89433e05 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/ThicknessSplitConverter.cs
@@ -30,4 +30,4 @@ public class ThicknessSplitConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
index fe65cda5..5a6f7bb5 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/TreeViewItemMarginConverter.cs
@@ -24,4 +24,4 @@ public class TreeViewItemMarginConverter : IValueConverter
     {
         throw new NotSupportedException();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
index 28985b55..37f67cea 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ColLayout.cs
@@ -123,4 +123,4 @@ public class ColLayout : MarkupExtension
         sb.Append(Xxl.ToString(cultureInfo));
         return sb.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
index 09ceca5c..10a6deef 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ColorExtension.cs
@@ -29,4 +29,4 @@ public static class ColorExtension
         color.G,
         color.B
     };
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
index d8d0a947..4ed89210 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/DependencyObjectExtension.cs
@@ -14,4 +14,4 @@ public static class DependencyObjectExtension
             _ => LogicalTreeHelper.GetParent(sourceElement)
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
index 08aaf8d9..b3e23049 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/DialogExtension.cs
@@ -74,4 +74,4 @@ public static class DialogExtension
 
         return viewModel;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
index 0f34b603..2748ac4e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/EnumerableExtension.cs
@@ -27,4 +27,4 @@ public static class EnumerableExtension
 
         return enumerable;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
index 3a032c87..f8b42fb9 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/FrameworkElementExtension.cs
@@ -54,4 +54,4 @@ public static class FrameworkElementExtension
 
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
index a0c44fcd..80cec295 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/GeometryExtension.cs
@@ -46,4 +46,4 @@ public static class GeometryExtension
         length /= min;
         return length / strokeThickness;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
index f60df3fd..d585f0ce 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/LangExtension.cs
@@ -57,37 +57,37 @@ public class LangExtension : MarkupExtension
         switch (Key)
         {
             case string key:
-            {
-                var binding = CreateLangBinding(key);
-                BindingOperations.SetBinding(targetObject, targetProperty, binding);
-                return binding.ProvideValue(serviceProvider);
-            }
+                {
+                    var binding = CreateLangBinding(key);
+                    BindingOperations.SetBinding(targetObject, targetProperty, binding);
+                    return binding.ProvideValue(serviceProvider);
+                }
             case Binding keyBinding when targetObject is FrameworkElement element:
-            {
-                if (element.DataContext != null)
                 {
-                    var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                    return binding.ProvideValue(serviceProvider);
+                    if (element.DataContext != null)
+                    {
+                        var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                        return binding.ProvideValue(serviceProvider);
+                    }
+
+                    SetTargetProperty(element, targetProperty);
+                    element.DataContextChanged += LangExtension_DataContextChanged;
+
+                    break;
                 }
-
-                SetTargetProperty(element, targetProperty);
-                element.DataContextChanged += LangExtension_DataContextChanged;
-
-                break;
-            }
             case Binding keyBinding when targetObject is FrameworkContentElement element:
-            {
-                if (element.DataContext != null)
                 {
-                    var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                    return binding.ProvideValue(serviceProvider);
+                    if (element.DataContext != null)
+                    {
+                        var binding = SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                        return binding.ProvideValue(serviceProvider);
+                    }
+
+                    SetTargetProperty(element, targetProperty);
+                    element.DataContextChanged += LangExtension_DataContextChanged;
+
+                    break;
                 }
-
-                SetTargetProperty(element, targetProperty);
-                element.DataContextChanged += LangExtension_DataContextChanged;
-
-                break;
-            }
         }
 
         return string.Empty;
@@ -98,25 +98,25 @@ public class LangExtension : MarkupExtension
         switch (sender)
         {
             case FrameworkElement element:
-            {
-                element.DataContextChanged -= LangExtension_DataContextChanged;
-                if (!(Key is Binding keyBinding)) return;
+                {
+                    element.DataContextChanged -= LangExtension_DataContextChanged;
+                    if (!(Key is Binding keyBinding)) return;
 
-                var targetProperty = GetTargetProperty(element);
-                SetTargetProperty(element, null);
-                SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                break;
-            }
+                    var targetProperty = GetTargetProperty(element);
+                    SetTargetProperty(element, null);
+                    SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                    break;
+                }
             case FrameworkContentElement element:
-            {
-                element.DataContextChanged -= LangExtension_DataContextChanged;
-                if (!(Key is Binding keyBinding)) return;
+                {
+                    element.DataContextChanged -= LangExtension_DataContextChanged;
+                    if (!(Key is Binding keyBinding)) return;
 
-                var targetProperty = GetTargetProperty(element);
-                SetTargetProperty(element, null);
-                SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
-                break;
-            }
+                    var targetProperty = GetTargetProperty(element);
+                    SetTargetProperty(element, null);
+                    SetLangBinding(element, targetProperty, keyBinding.Path, element.DataContext);
+                    break;
+                }
         }
     }
 
@@ -147,4 +147,4 @@ public class LangExtension : MarkupExtension
         Source = Source,
         Mode = BindingMode.OneWay
     };
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
index 84e24f1e..ad844163 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/StringExtension.cs
@@ -28,4 +28,4 @@ public static class StringExtension
             return null;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
index 891b46f2..0f816e58 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/UIElementExtension.cs
@@ -29,4 +29,4 @@ public static class UIElementExtension
     /// </summary>
     /// <param name="element"></param>
     public static void Collapse(this UIElement element) => element.Visibility = Visibility.Collapsed;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs b/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
index f5d63390..4ffe4aba 100644
--- a/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Extension/ValueExtension.cs
@@ -19,4 +19,4 @@ public static class ValueExtension
         && MathHelper.AreClose(thickness.Left, thickness.Bottom);
 
     public static bool IsNaN(this double value) => double.IsNaN(value);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
index 83461450..4f61f348 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/ComparerGenerator.cs
@@ -31,4 +31,4 @@ public class ComparerGenerator
     {
         DateTimeRange
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs b/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
index fc7b067f..f591629b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/DateTimeRangeComparer.cs
@@ -11,4 +11,4 @@ public class DateTimeRangeComparer : IComparer<DateTimeRange>
         if (x.Start < y.Start && x.End < y.End) return -1;
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
index d8502f17..4f845e2e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/GithubGravatarGenerator.cs
@@ -116,4 +116,4 @@ public class GithubGravatarGenerator : IGravatarGenerator
         return Color.FromRgb((byte) (arr[hValue % 6] * 255), (byte) (arr[(hValue | 16) % 6] * 255),
             (byte) (arr[(hValue | 8) % 6] * 255));
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs b/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
index 894caaae..9f00f085 100644
--- a/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Generator/HatchBrushGenerator.cs
@@ -113,4 +113,4 @@ public class HatchBrushGenerator
         hatchStyle < HatchStyle.Horizontal || hatchStyle > HatchStyle.SolidDiamond
             ? throw new ArgumentOutOfRangeException(nameof(hatchStyle))
             : HatchBrushes[(int) hatchStyle];
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
index d83161c6..830d73da 100644
--- a/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
+++ b/src/Shared/HandyControl_Shared/Tools/GlobalShortcut.cs
@@ -117,4 +117,4 @@ public class GlobalShortcut
 
     public static ObservableCollection<KeyBinding> GetKeyBindings(DependencyObject element)
         => (ObservableCollection<KeyBinding>) element.GetValue(KeyBindingsProperty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
index eb5021ae..95864b90 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/AnimationHelper.cs
@@ -90,4 +90,4 @@ public class AnimationHelper
 
         return accumulated;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
index c07c6510..c0c68820 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ArithmeticHelper.cs
@@ -123,4 +123,4 @@ internal class ArithmeticHelper
         var v1 = new Vector3D(p2.X - p1.X, p2.Y - p1.Y, p2.Z - p1.Z);
         return Vector3D.CrossProduct(v0, v1);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
index fe560ad8..2ffcfbff 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/BindingHelper.cs
@@ -27,4 +27,4 @@ public class BindingHelper
         BindingOperations.ClearBinding(tempObj, TextSearch.TextProperty);
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
index 22739088..d17723a3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ColorHelper.cs
@@ -16,4 +16,4 @@ public class ColorHelper
         var bytes = BitConverter.GetBytes(c);
         return Color.FromArgb(bytes[3], bytes[2], bytes[1], bytes[0]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
index adacda15..aab7503a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ConfigHelper.cs
@@ -79,9 +79,9 @@ public class ConfigHelper : INotifyPropertyChanged
         PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 #else
-        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+    protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
 #endif
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
index 66348bf2..8b54df0e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/DesignerHelper.cs
@@ -18,4 +18,4 @@ public class DesignerHelper
             return _isInDesignMode.Value;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
index c6a7a96e..582a34c3 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/DpiHelper.cs
@@ -100,4 +100,4 @@ internal static class DpiHelper
 
         return newValue;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
index 21d1e7e7..5c57372f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
@@ -273,4 +273,4 @@ internal static class FullScreenHelper
 
         return IntPtr.Zero;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
index 2deb6d7e..01174bb7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/IconHelper.cs
@@ -293,4 +293,4 @@ internal static class IconHelper
         var iconModuleFile = InteropMethods.GetModuleFileName(new HandleRef());
         InteropMethods.ExtractIconEx(iconModuleFile, 0, out largeIconHandle, out smallIconHandle, 1);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
index afee1272..2512a3ef 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/InputClickHelper.cs
@@ -145,4 +145,4 @@ public static class InputClickHelper
 
         public bool IsEmpty() => ClickEventHandler is null && DragStarted is null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
index 8a17a56e..90b59ece 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs
@@ -81,4 +81,4 @@ public class ResourceHelper
             Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml")
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
index 7863351d..442ec6ce 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ScreenHelper.cs
@@ -81,4 +81,4 @@ internal class ScreenHelper
             workAreaRect = new Rect(monitorInfo.rcWork.Position, monitorInfo.rcWork.Size);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
index 3de2bca3..520d9515 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SecurityHelper.cs
@@ -15,4 +15,4 @@ internal class SecurityHelper
         _allWindowsUIPermission ??= new UIPermission(UIPermissionWindow.AllWindows);
         _allWindowsUIPermission.Demand();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
index 4c4bdc88..002adc1c 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SingleOpenHelper.cs
@@ -38,4 +38,4 @@ public class SingleOpenHelper
         }
         return default;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
index 7222cde7..7e65b1a6 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/SystemHelper.cs
@@ -25,4 +25,4 @@ internal class SystemHelper
 
         return value != null && value.ToString() != "0";
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
index cd6f37f1..b6e71a0b 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TextHelper.cs
@@ -16,14 +16,14 @@ internal class TextHelper
             typeface,
             fontSize, Brushes.Black);
 #else
-            var formattedText = new FormattedText(
-                text,
-                CultureInfo.CurrentUICulture,
-                flowDirection,
-                typeface,
-                fontSize, Brushes.Black, DpiHelper.DeviceDpiX);
+        var formattedText = new FormattedText(
+            text,
+            CultureInfo.CurrentUICulture,
+            flowDirection,
+            typeface,
+            fontSize, Brushes.Black, DpiHelper.DeviceDpiX);
 #endif
 
         return formattedText;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
index 7790f82e..913cab34 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TokenizerHelper.cs
@@ -229,4 +229,4 @@ internal class TokenizerHelper
 
         return numericSeparator;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
index e3b96334..83ba61c1 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/TouchDragMoveWindowHelper.cs
@@ -69,4 +69,4 @@ internal class TouchDragMoveWindowHelper
 
         _lastPoint = lpPoint;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
index 1a076162..dd40ca41 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/ValidateHelper.cs
@@ -103,4 +103,4 @@ public class ValidateHelper
         var v = (int) value;
         return v <= 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
index 0c9cab6b..7d4d7f76 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/VisualHelper.cs
@@ -73,4 +73,4 @@ public static class VisualHelper
         InteropMethods.SetWindowLong(hWnd, InteropValues.GWL.STYLE, num);
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
index 9f18001f..23ec5e0f 100644
--- a/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Helper/WindowHelper.cs
@@ -140,10 +140,10 @@ public static class WindowHelper
 #if NET40
             return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -8 : 0));
 #elif NETCOREAPP
-                var hdc = InteropMethods.GetDC(IntPtr.Zero);
-                var scale = InteropMethods.GetDeviceCaps(hdc, InteropValues.DESKTOPVERTRES) / (float) InteropMethods.GetDeviceCaps(hdc, InteropValues.VERTRES);
-                InteropMethods.ReleaseDC(IntPtr.Zero, hdc);
-                return WindowResizeBorderThickness.Add(new Thickness((autoHide ? -4 : 4) * scale));
+            var hdc = InteropMethods.GetDC(IntPtr.Zero);
+            var scale = InteropMethods.GetDeviceCaps(hdc, InteropValues.DESKTOPVERTRES) / (float) InteropMethods.GetDeviceCaps(hdc, InteropValues.VERTRES);
+            InteropMethods.ReleaseDC(IntPtr.Zero, hdc);
+            return WindowResizeBorderThickness.Add(new Thickness((autoHide ? -4 : 4) * scale));
 #else
                 return WindowResizeBorderThickness.Add(new Thickness(autoHide ? -4 : 4));
 #endif
@@ -201,4 +201,4 @@ public static class WindowHelper
     public static void StartFullScreen(this Window window) => FullScreenHelper.StartFullScreen(window);
 
     public static void EndFullScreen(this Window window) => FullScreenHelper.EndFullScreen(window);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
index 5979fb3b..25916a90 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/ClipboardHook.cs
@@ -53,4 +53,4 @@ public class ClipboardHook
         }
         return IntPtr.Zero;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
index 40a1bcd4..f9cca1f0 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/KeyboardHook.cs
@@ -101,4 +101,4 @@ public class KeyboardHook
         }
         return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
index caf5ad10..149a1a8a 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/MouseHook.cs
@@ -64,4 +64,4 @@ internal class MouseHook
 
         return InteropMethods.CallNextHookEx(HookId, nCode, wParam, lParam);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
index 6ce5ada3..235bdcb7 100644
--- a/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Hook/SystemMenuHook.cs
@@ -49,4 +49,4 @@ public class SystemMenuHook
         }
         return IntPtr.Zero;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
index 9dbe38f8..4a8047ae 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/BitmapHandle.cs
@@ -41,4 +41,4 @@ internal sealed class BitmapHandle : WpfSafeHandle
             handle = hbitmap,
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
index 89439f50..3a4401c1 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/CommonHandles.cs
@@ -12,4 +12,4 @@ internal static class CommonHandles
     public static readonly int GDI = HandleCollector.RegisterType(nameof(GDI), 50, 500);
 
     public static readonly int Kernel = HandleCollector.RegisterType(nameof(Kernel), 0, 1000);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
index 481f4de4..c8613ef4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/HandleCollector.cs
@@ -128,4 +128,4 @@ internal static class HandleCollector
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
index 8018dcec..d59d8338 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/IconHandle.cs
@@ -29,4 +29,4 @@ internal sealed class IconHandle : WpfSafeHandle
     {
         return handle;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
index b4cb71e1..4e24b6db 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/SafeFileMappingHandle.cs
@@ -46,4 +46,4 @@ internal sealed class SafeFileMappingHandle : SafeHandleZeroOrMinusOneIsInvalid
         var result = InteropMethods.IntCloseHandle(handle);
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
index ca9a81e8..cbdc4768 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/Handle/WpfSafeHandle.cs
@@ -20,4 +20,4 @@ internal abstract class WpfSafeHandle : SafeHandleZeroOrMinusOneIsInvalid
         HandleCollector.Remove(_collectorId);
         base.Dispose(disposing);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
index 5291d3d8..4749a44e 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
@@ -744,4 +744,4 @@ internal class InteropMethods
         internal static extern int RtlGetVersion(out InteropValues.RTL_OSVERSIONINFOEX lpVersionInformation);
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
index e2495a21..66f055b4 100644
--- a/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
@@ -1188,4 +1188,4 @@ internal class InteropValues
         SHOWDEFAULT = 10,
         FORCEMINIMIZE = 11,
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs b/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
index 6b8ff981..7c8d479d 100644
--- a/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
+++ b/src/Shared/HandyControl_Shared/Tools/RegexJudgment.cs
@@ -93,4 +93,4 @@ public static class RegexJudgment
     {
         return Regex.IsMatch(str, RegexPatterns.UrlPattern);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs b/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
index 194f6228..b01ecb95 100644
--- a/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
+++ b/src/Shared/HandyControl_Shared/Tools/RegexPatterns.cs
@@ -147,4 +147,4 @@ public sealed class RegexPatterns
     /// <param name="propertyName"></param>
     /// <returns></returns>
     public object GetValue(string propertyName) => GetType().GetField(propertyName).GetValue(null);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
index a145972f..6dca25eb 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ButtonGroupItemStyleSelector.cs
@@ -118,4 +118,4 @@ public class ButtonGroupItemStyleSelector : StyleSelector
                     ? ResourceToken.RadioGroupItemVerticalLast
                     : ResourceToken.RadioGroupItemDefault];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
index 6032e79c..8f25e61f 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/ComboBoxItemCapsuleStyleSelector.cs
@@ -26,4 +26,4 @@ public class ComboBoxItemCapsuleStyleSelector : StyleSelector
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
index d3a8d644..b475242e 100644
--- a/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
+++ b/src/Shared/HandyControl_Shared/Tools/StyleSelector/TabItemCapsuleStyleSelector.cs
@@ -31,4 +31,4 @@ public class TabItemCapsuleStyleSelector : StyleSelector
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
index e6b32928..6982d9a0 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/BezierCurveFlattener.cs
@@ -353,4 +353,4 @@ internal static class BezierCurveFlattener
             return _numSteps != 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
index b8fd80f2..132a7370 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/CommonExtensions.cs
@@ -111,4 +111,4 @@ internal static class CommonExtensions
     {
         list.RemoveAt(list.Count - 1);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
index 43793776..ba0a8e82 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/ExceptionStringTable.cs
@@ -35,4 +35,4 @@ internal class ExceptionStringTable
 
     internal static string TypeNotSupported =>
         ResourceManager.GetString("TypeNotSupported", Culture);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
index 864a8610..121965ff 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/GeometryHelper.cs
@@ -217,4 +217,4 @@ public static class GeometryHelper
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
index 7536bee4..e44c5ea0 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchLocation.cs
@@ -46,4 +46,4 @@ internal class MarchLocation
     {
         return GeometryHelper.Lerp(points[Index], points[Index + 1], Ratio);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
index ca67f651..6462bf0a 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/MarchStopReason.cs
@@ -5,4 +5,4 @@ internal enum MarchStopReason
     CompleteStep,
     CompletePolyline,
     CornerPoint
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
index 138d3ab8..d8b171b3 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/MathHelper.cs
@@ -65,4 +65,4 @@ internal static class MathHelper
         }
         return fallback;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
index 0065709e..adee4976 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathFigureHelper.cs
@@ -111,4 +111,4 @@ internal static class PathFigureHelper
         flag |= figure.SetIfDifferent(PathFigure.IsClosedProperty, isClosed);
         return flag | figure.SetIfDifferent(PathFigure.IsFilledProperty, isFilled);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
index a4393ec8..9083a9f3 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathGeometryHelper.cs
@@ -21,4 +21,4 @@ internal static class PathGeometryHelper
     }
 
     internal static Geometry FixPathGeometryBoundary(Geometry geometry) => geometry;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
index af3a5517..3b4fd56e 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentData.cs
@@ -13,4 +13,4 @@ internal sealed class PathSegmentData
     public System.Windows.Media.PathSegment PathSegment { get; }
 
     public Point StartPoint { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
index 44a4a41b..8b490740 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PathSegmentHelper.cs
@@ -745,4 +745,4 @@ internal static class PathSegmentHelper
             yield return SimpleSegment.Create(Start, _segment.Point1, _segment.Point2);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
index b9d850a6..9b6804fb 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineData.cs
@@ -148,4 +148,4 @@ internal class PolylineData
 
         return Normals[index];
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
index 85cea863..2674d8fe 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/PolylineHelper.cs
@@ -112,4 +112,4 @@ internal static class PolylineHelper
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
index a96f08b3..280e986a 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/RandomEngine.cs
@@ -41,4 +41,4 @@ internal class RandomEngine
     public double NextUniform(double min, double max) => Uniform() * (max - min) + min;
 
     private double Uniform() => _random.NextDouble();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs b/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
index 41cc759a..fe553b3b 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Drawing/SimpleSegment.cs
@@ -72,4 +72,4 @@ internal class SimpleSegment
                 return;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
index 4dbdbe07..8f8afb95 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/ArcGeometrySource.cs
@@ -466,4 +466,4 @@ internal class ArcGeometrySource : GeometrySource<IArcGeometrySourceParameters>
         flag |= geometry.SetIfDifferent(LineGeometry.StartPointProperty, arcPoint);
         return flag | geometry.SetIfDifferent(LineGeometry.EndPointProperty, point2);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
index a87c68c0..ae7d618e 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyChangedEventArgs.cs
@@ -7,4 +7,4 @@ internal class DrawingPropertyChangedEventArgs : EventArgs
     public bool IsAnimated { get; set; }
 
     public DrawingPropertyMetadata Metadata { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
index 6c090281..f7c07af5 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadata.cs
@@ -73,4 +73,4 @@ internal class DrawingPropertyMetadata : FrameworkPropertyMetadata
 
         propertyChangedCallback?.Invoke(sender, e);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
index bb6bd8e0..11722e0c 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/DrawingPropertyMetadataOptions.cs
@@ -8,4 +8,4 @@ internal enum DrawingPropertyMetadataOptions
     AffectsMeasure = 1,
     AffectsRender = 0x10,
     None = 0
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
index 1ef6ea24..6a578309 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffect.cs
@@ -168,4 +168,4 @@ public abstract class GeometryEffect : Freezable
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
index 6d75e516..1d8a55f3 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/GeometryEffectConverter.cs
@@ -55,4 +55,4 @@ public sealed class GeometryEffectConverter : TypeConverter
 
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs b/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
index b424e658..aac84a95 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/GeometrySource`1.cs
@@ -84,4 +84,4 @@ public abstract class GeometrySource<TParameters> : IGeometrySource
     }
 
     protected abstract bool UpdateCachedGeometry(TParameters parameters);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
index c6149b07..62dac755 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/IArcGeometrySourceParameters.cs
@@ -9,4 +9,4 @@ public interface IArcGeometrySourceParameters : IGeometrySourceParameters
     double EndAngle { get; }
 
     double StartAngle { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
index bea37506..ed0ceb7f 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySource.cs
@@ -13,4 +13,4 @@ public interface IGeometrySource
     Rect LayoutBounds { get; }
 
     Rect LogicalBounds { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
index 42775a30..60645981 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceExtensions.cs
@@ -27,4 +27,4 @@ internal static class GeometrySourceExtensions
 
         return 0.0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
index 4785a63f..6bcd1adf 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/IGeometrySourceParameters.cs
@@ -9,4 +9,4 @@ public interface IGeometrySourceParameters
     Brush Stroke { get; }
 
     double StrokeThickness { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs b/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
index c8ba927d..fc064d45 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/IShape.cs
@@ -21,4 +21,4 @@ public interface IShape
     Brush Stroke { get; set; }
 
     double StrokeThickness { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs b/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
index 7fa88117..a03cf545 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/InvalidateGeometryReasons.cs
@@ -10,4 +10,4 @@ public enum InvalidateGeometryReasons
     ParentInvalidated = 8,
     PropertyChanged = 1,
     TemplateChanged = 0x10
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs b/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
index 4b49b396..abc2ccd9 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/SketchGeometryEffect.cs
@@ -45,12 +45,12 @@ public sealed class SketchGeometryEffect : GeometryEffect
     {
         var startPoint = pathFigure.StartPoint;
         foreach (var iteratorVariable1 in pathFigure.AllSegments())
-        foreach (var iteratorVariable2 in iteratorVariable1.PathSegment.GetSimpleSegments(
-                     iteratorVariable1.StartPoint))
-        {
-            yield return iteratorVariable2;
-            startPoint = iteratorVariable2.Points.Last();
-        }
+            foreach (var iteratorVariable2 in iteratorVariable1.PathSegment.GetSimpleSegments(
+                         iteratorVariable1.StartPoint))
+            {
+                yield return iteratorVariable2;
+                startPoint = iteratorVariable2.Points.Last();
+            }
 
         if (pathFigure.IsClosed) yield return SimpleSegment.Create(startPoint, pathFigure.StartPoint);
     }
@@ -131,4 +131,4 @@ public sealed class SketchGeometryEffect : GeometryEffect
         if (flag) CachedGeometry = PathGeometryHelper.FixPathGeometryBoundary(CachedGeometry);
         return flag;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs b/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
index d397e3db..1958d5f8 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Media/UnitType.cs
@@ -4,4 +4,4 @@ public enum UnitType
 {
     Pixel,
     Percent
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
index a4f07f4d..8d57f22b 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Shapes/Arc.cs
@@ -56,4 +56,4 @@ public sealed class Arc : PrimitiveShape, IArcGeometrySourceParameters
     {
         return new ArcGeometrySource();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs b/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs
index 7dc6647b..9c5211ad 100644
--- a/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs
+++ b/src/Shared/Microsoft.Expression.Drawing/Shapes/PrimitiveShape.cs
@@ -76,4 +76,4 @@ public abstract class PrimitiveShape : Shape, IGeometrySourceParameters, IShape
     protected override Size MeasureOverride(Size availableSize) => new(base.StrokeThickness, base.StrokeThickness);
 
     private void RealizeGeometry() => RenderedGeometryChanged?.Invoke(this, EventArgs.Empty);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs b/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs
index 39ccffe0..e318527d 100644
--- a/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/AdornerContainer.cs
@@ -42,4 +42,4 @@ public class AdornerContainer : Adorner
         if (index == 0 && _child != null) return _child;
         return base.GetVisualChild(index);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs b/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs
index a844a240..48b6940f 100644
--- a/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/ExceptionStringTable.cs
@@ -54,4 +54,4 @@ internal class ExceptionStringTable
 
     internal static string UnableToResolveTargetNameWarningMessage =>
         ResourceManager.GetString(nameof(UnableToResolveTargetNameWarningMessage), Culture);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs b/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs
index 011475ae..0daa3c40 100644
--- a/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/ExtendedVisualStateManager.cs
@@ -1120,4 +1120,4 @@ public class ExtendedVisualStateManager : VisualStateManager
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs
index 7433c05e..fa07e680 100644
--- a/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehavior.cs
@@ -445,4 +445,4 @@ public sealed class FluidMoveBehavior : FluidMoveBehaviorBase
         data.Child = newTagData.Child;
         data.Timestamp = newTagData.Timestamp;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs
index 95778904..37db593f 100644
--- a/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/FluidMoveBehaviorBase.cs
@@ -192,4 +192,4 @@ public abstract class FluidMoveBehaviorBase : Behavior<FrameworkElement>
 
         public DateTime Timestamp { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs b/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs
index dee335f4..1057fff4 100644
--- a/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/FluidMoveScope.cs
@@ -4,4 +4,4 @@ public enum FluidMoveScope
 {
     Self,
     Children
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs b/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs
index 216e38f8..938fbe7d 100644
--- a/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/MouseDragElementBehavior.cs
@@ -348,4 +348,4 @@ public class MouseDragElementBehavior : Behavior<FrameworkElement>
             ApplyTranslation(x, y);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/TagType.cs b/src/Shared/Microsoft.Expression.Interactions/TagType.cs
index 2abb20e1..d5187c28 100644
--- a/src/Shared/Microsoft.Expression.Interactions/TagType.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/TagType.cs
@@ -4,4 +4,4 @@ public enum TagType
 {
     Element,
     DataContext
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs b/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs
index baf128e5..6b9d3dfc 100644
--- a/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs
+++ b/src/Shared/Microsoft.Expression.Interactions/TransitionEffect.cs
@@ -52,4 +52,4 @@ public abstract class TransitionEffect : ShaderEffect
     }
 
     protected abstract TransitionEffect DeepCopy();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItem.cs b/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
index 3fea4202..7c37ab28 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItem.cs
@@ -9,4 +9,4 @@ public abstract class JumpItem
     }
 
     public string CustomCategory { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
index 5e7e68cc..d32f64ea 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemRejectionReason.cs
@@ -8,4 +8,4 @@ public enum JumpItemRejectionReason
     InvalidItem,
     NoRegisteredHandler,
     RemovedByUser
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
index 88b1403c..1d0d49ba 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemsRejectedEventArgs.cs
@@ -28,4 +28,4 @@ public sealed class JumpItemsRejectedEventArgs : EventArgs
     public IList<JumpItem> RejectedItems { get; private set; }
 
     public IList<JumpItemRejectionReason> RejectionReasons { get; private set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs b/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
index 3fe5b993..b955de6e 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpItemsRemovedEventArgs.cs
@@ -20,4 +20,4 @@ public sealed class JumpItemsRemovedEventArgs : EventArgs
     }
 
     public IList<JumpItem> RemovedItems { get; private set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpList.cs b/src/Shared/Microsoft.Windows.Shell/JumpList.cs
index c0c3d6bf..1473b0dd 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpList.cs
@@ -746,4 +746,4 @@ public sealed class JumpList : ISupportInitialize
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpPath.cs b/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
index 091993f8..baf0cdd2 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpPath.cs
@@ -5,4 +5,4 @@ namespace Microsoft.Windows.Shell;
 public class JumpPath : JumpItem
 {
     public string Path { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/JumpTask.cs b/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
index b7c76925..2fd432c0 100644
--- a/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
+++ b/src/Shared/Microsoft.Windows.Shell/JumpTask.cs
@@ -17,4 +17,4 @@ public class JumpTask : JumpItem
     public string IconResourcePath { get; set; }
 
     public int IconResourceIndex { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
index f712742f..25a3c797 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/AC.cs
@@ -6,4 +6,4 @@ internal enum AC : byte
 {
     SRC_OVER,
     SRC_ALPHA
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
index 87720c45..463d78df 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/APPDOCLISTTYPE.cs
@@ -6,4 +6,4 @@ internal enum APPDOCLISTTYPE
 {
     ADLT_RECENT,
     ADLT_FREQUENT
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
index b2eb66c8..b6d14025 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Assert.cs
@@ -229,4 +229,4 @@ internal static class Assert
     public delegate void EvaluateFunction();
 
     public delegate bool ImplicationFunction();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
index 9560f7b4..41ceb0e6 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BI.cs
@@ -5,4 +5,4 @@ namespace Standard;
 internal enum BI
 {
     RGB
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
index 68abffa3..11615253 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFO.cs
@@ -7,4 +7,4 @@ internal struct BITMAPINFO
     public BITMAPINFOHEADER bmiHeader;
 
     public RGBQUAD bmiColors;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
index 99438538..47c6b1ac 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BITMAPINFOHEADER.cs
@@ -27,4 +27,4 @@ internal struct BITMAPINFOHEADER
     public int biClrUsed;
 
     public int biClrImportant;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs b/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
index dcb011c5..41cc42ae 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/BLENDFUNCTION.cs
@@ -11,4 +11,4 @@ internal struct BLENDFUNCTION
     public byte SourceConstantAlpha;
 
     public AC AlphaFormat;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
index 3019fbe0..2aa27284 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CHANGEFILTERSTRUCT.cs
@@ -7,4 +7,4 @@ internal struct CHANGEFILTERSTRUCT
     public uint cbSize;
 
     public MSGFLTINFO ExtStatus;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
index 0b362863..e5afab90 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CLSID.cs
@@ -20,4 +20,4 @@ internal static class CLSID
     public const string ApplicationDestinations = "86c14003-4d6b-4ef3-a7b4-0506663b2e68";
 
     public const string ApplicationDocumentLists = "86bec222-30f2-47e0-9f25-60d11cd75c28";
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
index de8c9194..949b7b35 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CREATESTRUCT.cs
@@ -31,4 +31,4 @@ internal struct CREATESTRUCT
     public string lpszClass;
 
     public WS_EX dwExStyle;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
index 81c8863a..b308fa62 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CS.cs
@@ -18,4 +18,4 @@ internal enum CS : uint
     GLOBALCLASS = 16384u,
     IME = 65536u,
     DROPSHADOW = 131072u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs b/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
index 7b57389a..391feedc 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/CombineRgnResult.cs
@@ -8,4 +8,4 @@ internal enum CombineRgnResult
     NULLREGION,
     SIMPLEREGION,
     COMPLEXREGION
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
index 4dab6fdd..bafb6cc5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DOGIF.cs
@@ -9,4 +9,4 @@ internal enum DOGIF
     NO_HDROP,
     NO_URL = 4,
     ONLY_IF_ONE = 8
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
index 9373ff03..98fd708c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMFLIP3D.cs
@@ -7,4 +7,4 @@ internal enum DWMFLIP3D
     DEFAULT,
     EXCLUDEBELOW,
     EXCLUDEABOVE
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
index 4ec4f9cb..0cffcb1b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMNCRP.cs
@@ -7,4 +7,4 @@ internal enum DWMNCRP
     USEWINDOWSTYLE,
     DISABLED,
     ENABLED
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
index 0cfa3a8b..173395a3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWMWA.cs
@@ -16,4 +16,4 @@ internal enum DWMWA
     HAS_ICONIC_BITMAP,
     DISALLOW_PEEK,
     EXCLUDED_FROM_PEEK
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
index 94db57df..dfdc9c49 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_SIT.cs
@@ -6,4 +6,4 @@ internal enum DWM_SIT
 {
     None,
     DISPLAYFRAME
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
index 5c786ece..3c433fba 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DWM_TIMING_INFO.cs
@@ -85,4 +85,4 @@ internal struct DWM_TIMING_INFO
     public ulong cPixelsDrawn;
 
     public ulong cBuffersEmpty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
index 119a4d18..5a417c52 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DeviceCap.cs
@@ -8,4 +8,4 @@ internal enum DeviceCap
     PLANES = 14,
     LOGPIXELSX = 88,
     LOGPIXELSY = 90
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
index a93bc00c..469d01a1 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DoubleUtilities.cs
@@ -53,4 +53,4 @@ internal static class DoubleUtilities
     }
 
     private const double Epsilon = 1.53E-06;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs b/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
index 53fbb8de..eb7cdb51 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/DpiHelper.cs
@@ -66,4 +66,4 @@ internal static class DpiHelper
     private static Matrix _transformToDevice;
 
     private static Matrix _transformToDip;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
index 48c0948b..ea8d2f85 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ErrorModes.cs
@@ -10,4 +10,4 @@ internal enum ErrorModes
     NoGpFaultErrorBox = 2,
     NoAlignmentFaultExcept = 4,
     NoOpenFileErrorBox = 32768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
index 762a3697..6eb01c74 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/FO.cs
@@ -8,4 +8,4 @@ internal enum FO
     COPY,
     DELETE,
     RENAME
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
index 75822e1c..1b61751a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/FOF.cs
@@ -20,4 +20,4 @@ internal enum FOF : ushort
     NO_CONNECTED_ELEMENTS = 8192,
     WANTNUKEWARNING = 16384,
     NORECURSEREPARSE = 32768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
index 8f46a422..1aada6b7 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Facility.cs
@@ -15,4 +15,4 @@ internal enum Facility
     Control = 10,
     Ese = 3678,
     WinCodec = 2200
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
index e42569cf..544a76fe 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GCLP.cs
@@ -5,4 +5,4 @@ namespace Standard;
 internal enum GCLP
 {
     HBRBACKGROUND = -10
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
index e3cbef16..3db64555 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GPS.cs
@@ -14,4 +14,4 @@ internal enum GPS
     BESTEFFORT = 64,
     NO_OPLOCK = 128,
     MASK_VALID = 255
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs b/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
index 59f9dad2..4731d5e8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/GWL.cs
@@ -11,4 +11,4 @@ internal enum GWL
     EXSTYLE = -20,
     USERDATA = -21,
     ID = -12
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
index 2d3fec27..4d551bec 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HCF.cs
@@ -12,4 +12,4 @@ internal enum HCF
     HOTKEYSOUND = 16,
     INDICATOR = 32,
     HOTKEYAVAILABLE = 64
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
index 62a3d406..9f341333 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HIGHCONTRAST.cs
@@ -9,4 +9,4 @@ internal struct HIGHCONTRAST
     public HCF dwFlags;
 
     public IntPtr lpszDefaultScheme;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
index aee72456..9e704f3d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HRESULT.cs
@@ -240,4 +240,4 @@ internal struct HRESULT
 
     [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
     public static readonly HRESULT WC_E_SYNTAX = new HRESULT(3222072877u);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
index 70b14e62..13fe5298 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/HT.cs
@@ -33,4 +33,4 @@ internal enum HT
     OBJECT = 19,
     CLOSE,
     HELP
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
index 31d1f022..42a5a612 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDestinations.cs
@@ -13,4 +13,4 @@ internal interface IApplicationDestinations
     void RemoveDestination([MarshalAs(UnmanagedType.IUnknown)] object punk);
 
     void RemoveAllDestinations();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
index 3f3bfd35..715e073e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IApplicationDocumentLists.cs
@@ -12,4 +12,4 @@ internal interface IApplicationDocumentLists
 
     [return: MarshalAs(UnmanagedType.IUnknown)]
     object GetList([In] APPDOCLISTTYPE listtype, [In] uint cItemsDesired, [In] ref Guid riid);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
index 91d928a5..b3c18ad5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ICustomDestinationList.cs
@@ -29,4 +29,4 @@ internal interface ICustomDestinationList
     void DeleteList([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
 
     void AbortList();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
index 69f7bcb3..bdb51bf8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumIDList.cs
@@ -17,4 +17,4 @@ internal interface IEnumIDList
     void Reset();
 
     void Clone([MarshalAs(UnmanagedType.Interface)] out IEnumIDList ppenum);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
index 2821d169..bd6138b3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IEnumObjects.cs
@@ -15,4 +15,4 @@ internal interface IEnumObjects
     void Reset();
 
     IEnumObjects Clone();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
index 78374c1e..50c57a47 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IID.cs
@@ -51,4 +51,4 @@ internal static class IID
     public const string TaskbarList3 = "ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf";
 
     public const string TaskbarList4 = "c43dc798-95d1-4bea-9030-bb99e2983a1a";
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
index 1e0e7fba..06109c02 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT.cs
@@ -7,4 +7,4 @@ internal struct INPUT
     public uint type;
 
     public MOUSEINPUT mi;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
index bc32819b..2467ef3b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/INPUT_TYPE.cs
@@ -5,4 +5,4 @@ namespace Standard;
 internal enum INPUT_TYPE : uint
 {
     MOUSE
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
index 935ce552..ab80b075 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectArray.cs
@@ -12,4 +12,4 @@ internal interface IObjectArray
 
     [return: MarshalAs(UnmanagedType.IUnknown)]
     object GetAt([In] uint uiIndex, [In] ref Guid riid);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
index 8c07951e..4d00e499 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectCollection.cs
@@ -20,4 +20,4 @@ internal interface IObjectCollection : IObjectArray
     void RemoveObjectAt(uint uiIndex);
 
     void Clear();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
index 0387fa72..3374631b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithAppUserModelId.cs
@@ -12,4 +12,4 @@ internal interface IObjectWithAppUserModelId
 
     [return: MarshalAs(UnmanagedType.LPWStr)]
     string GetAppID();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
index bf94e01a..6f890e0d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IObjectWithProgId.cs
@@ -12,4 +12,4 @@ internal interface IObjectWithProgId
 
     [return: MarshalAs(UnmanagedType.LPWStr)]
     string GetProgID();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
index e6e1afc3..7829a9bb 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IPropertyStore.cs
@@ -17,4 +17,4 @@ internal interface IPropertyStore
     void SetValue([In] ref PKEY pkey, PROPVARIANT pv);
 
     void Commit();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
index e9ff5d04..34eac197 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellFolder.cs
@@ -33,4 +33,4 @@ internal interface IShellFolder
     void GetDisplayNameOf([In] IntPtr pidl, [In] SHGDN uFlags, out IntPtr pName);
 
     void SetNameOf([In] IntPtr hwnd, [In] IntPtr pidl, [MarshalAs(UnmanagedType.LPWStr)][In] string pszName, [In] SHGDN uFlags, out IntPtr ppidlOut);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
index 9918ac66..cc9e85c0 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem.cs
@@ -20,4 +20,4 @@ internal interface IShellItem
     SFGAO GetAttributes(SFGAO sfgaoMask);
 
     int Compare(IShellItem psi, SICHINT hint);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
index 9a809623..69977f12 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItem2.cs
@@ -52,4 +52,4 @@ internal interface IShellItem2 : IShellItem
 
     [return: MarshalAs(UnmanagedType.Bool)]
     void GetBool(IntPtr key);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
index 00bee5c4..95da1791 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellItemArray.cs
@@ -26,4 +26,4 @@ internal interface IShellItemArray
 
     [return: MarshalAs(UnmanagedType.Interface)]
     object EnumItems();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
index 2769321d..5455fd79 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/IShellLinkW.cs
@@ -44,4 +44,4 @@ internal interface IShellLinkW
     void Resolve(IntPtr hwnd, uint fFlags);
 
     void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
index 3591e9d3..80468ed3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList.cs
@@ -17,4 +17,4 @@ internal interface ITaskbarList
     void ActivateTab(IntPtr hwnd);
 
     void SetActiveAlt(IntPtr hwnd);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
index d1e3dce8..a27a4fa9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList2.cs
@@ -19,4 +19,4 @@ internal interface ITaskbarList2 : ITaskbarList
     void SetActiveAlt(IntPtr hwnd);
 
     void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
index 4e310e21..0353a5dc 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList3.cs
@@ -55,4 +55,4 @@ internal interface ITaskbarList3 : ITaskbarList2, ITaskbarList
 
     [PreserveSig]
     HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
index 6f76e491..c40c2b22 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ITaskbarList4.cs
@@ -57,4 +57,4 @@ internal interface ITaskbarList4 : ITaskbarList3, ITaskbarList2, ITaskbarList
     HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
 
     void SetTabProperties(IntPtr hwndTab, STPF stpFlags);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
index 30f3f414..49b3198e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/KDC.cs
@@ -6,4 +6,4 @@ internal enum KDC
 {
     FREQUENT = 1,
     RECENT
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
index 85f32190..4adfa95e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/LOGFONT.cs
@@ -34,4 +34,4 @@ internal struct LOGFONT
 
     [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
     public string lfFaceName;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
index fac3517f..8e8e5c0e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MARGINS.cs
@@ -11,4 +11,4 @@ internal struct MARGINS
     public int cyTopHeight;
 
     public int cyBottomHeight;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
index 89d27162..db2715f9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MF.cs
@@ -10,4 +10,4 @@ internal enum MF : uint
     BYCOMMAND = 0u,
     GRAYED = 1u,
     DISABLED = 2u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
index 959331ae..29b1295c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MINMAXINFO.cs
@@ -13,4 +13,4 @@ internal struct MINMAXINFO
     public POINT ptMinTrackSize;
 
     public POINT ptMaxTrackSize;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
index 46ee848d..dc7744b7 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MONITORINFO.cs
@@ -13,4 +13,4 @@ internal class MONITORINFO
     public RECT rcWork;
 
     public int dwFlags;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
index c260b194..15157e7a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEEVENTF.cs
@@ -6,4 +6,4 @@ internal enum MOUSEEVENTF
 {
     LEFTDOWN = 2,
     LEFTUP = 4
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
index f01eca97..9dff1f7e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MOUSEINPUT.cs
@@ -15,4 +15,4 @@ internal struct MOUSEINPUT
     public int time;
 
     public IntPtr dwExtraInfo;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
index 1fd0d017..2cdddcda 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLT.cs
@@ -7,4 +7,4 @@ internal enum MSGFLT
     RESET,
     ALLOW,
     DISALLOW
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
index e529a16e..6717ff0f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MSGFLTINFO.cs
@@ -8,4 +8,4 @@ internal enum MSGFLTINFO
     ALREADYALLOWED_FORWND,
     ALREADYDISALLOWED_FORWND,
     ALLOWED_HIGHER
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
index 4862d669..dc6a80f7 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ManagedIStream.cs
@@ -146,4 +146,4 @@ internal sealed class ManagedIStream : IStream, IDisposable
     private const int LOCK_EXCLUSIVE = 2;
 
     private Stream _source;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
index e22b3edb..9feac278 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MessageHandler.cs
@@ -2,4 +2,4 @@
 
 namespace Standard;
 
-internal delegate IntPtr MessageHandler(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled);
\ No newline at end of file
+internal delegate IntPtr MessageHandler(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled);
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs b/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
index f0290827..6557c659 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/MessageWindow.cs
@@ -128,4 +128,4 @@ internal sealed class MessageWindow : DispatcherObject, IDisposable
     private string _className;
 
     private bool _isDisposed;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
index b4a007ff..ba09007d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIF.cs
@@ -15,4 +15,4 @@ internal enum NIF : uint
     SHOWTIP = 128u,
     XP_MASK = 59u,
     VISTA_MASK = 251u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
index 0707e86f..b95e744d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIIF.cs
@@ -13,4 +13,4 @@ internal enum NIIF
     LARGE_ICON = 32,
     NIIF_RESPECT_QUIET_TIME = 128,
     XP_ICON_MASK = 15
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
index 7f4e820c..8c7d6e39 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NIM.cs
@@ -9,4 +9,4 @@ internal enum NIM : uint
     DELETE,
     SETFOCUS,
     SETVERSION
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
index d0004706..f0577b1e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NONCLIENTMETRICS.cs
@@ -61,4 +61,4 @@ internal struct NONCLIENTMETRICS
     public LOGFONT lfMessageFont;
 
     public int iPaddedBorderWidth;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
index feb7987c..73f4b2e5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NOTIFYICONDATA.cs
@@ -40,4 +40,4 @@ internal class NOTIFYICONDATA
     public Guid guidItem;
 
     private IntPtr hBalloonIcon;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs b/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
index f5b2483e..dc90e3a0 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/NativeMethods.cs
@@ -904,4 +904,4 @@ internal static class NativeMethods
     [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
     [DllImport("shell32.dll")]
     public static extern HRESULT GetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] out string AppID);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
index dddd7060..e57da5aa 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDEXECOPT.cs
@@ -8,4 +8,4 @@ internal enum OLECMDEXECOPT
     PROMPTUSER,
     DONTPROMPTUSER,
     SHOWHELP
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
index 126c6106..83cb5e7c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDF.cs
@@ -10,4 +10,4 @@ internal enum OLECMDF
     NINCHED = 8,
     INVISIBLE = 16,
     DEFHIDEONCTXTMENU = 32
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
index 93bb23b3..5601b98f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/OLECMDID.cs
@@ -61,4 +61,4 @@ internal enum OLECMDID
     FOCUSVIEWCONTROLS,
     FOCUSVIEWCONTROLSQUERY,
     SHOWPAGEACTIONMENU
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs b/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
index 9a3a5d90..addf0a27 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/PKEY.cs
@@ -27,4 +27,4 @@ internal struct PKEY
     public static readonly PKEY AppUserModel_RelaunchDisplayNameResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 4u);
 
     public static readonly PKEY AppUserModel_RelaunchIconResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 3u);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
index 0f8e7c21..ab188dc2 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/POINT.cs
@@ -7,4 +7,4 @@ internal struct POINT
     public int x;
 
     public int y;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
index f7651147..a9b99a06 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/PROPVARIANT.cs
@@ -90,4 +90,4 @@ internal class PROPVARIANT : IDisposable
         [DllImport("ole32.dll")]
         internal static extern HRESULT PropVariantClear(PROPVARIANT pvar);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
index e321cf94..42d479c3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/READYSTATE.cs
@@ -9,4 +9,4 @@ internal enum READYSTATE
     LOADED,
     INTERACTIVE,
     COMPLETE
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
index 8b7d5063..81cd963f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RECT.cs
@@ -148,4 +148,4 @@ internal struct RECT
     private int _right;
 
     private int _bottom;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
index a1b6a0d8..854ed1e1 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RGBQUAD.cs
@@ -11,4 +11,4 @@ internal struct RGBQUAD
     public byte rgbRed;
 
     public byte rgbReserved;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
index 2c111dee..8eeb0ba5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RGN.cs
@@ -9,4 +9,4 @@ internal enum RGN
     XOR,
     DIFF,
     COPY
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
index ab5583c9..7820b043 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RefPOINT.cs
@@ -11,4 +11,4 @@ internal class RefPOINT
     public int x;
 
     public int y;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
index 90798337..e2001dac 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/RefRECT.cs
@@ -103,4 +103,4 @@ internal class RefRECT
     private int _right;
 
     private int _bottom;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
index f6cf7de7..77f7e545 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SC.cs
@@ -27,4 +27,4 @@ internal enum SC
     F_ISSECURE = 1,
     ICON = 61472,
     ZOOM = 61488
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
index 75dda830..d3e905db 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SFGAO.cs
@@ -39,4 +39,4 @@ internal enum SFGAO : uint
     STORAGEANCESTOR = 8388608u,
     STORAGECAPMASK = 1891958792u,
     PKEYSFGAOMASK = 2164539392u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
index 068d0565..327fac1c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARD.cs
@@ -11,4 +11,4 @@ internal enum SHARD
     APPIDINFOIDLIST,
     LINK,
     APPIDINFOLINK
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
index 543d7d04..f270780a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFO.cs
@@ -13,4 +13,4 @@ internal class SHARDAPPIDINFO
 
     [MarshalAs(UnmanagedType.LPWStr)]
     private string pszAppID;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
index 220201a9..45cf318f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOIDLIST.cs
@@ -12,4 +12,4 @@ internal class SHARDAPPIDINFOIDLIST
 
     [MarshalAs(UnmanagedType.LPWStr)]
     private string pszAppID;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
index 01c49d7a..5f9e1935 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHARDAPPIDINFOLINK.cs
@@ -12,4 +12,4 @@ internal class SHARDAPPIDINFOLINK
 
     [MarshalAs(UnmanagedType.LPWStr)]
     private string pszAppID;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
index db7e414e..7a8052b2 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHCONTF.cs
@@ -16,4 +16,4 @@ internal enum SHCONTF
     FASTITEMS = 8192,
     FLATLIST = 16384,
     ENABLE_ASYNC = 32768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
index af7a9b3d..d7d97964 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHFILEOPSTRUCT.cs
@@ -24,4 +24,4 @@ internal struct SHFILEOPSTRUCT
     public IntPtr hNameMappings;
 
     public string lpszProgressTitle;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
index 656e6a1e..885fcedf 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SHGDN.cs
@@ -10,4 +10,4 @@ internal enum SHGDN
     SHGDN_FOREDITING = 4096,
     SHGDN_FORADDRESSBAR = 16384,
     SHGDN_FORPARSING = 32768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
index e723e33e..4305a9ef 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIATTRIBFLAGS.cs
@@ -7,4 +7,4 @@ internal enum SIATTRIBFLAGS
     AND = 1,
     OR,
     APPCOMPAT
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
index d4930d49..34a38caf 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SICHINT.cs
@@ -8,4 +8,4 @@ internal enum SICHINT : uint
     ALLFIELDS = 2147483648u,
     CANONICAL = 268435456u,
     TEST_FILESYSPATH_IF_NOT_EQUAL = 536870912u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
index 239e8ad3..6e184480 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIGDN.cs
@@ -13,4 +13,4 @@ internal enum SIGDN : uint
     URL = 2147909632u,
     PARENTRELATIVEFORADDRESSBAR = 2147991553u,
     PARENTRELATIVE = 2148007937u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
index f81812cf..5fd5201e 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SIZE.cs
@@ -7,4 +7,4 @@ internal struct SIZE
     public int cx;
 
     public int cy;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
index 011720f5..0a0e7cf5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SLGP.cs
@@ -8,4 +8,4 @@ internal enum SLGP
     SHORTPATH = 1,
     UNCPRIORITY = 2,
     RAWPATH = 4
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
index c16ec152..203ec6e8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SM.cs
@@ -88,4 +88,4 @@ internal enum SM
     MEDIACENTER,
     REMOTESESSION = 4096,
     REMOTECONTROL = 8193
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
index bb20c9bc..0251b65d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SPI.cs
@@ -219,4 +219,4 @@ internal enum SPI
     SETMINIMUMHITRADIUS,
     GETMESSAGEDURATION,
     SETMESSAGEDURATION
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
index 8bf40ed4..3f2dcbd8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SPIF.cs
@@ -9,4 +9,4 @@ internal enum SPIF
     UPDATEINIFILE = 1,
     SENDCHANGE = 2,
     SENDWININICHANGE = 2
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
index d2b2e62b..d9af9062 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STATE_SYSTEM.cs
@@ -37,4 +37,4 @@ internal enum STATE_SYSTEM
     ALERT_HIGH = 268435456,
     PROTECTED = 536870912,
     VALID = 1073741823
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
index 4fa14c46..6f0275f3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STPF.cs
@@ -10,4 +10,4 @@ internal enum STPF
     USEAPPTHUMBNAILWHENACTIVE = 2,
     USEAPPPEEKALWAYS = 4,
     USEAPPPEEKWHENACTIVE = 8
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
index b96c486d..5ee159fd 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/STR_GPS.cs
@@ -15,4 +15,4 @@ internal static class STR_GPS
     public const string BESTEFFORT = "GPS_BESTEFFORT";
 
     public const string NO_OPLOCK = "GPS_NO_OPLOCK";
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
index d2ec25b2..3713485d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SW.cs
@@ -18,4 +18,4 @@ internal enum SW
     RESTORE,
     SHOWDEFAULT,
     FORCEMINIMIZE
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
index 3ee5d4d6..0b3db4af 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SWP.cs
@@ -20,4 +20,4 @@ internal enum SWP
     NOSIZE = 1,
     NOZORDER = 4,
     SHOWWINDOW = 64
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
index 049192ac..858fe98d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeConnectionPointCookie.cs
@@ -72,4 +72,4 @@ internal sealed class SafeConnectionPointCookie : SafeHandleZeroOrMinusOneIsInva
     }
 
     private IConnectionPoint _cp;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
index 6b749d8d..27e35589 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeDC.cs
@@ -152,4 +152,4 @@ internal sealed class SafeDC : SafeHandleZeroOrMinusOneIsInvalid
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool DeleteDC(IntPtr hdc);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
index 97ed656b..50b5d80c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeFindHandle.cs
@@ -15,4 +15,4 @@ internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
     {
         return NativeMethods.FindClose(this.handle);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
index 5c4e94d8..1a2c18ba 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeGdiplusStartupToken.cs
@@ -34,4 +34,4 @@ internal sealed class SafeGdiplusStartupToken : SafeHandleZeroOrMinusOneIsInvali
         safeGdiplusStartupToken.Dispose();
         throw new Exception("Unable to initialize GDI+");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs b/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
index 321ef567..8e76d635 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/SafeHBITMAP.cs
@@ -15,4 +15,4 @@ internal sealed class SafeHBITMAP : SafeHandleZeroOrMinusOneIsInvalid
     {
         return NativeMethods.DeleteObject(this.handle);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
index af682487..21b3e2d5 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StartupInput.cs
@@ -13,4 +13,4 @@ internal class StartupInput
     public bool SuppressBackgroundThread;
 
     public bool SuppressExternalCodecs;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
index 71a22bd6..0cbc2fe3 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StartupOutput.cs
@@ -7,4 +7,4 @@ internal struct StartupOutput
     public IntPtr hook;
 
     public IntPtr unhook;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
index 31aeea8c..b2465910 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Status.cs
@@ -26,4 +26,4 @@ internal enum Status
     PropertyNotFound,
     PropertyNotSupported,
     ProfileNotFound
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs b/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
index eb1c9758..174e3f9c 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/StockObject.cs
@@ -16,4 +16,4 @@ internal enum StockObject
     NULL_PEN,
     SYSTEM_FONT = 13,
     DEFAULT_PALETTE = 15
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
index b883c541..4d64bc9b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TBPF.cs
@@ -9,4 +9,4 @@ internal enum TBPF
     NORMAL,
     ERROR = 4,
     PAUSED = 8
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
index 0032f165..6b229e2d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THB.cs
@@ -9,4 +9,4 @@ internal enum THB : uint
     ICON = 2u,
     TOOLTIP = 4u,
     FLAGS = 8u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
index 79650ff3..6b8603e1 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THBF.cs
@@ -11,4 +11,4 @@ internal enum THBF : uint
     NOBACKGROUND = 4u,
     HIDDEN = 8u,
     NONINTERACTIVE = 16u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs b/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
index 3d89a0d8..1e70d17d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/THUMBBUTTON.cs
@@ -20,4 +20,4 @@ internal struct THUMBBUTTON
     public string szTip;
 
     public THBF dwFlags;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
index e988de22..3934e41a 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFO.cs
@@ -19,4 +19,4 @@ internal struct TITLEBARINFO
     public STATE_SYSTEM rgstate_HelpButton;
 
     public STATE_SYSTEM rgstate_CloseButton;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
index 8642baf3..ced0cda7 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/TITLEBARINFOEX.cs
@@ -31,4 +31,4 @@ internal struct TITLEBARINFOEX
     public RECT rgrect_HelpButton;
 
     public RECT rgrect_CloseButton;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
index 90440b38..aaecb9e6 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/ULW.cs
@@ -7,4 +7,4 @@ internal enum ULW
     ALPHA = 2,
     COLORKEY = 1,
     OPAQUE = 4
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs b/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
index 2a688bdb..02cbacc4 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/UNSIGNED_RATIO.cs
@@ -7,4 +7,4 @@ internal struct UNSIGNED_RATIO
     public uint uiNumerator;
 
     public uint uiDenominator;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
index 4b2973e9..56e0bc7f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Utility.cs
@@ -603,7 +603,7 @@ internal static class Utility
                     urlDecoder.AddChar(c);
                 }
             }
-            IL_12D:;
+IL_12D:;
         }
         return urlDecoder.GetString();
     }
@@ -818,4 +818,4 @@ internal static class Utility
 
         private int _charCount;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
index 72f71991..c931bf61 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Verify.cs
@@ -242,4 +242,4 @@ internal static class Verify
             }), parameterName);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
index fc5d929f..97184131 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WIN32_FIND_DATAW.cs
@@ -32,4 +32,4 @@ internal class WIN32_FIND_DATAW
 
     [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
     public string cAlternateFileName;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
index 30535838..8e8b5f3f 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPLACEMENT.cs
@@ -17,4 +17,4 @@ internal class WINDOWPLACEMENT
     public POINT ptMaxPosition;
 
     public RECT rcNormalPosition;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
index d241ee73..5821c4b8 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWPOS.cs
@@ -17,4 +17,4 @@ internal struct WINDOWPOS
     public int cy;
 
     public int flags;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
index 7c1ab86f..8be67504 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WINDOWTHEMEATTRIBUTETYPE.cs
@@ -5,4 +5,4 @@ namespace Standard;
 internal enum WINDOWTHEMEATTRIBUTETYPE : uint
 {
     WTA_NONCLIENT = 1u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
index 4fce4f0e..633b9215 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WM.cs
@@ -135,4 +135,4 @@ internal enum WM
     USER = 1024,
     TRAYMOUSEMESSAGE = 2048,
     APP = 32768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
index bdc23d9a..1c53d37b 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WNDCLASSEX.cs
@@ -31,4 +31,4 @@ internal struct WNDCLASSEX
     public string lpszClassName;
 
     public IntPtr hIconSm;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
index 13e0860c..72df4221 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WS.cs
@@ -32,4 +32,4 @@ internal enum WS : uint
     OVERLAPPEDWINDOW = 13565952u,
     POPUPWINDOW = 2156396544u,
     CHILDWINDOW = 1073741824u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
index da272cc1..4425aa02 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WS_EX.cs
@@ -32,4 +32,4 @@ internal enum WS_EX : uint
     NOACTIVATE = 134217728u,
     OVERLAPPEDWINDOW = 768u,
     PALETTEWINDOW = 392u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
index 8ab10a08..fe8cd997 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WTA_OPTIONS.cs
@@ -16,4 +16,4 @@ internal struct WTA_OPTIONS
     [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
     [FieldOffset(4)]
     public WTNCA dwMask;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
index 4ff6d577..a96acb80 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WTNCA.cs
@@ -10,4 +10,4 @@ internal enum WTNCA : uint
     NOSYSMENU = 4u,
     NOMIRRORHELP = 8u,
     VALIDBITS = 15u
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
index b0e43174..ea61f4e9 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WVR.cs
@@ -12,4 +12,4 @@ internal enum WVR
     VREDRAW = 512,
     VALIDRECTS = 1024,
     REDRAW = 768
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
index 35ad7b46..00dea5ba 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Error.cs
@@ -123,4 +123,4 @@ internal struct Win32Error
 
     [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
     public static readonly Win32Error ERROR_INVALID_DATATYPE = new Win32Error(1804);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
index d434c256..594b7e5d 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/Win32Value.cs
@@ -17,4 +17,4 @@ internal static class Win32Value
     public const uint sizeof_CHAR = 1u;
 
     public const uint sizeof_BOOL = 4u;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
index bb9c6339..6cbe6e48 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WndProc.cs
@@ -2,4 +2,4 @@
 
 namespace Standard;
 
-internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
\ No newline at end of file
+internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
diff --git a/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs b/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
index 0126491e..4e772ede 100644
--- a/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
+++ b/src/Shared/Microsoft.Windows.Shell/Standard/WndProcHook.cs
@@ -2,4 +2,4 @@
 
 namespace Standard;
 
-internal delegate IntPtr WndProcHook(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam, ref bool handled);
\ No newline at end of file
+internal delegate IntPtr WndProcHook(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam, ref bool handled);
diff --git a/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs b/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
index f9d94099..66b17eb8 100644
--- a/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
+++ b/src/Shared/Microsoft.Windows.Shell/SystemCommands.cs
@@ -73,4 +73,4 @@ public static class SystemCommands
             NativeMethods.PostMessage(handle, WM.SYSCOMMAND, new IntPtr((long) ((ulong) num)), IntPtr.Zero);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs b/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
index ac8c643f..0fca0611 100644
--- a/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
+++ b/src/Shared/Microsoft.Windows.Shell/SystemParameters2.cs
@@ -201,7 +201,7 @@ public class SystemParameters2 : INotifyPropertyChanged
             }
         }
         windowCornerRadius = new CornerRadius(0.0);
-        IL_E6:
+IL_E6:
         this.WindowCornerRadius = windowCornerRadius;
     }
 
@@ -539,4 +539,4 @@ public class SystemParameters2 : INotifyPropertyChanged
     private readonly Dictionary<WM, List<SystemParameters2._SystemMetricUpdate>> _UpdateTable;
 
     private delegate void _SystemMetricUpdate(IntPtr wParam, IntPtr lParam);
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs b/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
index 5d7bfbc6..7908d67d 100644
--- a/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
+++ b/src/Shared/Microsoft.Windows.Shell/TaskbarItemInfo.cs
@@ -506,7 +506,7 @@ public sealed class TaskbarItemInfo : Freezable
                         default:
                             goto IL_A5;
                     }
-                    IL_146:
+IL_146:
                     array[(int) ((UIntPtr) num)] = thumbbutton;
                     num += 1u;
                     if (num != 7u)
@@ -514,7 +514,7 @@ public sealed class TaskbarItemInfo : Freezable
                         continue;
                     }
                     break;
-                    IL_A5:
+IL_A5:
                     thumbbutton.szTip = (thumbButtonInfo.Description ?? "");
                     thumbbutton.hIcon = this._GetHICONFromImageSource(thumbButtonInfo.ImageSource, this._overlaySize);
                     if (!thumbButtonInfo.IsBackgroundVisible)
@@ -542,7 +542,7 @@ public sealed class TaskbarItemInfo : Freezable
                 }
                 goto IL_1AE;
             }
-            IL_179:
+IL_179:
             array[(int) ((UIntPtr) num)] = new THUMBBUTTON
             {
                 iId = num,
@@ -550,7 +550,7 @@ public sealed class TaskbarItemInfo : Freezable
                 dwMask = (THB.ICON | THB.TOOLTIP | THB.FLAGS)
             };
             num += 1u;
-            IL_1AE:
+IL_1AE:
             if (num < 7u)
             {
                 goto IL_179;
@@ -623,4 +623,4 @@ public sealed class TaskbarItemInfo : Freezable
     {
         ((TaskbarItemInfo) d)._OnThumbButtonsChanged();
     }));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs b/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
index 212f24d0..5f6b92ce 100644
--- a/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
+++ b/src/Shared/Microsoft.Windows.Shell/TaskbarItemProgressState.cs
@@ -9,4 +9,4 @@ public enum TaskbarItemProgressState
     Normal,
     Error,
     Paused
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
index 717c8ace..c38a36a0 100644
--- a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
+++ b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfo.cs
@@ -285,4 +285,4 @@ public sealed class ThumbButtonInfo : Freezable, ICommandSource
     {
         d.CoerceValue(ThumbButtonInfo.IsEnabledProperty);
     }));
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
index b7391907..54b86f8f 100644
--- a/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
+++ b/src/Shared/Microsoft.Windows.Shell/ThumbButtonInfoCollection.cs
@@ -25,4 +25,4 @@ public class ThumbButtonInfoCollection : FreezableCollection<ThumbButtonInfo>
     }
 
     private static ThumbButtonInfoCollection s_empty;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs b/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
index 26ce6a25..fd95654a 100644
--- a/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
+++ b/src/Shared/Microsoft.Windows.Shell/WindowChrome.cs
@@ -215,4 +215,4 @@ public class WindowChrome : Freezable
 
         public DependencyProperty DependencyProperty { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs b/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
index 5112c6c9..20129f73 100644
--- a/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
+++ b/src/Shared/Microsoft.Windows.Shell/WindowChromeWorker.cs
@@ -809,4 +809,4 @@ internal class WindowChromeWorker : DependencyObject
     private static readonly HT[,] _HitTestBorders;
 
     private delegate void _Action();
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs b/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
index 2566b7d8..fdbcf9f8 100644
--- a/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
+++ b/src/Shared/System.Windows.Interactivity/AttachableCollection`1.cs
@@ -164,4 +164,4 @@ public abstract class AttachableCollection<T> : FreezableCollection<T>, IAttache
                 }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/Behavior.cs b/src/Shared/System.Windows.Interactivity/Behavior.cs
index fc343e35..a3873aeb 100644
--- a/src/Shared/System.Windows.Interactivity/Behavior.cs
+++ b/src/Shared/System.Windows.Interactivity/Behavior.cs
@@ -83,4 +83,4 @@ public abstract class Behavior : Animatable, IAttachedObject
     protected virtual void OnDetaching()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs b/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
index 9f016540..cbb1595e 100644
--- a/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
+++ b/src/Shared/System.Windows.Interactivity/BehaviorCollection.cs
@@ -38,4 +38,4 @@ public sealed class BehaviorCollection : AttachableCollection<Behavior>
     {
         return new BehaviorCollection();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/Behavior`1.cs b/src/Shared/System.Windows.Interactivity/Behavior`1.cs
index 647cd9b8..7922e654 100644
--- a/src/Shared/System.Windows.Interactivity/Behavior`1.cs
+++ b/src/Shared/System.Windows.Interactivity/Behavior`1.cs
@@ -9,4 +9,4 @@ public abstract class Behavior<T> : Behavior where T : DependencyObject
     }
 
     protected new T AssociatedObject => (T) base.AssociatedObject;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs b/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
index 651a5fa0..d7154637 100644
--- a/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
+++ b/src/Shared/System.Windows.Interactivity/DefaultTriggerAttribute.cs
@@ -45,4 +45,4 @@ public sealed class DefaultTriggerAttribute : Attribute
         }
         return (TriggerBase) obj2;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/EventTrigger.cs b/src/Shared/System.Windows.Interactivity/EventTrigger.cs
index ca988a05..9385b9d4 100644
--- a/src/Shared/System.Windows.Interactivity/EventTrigger.cs
+++ b/src/Shared/System.Windows.Interactivity/EventTrigger.cs
@@ -25,4 +25,4 @@ public class EventTrigger : EventTriggerBase<object>
 
         set => SetValue(EventNameProperty, value);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
index baf366d8..23b6314f 100644
--- a/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
+++ b/src/Shared/System.Windows.Interactivity/EventTriggerBase.cs
@@ -309,4 +309,4 @@ public abstract class EventTriggerBase : TriggerBase
             IsSourceChangedRegistered = false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs b/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
index 7d3544c8..a4a30f8f 100644
--- a/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
+++ b/src/Shared/System.Windows.Interactivity/EventTriggerBase`1.cs
@@ -17,4 +17,4 @@ public abstract class EventTriggerBase<T> : EventTriggerBase where T : class
     }
 
     public new T Source => (T) base.Source;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/IAttachedObject.cs b/src/Shared/System.Windows.Interactivity/IAttachedObject.cs
index 60c71b19..aa82d96c 100644
--- a/src/Shared/System.Windows.Interactivity/IAttachedObject.cs
+++ b/src/Shared/System.Windows.Interactivity/IAttachedObject.cs
@@ -8,4 +8,4 @@ public interface IAttachedObject
     void Detach();
 
     DependencyObject AssociatedObject { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/Interaction.cs b/src/Shared/System.Windows.Interactivity/Interaction.cs
index b3205f3f..7b5e5d70 100644
--- a/src/Shared/System.Windows.Interactivity/Interaction.cs
+++ b/src/Shared/System.Windows.Interactivity/Interaction.cs
@@ -73,4 +73,4 @@ public static class Interaction
     {
         return element.IsLoaded;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs b/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
index 7a5f79a4..1bf3cff4 100644
--- a/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
+++ b/src/Shared/System.Windows.Interactivity/InvokeCommandAction.cs
@@ -68,4 +68,4 @@ public sealed class InvokeCommandAction : TriggerAction<DependencyObject>
                     command = (ICommand) property.GetValue(AssociatedObject, null);
         return command;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs b/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
index 4ce11261..0f5cf3b3 100644
--- a/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
+++ b/src/Shared/System.Windows.Interactivity/NameResolvedEventArgs.cs
@@ -13,4 +13,4 @@ internal sealed class NameResolvedEventArgs : EventArgs
     public object NewObject { get; }
 
     public object OldObject { get; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/NameResolver.cs b/src/Shared/System.Windows.Interactivity/NameResolver.cs
index c3ff049c..e16839aa 100644
--- a/src/Shared/System.Windows.Interactivity/NameResolver.cs
+++ b/src/Shared/System.Windows.Interactivity/NameResolver.cs
@@ -120,4 +120,4 @@ internal sealed class NameResolver
         if (!Equals(oldObject, Object))
             OnObjectChanged(oldObject, Object);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs b/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
index 9e7fd948..edc7eaf1 100644
--- a/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
+++ b/src/Shared/System.Windows.Interactivity/PreviewInvokeEventArgs.cs
@@ -5,4 +5,4 @@ namespace HandyControl.Interactivity;
 public class PreviewInvokeEventArgs : EventArgs
 {
     public bool Cancelling { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TriggerAction.cs b/src/Shared/System.Windows.Interactivity/TriggerAction.cs
index de84cb51..159e6135 100644
--- a/src/Shared/System.Windows.Interactivity/TriggerAction.cs
+++ b/src/Shared/System.Windows.Interactivity/TriggerAction.cs
@@ -114,4 +114,4 @@ public abstract class TriggerAction : Animatable, IAttachedObject
     protected virtual void OnDetaching()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
index fc158b10..5feddd53 100644
--- a/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
+++ b/src/Shared/System.Windows.Interactivity/TriggerActionCollection.cs
@@ -42,4 +42,4 @@ public class TriggerActionCollection : AttachableCollection<TriggerAction>
         foreach (var action in this)
             action.Detach();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs b/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
index e719c299..40bf5cd3 100644
--- a/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
+++ b/src/Shared/System.Windows.Interactivity/TriggerAction`1.cs
@@ -15,4 +15,4 @@ public abstract class TriggerAction<T> : TriggerAction where T : DependencyObjec
 
     protected sealed override Type AssociatedObjectTypeConstraint =>
         base.AssociatedObjectTypeConstraint;
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TriggerBase.cs b/src/Shared/System.Windows.Interactivity/TriggerBase.cs
index 08b0e2cc..5640ea50 100644
--- a/src/Shared/System.Windows.Interactivity/TriggerBase.cs
+++ b/src/Shared/System.Windows.Interactivity/TriggerBase.cs
@@ -106,4 +106,4 @@ public abstract class TriggerBase : Animatable, IAttachedObject
     protected virtual void OnDetaching()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TriggerCollection.cs b/src/Shared/System.Windows.Interactivity/TriggerCollection.cs
index b2dadec9..66ab89d8 100644
--- a/src/Shared/System.Windows.Interactivity/TriggerCollection.cs
+++ b/src/Shared/System.Windows.Interactivity/TriggerCollection.cs
@@ -38,4 +38,4 @@ public sealed class TriggerCollection : AttachableCollection<TriggerBase>
     {
         return new TriggerCollection();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs b/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs
index 2838a824..bacc9ea4 100644
--- a/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs
+++ b/src/Shared/System.Windows.Interactivity/TypeConstraintAttribute.cs
@@ -11,4 +11,4 @@ public sealed class TypeConstraintAttribute : Attribute
     }
 
     public Type Constraint { get; }
-}
\ No newline at end of file
+}

From a7fda45340d61f22f9cda0e68629395c42b16264 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Tue, 15 Mar 2022 00:01:00 +0800
Subject: [PATCH 25/32] chore(style): add RadioButton small style

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |  54 ++++--
 .../Styles/RadioButtonDemoCtl.xaml            | 174 +++++++++++++-----
 .../Styles/ToggleButtonDemoCtl.xaml           |  52 ++++++
 .../Styles/Base/RadioButtonBaseStyle.xaml     |  13 +-
 .../Themes/Styles/RadioButton.xaml            |  48 ++++-
 .../HandyControl_Shared/Themes/Theme.xaml     |  54 ++++--
 6 files changed, 319 insertions(+), 76 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 8fbfb137..5ffc7a19 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -2971,6 +2971,7 @@
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RadioButton">
@@ -3011,20 +3012,12 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
-	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Padding" Value="10,0" />
 		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:IconElement.Width" Value="16" />
-		<Setter Property="hc:IconElement.Height" Value="16" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RadioButton">
@@ -4595,7 +4588,6 @@
 	<Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -4605,22 +4597,62 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="RadioButtonSameAsButtonDefault.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDefault}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonPrimary.Small" BasedOn="{StaticResource RadioButtonSameAsButtonPrimary}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonSuccess.Small" BasedOn="{StaticResource RadioButtonSameAsButtonSuccess}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonInfo.Small" BasedOn="{StaticResource RadioButtonSameAsButtonInfo}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonWarning.Small" BasedOn="{StaticResource RadioButtonSameAsButtonWarning}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonDanger.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDanger}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="RadioButtonIcon.Small" BasedOn="{StaticResource RadioButtonIcon}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
 	<Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
 		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
index 5cc97cd1..cddf08a0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/RadioButtonDemoCtl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.RadioButtonDemoCtl"
+<UserControl x:Class="HandyControlDemo.UserControl.RadioButtonDemoCtl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
@@ -6,47 +6,135 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <StackPanel>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True" IsEnabled="False"/>
-                    <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsEnabled="False"/>
-                </StackPanel>
-                <UniformGrid Margin="22,0,0,0" Rows="2" Columns="2">
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Margin="10,0,0,0" Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Margin="10,0,0,0" BorderThickness="1" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Margin="10,0,0,0" BorderThickness="1" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                </UniformGrid>
-            </StackPanel>
-            <hc:ButtonGroup Margin="0,32,0,0">
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                <RadioButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-            </hc:ButtonGroup>
-            <hc:ButtonGroup Margin="0,16,0,0" Style="{StaticResource ButtonGroupSolid}">
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                <RadioButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-            </hc:ButtonGroup>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <hc:ButtonGroup Margin="0,16,8,0" Orientation="Vertical">
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="8,16,0,0" Orientation="Vertical" Style="{StaticResource ButtonGroupSolid}">
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                </hc:ButtonGroup>
-            </StackPanel>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" Spacing="32" Margin="32">
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <WrapPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDefault}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDefault}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo1" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger}"/>
+                            <RadioButton GroupName="Demo1" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RadioButtonSameAsButtonDefault}"/>
+                            <RadioButton GroupName="Demo2" Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RadioButtonSameAsButtonDefault}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RadioButton GroupName="Demo2" Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RadioButton GroupName="Demo2" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RadioButton GroupName="Demo2" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RadioButton GroupName="Demo2" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo2" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RadioButton GroupName="Demo2" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDefault.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Default}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDefault.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Primary}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Success}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Info}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Warning}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo3" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger.Small}"/>
+                            <RadioButton GroupName="Demo3" IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger.Small}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RadioButtonSameAsButtonDefault.Small}"/>
+                            <RadioButton GroupName="Demo4" Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource RadioButtonSameAsButtonDefault.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <RadioButton GroupName="Demo4" Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <RadioButton GroupName="Demo4" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <RadioButton GroupName="Demo4" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <RadioButton GroupName="Demo4" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <RadioButton GroupName="Demo4" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <RadioButton GroupName="Demo4" IsEnabled="False" Margin="5" Style="{StaticResource RadioButtonSameAsButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <StackPanel>
+                        <RadioButton IsChecked="True" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsEnabled="False"/>
+                        <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Margin="0,16,0,0" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsEnabled="False"/>
+                    </StackPanel>
+                    <hc:UniformSpacingPanel Spacing="10">
+                        <RadioButton Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Style="{StaticResource RadioButtonIcon}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                    </hc:UniformSpacingPanel>
+                    <hc:UniformSpacingPanel Spacing="10">
+                        <RadioButton Background="{DynamicResource SecondaryRegionBrush}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon.Small}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Background="{DynamicResource SecondaryRegionBrush}" Style="{StaticResource RadioButtonIcon.Small}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton hc:IconElement.Geometry="{StaticResource CalendarGeometry}" Style="{StaticResource RadioButtonIcon.Small}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Style="{StaticResource RadioButtonIcon.Small}" Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                    </hc:UniformSpacingPanel>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
index fb22c6e4..243a1f68 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ToggleButtonDemoCtl.xaml
@@ -35,6 +35,32 @@
                             <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger}"/>
                         </StackPanel>
                     </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ToggleButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonPrimary}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonSuccess}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonInfo}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonWarning}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonDanger}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
                             <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
@@ -143,6 +169,32 @@
                             <ToggleButton IsEnabled="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Danger}}" Margin="5" Style="{StaticResource ToggleButtonDanger.Small}"/>
                         </StackPanel>
                     </WrapPanel>
+                    <WrapPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonDefault.Small}"/>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Clock}}" IsEnabled="False" Margin="5" hc:IconElement.Geometry="{StaticResource ClockGeometry}" Style="{StaticResource ToggleButtonDefault.Small}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" Margin="5" Style="{StaticResource ToggleButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                            <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.Calendar}}" IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonPrimary.Small}" hc:IconElement.Geometry="{StaticResource CalendarGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonSuccess.Small}" hc:IconElement.Geometry="{StaticResource RotateLeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonInfo.Small}" hc:IconElement.Geometry="{StaticResource RotateRightGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonWarning.Small}" hc:IconElement.Geometry="{StaticResource LeftGeometry}"/>
+                        </StackPanel>
+                        <StackPanel>
+                            <ToggleButton Margin="5" Style="{StaticResource ToggleButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                            <ToggleButton IsEnabled="False" Margin="5" Style="{StaticResource ToggleButtonDanger.Small}" hc:IconElement.Geometry="{StaticResource RightGeometry}"/>
+                        </StackPanel>
+                    </WrapPanel>
                     <WrapPanel>
                         <StackPanel>
                             <ToggleButton Margin="5" Style="{StaticResource ToggleButtonIcon.Small}" hc:IconSwitchElement.Geometry="{StaticResource LeftGeometry}" hc:IconSwitchElement.GeometrySelected="{StaticResource RightGeometry}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index 6005f632..f36589ba 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -103,6 +103,7 @@
 
     <Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
         <Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}"/>
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RadioButton">
@@ -144,20 +145,12 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-        <Setter Property="Height" Value="{StaticResource DefaultControlHeight}"/>
+    <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
-        <Setter Property="BorderThickness" Value="0"/>
-        <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="0"/>
-        <Setter Property="Padding" Value="10,0"/>
         <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}"/>
-        <Setter Property="hc:IconElement.Width" Value="16"/>
-        <Setter Property="hc:IconElement.Height" Value="16"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="RadioButton">
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/RadioButton.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/RadioButton.xaml
index 2da9bdac..7ccabadf 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/RadioButton.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/RadioButton.xaml
@@ -7,7 +7,6 @@
     <Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
-        <Setter Property="BorderThickness" Value="1"/>
         <Style.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
                 <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -18,28 +17,75 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="RadioButtonSameAsButtonDefault.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDefault}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
+    </Style>
+
     <Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}"/>
+    </Style>
+
+    <Style x:Key="RadioButtonSameAsButtonPrimary.Small" BasedOn="{StaticResource RadioButtonSameAsButtonPrimary}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource SuccessBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="RadioButtonSameAsButtonSuccess.Small" BasedOn="{StaticResource RadioButtonSameAsButtonSuccess}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource InfoBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}"/>
+    </Style>
+
+    <Style x:Key="RadioButtonSameAsButtonInfo.Small" BasedOn="{StaticResource RadioButtonSameAsButtonInfo}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource WarningBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}"/>
+    </Style>
+
+    <Style x:Key="RadioButtonSameAsButtonWarning.Small" BasedOn="{StaticResource RadioButtonSameAsButtonWarning}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
         <Setter Property="Background" Value="{DynamicResource DangerBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}"/>
+    </Style>
+
+    <Style x:Key="RadioButtonSameAsButtonDanger.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDanger}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
     </Style>
 
     <Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton"/>
 
+    <Style x:Key="RadioButtonIcon.Small" BasedOn="{StaticResource RadioButtonIcon}" TargetType="RadioButton">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="Padding" Value="6,1"/>
+        <Setter Property="hc:IconElement.Height" Value="12"/>
+    </Style>
+
     <Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton"/>
 
     <Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 5c904d64..c804dea8 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -2971,6 +2971,7 @@
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
 		<Setter Property="hc:BorderElement.CornerRadius" Value="{StaticResource DefaultCornerRadius}" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RadioButton">
@@ -3011,20 +3012,12 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
-	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource BaseStyle}" TargetType="RadioButton">
-		<Setter Property="Height" Value="{StaticResource DefaultControlHeight}" />
+	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
-		<Setter Property="Padding" Value="10,0" />
 		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
-		<Setter Property="hc:IconElement.Width" Value="16" />
-		<Setter Property="hc:IconElement.Height" Value="16" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="RadioButton">
@@ -4595,7 +4588,6 @@
 	<Style x:Key="RadioButtonSameAsButtonDefault" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Style.Triggers>
 			<Trigger Property="IsMouseOver" Value="True">
 				<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}" />
@@ -4605,22 +4597,62 @@
 			</Trigger>
 		</Style.Triggers>
 	</Style>
+	<Style x:Key="RadioButtonSameAsButtonDefault.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDefault}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="RadioButtonSameAsButtonPrimary" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource PrimaryBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonPrimary.Small" BasedOn="{StaticResource RadioButtonSameAsButtonPrimary}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonSuccess" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource SuccessBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource SuccessBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonSuccess.Small" BasedOn="{StaticResource RadioButtonSameAsButtonSuccess}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonInfo" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource InfoBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource InfoBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonInfo.Small" BasedOn="{StaticResource RadioButtonSameAsButtonInfo}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonWarning" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource WarningBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WarningBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonWarning.Small" BasedOn="{StaticResource RadioButtonSameAsButtonWarning}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonSameAsButtonDanger" BasedOn="{StaticResource RadioButtonSameAsButtonBaseStyle}" TargetType="RadioButton">
 		<Setter Property="Background" Value="{DynamicResource DangerBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource DangerBrush}" />
+	</Style>
+	<Style x:Key="RadioButtonSameAsButtonDanger.Small" BasedOn="{StaticResource RadioButtonSameAsButtonDanger}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
 	</Style>
 	<Style x:Key="RadioButtonIcon" BasedOn="{StaticResource RadioButtonIconBaseStyle}" TargetType="RadioButton" />
+	<Style x:Key="RadioButtonIcon.Small" BasedOn="{StaticResource RadioButtonIcon}" TargetType="RadioButton">
+		<Setter Property="Height" Value="20" />
+		<Setter Property="Padding" Value="6,1" />
+		<Setter Property="hc:IconElement.Height" Value="12" />
+	</Style>
 	<Style x:Key="RadioGroupItemDefault" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton" />
 	<Style x:Key="RadioGroupItemHorizontalFirst" BasedOn="{StaticResource RadioGroupItemBaseStyle}" TargetType="RadioButton">
 		<Setter Property="hc:BorderElement.CornerRadius" Value="4,0,0,4" />

From 6763d1569a20ca53e3c81ebc878db6e0df85dc93 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 16 Mar 2022 22:49:59 +0800
Subject: [PATCH 26/32] fix: fixed UniformSpacingPanel measure issue

---
 .../HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
index 1bab5b0e..04523f66 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
@@ -237,8 +238,6 @@ public class UniformSpacingPanel : Panel
                         panelSize.V += sz.V + spacingSize.V;
                         curLineSize = new PanelUvSize(_orientation);
                     }
-
-                    isFirst = true;
                 }
                 else
                 {
@@ -379,6 +378,7 @@ public class UniformSpacingPanel : Panel
             ArrangeLine(uvFinalSize.V, useItemU, itemU, spacingSize.U);
         }
 
+        Trace.WriteLine(finalSize.Width);
         return finalSize;
     }
 }

From bdf381cd77825b2a1635bf48c5b73e8b42a1d84f Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Wed, 16 Mar 2022 23:51:31 +0800
Subject: [PATCH 27/32] chore: optimized element layout of demo

---
 .../UserControl/Styles/BorderDemoCtl.xaml     |  90 +++++++------
 .../UserControl/Styles/BrushDemoCtl.xaml      |  62 ++++-----
 .../UserControl/Styles/CheckBoxDemoCtl.xaml   |   3 +-
 .../UserControl/Styles/ExpanderDemoCtl.xaml   | 122 +++++++++---------
 .../UserControl/Styles/GroupBoxDemoCtl.xaml   |  40 +++---
 .../Styles/NativeComboBoxDemoCtl.xaml         |   4 +-
 .../Styles/NativeDatePickerDemoCtl.xaml       |   4 +-
 .../Styles/NativePasswordBoxDemoCtl.xaml      |  38 +++---
 .../Styles/NativeProgressBarDemoCtl.xaml      |  81 +++++-------
 .../Styles/NativeTabControlDemoCtl.xaml       |  16 +--
 .../Styles/NativeTextBoxDemoCtl.xaml          |  38 +++---
 .../UserControl/Styles/SliderDemoCtl.xaml     |  34 ++---
 12 files changed, 261 insertions(+), 271 deletions(-)

diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
index 04b09fd0..d30ef7fb 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BorderDemoCtl.xaml
@@ -6,54 +6,58 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel>
-            <UniformGrid Margin="32,32,0,0" Columns="3" Rows="2">
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32">
-                    <Border Background="{DynamicResource PrimaryBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Orientation="Vertical" Spacing="32" MaxWidth="664">
+                <hc:UniformSpacingPanel Spacing="32" ItemWidth="200" ItemHeight="200" ChildWrapping="Wrap" HorizontalAlignment="Center">
+                    <Border Style="{StaticResource BorderRegion}">
+                        <Border Background="{DynamicResource PrimaryBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
                     </Border>
-                </Border>
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow1}">
-                    <Border Background="{DynamicResource InfoBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    <Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow1}">
+                        <Border Background="{DynamicResource InfoBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
                     </Border>
-                </Border>
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200" Margin="0,0,32,32" Effect="{StaticResource EffectShadow2}">
-                    <Border Background="{DynamicResource WarningBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    <Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow2}">
+                        <Border Background="{DynamicResource WarningBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
                     </Border>
-                </Border>
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow3}">
-                    <Border Background="{DynamicResource DangerBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    <Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow3}">
+                        <Border Background="{DynamicResource DangerBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
                     </Border>
-                </Border>
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow4}">
-                    <Border Background="{DynamicResource AccentBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                    <Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow4}">
+                        <Border Background="{DynamicResource AccentBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
                     </Border>
-                </Border>
-                <Border Style="{StaticResource BorderRegion}" Width="200" Height="200"  Margin="0,0,32,32" Effect="{StaticResource EffectShadow5}">
-                    <Border Background="{DynamicResource BorderBrush}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                    <Border Style="{StaticResource BorderRegion}" Effect="{StaticResource EffectShadow5}">
+                        <Border Background="{DynamicResource BorderBrush}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                        </Border>
                     </Border>
-                </Border>
-            </UniformGrid>
-            <Border Margin="32,0,32,10" Style="{StaticResource BorderTipPrimary}">
-                <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            </Border>
-            <Border Margin="32,0,32,10" Style="{StaticResource BorderTipDanger}">
-                <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            </Border>
-            <Border Margin="32,0,32,10" Style="{StaticResource BorderTipWarning}">
-                <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            </Border>
-            <Border Margin="32,0,32,10" Style="{StaticResource BorderTipInfo}">
-                <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            </Border>
-            <Border Margin="32,0,32,10" Style="{StaticResource BorderTipSuccess}">
-                <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
-            </Border>
-        </StackPanel>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="10">
+                    <Border Style="{StaticResource BorderTipPrimary}">
+                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
+                    </Border>
+                    <Border Style="{StaticResource BorderTipDanger}">
+                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
+                    </Border>
+                    <Border Style="{StaticResource BorderTipWarning}">
+                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
+                    </Border>
+                    <Border Style="{StaticResource BorderTipInfo}">
+                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
+                    </Border>
+                    <Border Style="{StaticResource BorderTipSuccess}">
+                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}"/>
+                    </Border>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
index fc406aa0..69d22757 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/BrushDemoCtl.xaml
@@ -4,40 +4,42 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <UniformGrid Margin="24" VerticalAlignment="Center" Columns="4" Rows="7">
-            <Label Content="PrimaryBrush" Style="{StaticResource LabelPrimary}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkPrimaryBrush" Background="{DynamicResource DarkPrimaryBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" ItemWidth="200" Margin="32" Spacing="16" VerticalAlignment="Center" MaxWidth="632">
+                <Label Content="PrimaryBrush" Style="{StaticResource LabelPrimary}"/>
+                <Label Content="DarkPrimaryBrush" Background="{DynamicResource DarkPrimaryBrush}" Foreground="White" BorderThickness="0"/>
 
-            <Label Content="DangerBrush" Style="{StaticResource LabelDanger}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkDangerBrush" Background="{DynamicResource DarkDangerBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
+                <Label Content="DangerBrush" Style="{StaticResource LabelDanger}"/>
+                <Label Content="DarkDangerBrush" Background="{DynamicResource DarkDangerBrush}" Foreground="White" BorderThickness="0"/>
 
-            <Label Content="WarningBrush" Style="{StaticResource LabelWarning}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkWarningBrush" Background="{DynamicResource DarkWarningBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
+                <Label Content="WarningBrush" Style="{StaticResource LabelWarning}"/>
+                <Label Content="DarkWarningBrush" Background="{DynamicResource DarkWarningBrush}" Foreground="White" BorderThickness="0"/>
 
-            <Label Content="InfoBrush" Style="{StaticResource LabelInfo}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkInfoBrush" Background="{DynamicResource DarkInfoBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
+                <Label Content="InfoBrush" Style="{StaticResource LabelInfo}"/>
+                <Label Content="DarkInfoBrush" Background="{DynamicResource DarkInfoBrush}" Foreground="White" BorderThickness="0"/>
 
-            <Label Content="SuccessBrush" Style="{StaticResource LabelSuccess}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkSuccessBrush" Background="{DynamicResource DarkSuccessBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
+                <Label Content="SuccessBrush" Style="{StaticResource LabelSuccess}"/>
+                <Label Content="DarkSuccessBrush" Background="{DynamicResource DarkSuccessBrush}" Foreground="White" BorderThickness="0"/>
 
-            <Label Content="AccentBrush" Background="{DynamicResource AccentBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkAccentBrush" Background="{DynamicResource DarkAccentBrush}" Foreground="White" BorderThickness="0" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="PrimaryTextBrush" Background="{DynamicResource PrimaryTextBrush}" Foreground="{DynamicResource ThirdlyTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="SecondaryTextBrush" BorderThickness="0" Background="{DynamicResource SecondaryTextBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="ThirdlyTextBrush" BorderThickness="0" Background="{DynamicResource ThirdlyTextBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="ReverseTextBrush" BorderThickness="0" Background="{DynamicResource ReverseTextBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="TextIconBrush" Background="{DynamicResource TextIconBrush}" Foreground="{DynamicResource ReverseTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="BorderBrush" BorderThickness="0" Background="{DynamicResource BorderBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="SecondaryBorderBrush" BorderThickness="0" Background="{DynamicResource SecondaryBorderBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="BackgroundBrush" BorderThickness="0" Background="{DynamicResource BackgroundBrush}" Foreground="{DynamicResource ReverseTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="RegionBrush" Background="{DynamicResource RegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="SecondaryRegionBrush" BorderThickness="0" Background="{DynamicResource SecondaryRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="ThirdlyRegionBrush" Background="{DynamicResource ThirdlyRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="TitleBrush" BorderThickness="0" Background="{DynamicResource TitleBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DefaultBrush" Background="{DynamicResource DefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkDefaultBrush" BorderThickness="0" Background="{DynamicResource DarkDefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkMaskBrush" BorderThickness="0" Background="{DynamicResource DarkMaskBrush}" Foreground="{DynamicResource PrimaryTextBrush}" Margin="8" HorizontalAlignment="Stretch"/>
-            <Label Content="DarkOpacityBrush" BorderThickness="0" Background="{DynamicResource DarkOpacityBrush}" Foreground="White" Margin="8" HorizontalAlignment="Stretch"/>
-        </UniformGrid>
+                <Label Content="AccentBrush" Background="{DynamicResource AccentBrush}" Foreground="White" BorderThickness="0"/>
+                <Label Content="DarkAccentBrush" Background="{DynamicResource DarkAccentBrush}" Foreground="White" BorderThickness="0"/>
+                <Label Content="PrimaryTextBrush" Background="{DynamicResource PrimaryTextBrush}" Foreground="{DynamicResource ThirdlyTextBrush}"/>
+                <Label Content="SecondaryTextBrush" BorderThickness="0" Background="{DynamicResource SecondaryTextBrush}" Foreground="White"/>
+                <Label Content="ThirdlyTextBrush" BorderThickness="0" Background="{DynamicResource ThirdlyTextBrush}" Foreground="White"/>
+                <Label Content="ReverseTextBrush" BorderThickness="0" Background="{DynamicResource ReverseTextBrush}" Foreground="White"/>
+                <Label Content="TextIconBrush" Background="{DynamicResource TextIconBrush}" Foreground="{DynamicResource ReverseTextBrush}"/>
+                <Label Content="BorderBrush" BorderThickness="0" Background="{DynamicResource BorderBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="SecondaryBorderBrush" BorderThickness="0" Background="{DynamicResource SecondaryBorderBrush}" Foreground="White"/>
+                <Label Content="BackgroundBrush" BorderThickness="0" Background="{DynamicResource BackgroundBrush}" Foreground="{DynamicResource ReverseTextBrush}"/>
+                <Label Content="RegionBrush" Background="{DynamicResource RegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="SecondaryRegionBrush" BorderThickness="0" Background="{DynamicResource SecondaryRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="ThirdlyRegionBrush" Background="{DynamicResource ThirdlyRegionBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="TitleBrush" BorderThickness="0" Background="{DynamicResource TitleBrush}" Foreground="White"/>
+                <Label Content="DefaultBrush" Background="{DynamicResource DefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="DarkDefaultBrush" BorderThickness="0" Background="{DynamicResource DarkDefaultBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="DarkMaskBrush" BorderThickness="0" Background="{DynamicResource DarkMaskBrush}" Foreground="{DynamicResource PrimaryTextBrush}"/>
+                <Label Content="DarkOpacityBrush" BorderThickness="0" Background="{DynamicResource DarkOpacityBrush}" Foreground="White"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
index c9ab0a61..bf497ae5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/CheckBoxDemoCtl.xaml
@@ -4,8 +4,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
-             Background="{DynamicResource RegionBrush}"
-             Width="400">
+             Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
         <StackPanel Margin="32" HorizontalAlignment="Center" VerticalAlignment="Center">
             <CheckBox Content="{ex:Lang Key={x:Static langs:LangKeys.CheckBox}}" IsChecked="True"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
index 967c77c6..402a78c8 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/ExpanderDemoCtl.xaml
@@ -6,63 +6,69 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="16" HorizontalAlignment="Center" VerticalAlignment="Center">
-            <StackPanel Width="240" Margin="16">
-                <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
-                    <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
-                    <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
-                    <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
-                    <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
-                </Expander>
-            </StackPanel>
-            <StackPanel Width="240" Margin="16">
-                <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
-                    <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
-                    <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
-                    <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
-                </Expander>
-                <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
-                    <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
-                </Expander>
-            </StackPanel>
-            <StackPanel Height="240" Margin="16" Orientation="Horizontal">
-                <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
-                    <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
-                    <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
-                    <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
-                    <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
-                </Expander>
-            </StackPanel>
-            <StackPanel Height="240" Margin="16" Orientation="Horizontal">
-                <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
-                    <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
-                    <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
-                    <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
-                </Expander>
-                <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
-                    <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
-                </Expander>
-            </StackPanel>
-        </WrapPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <StackPanel Width="240">
+                        <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
+                            <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
+                            <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
+                            <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}">
+                            <Border Height="100" BorderThickness="1,0,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,0,4,4"/>
+                        </Expander>
+                    </StackPanel>
+                    <StackPanel Width="240">
+                        <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
+                            <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
+                            <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
+                            <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
+                        </Expander>
+                        <Expander Margin="0,4,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Up">
+                            <Border Height="100" BorderThickness="1,1,1,0" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,4,0,0"/>
+                        </Expander>
+                    </StackPanel>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Spacing="32" ChildWrapping="Wrap">
+                    <StackPanel Height="240" Orientation="Horizontal">
+                        <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
+                            <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
+                            <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
+                            <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Left">
+                            <Border Width="100" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="4,0,0,4"/>
+                        </Expander>
+                    </StackPanel>
+                    <StackPanel Height="240" Orientation="Horizontal">
+                        <Expander Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
+                            <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
+                            <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
+                            <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
+                        </Expander>
+                        <Expander Margin="4,0,0,0" Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" ExpandDirection="Right">
+                            <Border Width="100" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BorderBrush}" Background="{DynamicResource RegionBrush}" CornerRadius="0,4,4,0"/>
+                        </Expander>
+                    </StackPanel>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
index c3683aff..a02b5bc1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/GroupBoxDemoCtl.xaml
@@ -6,45 +6,37 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
-            <Grid Margin="32">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <GroupBox Grid.Row="0" Grid.Column="0" Width="300" Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Margin="16">
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" Margin="32" Spacing="32" ItemWidth="300">
+                <GroupBox Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10">
                     <Border Background="{DynamicResource RegionBrush}" CornerRadius="4">
                         <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="0" Grid.Column="1" Width="300" Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Margin="16" hc:TitleElement.TitlePlacement="Left">
+                <GroupBox Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" hc:TitleElement.TitlePlacement="Left">
                     <Border Background="{DynamicResource RegionBrush}" CornerRadius="4">
                         <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="1" Grid.Column="0" Width="300" Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Margin="16" Style="{StaticResource GroupBoxTab}">
+                <GroupBox Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Style="{StaticResource GroupBoxTab}">
                     <Border Background="{DynamicResource RegionBrush}" CornerRadius="4">
                         <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="1" Grid.Column="1" Width="300" Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Margin="16" Style="{StaticResource GroupBoxTab}" hc:TitleElement.TitlePlacement="Left">
+                <GroupBox Height="200" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Padding="10" Style="{StaticResource GroupBoxTab}" hc:TitleElement.TitlePlacement="Left">
                     <Border Background="{DynamicResource RegionBrush}" CornerRadius="4">
                         <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
                     </Border>
                 </GroupBox>
-                <GroupBox Grid.Row="2" Grid.Column="0" Width="300" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left">
-                    <TextBox/>
-                </GroupBox>
-                <GroupBox Grid.Row="2" VerticalAlignment="Bottom" Grid.Column="1" Width="300" hc:TitleElement.TitleWidth="100" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="16" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left" hc:TitleElement.TitlePlacement="Left">
-                    <ComboBox DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
-                </GroupBox>
-            </Grid>
-        </ScrollViewer>
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="16">
+                    <GroupBox VerticalAlignment="Bottom" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left">
+                        <TextBox/>
+                    </GroupBox>
+                    <GroupBox VerticalAlignment="Bottom" hc:TitleElement.TitleWidth="100" Header="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource GroupBoxOriginal}" HorizontalContentAlignment="Left" hc:TitleElement.TitlePlacement="Left">
+                        <ComboBox DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}" ItemsSource="{Binding DataList}"/>
+                    </GroupBox>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
index c8c55ec4..199cb261 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeComboBoxDemoCtl.xaml
@@ -7,7 +7,7 @@
              DataContext="{Binding InputElementDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <ComboBox hc:DropDownElement.ConsistentWidth="False" ItemsSource="{Binding DataList}" SelectedIndex="0"/>
@@ -40,6 +40,6 @@
                     <ComboBox ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource ComboBoxExtend.Small}" Margin="0,16,0,0"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
index 6b036c08..4e8d63d6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeDatePickerDemoCtl.xaml
@@ -7,7 +7,7 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <DatePicker SelectedDate="{x:Static system:DateTime.Now}"/>
@@ -30,6 +30,6 @@
                     <DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DatePickerExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
index f51ee3c5..58d92b99 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativePasswordBoxDemoCtl.xaml
@@ -6,27 +6,29 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <PasswordBox Password="123456"/>
-                <PasswordBox Password="123456" IsEnabled="False" Margin="0,16,0,0"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <PasswordBox Password="123456"/>
+                    <PasswordBox Password="123456" IsEnabled="False" Margin="0,16,0,0"/>
 
-                <PasswordBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend}"/>
-                <PasswordBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource PasswordBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <PasswordBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend}"/>
+                    <PasswordBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource PasswordBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource PasswordBoxExtend}" Margin="0,32,0,0" Password="123456"/>
-                <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend}" Margin="0,16,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <PasswordBox Password="123456" Style="{StaticResource PasswordBox.Small}"/>
-                <PasswordBox Password="123456" IsEnabled="False" Margin="0,16,0,0" Style="{StaticResource PasswordBox.Small}"/>
+                    <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource PasswordBoxExtend}" Margin="0,32,0,0" Password="123456"/>
+                    <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend}" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <PasswordBox Password="123456" Style="{StaticResource PasswordBox.Small}"/>
+                    <PasswordBox Password="123456" IsEnabled="False" Margin="0,16,0,0" Style="{StaticResource PasswordBox.Small}"/>
 
-                <PasswordBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend.Small}"/>
-                <PasswordBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource PasswordBoxExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <PasswordBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxExtend.Small}"/>
+                    <PasswordBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource PasswordBoxExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
 
-                <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource PasswordBoxExtend.Small}" Margin="0,32,0,0" Password="123456"/>
-                <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend.Small}" Margin="0,16,0,0"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource PasswordBoxExtend.Small}" Margin="0,32,0,0" Password="123456"/>
+                    <PasswordBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource PasswordBoxExtend.Small}" Margin="0,16,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
index 890e3624..b858aa8c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeProgressBarDemoCtl.xaml
@@ -4,55 +4,36 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="32" ItemWidth="600">
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Width="400">
-                    <ProgressBar Value="20" Margin="0,0,0,10"/>
-                    <ProgressBar Style="{StaticResource ProgressBarSuccess}" Margin="0,0,0,10" Value="40"/>
-                    <ProgressBar Style="{StaticResource ProgressBarInfo}" Margin="0,0,0,10" Value="60"/>
-                    <ProgressBar Style="{StaticResource ProgressBarWarning}" Margin="0,0,0,10" Value="80"/>
-                    <ProgressBar Style="{StaticResource ProgressBarDanger}" Margin="0,0,0,10" Value="100" Maximum="200" IsIndeterminate="True"/>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Width="200" HorizontalAlignment="Left">
-                    <TextBlock Padding="0,2,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarPrimary" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarSuccess" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarInfo" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarWarning" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarDanger" HorizontalAlignment="Left"/>
-                </StackPanel>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <StackPanel Width="400">
-                    <ProgressBar Style="{StaticResource ProgressBarPrimaryStripe}" Margin="0,0,0,10" Value="120" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Margin="0,0,0,10" Value="60" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Margin="0,0,0,10" Value="50" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Margin="0,0,0,10" Value="180" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,0,10" IsIndeterminate="True" Maximum="200" />
-                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,8,0,10" Value="110" Maximum="200" IsIndeterminate="True"/>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Width="200" HorizontalAlignment="Left">
-                    <TextBlock Padding="0,2,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarPrimaryStripe" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarSuccessStripe" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarInfoStripe" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarWarningStripe" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarDangerStripe" HorizontalAlignment="Left"/>
-                    <TextBlock Padding="0,12,0,3" Style="{StaticResource TextBlockDefault}" Text="ProgressBarFlat" HorizontalAlignment="Left"/>
-                </StackPanel>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Height="200">
-                <ProgressBar Value="20" Margin="0,0,10,0" Orientation="Vertical" Width="20"/>
-                <ProgressBar Style="{StaticResource ProgressBarSuccess}" Margin="0,0,10,0" Value="40" Orientation="Vertical" Width="20"/>
-                <ProgressBar Style="{StaticResource ProgressBarInfo}" Margin="0,0,10,0" Value="60" Orientation="Vertical" Width="20"/>
-                <ProgressBar Style="{StaticResource ProgressBarWarning}" Margin="0,0,10,0" Value="80" Orientation="Vertical" Width="20"/>
-                <ProgressBar Style="{StaticResource ProgressBarDanger}" Margin="0,0,10,0" Value="100" Maximum="200" IsIndeterminate="True" Width="20" Orientation="Vertical"/>
-                
-                <ProgressBar Style="{StaticResource ProgressBarPrimaryStripe}" Margin="10,0,10,0" Value="120" Maximum="200" Orientation="Vertical" Width="20" />
-                <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Margin="0,0,10,0" Value="60" Maximum="200" Orientation="Vertical" Width="20" />
-                <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Margin="0,0,10,0" Value="50" Maximum="200" Orientation="Vertical" Width="20" />
-                <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Margin="0,0,10,0" Value="180" Maximum="200" Orientation="Vertical" Width="20" />
-                <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" Margin="0,0,10,0" IsIndeterminate="True" Maximum="200" Orientation="Vertical" Width="20"/>
-                <ProgressBar Style="{StaticResource ProgressBarFlat}" Margin="0,0,10,0" Value="110" Maximum="200" IsIndeterminate="True" Orientation="Vertical" Width="4"/>
-            </StackPanel>
-        </WrapPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap">
+                <hc:UniformSpacingPanel Spacing="10" ItemWidth="400" Orientation="Vertical">
+                    <ProgressBar Value="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarSuccess}" Value="40"/>
+                    <ProgressBar Style="{StaticResource ProgressBarInfo}" Value="60"/>
+                    <ProgressBar Style="{StaticResource ProgressBarWarning}" Value="80"/>
+                    <ProgressBar Style="{StaticResource ProgressBarDanger}" Value="100" Maximum="200" IsIndeterminate="True"/>
+                    <ProgressBar Style="{StaticResource ProgressBarPrimaryStripe}" Value="120" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Value="60" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Value="50" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Value="180" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" IsIndeterminate="True" Maximum="200" />
+                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Value="110" Maximum="200" IsIndeterminate="True"/>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Spacing="10" ItemHeight="300">
+                    <ProgressBar Value="20" Orientation="Vertical" Width="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarSuccess}" Value="40" Orientation="Vertical" Width="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarInfo}" Value="60" Orientation="Vertical" Width="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarWarning}" Value="80" Orientation="Vertical" Width="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarDanger}" Value="100" Maximum="200" IsIndeterminate="True" Width="20" Orientation="Vertical"/>
+
+                    <ProgressBar Style="{StaticResource ProgressBarPrimaryStripe}" Value="120" Maximum="200" Orientation="Vertical" Width="20" />
+                    <ProgressBar Style="{StaticResource ProgressBarSuccessStripe}" Value="60" Maximum="200" Orientation="Vertical" Width="20" />
+                    <ProgressBar Style="{StaticResource ProgressBarInfoStripe}" Value="50" Maximum="200" Orientation="Vertical" Width="20" />
+                    <ProgressBar Style="{StaticResource ProgressBarWarningStripe}" Value="180" Maximum="200" Orientation="Vertical" Width="20" />
+                    <ProgressBar Style="{StaticResource ProgressBarDangerStripe}" IsIndeterminate="True" Maximum="200" Orientation="Vertical" Width="20"/>
+                    <ProgressBar Style="{StaticResource ProgressBarFlat}" Value="110" Maximum="200" IsIndeterminate="True" Orientation="Vertical" Width="4"/>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
index 02dafde3..add47557 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTabControlDemoCtl.xaml
@@ -6,9 +6,9 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
-            <UniformGrid Rows="2" Columns="2" Margin="16">
-                <TabControl TabStripPlacement="Right" Margin="16" Width="400" Height="200">
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32" ItemWidth="400" ItemHeight="200" MaxWidth="832" ChildWrapping="Wrap">
+                <TabControl TabStripPlacement="Right">
                     <TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
                             <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
@@ -50,7 +50,7 @@
                         </Border>
                     </TabItem>
                 </TabControl>
-                <TabControl Margin="16" Width="400" Height="200" Style="{StaticResource TabControlInLine}">
+                <TabControl Style="{StaticResource TabControlInLine}">
                     <TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
                             <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
@@ -92,7 +92,7 @@
                         </Border>
                     </TabItem>
                 </TabControl>
-                <TabControl TabStripPlacement="Left" Margin="16" Width="400" Height="200" Style="{StaticResource TabControlCapsule}">
+                <TabControl TabStripPlacement="Left" Style="{StaticResource TabControlCapsule}">
                     <TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
                             <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
@@ -134,7 +134,7 @@
                         </Border>
                     </TabItem>
                 </TabControl>
-                <TabControl TabStripPlacement="Bottom" Margin="16" Width="400" Height="200" Style="{StaticResource TabControlCapsuleSolid}">
+                <TabControl TabStripPlacement="Bottom" Style="{StaticResource TabControlCapsuleSolid}">
                     <TabItem Header="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HeaderStringFormat="{}{0}1">
                         <Border Background="{DynamicResource PrimaryBrush}">
                             <TextBlock Style="{StaticResource TextBlockLargeBold}" Foreground="{DynamicResource TextIconBrush}">
@@ -176,7 +176,7 @@
                         </Border>
                     </TabItem>
                 </TabControl>
-            </UniformGrid>
-        </ScrollViewer>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
index bee7e215..12624bc0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeTextBoxDemoCtl.xaml
@@ -6,25 +6,27 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False"/>
 
-                <TextBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TextBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-                <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend}" Margin="0,16,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBox.Small}"/>
-                <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TextBox.Small}"/>
+                    <TextBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TextBoxExtend}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TextBoxExtend}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend}" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBox.Small}"/>
+                    <TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TextBox.Small}"/>
 
-                <TextBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource TextBoxExtend.Small}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TextBoxExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-                <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TextBoxExtend.Small}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend.Small}" Margin="0,16,0,0"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <TextBox hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Style="{StaticResource TextBoxExtend.Small}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" Style="{StaticResource TextBoxExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                    <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TextBoxExtend.Small}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Style="{StaticResource TextBoxExtend.Small}" Margin="0,16,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
index 1094c1f5..d05a59dc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/SliderDemoCtl.xaml
@@ -4,21 +4,23 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <StackPanel>
-                <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
-                <Slider Width="400" IsSnapToTickEnabled="True" Value="3" Margin="0,32,0,0" IsEnabled="False"/>
-                <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80" Margin="0,32,0,0"/>
-                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel Margin="32,0,0,0" Orientation="Horizontal">
-                <Slider Height="400" IsSnapToTickEnabled="True" Value="8" Orientation="Vertical"/>
-                <Slider Height="400" IsSnapToTickEnabled="True" Value="3" Margin="32,0,0,0" IsEnabled="False" Orientation="Vertical"/>
-                <Slider Height="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="80" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
-                <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
-            </StackPanel>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Orientation="Horizontal" Spacing="32" ClipToBounds="False" ChildWrapping="Wrap">
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <Slider Width="400" IsSnapToTickEnabled="True" Value="8"/>
+                    <Slider Width="400" IsSnapToTickEnabled="True" Value="3" IsEnabled="False"/>
+                    <Slider Width="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="10" SelectionEnd="80"/>
+                    <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight"/>
+                    <Slider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both"/>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Spacing="32">
+                    <Slider Height="400" IsSnapToTickEnabled="True" Value="8" Orientation="Vertical"/>
+                    <Slider Height="400" IsSnapToTickEnabled="True" Value="3" IsEnabled="False" Orientation="Vertical"/>
+                    <Slider Height="400" IsSnapToTickEnabled="True" TickFrequency="5" Maximum="100" TickPlacement="TopLeft" Value="10" IsSelectionRangeEnabled="True" SelectionStart="20" SelectionEnd="80" Orientation="Vertical"/>
+                    <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" IsSnapToTickEnabled="True" Maximum="100" Value="60" TickFrequency="10" TickPlacement="BottomRight" Orientation="Vertical"/>
+                    <Slider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" hc:TipElement.StringFormat="#0.00" Value="5" TickPlacement="Both" Orientation="Vertical"/>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>

From 54f8d562ccad6747b07ed848eec9e69ca292c7ed Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 17 Mar 2022 21:49:56 +0800
Subject: [PATCH 28/32] chore: delete debug code

---
 .../HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
index 04523f66..304f43b8 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/UniformSpacingPanel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using HandyControl.Data;
@@ -378,7 +377,6 @@ public class UniformSpacingPanel : Panel
             ArrangeLine(uvFinalSize.V, useItemU, itemU, spacingSize.U);
         }
 
-        Trace.WriteLine(finalSize.Width);
         return finalSize;
     }
 }

From ee90c7dc4f602c08c8bfaa44e2b2958731db2bb4 Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Sat, 19 Mar 2022 12:22:21 +0330
Subject: [PATCH 29/32] Update bug_report.yaml

---
 .github/ISSUE_TEMPLATE/bug_report.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index ea3be13c..f03073b1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -30,9 +30,15 @@ body:
     attributes:
       label: NuGet package version
       options:
+        - "HandyControl 3.4.0"
+        - "HandyControl 3.3.0"
         - "HandyControl 3.2.0"
         - "HandyControl 3.1.0"
         - "HandyControl 3.0.0"
+        - "HandyControls (Custom version) 3.4.0"
+        - "HandyControls (Custom version) 3.3.11"
+        - "HandyControls (Custom version) 3.3.10"
+        - "HandyControls (Custom version) 3.3.9"
         - "HandyControls (Custom version) 3.3.8.1"
         - "HandyControls (Custom version) 3.3.8"
         - "HandyControls (Custom version) 3.3.7"

From fe89a9dfc82357ae79bddf0dada4658ad05e15d3 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sat, 19 Mar 2022 23:08:59 +0800
Subject: [PATCH 30/32] chore: optimized element layout of extend controls demo

---
 .../HandyControl_Net_40/Themes/Theme.xaml     |   1 +
 .../HandyControlDemo_Code.csproj              |   3 +
 .../Resources/Themes/Styles/Style.xaml        |   3 +-
 .../UserControl/Controls/BadgeDemoCtl.xaml    |  14 +-
 .../Controls/ButtonGroupDemoCtl.xaml          | 126 +++++++++---------
 .../UserControl/Controls/CardDemoCtl.xaml     |   2 +-
 .../UserControl/Controls/CarouselDemoCtl.xaml |   2 +-
 .../Controls/ChatBubbleDemoCtl.xaml           |  26 ++--
 .../Controls/CheckComboBoxDemoCtl.xaml        |   4 +-
 .../UserControl/Controls/ClockDemoCtl.xaml    |  10 +-
 .../UserControl/Controls/ComboBoxDemoCtl.xaml |   4 +-
 .../Controls/CompareSliderDemoCtl.xaml        |   2 +-
 .../Controls/CoverFlowDemoCtl.xaml            |   4 +-
 .../Controls/CoverViewDemoCtl.xaml            |  30 +++--
 .../Controls/DatePickerDemoCtl.xaml           |   4 +-
 .../Controls/DateTimePickerDemoCtl.xaml       |   4 +-
 .../UserControl/Controls/DividerDemoCtl.xaml  |  66 ++++-----
 .../Controls/ElementGroupDemoCtl.xaml         |   2 +-
 .../Controls/FlexPanelDemoCtl.xaml            |   4 +-
 .../Controls/FlipClockDemoCtl.xaml            |   4 +-
 .../UserControl/Controls/GotoTopDemoCtl.xaml  |   2 +-
 .../UserControl/Controls/GravatarDemoCtl.xaml |  40 +++---
 .../UserControl/Controls/GridDemoCtl.xaml     |   4 +-
 .../Controls/ImageBlockDemoCtl.xaml           |  28 ++--
 .../Controls/ImageBrowserDemoCtl.xaml         |   2 +-
 .../Controls/ImageSelectorDemoCtl.xaml        |  18 +--
 .../Controls/MagnifierDemoCtl.xaml            |  18 +--
 .../Controls/NumericUpDownDemoCtl.xaml        | 110 +++++++--------
 .../Controls/OutlineTextDemoCtl.xaml          |  20 +--
 .../Controls/PaginationDemoCtl.xaml           |   2 +-
 .../Controls/PasswordBoxDemoCtl.xaml          |  42 +++---
 .../UserControl/Controls/PoptipDemoCtl.xaml   |  26 ++--
 .../Controls/ProgressButtonDemoCtl.xaml       |  38 +++---
 .../Controls/RangeSliderDemoCtl.xaml          |  30 +++--
 .../Controls/RelativePanelDemoCtl.xaml        | 108 +++++++--------
 .../Controls/RunningBlockDemoCtl.xaml         |  54 ++++----
 .../Controls/ScrollViewerDemoCtl.xaml         |   2 +-
 .../Controls/SearchBarDemoCtl.xaml            | 102 +++++++-------
 .../Controls/TabControlDemoCtl.xaml           |  24 ++--
 .../UserControl/Controls/TagDemoCtl.xaml      |  56 ++++----
 .../UserControl/Controls/TextBoxDemoCtl.xaml  |  70 +++++-----
 .../Controls/TimePickerDemoCtl.xaml           |   4 +-
 .../TransitioningContentControlDemoCtl.xaml   |  86 ++++++------
 .../Controls/UniformSpacingPanelDemoCtl.xaml  |  60 +++++----
 .../Controls/WaterfallPanelDemoCtl.xaml       |   6 +-
 .../UserControl/Controls/WindowDemoCtl.xaml   |  24 ++--
 .../Styles/NativeScrollViewerDemoCtl.xaml     |   2 +-
 .../Styles/NativeWindowDemoCtl.xaml           |   4 +-
 .../UserControl/Styles/TextBlockDemoCtl.xaml  |  61 +++------
 .../UserControl/Tools/EffectsDemoCtl.xaml     | 114 ++++++++--------
 .../Styles/Base/RadioButtonBaseStyle.xaml     |   1 +
 .../HandyControl_Shared/Themes/Theme.xaml     |   1 +
 52 files changed, 752 insertions(+), 722 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index 5ffc7a19..e6e99ae8 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -3015,6 +3015,7 @@
 	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
 		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />
diff --git a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
index d987392a..ba9826f5 100644
--- a/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
+++ b/src/Shared/HandyControlDemo_Code/HandyControlDemo_Code.csproj
@@ -854,6 +854,9 @@
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Basic\InteractiveDialogViewModel.cs">
       <Link>ViewModel\InteractiveDialogViewModel.cs</Link>
     </Resource>
+    <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Common\InputElementDemoViewModel.cs">
+      <Link>ViewModel\InputElementDemoViewModel.cs</Link>
+    </Resource>
     <Resource Include="..\..\Shared\HandyControlDemo_Shared\ViewModel\Controls\AutoCompleteTextBoxDemoViewModel.cs">
       <Link>ViewModel\AutoCompleteTextBoxDemoViewModel.cs</Link>
     </Resource>
diff --git a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
index 924112f4..e6cf4862 100644
--- a/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
+++ b/src/Shared/HandyControlDemo_Shared/Resources/Themes/Styles/Style.xaml
@@ -81,6 +81,7 @@
         <Setter Property="hc:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="ItemContainerStyle" Value="{StaticResource ListBoxItemTransparent}"/>
+        <Setter Property="hc:ScrollViewer.IsInertiaEnabled" Value="True"/>
     </Style>
 
     <ItemsPanelTemplate x:Key="FluidMoveBehaviorWrapPanelItemsPanelTemplate">
@@ -176,7 +177,7 @@
                         </Style>
                     </ControlTemplate.Resources>
                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <ScrollViewer Name="PART_ScrollViewer" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" CanContentScroll="True" Content="{Binding TextArea,RelativeSource={RelativeSource TemplatedParent}}" Focusable="False" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" />
+                        <hc:ScrollViewer IsInertiaEnabled="True" Name="PART_ScrollViewer" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="Left" VerticalContentAlignment="Top" CanContentScroll="True" Content="{Binding TextArea,RelativeSource={RelativeSource TemplatedParent}}" Focusable="False" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" />
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="WordWrap" Value="True">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
index 8d363fcb..806ae926 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/BadgeDemoCtl.xaml
@@ -7,25 +7,25 @@
              Background="{DynamicResource RegionBrush}"
              DataContext="{Binding BadgeDemo, Source={StaticResource Locator}}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
+        <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Center">
             <hc:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Comment}}"/>
             </hc:Badge>
-            <hc:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            <hc:Badge Text="New" BadgeMargin="0,-14,-20,0" Height="30" Style="{StaticResource BadgeDanger}">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Comment}}"/>
             </hc:Badge>
-            <hc:Badge Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgePrimary}">
+            <hc:Badge Value="{Binding Count}" BadgeMargin="0,-14,-10,0" Height="30" Style="{StaticResource BadgePrimary}">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Click2Count}}" Command="{Binding CountCmd}"/>
             </hc:Badge>
-            <hc:Badge Value="100" BadgeMargin="0,-14,-20,0" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            <hc:Badge Value="100" BadgeMargin="0,-14,-20,0" Height="30" Style="{StaticResource BadgeDanger}">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Comment}}"/>
             </hc:Badge>
-            <hc:Badge Status="Dot" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            <hc:Badge Status="Dot" Height="30" Style="{StaticResource BadgeDanger}">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Reply}}"/>
             </hc:Badge>
-            <hc:Badge Status="Processing" Height="30" Margin="32,0,0,0" Style="{StaticResource BadgeDanger}">
+            <hc:Badge Status="Processing" Height="30" Style="{StaticResource BadgeDanger}">
                 <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Reply}}" />
             </hc:Badge>
-        </StackPanel>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml
index d5ff5fc5..56a1dfe7 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ButtonGroupDemoCtl.xaml
@@ -6,67 +6,69 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="16" VerticalAlignment="Center">
-            <StackPanel Margin="16">
-                <hc:ButtonGroup>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="0,32,0,0">
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="0,32,0,0" Style="{StaticResource ButtonGroupSolid}">
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="0,32,0,0">
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
-                </hc:ButtonGroup>
-            </StackPanel>
-            <StackPanel Margin="16" Orientation="Horizontal">
-                <hc:ButtonGroup Orientation="Vertical">
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="32,0,0,0" Orientation="Vertical">
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="32,0,0,0" Style="{StaticResource ButtonGroupSolid}" Orientation="Vertical">
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                </hc:ButtonGroup>
-                <hc:ButtonGroup Margin="32,0,0,0" Orientation="Vertical">
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
-                    <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
-                    <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
-                </hc:ButtonGroup>
-            </StackPanel>
-        </WrapPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap" VerticalAlignment="Center">
+                <hc:UniformSpacingPanel Spacing="32" Orientation="Vertical">
+                    <hc:ButtonGroup>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup Style="{StaticResource ButtonGroupSolid}">
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
+                    </hc:ButtonGroup>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Spacing="32" ChildWrapping="Wrap">
+                    <hc:ButtonGroup Orientation="Vertical">
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup Orientation="Vertical">
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup Style="{StaticResource ButtonGroupSolid}" Orientation="Vertical">
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                    </hc:ButtonGroup>
+                    <hc:ButtonGroup Orientation="Vertical">
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}" IsChecked="True"/>
+                        <RadioButton Content="{ex:Lang Key={x:Static langs:LangKeys.RadioButton}}"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
+                        <ToggleButton Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}" IsChecked="True"/>
+                    </hc:ButtonGroup>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml
index d446a17f..9a966eb3 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CardDemoCtl.xaml
@@ -6,7 +6,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              xmlns:data="clr-namespace:HandyControlDemo.Data">
     <hc:TransitioningContentControl>
-        <ListBox Margin="32" BorderThickness="0" Style="{StaticResource WrapPanelHorizontalListBox}" ItemsPanel="{StaticResource FluidMoveBehaviorWrapPanelItemsPanelTemplate}" ItemsSource="{Binding DataList}">
+        <ListBox Margin="32" hc:ScrollViewer.IsInertiaEnabled="True" BorderThickness="0" Style="{StaticResource WrapPanelHorizontalListBox}" ItemsPanel="{StaticResource FluidMoveBehaviorWrapPanelItemsPanelTemplate}" ItemsSource="{Binding DataList}">
             <ListBox.ItemTemplate>
                 <DataTemplate DataType="data:CardModel">
                     <hc:Card MaxWidth="240" BorderThickness="0" Effect="{StaticResource EffectShadow2}" Margin="8" Footer="{Binding Footer}">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
index 889109ad..f9ccfd6f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CarouselDemoCtl.xaml
@@ -4,7 +4,7 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <hc:Carousel Margin="32" IsCenter="True" AutoRun="True" Width="600" Height="330" VerticalAlignment="Center">
+        <hc:Carousel Margin="32" IsCenter="True" AutoRun="True" MaxWidth="600" Height="330" VerticalAlignment="Center">
             <Image Width="600" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Image Width="300" Stretch="UniformToFill" Source="/HandyControlDemo;component/Resources/Img/2.jpg"/>
             <hc:SimplePanel Width="600">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
index b7e9da26..0e58a4f0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ChatBubbleDemoCtl.xaml
@@ -5,17 +5,19 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Orientation="Horizontal" Margin="32">
-            <userControl:ChatBox>
-                <userControl:ChatBox.Background>
-                    <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/Chat/chat_back1.jpg" Stretch="Uniform"/>
-                </userControl:ChatBox.Background>
-            </userControl:ChatBox>
-            <userControl:ChatBox Margin="32,0,0,0">
-                <userControl:ChatBox.Background>
-                    <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/Chat/chat_back2.jpg" Stretch="Uniform"/>
-                </userControl:ChatBox.Background>
-            </userControl:ChatBox>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" ChildWrapping="Wrap" Margin="32">
+                <userControl:ChatBox>
+                    <userControl:ChatBox.Background>
+                        <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/Chat/chat_back1.jpg" Stretch="Uniform"/>
+                    </userControl:ChatBox.Background>
+                </userControl:ChatBox>
+                <userControl:ChatBox>
+                    <userControl:ChatBox.Background>
+                        <ImageBrush ImageSource="/HandyControlDemo;component/Resources/Img/Chat/chat_back2.jpg" Stretch="Uniform"/>
+                    </userControl:ChatBox.Background>
+                </userControl:ChatBox>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
index cee0bb0c..79e3ea2e 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CheckComboBoxDemoCtl.xaml
@@ -7,7 +7,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <hc:CheckComboBox ShowClearButton="True" MaxWidth="380" ItemsSource="{Binding DataList}" ShowSelectAllButton="True"/>
@@ -50,6 +50,6 @@
                     <hc:CheckComboBox MaxWidth="380" ItemsSource="{Binding DataList}" ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource CheckComboBoxPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
index bc1a0bfb..45f5cb92 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ClockDemoCtl.xaml
@@ -4,9 +4,11 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Orientation="Horizontal" Margin="32">
-            <hc:Clock/>
-            <hc:ListClock Margin="16,0,0,0"/>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="16" ChildWrapping="Wrap" Margin="32">
+                <hc:Clock/>
+                <hc:ListClock/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
index ab9fa393..2b6d7aae 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ComboBoxDemoCtl.xaml
@@ -7,7 +7,7 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <hc:ComboBox ShowClearButton="True" ItemsSource="{Binding DataList}" SelectedIndex="0"/>
@@ -40,6 +40,6 @@
                     <hc:ComboBox AutoComplete="True" ShowClearButton="True" ItemsSource="{Binding DataList}" IsEditable="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0" Style="{StaticResource ComboBoxPlus.Small}"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
index c77e8e3c..50168652 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CompareSliderDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:ScrollViewer VerticalAlignment="Center">
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <WrapPanel ItemHeight="384" ItemWidth="632">
                 <hc:CompareSlider Value="5" Width="600" Height="352">
                     <hc:CompareSlider.TargetContent>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
index 742adf40..f67804dd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverFlowDemoCtl.xaml
@@ -4,6 +4,8 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:CoverFlow x:Name="CoverFlowMain" Margin="32" Width="500" Height="300"/>
+        <Viewbox MaxWidth="500">
+            <hc:CoverFlow x:Name="CoverFlowMain" Margin="32" Width="500" Height="300"/>
+        </Viewbox>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
index cc3ff299..7bf7739d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/CoverViewDemoCtl.xaml
@@ -7,19 +7,21 @@
              DataContext="{Binding CoverView,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:CoverView Margin="27" Width="880" Height="432" ItemWidth="160" ItemHeight="160" ItemsSource="{Binding DataList}">
-            <hc:CoverView.ItemHeaderTemplate>
-                <DataTemplate>
-                    <Image Source="{Binding ImgPath}"/>
-                </DataTemplate>
-            </hc:CoverView.ItemHeaderTemplate>
-            <hc:CoverView.ItemTemplate>
-                <DataTemplate>
-                    <Border Margin="10" Height="300" Background="{Binding BackgroundToken,Converter={StaticResource String2BrushConverter}}">
-                        <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
-                    </Border>
-                </DataTemplate>
-            </hc:CoverView.ItemTemplate>
-        </hc:CoverView>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:CoverView Margin="27" MaxWidth="880" ItemWidth="160" ItemHeight="160" ItemsSource="{Binding DataList}">
+                <hc:CoverView.ItemHeaderTemplate>
+                    <DataTemplate>
+                        <Image Source="{Binding ImgPath}"/>
+                    </DataTemplate>
+                </hc:CoverView.ItemHeaderTemplate>
+                <hc:CoverView.ItemTemplate>
+                    <DataTemplate>
+                        <Border Margin="10" Height="300" Background="{Binding BackgroundToken,Converter={StaticResource String2BrushConverter}}">
+                            <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                        </Border>
+                    </DataTemplate>
+                </hc:CoverView.ItemTemplate>
+            </hc:CoverView>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
index 8d946d1a..b7dd79c6 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DatePickerDemoCtl.xaml
@@ -7,7 +7,7 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <hc:DatePicker ShowClearButton="True" SelectedDate="{x:Static system:DateTime.Now}"/>
@@ -30,6 +30,6 @@
                     <hc:DatePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource DatePickerPlus.Small}"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
index 971f319c..0f14ce55 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DateTimePickerDemoCtl.xaml
@@ -6,7 +6,7 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel  Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <hc:DateTimePicker ShowClearButton="True"/>
@@ -49,6 +49,6 @@
                     <hc:DateTimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource DateTimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
index 3bb2853a..62c81bf1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/DividerDemoCtl.xaml
@@ -6,39 +6,41 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="16">
-            <StackPanel Margin="16" Width="300">
-                <hc:Divider/>
-                <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}"/>
-                <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" Padding="10,0"/>
-                <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}"/>
-                <hc:Divider LineStrokeDashArray="2,2"/>
-            </StackPanel>
-            <StackPanel Margin="16" Width="300">
-                <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HorizontalContentAlignment="Left"/>
-                <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" Padding="10,0"  HorizontalContentAlignment="Right"/>
-                <StackPanel Orientation="Horizontal">
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32" ChildWrapping="Wrap">
+                <StackPanel Width="300">
+                    <hc:Divider/>
+                    <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}"/>
+                    <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" Padding="10,0"/>
+                    <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}"/>
+                    <hc:Divider LineStrokeDashArray="2,2"/>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                <StackPanel Width="300">
+                    <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" HorizontalContentAlignment="Left"/>
+                    <hc:Divider Content="{ex:Lang Key={x:Static langs:LangKeys.Title}}" Padding="10,0" HorizontalContentAlignment="Right"/>
+                    <StackPanel Orientation="Horizontal">
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider LineStrokeThickness="2" Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                        <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
+                        <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
+                    </StackPanel>
                 </StackPanel>
-                <StackPanel Orientation="Horizontal" Margin="0,16,0,0">
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                    <hc:Divider LineStrokeThickness="2" LineStroke="{DynamicResource DarkPrimaryBrush}" Orientation="Vertical" MaxHeight="16"/>
-                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
-                </StackPanel>
-            </StackPanel>
-        </WrapPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
index afe53368..a14d51db 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ElementGroupDemoCtl.xaml
@@ -13,7 +13,7 @@
                 <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
                 <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
             </hc:ElementGroup>
-            <hc:ElementGroup Orientation="Horizontal" Width="500">
+            <hc:ElementGroup Orientation="Horizontal" MaxWidth="500">
                 <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
                 <Button HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.Button}}"/>
                 <ToggleButton HorizontalAlignment="Stretch" Width="auto" Content="{ex:Lang Key={x:Static langs:LangKeys.ToggleButton}}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml
index c55f1b4c..183f0232 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlexPanelDemoCtl.xaml
@@ -12,7 +12,7 @@
         </Style>
     </UserControl.Resources>
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:FlexPanel Margin="32" AlignItems="FlexStart" AlignContent="SpaceBetween" JustifyContent="SpaceAround" FlexWrap="WrapReverse" FlexDirection="RowReverse">
                 <Border hc:FlexPanel.Order="99" Height="50" Style="{StaticResource Border4FlexPanelDemoStyle}">
                     <TextBlock Text="0" Style="{StaticResource TextBlockTitle}"/>
@@ -45,6 +45,6 @@
                     <TextBlock Text="9" Style="{StaticResource TextBlockTitle}"/>
                 </Border>
             </hc:FlexPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
index 8e2f08b2..e2240307 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/FlipClockDemoCtl.xaml
@@ -4,6 +4,8 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <hc:FlipClock Margin="32"/>
+        <Viewbox MaxWidth="520">
+            <hc:FlipClock Margin="32"/>
+        </Viewbox>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
index 6ab499a8..055f8d70 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GotoTopDemoCtl.xaml
@@ -4,7 +4,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:SimplePanel Width="500" Height="400">
+        <hc:SimplePanel Height="400">
             <hc:ScrollViewer Name="ScrollViewerDemo" IsInertiaEnabled="True" Margin="0,10,0,0">
                 <Border Height="2000" Margin="8,0">
                     <Border.Background>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
index 98ecc600..4b5c9ffc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GravatarDemoCtl.xaml
@@ -4,24 +4,26 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <UniformGrid Rows="3" Columns="3" Width="240" Height="240">
-                <hc:Gravatar Id="User1"/>
-                <hc:Gravatar Id="User2"/>
-                <hc:Gravatar Style="{StaticResource GravatarCircleImg}">
-                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/2.jpg"/>
-                </hc:Gravatar>
-                <hc:Gravatar Id="User4"/>
-                <hc:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
-                <hc:Gravatar Id="User6"/>
-                <hc:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
-                <hc:Gravatar Id="User8"/>
-                <hc:Gravatar Id="User9"/>
-            </UniformGrid>
-            <StackPanel Margin="16,0,0,0" Height="220" VerticalAlignment="Center">
-                <TextBox Text="User1" Name="TextBoxName" Width="180"/>
-                <hc:Gravatar Height="180" Width="180" Id="{Binding Text,ElementName=TextBoxName}" Margin="10"/>
-            </StackPanel>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" ChildWrapping="Wrap" Spacing="16" ItemHorizontalAlignment="Center">
+                <UniformGrid Rows="3" Columns="3" Width="240" Height="240">
+                    <hc:Gravatar Id="User1"/>
+                    <hc:Gravatar Id="User2"/>
+                    <hc:Gravatar Style="{StaticResource GravatarCircleImg}">
+                        <Image Source="/HandyControlDemo;component/Resources/Img/Album/2.jpg"/>
+                    </hc:Gravatar>
+                    <hc:Gravatar Id="User4"/>
+                    <hc:Gravatar Id="User5" Style="{StaticResource GravatarCircle}"/>
+                    <hc:Gravatar Id="User6"/>
+                    <hc:Gravatar Style="{StaticResource GravatarCircle}" Source="/HandyControlDemo;component/Resources/Img/Album/1.jpg"/>
+                    <hc:Gravatar Id="User8"/>
+                    <hc:Gravatar Id="User9"/>
+                </UniformGrid>
+                <StackPanel Width="240" Height="220" VerticalAlignment="Center">
+                    <TextBox Text="User1" Name="TextBoxName" Width="180"/>
+                    <hc:Gravatar Height="180" Width="180" Id="{Binding Text,ElementName=TextBoxName}" Margin="10"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
index 29eb161a..1ab2917f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/GridDemoCtl.xaml
@@ -6,7 +6,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
-    <ScrollViewer>
+    <hc:ScrollViewer IsInertiaEnabled="True">
         <StackPanel Margin="32">
             <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.BasicLayout}}" Style="{StaticResource TextBlockLargeBold}" HorizontalAlignment="Left"/>
             <hc:Row Margin="0,20,0,0">
@@ -154,5 +154,5 @@
                 </hc:Col>
             </hc:Row>
         </StackPanel>
-    </ScrollViewer>
+    </hc:ScrollViewer>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml
index 75ee0588..bf300da0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBlockDemoCtl.xaml
@@ -4,17 +4,19 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <UniformGrid Rows="3" Columns="4" Margin="32">
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="0" EndColumn="7" EndRow="0" Width="110" Height="128" IsPlaying="True"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="1" EndColumn="7" EndRow="1" Width="110" Height="128" IsPlaying="True"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="2" EndColumn="7" EndRow="2" Width="110" Height="128" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="3" EndColumn="7" EndRow="3" Width="110" Height="128" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.1" Columns="8" Rows="10" StartColumn="0" StartRow="4" EndColumn="7" EndRow="4" Width="110" Height="128" IsPlaying="True"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="5" EndColumn="7" EndRow="5" Width="110" Height="128" IsPlaying="True"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="6" EndColumn="7" EndRow="6" Width="110" Height="128" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.1" Columns="8" Rows="10" StartColumn="0" StartRow="7" EndColumn="7" EndRow="7" Width="110" Height="128" IsPlaying="True"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="8" EndColumn="7" EndRow="8" Width="110" Height="128" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
-            <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="9" EndColumn="7" EndRow="9" Width="110" Height="128" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
-        </UniformGrid>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" ChildWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center" ItemWidth="110" ItemHeight="128">
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="0" EndColumn="7" EndRow="0" IsPlaying="True"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="1" EndColumn="7" EndRow="1" IsPlaying="True"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="2" EndColumn="7" EndRow="2" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="3" EndColumn="7" EndRow="3" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.1" Columns="8" Rows="10" StartColumn="0" StartRow="4" EndColumn="7" EndRow="4" IsPlaying="True"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="5" EndColumn="7" EndRow="5" IsPlaying="True"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="6" EndColumn="7" EndRow="6" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.1" Columns="8" Rows="10" StartColumn="0" StartRow="7" EndColumn="7" EndRow="7" IsPlaying="True"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="8" EndColumn="7" EndRow="8" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
+                <hc:ImageBlock Source="/HandyControlDemo;component/Resources/Img/Dance.png" Interval="0:0:0.125" Columns="8" Rows="10" StartColumn="0" StartRow="9" EndColumn="7" EndRow="9" IsPlaying="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
index be1672ce..f39b909f 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageBrowserDemoCtl.xaml
@@ -8,7 +8,7 @@
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
         <StackPanel Margin="32">
-            <hc:ImageViewer Background="{DynamicResource SecondaryRegionBrush}" Width="600" Height="330" ImageSource="/HandyControlDemo;component/Resources/Img/1.jpg"/>
+            <hc:ImageViewer Background="{DynamicResource SecondaryRegionBrush}" MaxWidth="600" Height="330" ImageSource="/HandyControlDemo;component/Resources/Img/1.jpg"/>
             <Button Margin="0,32,0,0" Command="{Binding OpenImgCmd}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenImageBrowser}}" Style="{StaticResource ButtonPrimary}" HorizontalAlignment="Center"/>
         </StackPanel>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml
index a08ee288..15d5be6b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ImageSelectorDemoCtl.xaml
@@ -4,13 +4,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <UniformGrid Columns="3" Margin="16">
-            <hc:ImageSelector Width="100" Height="100" Margin="16"/>
-            <hc:ImageSelector Width="100" Height="100" Margin="16" hc:BorderElement.CornerRadius="50"/>
-            <hc:ImageSelector Width="100" Height="100" Margin="16" hc:BorderElement.CornerRadius="50" StrokeDashArray="10,5"/>
-            <hc:ImageSelector Width="100" Height="100" Margin="16" hc:BorderElement.CornerRadius="50" BorderBrush="{DynamicResource SuccessBrush}"/>
-            <hc:ImageSelector Width="100" Height="100" Margin="16" hc:BorderElement.CornerRadius="50" StrokeDashArray="10,5,10" BorderBrush="{DynamicResource DangerBrush}"/>
-            <hc:ImageSelector Width="100" Height="100" Margin="16" hc:BorderElement.CornerRadius="10" StrokeThickness="2" BorderThickness="2" BorderBrush="{DynamicResource PrimaryBrush}"/>
-        </UniformGrid>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" ChildWrapping="Wrap" VerticalAlignment="Center" Spacing="32" HorizontalAlignment="Center">
+                <hc:ImageSelector Width="100" Height="100"/>
+                <hc:ImageSelector Width="100" Height="100" hc:BorderElement.CornerRadius="50"/>
+                <hc:ImageSelector Width="100" Height="100" hc:BorderElement.CornerRadius="50" StrokeDashArray="10,5"/>
+                <hc:ImageSelector Width="100" Height="100" hc:BorderElement.CornerRadius="50" BorderBrush="{DynamicResource SuccessBrush}"/>
+                <hc:ImageSelector Width="100" Height="100" hc:BorderElement.CornerRadius="50" StrokeDashArray="10,5,10" BorderBrush="{DynamicResource DangerBrush}"/>
+                <hc:ImageSelector Width="100" Height="100" hc:BorderElement.CornerRadius="10" StrokeThickness="2" BorderThickness="2" BorderBrush="{DynamicResource PrimaryBrush}"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml
index 4851dca1..ba0c5059 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/MagnifierDemoCtl.xaml
@@ -4,14 +4,16 @@
              Background="{DynamicResource RegionBrush}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="16">
-            <Image Margin="16" hc:Magnifier.Instance="{x:Static hc:Magnifier.Default}" Source="/HandyControlDemo;component/Resources/Img/b1.jpg" Stretch="None" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel ChildWrapping="Wrap" Spacing="32" Margin="32">
+                <Image hc:Magnifier.Instance="{x:Static hc:Magnifier.Default}" Source="/HandyControlDemo;component/Resources/Img/b1.jpg" Stretch="None" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
 
-            <Image Margin="16" Source="/HandyControlDemo;component/Resources/Img/b1.jpg" Stretch="None" RenderOptions.BitmapScalingMode="NearestNeighbor">
-                <hc:Magnifier.Instance>
-                    <hc:Magnifier Scale="6" HorizontalOffset="-16" VerticalOffset="-16"/>
-                </hc:Magnifier.Instance>
-            </Image>
-        </WrapPanel>
+                <Image Source="/HandyControlDemo;component/Resources/Img/b1.jpg" Stretch="None" RenderOptions.BitmapScalingMode="NearestNeighbor">
+                    <hc:Magnifier.Instance>
+                        <hc:Magnifier Scale="6" HorizontalOffset="-16" VerticalOffset="-16"/>
+                    </hc:Magnifier.Instance>
+                </Image>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
index c7c9cfae..5ddf70dd 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/NumericUpDownDemoCtl.xaml
@@ -8,63 +8,65 @@
              Background="{DynamicResource RegionBrush}"
              DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <hc:NumericUpDown Maximum="100"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:NumericUpDown Maximum="100"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True"/>
 
-                <hc:NumericUpDown hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend}"/>
-                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend}"/>
-                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
-                <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}">
-                    <hc:NumericUpDown.Value>
-                        <Binding Path="DoubleValue1" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <tools:NumericUpDownDemoRule/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:NumericUpDown.Value>
-                </hc:NumericUpDown>
-                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus}"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus}"/>
+                    <hc:NumericUpDown hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend}"/>
+                    <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend}"/>
+                    <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" Margin="0,32,0,0"/>
+                    <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus}">
+                        <hc:NumericUpDown.Value>
+                            <Binding Path="DoubleValue1" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <tools:NumericUpDownDemoRule/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:NumericUpDown.Value>
+                    </hc:NumericUpDown>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus}"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus}"/>
 
-                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
-                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus}"/>
-                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" Margin="0,32,0,0"/>
-                <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:NumericUpDown Maximum="100" Style="{StaticResource NumericUpDown.Small}"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDown.Small}"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDown.Small}"/>
+                    <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus}"/>
+                    <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus}"/>
+                    <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" Margin="0,32,0,0"/>
+                    <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:NumericUpDown Maximum="100" Style="{StaticResource NumericUpDown.Small}"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDown.Small}"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDown.Small}"/>
 
-                <hc:NumericUpDown hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend.Small}"/>
-                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend.Small}"/>
-                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" Margin="0,32,0,0"/>
-                <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus.Small}">
-                    <hc:NumericUpDown.Value>
-                        <Binding Path="DoubleValue2" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <tools:NumericUpDownDemoRule/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:NumericUpDown.Value>
-                </hc:NumericUpDown>
-                <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus.Small}"/>
-                <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                    <hc:NumericUpDown hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownExtend.Small}"/>
+                    <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownExtend.Small}"/>
+                    <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" Margin="0,32,0,0"/>
+                    <hc:NumericUpDown ValueFormat="N2" Maximum="100000" Value="10000" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" Style="{StaticResource NumericUpDownPlus.Small}">
+                        <hc:NumericUpDown.Value>
+                            <Binding Path="DoubleValue2" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <tools:NumericUpDownDemoRule/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:NumericUpDown.Value>
+                    </hc:NumericUpDown>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                    <hc:NumericUpDown Margin="0,32,0,0" IsReadOnly="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
 
-                <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus.Small}"/>
-                <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
-                <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" Margin="0,32,0,0"/>
-                <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <hc:NumericUpDown hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                    <hc:NumericUpDown hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource NumericUpDownPlus.Small}"/>
+                    <hc:NumericUpDown Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" Margin="0,32,0,0"/>
+                    <hc:NumericUpDown DecimalPlaces="2" hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource NumericUpDownPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
index 1d93bf32..d8ba610b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/OutlineTextDemoCtl.xaml
@@ -6,14 +6,16 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Width="400">
-            <hc:OutlineText TextWrapping="Wrap" Fill="{DynamicResource PrimaryTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=20}"/>
-            <hc:OutlineText Margin="0,10,0,0" FontSize="30" Fill="{DynamicResource SuccessBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
-            <hc:OutlineText Margin="0,10,0,0" Fill="{DynamicResource PrimaryTextBrush}" FontSize="30" FontStyle="Italic" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
-            <hc:OutlineText Margin="0,10,0,0" TextWrapping="Wrap" TextTrimming="CharacterEllipsis" FontSize="50" StrokeThickness="2" Fill="{DynamicResource DangerBrush}" Stroke="{DynamicResource PrimaryBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-            <hc:OutlineText Margin="0,10,0,0" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-            <hc:OutlineText Margin="0,10,0,0" StrokePosition="Outside" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-            <hc:OutlineText Margin="0,10,0,0" StrokePosition="InSide" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <StackPanel Margin="32" Width="400">
+                <hc:OutlineText TextWrapping="Wrap" Fill="{DynamicResource PrimaryTextBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=20}"/>
+                <hc:OutlineText FontSize="30" Fill="{DynamicResource SuccessBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
+                <hc:OutlineText Fill="{DynamicResource PrimaryTextBrush}" FontSize="30" FontStyle="Italic" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=8}"/>
+                <hc:OutlineText TextWrapping="Wrap" TextTrimming="CharacterEllipsis" FontSize="50" StrokeThickness="2" Fill="{DynamicResource DangerBrush}" Stroke="{DynamicResource PrimaryBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+                <hc:OutlineText FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+                <hc:OutlineText StrokePosition="Outside" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+                <hc:OutlineText StrokePosition="InSide" FontSize="80" FontWeight="Bold" StrokeThickness="4" Fill="{DynamicResource PrimaryBrush}" Stroke="{DynamicResource DangerBrush}" Text="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+            </StackPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
index 2bf36b55..d5c3ba2b 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PaginationDemoCtl.xaml
@@ -19,7 +19,7 @@
                     </hc:EventTrigger>
                 </hc:Interaction.Triggers>
             </hc:Pagination>
-            <DataGrid IsReadOnly="True" Width="600" Margin="0,16,0,0" Grid.Row="1" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
+            <DataGrid IsReadOnly="True" MaxWidth="600" Margin="0,16,0,0" Grid.Row="1" HeadersVisibility="All" RowHeaderWidth="60" AutoGenerateColumns="False" ItemsSource="{Binding DataList}">
                 <DataGrid.RowHeaderTemplate>
                     <DataTemplate>
                         <CheckBox IsChecked="{Binding IsSelected,RelativeSource={RelativeSource AncestorType=DataGridRow}}"/>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
index 1d2a0bd5..0059b3cc 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PasswordBoxDemoCtl.xaml
@@ -6,29 +6,31 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <hc:PasswordBox Name="PasswordBoxDemo" ShowClearButton="True" Password="123456" IsSafeEnabled="False"/>
-                <TextBox Text="{Binding UnsafePassword,ElementName=PasswordBoxDemo,UpdateSourceTrigger=PropertyChanged}" Margin="0,6,0,0"/>
-                <hc:PasswordBox Password="123456" Margin="0,16,0,0"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:PasswordBox Name="PasswordBoxDemo" ShowClearButton="True" Password="123456" IsSafeEnabled="False"/>
+                    <TextBox Text="{Binding UnsafePassword,ElementName=PasswordBoxDemo,UpdateSourceTrigger=PropertyChanged}" Margin="0,6,0,0"/>
+                    <hc:PasswordBox Password="123456" Margin="0,16,0,0"/>
 
-                <hc:PasswordBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0"/>
-                <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                    <hc:PasswordBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0"/>
+                    <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
 
-                <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Password="123456"/>
-                <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:PasswordBox Name="PasswordBoxDemoSmall" ShowClearButton="True" Password="123456" IsSafeEnabled="False" Style="{StaticResource PasswordBoxPlus.Small}"/>
-                <TextBox Text="{Binding UnsafePassword,ElementName=PasswordBoxDemoSmall,UpdateSourceTrigger=PropertyChanged}" Margin="0,6,0,0"/>
-                <hc:PasswordBox Password="123456" Margin="0,16,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                    <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Password="123456"/>
+                    <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:PasswordBox Name="PasswordBoxDemoSmall" ShowClearButton="True" Password="123456" IsSafeEnabled="False" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                    <TextBox Text="{Binding UnsafePassword,ElementName=PasswordBoxDemoSmall,UpdateSourceTrigger=PropertyChanged}" Margin="0,6,0,0"/>
+                    <hc:PasswordBox Password="123456" Margin="0,16,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
 
-                <hc:PasswordBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
-                <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                    <hc:PasswordBox ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Password="123456" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                    <hc:PasswordBox ShowEyeButton="True" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
 
-                <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Password="123456" Style="{StaticResource PasswordBoxPlus.Small}"/>
-                <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <hc:PasswordBox ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Password="123456" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                    <hc:PasswordBox ShowClearButton="True" ShowEyeButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,32,0,0" Style="{StaticResource PasswordBoxPlus.Small}"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
index 0f9947ce..ab9e5ff0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/PoptipDemoCtl.xaml
@@ -10,14 +10,12 @@
         <Style x:Key="Button4PoptipStyle" BasedOn="{StaticResource {x:Type Button}}" TargetType="Button">
             <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
             <Setter Property="Height" Value="40"/>
-            <Setter Property="MinWidth" Value="100"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={ex:Lang Key={x:Static langs:LangKeys.PoptipPositionStr}}}"/>
         </Style>
         <Style x:Key="ToggleButton4PoptipStyle" BasedOn="{StaticResource {x:Type ToggleButton}}" TargetType="ToggleButton">
             <Setter Property="Width" Value="{x:Static system:Double.NaN}"/>
             <Setter Property="Height" Value="40"/>
-            <Setter Property="MinWidth" Value="100"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="Content" Value="{Binding Tag,RelativeSource={RelativeSource Self},Converter={StaticResource Int2StringConverter},ConverterParameter={ex:Lang Key={x:Static langs:LangKeys.PoptipPositionStr}}}"/>
         </Style>
@@ -35,12 +33,12 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <UniformGrid Grid.Column="1" Columns="3">
-                <Button Margin="8,0" Tag="0" Style="{StaticResource Button4PoptipStyle}">
+                <Button Margin="8,0" Tag="TopLeft" Style="{StaticResource Button4PoptipStyle}">
                     <hc:Poptip.Instance>
                         <hc:Poptip Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" PlacementType="TopLeft"/>
                     </hc:Poptip.Instance>
                 </Button>
-                <Button Margin="8,0" Tag="1" Style="{StaticResource Button4PoptipStyle}">
+                <Button Margin="8,0" Tag="Top" Style="{StaticResource Button4PoptipStyle}">
                     <hc:Poptip.Instance>
                         <hc:Poptip PlacementType="Top">
                             <hc:Poptip.Content>
@@ -49,11 +47,11 @@
                         </hc:Poptip>
                     </hc:Poptip.Instance>
                 </Button>
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="TopRight" Margin="8,0" Tag="2" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="TopRight" Margin="8,0" Tag="TopRight" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Row="1" Grid.Column="2" Rows="3">
-                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="RightTop" Margin="8,16" Tag="3" Style="{StaticResource ToggleButton4PoptipStyle}"/>
-                <ToggleButton Margin="8,16" Tag="4" Style="{StaticResource ToggleButton4PoptipStyle}">
+                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="RightTop" Margin="8,16" Tag="RightTop" Style="{StaticResource ToggleButton4PoptipStyle}"/>
+                <ToggleButton Margin="8,16" Tag="Right" Style="{StaticResource ToggleButton4PoptipStyle}">
                     <hc:Poptip.Instance>
                         <hc:Poptip Background="Transparent" Padding="0" BorderThickness="0" HitMode="None" PlacementType="Right" IsOpen="{Binding Target.IsChecked,RelativeSource={RelativeSource Self}}">
                             <hc:Poptip.Content>
@@ -62,17 +60,17 @@
                         </hc:Poptip>
                     </hc:Poptip.Instance>
                 </ToggleButton>
-                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="RightBottom" Margin="8,16" Tag="5" Style="{StaticResource ToggleButton4PoptipStyle}"/>
+                <ToggleButton hc:Poptip.HitMode="None" hc:Poptip.IsOpen="{Binding IsChecked,RelativeSource={RelativeSource Self}}" hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="RightBottom" Margin="8,16" Tag="RightBottom" Style="{StaticResource ToggleButton4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Column="1" Grid.Row="2" Columns="3">
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="BottomLeft" Margin="8,0" Tag="8" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="Bottom" Margin="8,0" Tag="7" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="BottomRight" Margin="8,0" Tag="6" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="BottomLeft" Margin="8,0" Tag="BottomLeft" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="Bottom" Margin="8,0" Tag="Bottom" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="BottomRight" Margin="8,0" Tag="BottomRight" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
             <UniformGrid Grid.Row="1" Grid.Column="0" Rows="3">
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="LeftTop" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="11" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="Left" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="10" Style="{StaticResource Button4PoptipStyle}"/>
-                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="LeftBottom" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="9" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="LeftTop" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="LeftTop" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="Left" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="Left" Style="{StaticResource Button4PoptipStyle}"/>
+                <Button hc:Poptip.Content="{ex:Lang Key={x:Static langs:LangKeys.Text}}" hc:Poptip.Placement="LeftBottom" hc:Poptip.HitMode="Focus" Margin="8,16" Tag="LeftBottom" Style="{StaticResource Button4PoptipStyle}"/>
             </UniformGrid>
         </Grid>
     </hc:TransitioningContentControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
index 00aae1f9..32a3b95d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ProgressButtonDemoCtl.xaml
@@ -5,23 +5,25 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <WrapPanel Margin="16" VerticalAlignment="Center">
-            <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
-                <hc:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <hc:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            </StackPanel>
-            <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
-                <ToggleButton Style="{StaticResource ToggleButtonLoading}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-                <ToggleButton Style="{StaticResource ToggleButtonLoadingDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
-            </StackPanel>
-        </WrapPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <WrapPanel Margin="16" VerticalAlignment="Center">
+                <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
+                    <hc:ProgressButton IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <hc:ProgressButton Style="{StaticResource ProgressButtonPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <hc:ProgressButton Style="{StaticResource ProgressButtonSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <hc:ProgressButton Style="{StaticResource ProgressButtonInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <hc:ProgressButton Style="{StaticResource ProgressButtonWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <hc:ProgressButton Style="{StaticResource ProgressButtonDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Progress="{Binding Progress}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                </StackPanel>
+                <StackPanel Margin="16" Button.Click="ButtonProgress_OnClick">
+                    <ToggleButton Style="{StaticResource ToggleButtonLoading}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonLoadingPrimary}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonLoadingSuccess}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonLoadingInfo}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonLoadingWarning}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                    <ToggleButton Style="{StaticResource ToggleButtonLoadingDanger}" IsChecked="{Binding IsUploading,Mode=TwoWay}" Content="{Binding IsChecked,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2StringConverter},ConverterParameter={x:Static langs:Lang.UploadStr}}" Width="180" Margin="5"/>
+                </StackPanel>
+            </WrapPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
index 8f4f3b99..3cc98cd0 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RangeSliderDemoCtl.xaml
@@ -4,19 +4,21 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <StackPanel>
-                <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueStart="2" ValueEnd="8"/>
-                <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueEnd="3" Margin="0,32,0,0" IsEnabled="False"/>
-                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="0,32,0,0"/>
-                <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel Margin="32,0,0,0" Orientation="Horizontal">
-                <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="8" Orientation="Vertical"/>
-                <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="3" Margin="32,0,0,0" IsEnabled="False" Orientation="Vertical"/>
-                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Margin="32,0,0,0" Orientation="Vertical"/>
-                <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both" Margin="32,0" Orientation="Vertical"/>
-            </StackPanel>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="32">
+                <hc:UniformSpacingPanel Orientation="Vertical" Spacing="32">
+                    <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueStart="2" ValueEnd="8"/>
+                    <hc:RangeSlider Width="400" IsSnapToTickEnabled="True" ValueEnd="3" IsEnabled="False"/>
+                    <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Top" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight"/>
+                    <hc:RangeSlider Width="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Bottom" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both"/>
+                </hc:UniformSpacingPanel>
+                <hc:UniformSpacingPanel Spacing="32">
+                    <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="8" Orientation="Vertical"/>
+                    <hc:RangeSlider Height="400" IsSnapToTickEnabled="True" ValueEnd="3" IsEnabled="False" Orientation="Vertical"/>
+                    <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Right" IsSnapToTickEnabled="True" Maximum="100" ValueEnd="60" TickFrequency="10" TickPlacement="BottomRight" Orientation="Vertical"/>
+                    <hc:RangeSlider Height="400" hc:TipElement.Visibility="Visible" hc:TipElement.Placement="Left" hc:TipElement.StringFormat="#0.00" ValueEnd="5" TickPlacement="Both" Orientation="Vertical"/>
+                </hc:UniformSpacingPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
index 87ca8eca..0e049bd1 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RelativePanelDemoCtl.xaml
@@ -4,58 +4,60 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:RelativePanel Width="620" Height="700" Margin="32">
-            <Border Name="Rect1" Background="{DynamicResource DangerBrush}" Height="50" Width="50">
-                <TextBlock Text="Rect1" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect2" Background="{DynamicResource PrimaryBrush}" Height="50" Width="50" hc:RelativePanel.AlignHorizontalCenterWithPanel="True">
-                <TextBlock Text="Rect2" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect3" Background="{DynamicResource SuccessBrush}" Height="50" Width="50" hc:RelativePanel.AlignRightWithPanel="True">
-                <TextBlock Text="Rect3" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect4" Background="{DynamicResource DangerBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True">
-                <TextBlock Text="Rect4" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect5" Background="{DynamicResource PrimaryBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True" hc:RelativePanel.AlignHorizontalCenterWithPanel="True">
-                <TextBlock Text="Rect5" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect6" Background="{DynamicResource SuccessBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True" hc:RelativePanel.AlignRightWithPanel="True">
-                <TextBlock Text="Rect6" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect7" Background="{DynamicResource PrimaryBrush}" Height="50" hc:RelativePanel.RightOf="{Binding ElementName=Rect1}">
-                <TextBlock Text="Rect7 (RightOf Rect1)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect8" Background="{DynamicResource SuccessBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect7}">
-                <TextBlock Text="Rect8 (Below Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect9" Background="{DynamicResource PrimaryBrush}" Height="140" Width="460" hc:RelativePanel.AlignHorizontalCenterWithPanel="True" hc:RelativePanel.AlignVerticalCenterWithPanel="True">
-                <TextBlock Text="Rect9" Padding="10" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top"/>
-            </Border>
-            <Border Name="Rect10" Background="{DynamicResource DangerBrush}" Width="50" hc:RelativePanel.RightOf="{Binding ElementName=Rect9}" hc:RelativePanel.AlignVerticalCenterWith="{Binding ElementName=Rect9}">
-                <TextBlock Text="Rect14 (RightOf Rect9, AlignVerticalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <TextBlock.LayoutTransform>
-                        <TransformGroup>
-                            <RotateTransform Angle="-90"/>
-                        </TransformGroup>
-                    </TextBlock.LayoutTransform>
-                </TextBlock>
-            </Border>
-            <Border Name="Rect11" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.AlignBottomWith="{Binding ElementName=Rect9}" hc:RelativePanel.AlignHorizontalCenterWith="{Binding ElementName=Rect9}">
-                <TextBlock Text="Rect11 (AlignBottomWith Rect9, AlignHorizontalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect12" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect8}" hc:RelativePanel.AlignLeftWith="{Binding ElementName=Rect7}">
-                <TextBlock Text="Rect12 (Below Rect8, AlignLeftWith Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect13" Background="{DynamicResource PrimaryBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect12}" hc:RelativePanel.AlignRightWith="{Binding ElementName=Rect12}">
-                <TextBlock Text="Rect13 (Below Rect12, AlignRightWith Rect12)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect14" Background="{DynamicResource SuccessBrush}" Height="50" hc:RelativePanel.Above="{Binding ElementName=Rect9}" hc:RelativePanel.AlignRightWith="{Binding ElementName=Rect9}">
-                <TextBlock Text="Rect14 (Above Rect9, AlignRightWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-            <Border Name="Rect15" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.LeftOf="{Binding ElementName=Rect2}" hc:RelativePanel.AlignTopWith="{Binding ElementName=Rect9}">
-                <TextBlock Text="Rect15 (LeftOf Rect2, AlignTopWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            </Border>
-        </hc:RelativePanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:RelativePanel Width="620" Height="700" Margin="32">
+                <Border Name="Rect1" Background="{DynamicResource DangerBrush}" Height="50" Width="50">
+                    <TextBlock Text="Rect1" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect2" Background="{DynamicResource PrimaryBrush}" Height="50" Width="50" hc:RelativePanel.AlignHorizontalCenterWithPanel="True">
+                    <TextBlock Text="Rect2" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect3" Background="{DynamicResource SuccessBrush}" Height="50" Width="50" hc:RelativePanel.AlignRightWithPanel="True">
+                    <TextBlock Text="Rect3" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect4" Background="{DynamicResource DangerBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True">
+                    <TextBlock Text="Rect4" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect5" Background="{DynamicResource PrimaryBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True" hc:RelativePanel.AlignHorizontalCenterWithPanel="True">
+                    <TextBlock Text="Rect5" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect6" Background="{DynamicResource SuccessBrush}" Height="50" Width="50" hc:RelativePanel.AlignBottomWithPanel="True" hc:RelativePanel.AlignRightWithPanel="True">
+                    <TextBlock Text="Rect6" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect7" Background="{DynamicResource PrimaryBrush}" Height="50" hc:RelativePanel.RightOf="{Binding ElementName=Rect1}">
+                    <TextBlock Text="Rect7 (RightOf Rect1)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect8" Background="{DynamicResource SuccessBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect7}">
+                    <TextBlock Text="Rect8 (Below Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect9" Background="{DynamicResource PrimaryBrush}" Height="140" Width="460" hc:RelativePanel.AlignHorizontalCenterWithPanel="True" hc:RelativePanel.AlignVerticalCenterWithPanel="True">
+                    <TextBlock Text="Rect9" Padding="10" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+                </Border>
+                <Border Name="Rect10" Background="{DynamicResource DangerBrush}" Width="50" hc:RelativePanel.RightOf="{Binding ElementName=Rect9}" hc:RelativePanel.AlignVerticalCenterWith="{Binding ElementName=Rect9}">
+                    <TextBlock Text="Rect14 (RightOf Rect9, AlignVerticalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock.LayoutTransform>
+                            <TransformGroup>
+                                <RotateTransform Angle="-90"/>
+                            </TransformGroup>
+                        </TextBlock.LayoutTransform>
+                    </TextBlock>
+                </Border>
+                <Border Name="Rect11" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.AlignBottomWith="{Binding ElementName=Rect9}" hc:RelativePanel.AlignHorizontalCenterWith="{Binding ElementName=Rect9}">
+                    <TextBlock Text="Rect11 (AlignBottomWith Rect9, AlignHorizontalCenterWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect12" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect8}" hc:RelativePanel.AlignLeftWith="{Binding ElementName=Rect7}">
+                    <TextBlock Text="Rect12 (Below Rect8, AlignLeftWith Rect7)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect13" Background="{DynamicResource PrimaryBrush}" Height="50" hc:RelativePanel.Below="{Binding ElementName=Rect12}" hc:RelativePanel.AlignRightWith="{Binding ElementName=Rect12}">
+                    <TextBlock Text="Rect13 (Below Rect12, AlignRightWith Rect12)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect14" Background="{DynamicResource SuccessBrush}" Height="50" hc:RelativePanel.Above="{Binding ElementName=Rect9}" hc:RelativePanel.AlignRightWith="{Binding ElementName=Rect9}">
+                    <TextBlock Text="Rect14 (Above Rect9, AlignRightWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+                <Border Name="Rect15" Background="{DynamicResource DangerBrush}" Height="50" hc:RelativePanel.LeftOf="{Binding ElementName=Rect2}" hc:RelativePanel.AlignTopWith="{Binding ElementName=Rect9}">
+                    <TextBlock Text="Rect15 (LeftOf Rect2, AlignTopWith Rect9)" Padding="10,0" Foreground="White" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </Border>
+            </hc:RelativePanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml
index 74fc67f7..be53f250 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/RunningBlockDemoCtl.xaml
@@ -6,31 +6,33 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" VerticalAlignment="Center">
-            <hc:RunningBlock Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-            <hc:RunningBlock Runaway="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
-            <hc:RunningBlock HorizontalAlignment="Left" Width="500" Speed="50" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
-            <hc:RunningBlock HorizontalAlignment="Left" Width="300" FontSize="30" Speed="50" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
-            <hc:RunningBlock HorizontalAlignment="Left" AutoRun="True" Width="100" Runaway="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Duration="0:0:2" Margin="0,16,0,0"/>
-            <hc:RunningBlock HorizontalAlignment="Left" AutoReverse="True" AutoRun="True" Width="100" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
-            <hc:RunningBlock HorizontalAlignment="Left" AutoRun="True" Width="200" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
-            <hc:RunningBlock Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:10" Margin="0,16,0,0"/>
-            <hc:RunningBlock AutoReverse="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:10" Margin="0,16,0,0"/>
-            <hc:RunningBlock Orientation="Vertical" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:4" Margin="0,16,0,0"/>
-            <hc:RunningBlock Margin="0,16,0,0" Duration="0:0:20" IsRunning="{Binding IsMouseOver,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2BooleanReConverter}}">
-                <StackPanel Orientation="Horizontal">
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/1.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/2.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/3.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/4.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/5.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/6.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/7.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/8.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/9.gif" Margin="10,0" Width="30" Height="30"/>
-                    <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/10.gif" Margin="10,0" Width="30" Height="30"/>
-                </StackPanel>
-            </hc:RunningBlock>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <StackPanel Margin="32" VerticalAlignment="Center">
+                <hc:RunningBlock Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+                <hc:RunningBlock Runaway="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
+                <hc:RunningBlock HorizontalAlignment="Left" Width="500" Speed="50" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
+                <hc:RunningBlock HorizontalAlignment="Left" Width="300" FontSize="30" Speed="50" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
+                <hc:RunningBlock HorizontalAlignment="Left" AutoRun="True" Width="100" Runaway="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Duration="0:0:2" Margin="0,16,0,0"/>
+                <hc:RunningBlock HorizontalAlignment="Left" AutoReverse="True" AutoRun="True" Width="100" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
+                <hc:RunningBlock HorizontalAlignment="Left" AutoRun="True" Width="200" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}" Margin="0,16,0,0"/>
+                <hc:RunningBlock Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:10" Margin="0,16,0,0"/>
+                <hc:RunningBlock AutoReverse="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:10" Margin="0,16,0,0"/>
+                <hc:RunningBlock Orientation="Vertical" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=10}" FontSize="20" FontWeight="Bold" Foreground="OrangeRed" Duration="0:0:4" Margin="0,16,0,0"/>
+                <hc:RunningBlock Margin="0,16,0,0" Duration="0:0:20" IsRunning="{Binding IsMouseOver,RelativeSource={RelativeSource Self},Converter={StaticResource Boolean2BooleanReConverter}}">
+                    <StackPanel Orientation="Horizontal">
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/1.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/2.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/3.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/4.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/5.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/6.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/7.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/8.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/9.gif" Margin="10,0" Width="30" Height="30"/>
+                        <hc:GifImage Uri="/HandyControlDemo;component/Resources/Img/QQ/10.gif" Margin="10,0" Width="30" Height="30"/>
+                    </StackPanel>
+                </hc:RunningBlock>
+            </StackPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
index 08918f62..50371526 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/ScrollViewerDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}"
-             Width="550"
+             MaxWidth="550"
              Height="600">
     <hc:TransitioningContentControl>
         <Grid Margin="32">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
index 9307a54c..7930304c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/SearchBarDemoCtl.xaml
@@ -7,59 +7,61 @@
              DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
-                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}"/>
+                    <hc:SearchBar Margin="0,32,0,0" IsEnabled="False"/>
 
-                <hc:SearchBar hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend}"/>
-                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend}"/>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" Margin="0,32,0,0"/>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
-                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus}"/>
+                    <hc:SearchBar hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend}"/>
+                    <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend}"/>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" Margin="0,32,0,0"/>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus}"/>
+                    <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus}"/>
 
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
-                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}">
-                    <hc:SearchBar.Text>
-                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <hc:RegexRule Type="Mail"/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:SearchBar.Text>
-                </hc:SearchBar>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" Margin="0,32,0,0"/>
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}" Style="{StaticResource SearchBar.Small}"/>
-                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBar.Small}"/>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus}"/>
+                    <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus}">
+                        <hc:SearchBar.Text>
+                            <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <hc:RegexRule Type="Mail"/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:SearchBar.Text>
+                    </hc:SearchBar>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" Margin="0,32,0,0"/>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:SearchBar Command="{Binding SearchCmd}" CommandParameter="{Binding Text,RelativeSource={RelativeSource Self}}" Style="{StaticResource SearchBar.Small}"/>
+                    <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBar.Small}"/>
 
-                <hc:SearchBar hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend.Small}"/>
-                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend.Small}"/>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" Margin="0,32,0,0"/>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus.Small}"/>
-                <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus.Small}"/>
+                    <hc:SearchBar hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarExtend.Small}"/>
+                    <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarExtend.Small}"/>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" Margin="0,32,0,0"/>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarExtend.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" Style="{StaticResource SearchBarPlus.Small}"/>
+                    <hc:SearchBar Margin="0,32,0,0" IsEnabled="False" Style="{StaticResource SearchBarPlus.Small}"/>
 
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus.Small}"/>
-                <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus.Small}">
-                    <hc:SearchBar.Text>
-                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <hc:RegexRule Type="Mail"/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:SearchBar.Text>
-                </hc:SearchBar>
-                <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" Margin="0,32,0,0"/>
-                <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Style="{StaticResource SearchBarPlus.Small}"/>
+                    <hc:SearchBar hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" hc:InfoElement.Necessary="True" Style="{StaticResource SearchBarPlus.Small}">
+                        <hc:SearchBar.Text>
+                            <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <hc:RegexRule Type="Mail"/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:SearchBar.Text>
+                    </hc:SearchBar>
+                    <hc:SearchBar Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" Margin="0,32,0,0"/>
+                    <hc:SearchBar hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource SearchBarPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,32,0,0"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
index 98f7378d..78c93a18 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TabControlDemoCtl.xaml
@@ -5,7 +5,7 @@
              DataContext="{Binding TabControlDemo,Source={StaticResource Locator}}"
              xmlns:hc="https://handyorg.github.io/handycontrol">
     <hc:TransitioningContentControl>
-        <hc:ScrollViewer HorizontalScrollBarVisibility="Auto">
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:Interaction.Triggers>
                 <hc:RoutedEventTrigger RoutedEvent="hc:TabItem.Closing">
                     <hc:EventToCommand Command="{Binding ClosingCmd}" PassEventArgsToCommand="True" />
@@ -14,9 +14,13 @@
                     <hc:EventToCommand Command="{Binding ClosedCmd}" PassEventArgsToCommand="True" />
                 </hc:RoutedEventTrigger>
             </hc:Interaction.Triggers>
-            <StackPanel>
-                <Label Style="{StaticResource LabelPrimary}" Content="Default" Margin="32,32,0,0" HorizontalAlignment="Left"/>
-                <hc:TabControl ShowOverflowButton="False" ShowScrollButton="True" Margin="32,16,32,0" Width="800" Height="300" IsScrollable="True">
+            <Grid Margin="32">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <hc:TabControl ShowOverflowButton="False" ShowScrollButton="True" MaxWidth="800" Height="300" IsScrollable="True">
                     <hc:TabItem Header="TabItem1" IsSelected="True">
                         <hc:SimplePanel Background="{DynamicResource RegionBrush}"/>
                     </hc:TabItem>
@@ -39,13 +43,7 @@
                         <hc:SimplePanel Background="{DynamicResource DarkAccentBrush}"/>
                     </hc:TabItem>
                 </hc:TabControl>
-                <StackPanel Orientation="Horizontal" Margin="32,32,32,16">
-                    <Label Style="{StaticResource LabelPrimary}" Margin="0" Content="IsTabFillEnabled = True"/>
-                    <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="ShowCloseButton = True"/>
-                    <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsDraggable = True"/>
-                    <Label Style="{StaticResource LabelPrimary}" Margin="16,0,0,0" Content="IsAnimationEnabled = True"/>
-                </StackPanel>
-                <hc:TabControl x:Name="TabControlDemo" IsAnimationEnabled="True" ShowCloseButton="True" IsDraggable="True" IsTabFillEnabled="True" Margin="32,0,32,32" Width="800" Height="300">
+                <hc:TabControl Grid.Row="1" x:Name="TabControlDemo" Margin="0,32,0,0" IsAnimationEnabled="True" ShowCloseButton="True" IsDraggable="True" IsTabFillEnabled="True" MaxWidth="800" Height="300">
                     <hc:TabItem Header="TabItem1" hc:IconElement.Height="16" hc:IconElement.Width="16" hc:IconElement.Geometry="{StaticResource ConfigGeometry}">
                         <hc:SimplePanel Background="{DynamicResource RegionBrush}"/>
                     </hc:TabItem>
@@ -68,7 +66,7 @@
                         <hc:SimplePanel Background="#FFE8E03F"/>
                     </hc:TabItem>
                 </hc:TabControl>
-                <hc:TabControl IsAnimationEnabled="True" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" Width="800" Height="300">
+                <hc:TabControl Grid.Row="2" IsAnimationEnabled="True" Margin="0,32,0,0" ShowCloseButton="True" IsDraggable="True" ItemsSource="{Binding DataList}" MaxWidth="800" Height="300">
                     <TabControl.ItemTemplate>
                         <DataTemplate>
                             <TextBlock Text="{Binding Header}"/>
@@ -80,7 +78,7 @@
                         </DataTemplate>
                     </TabControl.ContentTemplate>
                 </hc:TabControl>
-            </StackPanel>
+            </Grid>
         </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
index d1744bb2..4c8b5bf5 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TagDemoCtl.xaml
@@ -14,32 +14,34 @@
         </Style>
     </UserControl.Resources>
     <hc:TransitioningContentControl>
-        <StackPanel Margin="11">
-            <hc:TagContainer Name="Container1" Margin="11" Width="420" Padding="5">
-                <hc:Tag Header="H" hc:TitleElement.Background="{DynamicResource PrimaryBrush}" Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
-                <hc:Tag Margin="5" Selectable="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
-                <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-                <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-                <hc:Tag Margin="5" IsSelected="True" Selectable="True" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-                <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
-                <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}">
-                    <hc:Tag.Header>
-                        <Image Source="/Resources/Img/Album/1.jpg"/>
-                    </hc:Tag.Header>
-                </hc:Tag>
-                <hc:Tag Margin="5" IsSelected="True" Selectable="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}">
-                    <hc:Tag.Header>
-                        <Image Source="/Resources/Img/Avatar/avatar2.png"/>
-                    </hc:Tag.Header>
-                </hc:Tag>
-                <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
-                <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
-            </hc:TagContainer>
-            <hc:TagContainer ItemContainerStyle="{StaticResource TagCustomStyle}" Margin="11" Width="420" Padding="5" ItemsSource="{Binding DataList}"/>
-            <DockPanel LastChildFill="True" Margin="11,0,11,11">
-                <Button Command="{Binding AddItemCmd}" Margin="10,0,0,0" DockPanel.Dock="Right" Content="{ex:Lang Key={x:Static langs:LangKeys.AddItem}}"/>
-                <TextBox Text="{Binding TagName}"/>
-            </DockPanel>
-        </StackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <StackPanel Margin="11">
+                <hc:TagContainer Name="Container1" Margin="11" MaxWidth="420" Padding="5">
+                    <hc:Tag Header="H" hc:TitleElement.Background="{DynamicResource PrimaryBrush}" Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}"/>
+                    <hc:Tag Margin="5" Selectable="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
+                    <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+                    <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+                    <hc:Tag Margin="5" IsSelected="True" Selectable="True" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+                    <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}"/>
+                    <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=2}">
+                        <hc:Tag.Header>
+                            <Image Source="/Resources/Img/Album/1.jpg"/>
+                        </hc:Tag.Header>
+                    </hc:Tag>
+                    <hc:Tag Margin="5" IsSelected="True" Selectable="True" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=3}">
+                        <hc:Tag.Header>
+                            <Image Source="/Resources/Img/Avatar/avatar2.png"/>
+                        </hc:Tag.Header>
+                    </hc:Tag>
+                    <hc:Tag Margin="5" ShowCloseButton="False" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=4}"/>
+                    <hc:Tag Margin="5" Content="{ex:Lang Key={x:Static langs:LangKeys.Text}, Converter={StaticResource StringRepeatConverter}, ConverterParameter=5}"/>
+                </hc:TagContainer>
+                <hc:TagContainer ItemContainerStyle="{StaticResource TagCustomStyle}" Margin="11" MaxWidth="420" Padding="5" ItemsSource="{Binding DataList}"/>
+                <DockPanel LastChildFill="True" Margin="11,0,11,11">
+                    <Button Command="{Binding AddItemCmd}" Margin="10,0,0,0" DockPanel.Dock="Right" Content="{ex:Lang Key={x:Static langs:LangKeys.AddItem}}"/>
+                    <TextBox Text="{Binding TagName}"/>
+                </DockPanel>
+            </StackPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
index 7bac1879..c3d97fee 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TextBoxDemoCtl.xaml
@@ -7,41 +7,43 @@
              xmlns:hc="https://handyorg.github.io/handycontrol"
              DataContext="{Binding InputElementDemo, Source={StaticResource Locator}}">
     <hc:TransitioningContentControl>
-        <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
-            <StackPanel>
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Spacing="32" Margin="32" ChildWrapping="Wrap">
+                <StackPanel>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False"/>
 
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0">
-                    <hc:TextBox.Text>
-                        <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <hc:RegexRule Type="Mail"/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:TextBox.Text>
-                </hc:TextBox>
-                <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
-            </StackPanel>
-            <StackPanel>
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
-                <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TextBoxPlus.Small}"/>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0">
+                        <hc:TextBox.Text>
+                            <Binding Path="Email1" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <hc:RegexRule Type="Mail"/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:TextBox.Text>
+                    </hc:TextBox>
+                    <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
+                </StackPanel>
+                <StackPanel>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
+                    <hc:TextBox Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TextBoxPlus.Small}"/>
 
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
-                <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}">
-                    <hc:TextBox.Text>
-                        <Binding Path="Email2" UpdateSourceTrigger="PropertyChanged">
-                            <Binding.ValidationRules>
-                                <hc:RegexRule Type="Mail"/>
-                            </Binding.ValidationRules>
-                        </Binding>
-                    </hc:TextBox.Text>
-                </hc:TextBox>
-                <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
-                <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}"/>
-            </StackPanel>
-        </hc:UniformSpacingPanel>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr1}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
+                    <hc:TextBox hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterEmail}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr2}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}">
+                        <hc:TextBox.Text>
+                            <Binding Path="Email2" UpdateSourceTrigger="PropertyChanged">
+                                <Binding.ValidationRules>
+                                    <hc:RegexRule Type="Mail"/>
+                                </Binding.ValidationRules>
+                            </Binding>
+                        </hc:TextBox.Text>
+                    </hc:TextBox>
+                    <hc:TextBox Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Margin="0,32,0,0" Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" Style="{StaticResource TextBoxPlus.Small}"/>
+                    <hc:TextBox hc:InfoElement.ShowClearButton="True" Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" hc:InfoElement.Necessary="True" Margin="0,16,0,0" Style="{StaticResource TextBoxPlus.Small}"/>
+                </StackPanel>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
index 6e054d8e..c430c1f4 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TimePickerDemoCtl.xaml
@@ -6,7 +6,7 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <ScrollViewer>
+        <hc:ScrollViewer IsInertiaEnabled="True">
             <hc:UniformSpacingPanel  Spacing="32" Margin="32" ChildWrapping="Wrap">
                 <StackPanel>
                     <hc:TimePicker ShowClearButton="True"/>
@@ -57,6 +57,6 @@
                     <hc:TimePicker Width="380" hc:InfoElement.TitleWidth="140" hc:InfoElement.TitlePlacement="Left" hc:InfoElement.Placeholder="{ex:Lang Key={x:Static langs:LangKeys.PlsEnterContent}}" hc:InfoElement.Title="{ex:Lang Key={x:Static langs:LangKeys.TitleDemoStr3}}" Style="{StaticResource TimePickerPlus.Small}" hc:InfoElement.Necessary="True" Margin="0,16,0,0"/>
                 </StackPanel>
             </hc:UniformSpacingPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml
index b7d76fec..c20c2c2d 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/TransitioningContentControlDemoCtl.xaml
@@ -2,52 +2,52 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
-             Background="{DynamicResource RegionBrush}"
-             Width="720"
-             Height="500">
-    <Grid Margin="32">
+             Background="{DynamicResource RegionBrush}">
+    <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition/>
         </Grid.RowDefinitions>
-        <ToggleButton Margin="0,0,0,32" IsChecked="True" Name="ButtonVisibilitySwitch" Style="{StaticResource ToggleButtonSwitch}"/>
-        <UniformGrid Visibility="{Binding IsChecked,ElementName=ButtonVisibilitySwitch,Converter={StaticResource Boolean2VisibilityConverter}}" Grid.Row="1" Rows="4" Columns="3">
-            <hc:TransitioningContentControl>
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2Left}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Left2Right">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2Right}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Bottom2Top">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2Top}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Top2Bottom">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2Bottom}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2RightWithFade}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Bottom2TopWithFade">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2TopWithFade}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2BottomWithFade}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
-                <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
-                <Label HorizontalAlignment="Stretch" Content="Custom1" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom2Transition}">
-                <Label HorizontalAlignment="Stretch" Content="Custom2" Margin="32"/>
-            </hc:TransitioningContentControl>
-            <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition}">
-                <Label HorizontalAlignment="Stretch" Content="Custom3" Margin="32"/>
-            </hc:TransitioningContentControl>
-        </UniformGrid>
+        <ToggleButton Margin="0,32,0,0" IsChecked="True" Name="ButtonVisibilitySwitch" Style="{StaticResource ToggleButtonSwitch}"/>
+        <hc:ScrollViewer IsInertiaEnabled="True" Grid.Row="1">
+            <hc:UniformSpacingPanel Visibility="{Binding IsChecked,ElementName=ButtonVisibilitySwitch,Converter={StaticResource Boolean2VisibilityConverter}}" MaxWidth="720" Margin="32" Spacing="32" ChildWrapping="Wrap">
+                <hc:TransitioningContentControl>
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2Left}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Left2Right">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2Right}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Bottom2Top">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2Top}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Top2Bottom">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2Bottom}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Left2RightWithFade">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Left2RightWithFade}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Bottom2TopWithFade">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Bottom2TopWithFade}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Top2BottomWithFade">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Top2BottomWithFade}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionMode="Right2LeftWithFade">
+                    <Label HorizontalAlignment="Stretch" Content="{x:Static hc:TransitionMode.Right2LeftWithFade}"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom1Transition}">
+                    <Label HorizontalAlignment="Stretch" Content="Custom1"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom2Transition}">
+                    <Label HorizontalAlignment="Stretch" Content="Custom2"/>
+                </hc:TransitioningContentControl>
+                <hc:TransitioningContentControl TransitionStoryboard="{StaticResource Custom3Transition}">
+                    <Label HorizontalAlignment="Stretch" Content="Custom3"/>
+                </hc:TransitioningContentControl>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml
index 6287df75..28f53324 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/UniformSpacingPanelDemoCtl.xaml
@@ -6,34 +6,36 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <hc:SimpleStackPanel Margin="32">
-            <hc:UniformSpacingPanel Spacing="10">
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-            </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="2,2"/>
-            <hc:UniformSpacingPanel Spacing="10" Orientation="Vertical">
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-            </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="2,2"/>
-            <hc:UniformSpacingPanel Spacing="10" Width="300" ChildWrapping="Wrap" HorizontalAlignment="Left">
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-            </hc:UniformSpacingPanel>
-            <hc:Divider LineStrokeDashArray="2,2"/>
-            <hc:UniformSpacingPanel Spacing="10" Orientation="Vertical" Height="70" ChildWrapping="Wrap" HorizontalAlignment="Left">
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-                <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
-            </hc:UniformSpacingPanel>
-        </hc:SimpleStackPanel>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:SimpleStackPanel Margin="32">
+                <hc:UniformSpacingPanel Spacing="10">
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                </hc:UniformSpacingPanel>
+                <hc:Divider LineStrokeDashArray="2,2"/>
+                <hc:UniformSpacingPanel Spacing="10" Orientation="Vertical">
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                </hc:UniformSpacingPanel>
+                <hc:Divider LineStrokeDashArray="2,2"/>
+                <hc:UniformSpacingPanel Spacing="10" Width="300" ChildWrapping="Wrap" HorizontalAlignment="Left">
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                </hc:UniformSpacingPanel>
+                <hc:Divider LineStrokeDashArray="2,2"/>
+                <hc:UniformSpacingPanel Spacing="10" Orientation="Vertical" Height="70" ChildWrapping="Wrap" HorizontalAlignment="Left">
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                    <Button Content="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}"/>
+                </hc:UniformSpacingPanel>
+            </hc:SimpleStackPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
index 37218e9a..4e1a662c 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WaterfallPanelDemoCtl.xaml
@@ -12,7 +12,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
             <hc:NumericUpDown x:Name="UpDownGroups" HorizontalAlignment="Center" Value="2" Minimum="1" Maximum="3" Width="200" Style="{StaticResource NumericUpDownExtend}" hc:TitleElement.Title="{ex:Lang Key={x:Static langs:LangKeys.Groups}}" hc:TitleElement.TitleWidth="50" hc:TitleElement.TitlePlacement="Left"/>
-            <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,16,0,0">
+            <hc:UniformSpacingPanel Grid.Row="1" Spacing="16" ChildWrapping="Wrap" Margin="0,16,0,0">
                 <hc:ScrollViewer MaxHeight="300">
                     <hc:WaterfallPanel VerticalAlignment="Center" Width="300" Groups="{Binding Value,ElementName=UpDownGroups}" hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
                         <Border Height="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
@@ -32,7 +32,7 @@
                         </Border>
                     </hc:WaterfallPanel>
                 </hc:ScrollViewer>
-                <hc:ScrollViewer Margin="32,0,0,0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" hc:ScrollViewerAttach.Orientation="Horizontal" MaxWidth="300">
+                <hc:ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden" hc:ScrollViewerAttach.Orientation="Horizontal" MaxWidth="300">
                     <hc:WaterfallPanel VerticalAlignment="Center" Height="300" Orientation="Vertical" Groups="{Binding Value,ElementName=UpDownGroups}" hc:PanelElement.FluidMoveBehavior="{StaticResource BehaviorXY200}">
                         <Border Width="100" Background="{DynamicResource PrimaryBrush}" Effect="{StaticResource EffectShadow1}" Margin="5">
                             <TextBlock Text="{ex:Lang Key={x:Static langs:LangKeys.ContentDemoStr}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
@@ -51,7 +51,7 @@
                         </Border>
                     </hc:WaterfallPanel>
                 </hc:ScrollViewer>
-            </StackPanel>
+            </hc:UniformSpacingPanel>
         </Grid>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
index cbbe9643..7ec91422 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Controls/WindowDemoCtl.xaml
@@ -8,16 +8,18 @@
              DataContext="{Binding WindowDemo,Source={StaticResource Locator}}"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
-            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCommonWindow}}"/>
-            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenBlurWindow}}"/>
-            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomNonClientAreaWindow}}"/>
-            <Button Click="ButtonMessage_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenMessageWindow}}"/>
-            <Button Click="ButtonCustomMessage_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomMessageWindow}}"/>
-            <Button Click="ButtonCustomContent_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomContentWindow}}"/>
-            <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenMouseFollowWindow}}"/>
-            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenNoNonClientAreaDragableWindow}}"/>
-            <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.GlowWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenGlowWindow}}"/>
-        </UniformGrid>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" ChildWrapping="Wrap" Spacing="16" VerticalAlignment="Center" MaxWidth="500">
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CommonWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCommonWindow}}"/>
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.BlurWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenBlurWindow}}"/>
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.CustomNonClientAreaWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomNonClientAreaWindow}}"/>
+                <Button Click="ButtonMessage_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenMessageWindow}}"/>
+                <Button Click="ButtonCustomMessage_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomMessageWindow}}"/>
+                <Button Click="ButtonCustomContent_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenCustomContentWindow}}"/>
+                <Button Name="ButtonMouseFollow" Click="ButtonMouseFollow_OnClick" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenMouseFollowWindow}}"/>
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NoNonClientAreaDragableWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenNoNonClientAreaDragableWindow}}"/>
+                <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.GlowWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenGlowWindow}}"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
index b0447226..f98cd9d2 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeScrollViewerDemoCtl.xaml
@@ -5,7 +5,7 @@
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}" 
-             Width="550"
+             MaxWidth="550"
              Height="600">
     <hc:TransitioningContentControl>
         <Grid Margin="32">
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml
index e7fd28b5..1caacbaa 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/NativeWindowDemoCtl.xaml
@@ -8,10 +8,10 @@
              xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <UniformGrid Margin="32" Columns="3" Rows="3" Height="200">
+        <hc:UniformSpacingPanel Margin="32" Spacing="16" ChildWrapping="Wrap" VerticalAlignment="Center">
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NativeCommonWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenNativeCommonWindow}}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.NavigationWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenNavigationWindow}}"/>
             <Button Command="{Binding OpenWindowCmd}" CommandParameter="{x:Static data:MessageToken.TouchDragMoveWindow}" Content="{ex:Lang Key={x:Static langs:LangKeys.OpenTouchDragMoveWindow}}"/>
-        </UniformGrid>
+        </hc:UniformSpacingPanel>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
index 2d652f2d..4f9c7d37 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/TextBlockDemoCtl.xaml
@@ -2,49 +2,28 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:hc="https://handyorg.github.io/handycontrol"
-             xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
-             xmlns:ex="clr-namespace:HandyControlDemo.Tools.Extension"
              Background="{DynamicResource RegionBrush}">
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32" Orientation="Horizontal">
-            <StackPanel>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLargeBold" Style="{StaticResource TextBlockLargeBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockLarge" Style="{StaticResource TextBlockLarge}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeaderBold" Style="{StaticResource TextBlockTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockHeader" Style="{StaticResource TextBlockTitle}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeaderBold" Style="{StaticResource TextBlockSubTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockSubHeader" Style="{StaticResource TextBlockSubTitle}"/>
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <hc:UniformSpacingPanel Margin="32" Spacing="5" Orientation="Vertical">
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockLargeBold" Style="{StaticResource TextBlockLargeBold}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockLarge" Style="{StaticResource TextBlockLarge}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockHeaderBold" Style="{StaticResource TextBlockTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockHeader" Style="{StaticResource TextBlockTitle}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockSubHeaderBold" Style="{StaticResource TextBlockSubTitleBold}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockSubHeader" Style="{StaticResource TextBlockSubTitle}"/>
 
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultBold" Style="{StaticResource TextBlockDefaultBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefault" Style="{StaticResource TextBlockDefault}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultAccent" Style="{StaticResource TextBlockDefaultAccent}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSecLight" Style="{StaticResource TextBlockDefaultSecLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultThiLight" Style="{StaticResource TextBlockDefaultThiLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultPrimary" Style="{StaticResource TextBlockDefaultPrimary}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultDanger" Style="{StaticResource TextBlockDefaultDanger}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultWarning" Style="{StaticResource TextBlockDefaultWarning}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultInfo" Style="{StaticResource TextBlockDefaultInfo}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="TextBlockDefaultSuccess" Style="{StaticResource TextBlockDefaultSuccess}"/>
-            </StackPanel>
-            <StackPanel Margin="10,0,0,0">
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockLargeBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockLarge}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{StaticResource TextBlockTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Title},Converter={StaticResource StringRepeatConverter},ConverterParameter=12}" Style="{StaticResource TextBlockTitle}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockSubTitleBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.SubTitle},Converter={StaticResource StringRepeatConverter},ConverterParameter=10}" Style="{StaticResource TextBlockSubTitle}"/>
-
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultBold}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefault}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultAccent}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultSecLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultThiLight}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultPrimary}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultDanger}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultWarning}"/>
-                <TextBlock HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultInfo}"/>
-                <TextBlock hc:TextBlockAttach.AutoTooltip="True" TextTrimming="CharacterEllipsis" Width="300" HorizontalAlignment="Left" Margin="5" Text="{ex:Lang Key={x:Static langs:LangKeys.Text},Converter={StaticResource StringRepeatConverter},ConverterParameter=20}" Style="{StaticResource TextBlockDefaultSuccess}"/>
-            </StackPanel>
-        </StackPanel>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultBold" Style="{StaticResource TextBlockDefaultBold}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefault" Style="{StaticResource TextBlockDefault}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultAccent" Style="{StaticResource TextBlockDefaultAccent}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultSecLight" Style="{StaticResource TextBlockDefaultSecLight}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultThiLight" Style="{StaticResource TextBlockDefaultThiLight}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultPrimary" Style="{StaticResource TextBlockDefaultPrimary}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultDanger" Style="{StaticResource TextBlockDefaultDanger}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultWarning" Style="{StaticResource TextBlockDefaultWarning}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultInfo" Style="{StaticResource TextBlockDefaultInfo}"/>
+                <TextBlock HorizontalAlignment="Left" Text="TextBlockDefaultSuccess" Style="{StaticResource TextBlockDefaultSuccess}"/>
+            </hc:UniformSpacingPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml
index 649aef85..01cbdd34 100644
--- a/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml
+++ b/src/Shared/HandyControlDemo_Shared/UserControl/Tools/EffectsDemoCtl.xaml
@@ -25,67 +25,69 @@
         </EventTrigger>
     </UserControl.Triggers>
     <hc:TransitioningContentControl>
-        <StackPanel Margin="32">
-            <UniformGrid Margin="16" Columns="3">
-                <Image Margin="16" Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg"/>
-                <Image Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
-                    <Image.Effect>
-                        <hc:ColorComplementEffect/>
-                    </Image.Effect>
-                </Image>
-                <Image Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
-                    <Image.Effect>
-                        <hc:GrayScaleEffect/>
-                    </Image.Effect>
-                </Image>
-                <Image Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
-                    <Image.Effect>
-                        <hc:GrayScaleEffect Scale=".7"/>
-                    </Image.Effect>
-                </Image>
-                <Image Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
-                    <Image.Effect>
-                        <hc:ColorMatrixEffect M11="-1" M22="-1" M33="-1" M41="1" M42="1" M43="1" M44="1" M51="1"/>
-                    </Image.Effect>
-                </Image>
-                <Image Width="120" Height="120" Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
-                    <Image.Effect>
-                        <hc:ColorMatrixEffect M11="1.5" M21="1.5" M31="1.5" M12="1.5" M22="1.5" M32="1.5" M13="1.5" M23="1.5" M33="1.5" M51="-1" M52="-1" M53="-1"/>
-                    </Image.Effect>
-                </Image>
-            </UniformGrid>
-            <hc:BlendEffectBox>
-                <hc:BlendEffectBox.Effects>
-                    <BlurEffect Radius="30"/>
-                    <hc:BrightnessEffect Brightness="1"/>
-                    <hc:ContrastEffect Contrast="20"/>
-                </hc:BlendEffectBox.Effects>
-                <StackPanel>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Border Width="100" Height="100" Background="Red" RenderTransformOrigin="0.5,0.5">
+        <hc:ScrollViewer IsInertiaEnabled="True">
+            <StackPanel Margin="32">
+                <hc:UniformSpacingPanel Margin="16" Spacing="16" ItemWidth="120" ItemHeight="120" ChildWrapping="Wrap" MaxWidth="392" HorizontalAlignment="Center">
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg"/>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
+                        <Image.Effect>
+                            <hc:ColorComplementEffect/>
+                        </Image.Effect>
+                    </Image>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
+                        <Image.Effect>
+                            <hc:GrayScaleEffect/>
+                        </Image.Effect>
+                    </Image>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
+                        <Image.Effect>
+                            <hc:GrayScaleEffect Scale=".7"/>
+                        </Image.Effect>
+                    </Image>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
+                        <Image.Effect>
+                            <hc:ColorMatrixEffect M11="-1" M22="-1" M33="-1" M41="1" M42="1" M43="1" M44="1" M51="1"/>
+                        </Image.Effect>
+                    </Image>
+                    <Image Source="/HandyControlDemo;component/Resources/Img/Album/10.jpg">
+                        <Image.Effect>
+                            <hc:ColorMatrixEffect M11="1.5" M21="1.5" M31="1.5" M12="1.5" M22="1.5" M32="1.5" M13="1.5" M23="1.5" M33="1.5" M51="-1" M52="-1" M53="-1"/>
+                        </Image.Effect>
+                    </Image>
+                </hc:UniformSpacingPanel>
+                <hc:BlendEffectBox Margin="0,16,0,0">
+                    <hc:BlendEffectBox.Effects>
+                        <BlurEffect Radius="30"/>
+                        <hc:BrightnessEffect Brightness="1"/>
+                        <hc:ContrastEffect Contrast="20"/>
+                    </hc:BlendEffectBox.Effects>
+                    <StackPanel>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Border Width="100" Height="100" Background="Red" RenderTransformOrigin="0.5,0.5">
+                                <Border.RenderTransform>
+                                    <TransformGroup>
+                                        <RotateTransform Angle="0" x:Name="TransformRotate1"/>
+                                    </TransformGroup>
+                                </Border.RenderTransform>
+                            </Border>
+                            <Border Margin="30,0,0,0" Width="100" Height="100" Background="Red" RenderTransformOrigin="0.5,0.5">
+                                <Border.RenderTransform>
+                                    <TransformGroup>
+                                        <RotateTransform Angle="0" x:Name="TransformRotate2"/>
+                                    </TransformGroup>
+                                </Border.RenderTransform>
+                            </Border>
+                        </StackPanel>
+                        <Border Width="100" Height="100" Background="Red" HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5">
                             <Border.RenderTransform>
                                 <TransformGroup>
-                                    <RotateTransform Angle="0" x:Name="TransformRotate1"/>
-                                </TransformGroup>
-                            </Border.RenderTransform>
-                        </Border>
-                        <Border Margin="30,0,0,0" Width="100" Height="100" Background="Red" RenderTransformOrigin="0.5,0.5">
-                            <Border.RenderTransform>
-                                <TransformGroup>
-                                    <RotateTransform Angle="0" x:Name="TransformRotate2"/>
+                                    <RotateTransform Angle="0" x:Name="TransformRotate3"/>
                                 </TransformGroup>
                             </Border.RenderTransform>
                         </Border>
                     </StackPanel>
-                    <Border Width="100" Height="100" Background="Red" HorizontalAlignment="Center" RenderTransformOrigin="0.5,0.5">
-                        <Border.RenderTransform>
-                            <TransformGroup>
-                                <RotateTransform Angle="0" x:Name="TransformRotate3"/>
-                            </TransformGroup>
-                        </Border.RenderTransform>
-                    </Border>
-                </StackPanel>
-            </hc:BlendEffectBox>
-        </StackPanel>
+                </hc:BlendEffectBox>
+            </StackPanel>
+        </hc:ScrollViewer>
     </hc:TransitioningContentControl>
 </UserControl>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
index f36589ba..a48202ef 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RadioButtonBaseStyle.xaml
@@ -148,6 +148,7 @@
     <Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}"/>
+        <Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}"/>
         <Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
         <Setter Property="hc:BorderElement.CornerRadius" Value="0"/>
         <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}"/>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index c804dea8..8c7f90ca 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -3015,6 +3015,7 @@
 	<Style x:Key="RadioButtonIconBaseStyle" BasedOn="{StaticResource ButtonBaseBaseStyle}" TargetType="RadioButton">
 		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisualRadius0}" />
+		<Setter Property="Foreground" Value="{DynamicResource PrimaryTextBrush}" />
 		<Setter Property="Background" Value="{DynamicResource RegionBrush}" />
 		<Setter Property="hc:BorderElement.CornerRadius" Value="0" />
 		<Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource PrimaryBrush}" />

From 2babb718a65ee3316bdb0ae1ac0edf678da049e9 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 20 Mar 2022 13:45:14 +0800
Subject: [PATCH 31/32] fix: fixed CoverView crash issue when the value of
 Groups is 0

---
 .../Controls/Cover/CoverView/CoverView.cs           | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
index 5cb9c9b7..07825942 100644
--- a/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Cover/CoverView/CoverView.cs
@@ -108,7 +108,12 @@ public class CoverView : RegularItemsControl
     internal static readonly DependencyProperty GroupsProperty = DependencyProperty.Register(
         "Groups", typeof(int), typeof(CoverView),
         new FrameworkPropertyMetadata(ValueBoxes.Int5Box, FrameworkPropertyMetadataOptions.AffectsMeasure,
-            OnGroupsChanged), IsGroupsValid);
+            OnGroupsChanged, CoerceGroups));
+
+    private static object CoerceGroups(DependencyObject d, object basevalue)
+    {
+        return (int) basevalue < 1 ? 1 : basevalue;
+    }
 
     internal static void OnGroupsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -118,12 +123,6 @@ public class CoverView : RegularItemsControl
         }
     }
 
-    private static bool IsGroupsValid(object value)
-    {
-        var v = (int) value;
-        return v >= 1;
-    }
-
     public int Groups
     {
         get => (int) GetValue(GroupsProperty);

From 5540eedbcfab223b42c78346aa3dae2493953dbf Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 20 Mar 2022 15:09:42 +0800
Subject: [PATCH 32/32] fix: fixed a measure issue of RelativePanel

---
 .../Controls/Panel/RelativePanel.cs                    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
index 2d379b18..410341a7 100644
--- a/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Panel/RelativePanel.cs
@@ -417,10 +417,18 @@ public class RelativePanel : Panel
 
         public void Measure(Size availableSize)
         {
-            AvailableSize = availableSize;
+            AvailableSize = EnsureValidSize(availableSize);
             Measure(_nodeDic.Values, null);
         }
 
+        private static Size EnsureValidSize(Size size)
+        {
+            var width = double.IsInfinity(size.Width) ? 0 : size.Width;
+            var height = double.IsInfinity(size.Height) ? 0 : size.Height;
+
+            return new Size(width, height);
+        }
+
         private void Measure(IEnumerable<GraphNode> nodes, HashSet<DependencyObject> set)
         {
             set ??= new HashSet<DependencyObject>();